From 69270cd38b4fea68f0432c075b9222724e1cc6da Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Wed, 9 Feb 2022 14:18:43 -0500 Subject: [PATCH 1/6] switch to using window.setTimeout --- packages/tracing/src/idletransaction.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/tracing/src/idletransaction.ts b/packages/tracing/src/idletransaction.ts index 7e876bb18660..8ec02ec7f1e9 100644 --- a/packages/tracing/src/idletransaction.ts +++ b/packages/tracing/src/idletransaction.ts @@ -1,6 +1,6 @@ import { Hub } from '@sentry/hub'; import { TransactionContext } from '@sentry/types'; -import { logger, timestampWithMs } from '@sentry/utils'; +import { getGlobalObject, logger, timestampWithMs } from '@sentry/utils'; import { FINISH_REASON_TAG, IDLE_TRANSACTION_FINISH_REASONS } from './constants'; import { Span, SpanRecorder } from './span'; @@ -9,6 +9,8 @@ import { Transaction } from './transaction'; export const DEFAULT_IDLE_TIMEOUT = 1000; export const HEARTBEAT_INTERVAL = 5000; +const global = getGlobalObject(); + /** * @inheritDoc */ @@ -71,7 +73,7 @@ export class IdleTransaction extends Transaction { * If a transaction is created and no activities are added, we want to make sure that * it times out properly. This is cleared and not used when activities are added. */ - private _initTimeout: ReturnType | undefined; + private _initTimeout: ReturnType | undefined; public constructor( transactionContext: TransactionContext, @@ -96,7 +98,7 @@ export class IdleTransaction extends Transaction { _idleHub.configureScope(scope => scope.setSpan(this)); } - this._initTimeout = setTimeout(() => { + this._initTimeout = global.setTimeout(() => { if (!this._finished) { this.finish(); } @@ -221,7 +223,7 @@ export class IdleTransaction extends Transaction { // Remember timestampWithMs is in seconds, timeout is in ms const end = timestampWithMs() + timeout / 1000; - setTimeout(() => { + global.setTimeout(() => { if (!this._finished) { this.setTag(FINISH_REASON_TAG, IDLE_TRANSACTION_FINISH_REASONS[1]); this.finish(end); @@ -265,7 +267,7 @@ export class IdleTransaction extends Transaction { */ private _pingHeartbeat(): void { logger.log(`pinging Heartbeat -> current counter: ${this._heartbeatCounter}`); - setTimeout(() => { + global.setTimeout(() => { this._beat(); }, HEARTBEAT_INTERVAL); } From 3dacee46af39feb5a95b0ad778d246e32637ee37 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Wed, 9 Feb 2022 15:38:06 -0500 Subject: [PATCH 2/6] feat(tracing): Reset IdleTimeout based on activities count --- .../tracing/src/browser/browsertracing.ts | 14 ++++- packages/tracing/src/constants.ts | 7 ++- packages/tracing/src/idletransaction.ts | 57 ++++++++++++++----- .../test/browser/browsertracing.test.ts | 3 +- packages/tracing/test/idletransaction.test.ts | 37 +++++++----- 5 files changed, 87 insertions(+), 31 deletions(-) diff --git a/packages/tracing/src/browser/browsertracing.ts b/packages/tracing/src/browser/browsertracing.ts index 4218f8e84fd7..7a530559b799 100644 --- a/packages/tracing/src/browser/browsertracing.ts +++ b/packages/tracing/src/browser/browsertracing.ts @@ -3,7 +3,7 @@ import { EventProcessor, Integration, Transaction, TransactionContext } from '@s import { getGlobalObject, logger } from '@sentry/utils'; import { startIdleTransaction } from '../hubextensions'; -import { DEFAULT_IDLE_TIMEOUT, IdleTransaction } from '../idletransaction'; +import { DEFAULT_FINAL_TIMEOUT, DEFAULT_IDLE_TIMEOUT, IdleTransaction } from '../idletransaction'; import { extractTraceparentData, secToMs } from '../utils'; import { registerBackgroundTabDetection } from './backgroundtab'; import { MetricsInstrumentation } from './metrics'; @@ -21,12 +21,23 @@ export interface BrowserTracingOptions extends RequestInstrumentationOptions { /** * The time to wait in ms until the transaction will be finished. The transaction will use the end timestamp of * the last finished span as the endtime for the transaction. + * * Time is in ms. * * Default: 1000 */ idleTimeout: number; + /** + * The max transaction duration for a transaction. If a transaction duration hits the `finalTimeout` value, it + * will be finished. + * + * Time is in ms. + * + * Default: 30000 + */ + finalTimeout: number; + /** * Flag to enable/disable creation of `navigation` transaction on history changes. * @@ -93,6 +104,7 @@ export interface BrowserTracingOptions extends RequestInstrumentationOptions { const DEFAULT_BROWSER_TRACING_OPTIONS = { idleTimeout: DEFAULT_IDLE_TIMEOUT, + finalTimeout: DEFAULT_FINAL_TIMEOUT, markBackgroundTransactions: true, maxTransactionDuration: DEFAULT_MAX_TRANSACTION_DURATION_SECONDS, routingInstrumentation: instrumentRoutingWithDefaults, diff --git a/packages/tracing/src/constants.ts b/packages/tracing/src/constants.ts index 3f01982c3614..2d02f3099571 100644 --- a/packages/tracing/src/constants.ts +++ b/packages/tracing/src/constants.ts @@ -2,4 +2,9 @@ // Readonly type should enforce that this is not mutated. export const FINISH_REASON_TAG = 'finishReason'; -export const IDLE_TRANSACTION_FINISH_REASONS = ['heartbeatFailed', 'idleTimeout', 'documentHidden'] as const; +export const IDLE_TRANSACTION_FINISH_REASONS = [ + 'heartbeatFailed', + 'idleTimeout', + 'documentHidden', + 'finalTimeout', +] as const; diff --git a/packages/tracing/src/idletransaction.ts b/packages/tracing/src/idletransaction.ts index 8ec02ec7f1e9..94492db7ba46 100644 --- a/packages/tracing/src/idletransaction.ts +++ b/packages/tracing/src/idletransaction.ts @@ -1,3 +1,4 @@ +/* eslint-disable max-lines */ import { Hub } from '@sentry/hub'; import { TransactionContext } from '@sentry/types'; import { getGlobalObject, logger, timestampWithMs } from '@sentry/utils'; @@ -7,6 +8,7 @@ import { Span, SpanRecorder } from './span'; import { Transaction } from './transaction'; export const DEFAULT_IDLE_TIMEOUT = 1000; +export const DEFAULT_FINAL_TIMEOUT = 30000; export const HEARTBEAT_INTERVAL = 5000; const global = getGlobalObject(); @@ -73,7 +75,7 @@ export class IdleTransaction extends Transaction { * If a transaction is created and no activities are added, we want to make sure that * it times out properly. This is cleared and not used when activities are added. */ - private _initTimeout: ReturnType | undefined; + private _idleTimeoutID: ReturnType | undefined; public constructor( transactionContext: TransactionContext, @@ -81,10 +83,21 @@ export class IdleTransaction extends Transaction { /** * The time to wait in ms until the idle transaction will be finished. * @default 1000 + * + * TODO: Make _idleTimeout and _finalTimeout required to reduce duplication when setting the options + * in `BrowserTracing`. This is considered a breaking change to the IdleTransaction API, + * so we need to make sure we communicate it with react native. */ private readonly _idleTimeout: number = DEFAULT_IDLE_TIMEOUT, // Whether or not the transaction should put itself on the scope when it starts and pop itself off when it ends private readonly _onScope: boolean = false, + /** + * The final value that a transaction cannot exceed + * @default 15000 + * @experimental + * @internal + */ + private readonly _finalTimeout: number = DEFAULT_FINAL_TIMEOUT, ) { super(transactionContext, _idleHub); @@ -98,11 +111,13 @@ export class IdleTransaction extends Transaction { _idleHub.configureScope(scope => scope.setSpan(this)); } - this._initTimeout = global.setTimeout(() => { + this._startIdleTimeout(); + global.setTimeout(() => { if (!this._finished) { + this.setTag(FINISH_REASON_TAG, IDLE_TRANSACTION_FINISH_REASONS[3]); this.finish(); } - }, this._idleTimeout); + }, this._finalTimeout); } /** {@inheritDoc} */ @@ -191,15 +206,35 @@ export class IdleTransaction extends Transaction { this.spanRecorder.add(this); } + /** + * Creates an idletimeout + */ + private _cancelIdleTimeout(): void { + if (this._idleTimeoutID) { + global.clearTimeout(this._idleTimeoutID); + this._idleTimeoutID = undefined; + } + } + + /** + * Creates an idletimeout + */ + private _startIdleTimeout(end?: Parameters[0]): void { + this._cancelIdleTimeout(); + this._idleTimeoutID = global.setTimeout(() => { + if (!this._finished && Object.keys(this.activities).length === 0) { + this.setTag(FINISH_REASON_TAG, IDLE_TRANSACTION_FINISH_REASONS[1]); + this.finish(end); + } + }, this._idleTimeout); + } + /** * Start tracking a specific activity. * @param spanId The span id that represents the activity */ private _pushActivity(spanId: string): void { - if (this._initTimeout) { - clearTimeout(this._initTimeout); - this._initTimeout = undefined; - } + this._cancelIdleTimeout(); logger.log(`[Tracing] pushActivity: ${spanId}`); this.activities[spanId] = true; logger.log('[Tracing] new activities count', Object.keys(this.activities).length); @@ -222,13 +257,7 @@ export class IdleTransaction extends Transaction { // We need to add the timeout here to have the real endtimestamp of the transaction // Remember timestampWithMs is in seconds, timeout is in ms const end = timestampWithMs() + timeout / 1000; - - global.setTimeout(() => { - if (!this._finished) { - this.setTag(FINISH_REASON_TAG, IDLE_TRANSACTION_FINISH_REASONS[1]); - this.finish(end); - } - }, timeout); + this._startIdleTimeout(end); } } diff --git a/packages/tracing/test/browser/browsertracing.test.ts b/packages/tracing/test/browser/browsertracing.test.ts index 5658dd34858c..fcfc3138cf13 100644 --- a/packages/tracing/test/browser/browsertracing.test.ts +++ b/packages/tracing/test/browser/browsertracing.test.ts @@ -14,7 +14,7 @@ import { MetricsInstrumentation } from '../../src/browser/metrics'; import { defaultRequestInstrumentationOptions } from '../../src/browser/request'; import { instrumentRoutingWithDefaults } from '../../src/browser/router'; import * as hubExtensions from '../../src/hubextensions'; -import { DEFAULT_IDLE_TIMEOUT, IdleTransaction } from '../../src/idletransaction'; +import { DEFAULT_IDLE_TIMEOUT, IdleTransaction, DEFAULT_FINAL_TIMEOUT } from '../../src/idletransaction'; import { getActiveTransaction, secToMs } from '../../src/utils'; let mockChangeHistory: ({ to, from }: { to: string; from?: string }) => void = () => undefined; @@ -83,6 +83,7 @@ describe('BrowserTracing', () => { expect(browserTracing.options).toEqual({ idleTimeout: DEFAULT_IDLE_TIMEOUT, + finalTimeout: DEFAULT_FINAL_TIMEOUT, markBackgroundTransactions: true, maxTransactionDuration: DEFAULT_MAX_TRANSACTION_DURATION_SECONDS, routingInstrumentation: instrumentRoutingWithDefaults, diff --git a/packages/tracing/test/idletransaction.test.ts b/packages/tracing/test/idletransaction.test.ts index b60fec726c54..b229ae349902 100644 --- a/packages/tracing/test/idletransaction.test.ts +++ b/packages/tracing/test/idletransaction.test.ts @@ -9,7 +9,16 @@ import { } from '../src/idletransaction'; import { Span } from '../src/span'; -export class SimpleTransport extends Transports.BaseTransport {} +type TransportSendRequest = Transports.BaseTransport['_sendRequest']; + +export class SimpleTransport extends Transports.BaseTransport { + protected _sendRequest( + _req: Parameters[0], + _payload: Parameters[1], + ): ReturnType { + throw new Error('Method not implemented.'); + } +} const dsn = 'https://123@sentry.io/42'; let hub: Hub; @@ -103,7 +112,7 @@ describe('IdleTransaction', () => { expect(transaction.activities).toMatchObject({ [span.spanId]: true, [childSpan.spanId]: true }); span.finish(); - jest.runOnlyPendingTimers(); + jest.advanceTimersByTime(DEFAULT_IDLE_TIMEOUT + 1); expect(mockFinish).toHaveBeenCalledTimes(0); expect(transaction.activities).toMatchObject({ [childSpan.spanId]: true }); @@ -229,20 +238,20 @@ describe('IdleTransaction', () => { transaction.startChild({}); // Beat 1 - jest.runOnlyPendingTimers(); + jest.advanceTimersByTime(HEARTBEAT_INTERVAL); expect(mockFinish).toHaveBeenCalledTimes(0); // Beat 2 - jest.runOnlyPendingTimers(); + jest.advanceTimersByTime(HEARTBEAT_INTERVAL); expect(mockFinish).toHaveBeenCalledTimes(0); // Beat 3 - jest.runOnlyPendingTimers(); + jest.advanceTimersByTime(HEARTBEAT_INTERVAL); expect(mockFinish).toHaveBeenCalledTimes(1); }); it('resets after new activities are added', () => { - const transaction = new IdleTransaction({ name: 'foo' }, hub, DEFAULT_IDLE_TIMEOUT); + const transaction = new IdleTransaction({ name: 'foo' }, hub, DEFAULT_IDLE_TIMEOUT, false, 50000); const mockFinish = jest.spyOn(transaction, 'finish'); transaction.initSpanRecorder(10); @@ -250,42 +259,42 @@ describe('IdleTransaction', () => { transaction.startChild({}); // Beat 1 - jest.runOnlyPendingTimers(); + jest.advanceTimersByTime(HEARTBEAT_INTERVAL); expect(mockFinish).toHaveBeenCalledTimes(0); const span = transaction.startChild(); // push activity // Beat 1 - jest.runOnlyPendingTimers(); + jest.advanceTimersByTime(HEARTBEAT_INTERVAL); expect(mockFinish).toHaveBeenCalledTimes(0); // Beat 2 - jest.runOnlyPendingTimers(); + jest.advanceTimersByTime(HEARTBEAT_INTERVAL); expect(mockFinish).toHaveBeenCalledTimes(0); transaction.startChild(); // push activity transaction.startChild(); // push activity // Beat 1 - jest.runOnlyPendingTimers(); + jest.advanceTimersByTime(HEARTBEAT_INTERVAL); expect(mockFinish).toHaveBeenCalledTimes(0); // Beat 2 - jest.runOnlyPendingTimers(); + jest.advanceTimersByTime(HEARTBEAT_INTERVAL); expect(mockFinish).toHaveBeenCalledTimes(0); span.finish(); // pop activity // Beat 1 - jest.runOnlyPendingTimers(); + jest.advanceTimersByTime(HEARTBEAT_INTERVAL); expect(mockFinish).toHaveBeenCalledTimes(0); // Beat 2 - jest.runOnlyPendingTimers(); + jest.advanceTimersByTime(HEARTBEAT_INTERVAL); expect(mockFinish).toHaveBeenCalledTimes(0); // Beat 3 - jest.runOnlyPendingTimers(); + jest.advanceTimersByTime(HEARTBEAT_INTERVAL); expect(mockFinish).toHaveBeenCalledTimes(1); // Heartbeat does not keep going after finish has been called From 52e642b19dd9a11cbba17b898973a28b178b2193 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Wed, 9 Feb 2022 15:45:08 -0500 Subject: [PATCH 3/6] update default --- packages/tracing/src/idletransaction.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tracing/src/idletransaction.ts b/packages/tracing/src/idletransaction.ts index 94492db7ba46..4e29feb56d8f 100644 --- a/packages/tracing/src/idletransaction.ts +++ b/packages/tracing/src/idletransaction.ts @@ -93,7 +93,7 @@ export class IdleTransaction extends Transaction { private readonly _onScope: boolean = false, /** * The final value that a transaction cannot exceed - * @default 15000 + * @default 30000 * @experimental * @internal */ From 8c35b6dbae9997fbd6b15035f89573b9e665c748 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Wed, 9 Feb 2022 18:53:59 -0500 Subject: [PATCH 4/6] prettier fix --- packages/tracing/test/browser/browsertracing.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tracing/test/browser/browsertracing.test.ts b/packages/tracing/test/browser/browsertracing.test.ts index fcfc3138cf13..b2117877690e 100644 --- a/packages/tracing/test/browser/browsertracing.test.ts +++ b/packages/tracing/test/browser/browsertracing.test.ts @@ -14,7 +14,7 @@ import { MetricsInstrumentation } from '../../src/browser/metrics'; import { defaultRequestInstrumentationOptions } from '../../src/browser/request'; import { instrumentRoutingWithDefaults } from '../../src/browser/router'; import * as hubExtensions from '../../src/hubextensions'; -import { DEFAULT_IDLE_TIMEOUT, IdleTransaction, DEFAULT_FINAL_TIMEOUT } from '../../src/idletransaction'; +import { DEFAULT_FINAL_TIMEOUT, DEFAULT_IDLE_TIMEOUT, IdleTransaction } from '../../src/idletransaction'; import { getActiveTransaction, secToMs } from '../../src/utils'; let mockChangeHistory: ({ to, from }: { to: string; from?: string }) => void = () => undefined; From 5aebbe025de55710c7ff8848b6e3697966e8a02b Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Fri, 11 Feb 2022 09:35:51 -0500 Subject: [PATCH 5/6] [DO NOT MERGE] 6.17.8-beta.0 branch This branch tracks the beta for `6.17.8-beta.0`. For more information, see: https://github.com/getsentry/sentry-javascript/pull/4531. --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3610e554ff38..d08d2097bec2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott +## 6.17.8-beta.0 + +- feat(tracing): Reset IdleTimeout based on activities count ([#4531](https://github.com/getsentry/sentry-javascript/pull/4531)) + ## 6.17.7 - fix(utils): Make new non-enumerable properties mutable ([#4528](https://github.com/getsentry/sentry-javascript/pull/4528)) From 07f9257fb156682d16d56ef4d338abd27dc17fc8 Mon Sep 17 00:00:00 2001 From: getsentry-bot Date: Fri, 11 Feb 2022 14:40:11 +0000 Subject: [PATCH 6/6] release: 6.17.8-beta.0 --- lerna.json | 2 +- packages/angular/package.json | 8 ++++---- packages/browser/package.json | 8 ++++---- packages/core/package.json | 10 +++++----- packages/core/src/version.ts | 2 +- packages/ember/package.json | 10 +++++----- packages/eslint-config-sdk/package.json | 6 +++--- packages/eslint-plugin-sdk/package.json | 2 +- packages/gatsby/package.json | 8 ++++---- packages/hub/package.json | 6 +++--- packages/integration-tests/package.json | 2 +- packages/integrations/package.json | 6 +++--- packages/minimal/package.json | 6 +++--- packages/nextjs/package.json | 18 +++++++++--------- packages/node/package.json | 12 ++++++------ packages/react/package.json | 10 +++++----- packages/serverless/package.json | 12 ++++++------ packages/tracing/package.json | 12 ++++++------ packages/types/package.json | 2 +- packages/typescript/package.json | 2 +- packages/utils/package.json | 4 ++-- packages/vue/package.json | 12 ++++++------ packages/wasm/package.json | 6 +++--- 23 files changed, 83 insertions(+), 83 deletions(-) diff --git a/lerna.json b/lerna.json index 5f9b947ee386..a87215e63204 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "3.4.0", - "version": "6.17.7", + "version": "6.17.8-beta.0", "packages": "packages/*", "npmClient": "yarn", "useWorkspaces": true diff --git a/packages/angular/package.json b/packages/angular/package.json index 104c8ee48604..edee5f86a42f 100644 --- a/packages/angular/package.json +++ b/packages/angular/package.json @@ -1,6 +1,6 @@ { "name": "@sentry/angular", - "version": "6.17.7", + "version": "6.17.8-beta.0", "description": "Official Sentry SDK for Angular", "repository": "git://github.com/getsentry/sentry-javascript.git", "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular", @@ -21,9 +21,9 @@ "@angular/router": "10.x || 11.x || 12.x || 13.x" }, "dependencies": { - "@sentry/browser": "6.17.7", - "@sentry/types": "6.17.7", - "@sentry/utils": "6.17.7", + "@sentry/browser": "6.17.8-beta.0", + "@sentry/types": "6.17.8-beta.0", + "@sentry/utils": "6.17.8-beta.0", "rxjs": "^6.6.0", "tslib": "^1.9.3" }, diff --git a/packages/browser/package.json b/packages/browser/package.json index bb78947c93c5..4b6533582b3b 100644 --- a/packages/browser/package.json +++ b/packages/browser/package.json @@ -1,6 +1,6 @@ { "name": "@sentry/browser", - "version": "6.17.7", + "version": "6.17.8-beta.0", "description": "Official Sentry SDK for browsers", "repository": "git://github.com/getsentry/sentry-javascript.git", "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser", @@ -16,9 +16,9 @@ "access": "public" }, "dependencies": { - "@sentry/core": "6.17.7", - "@sentry/types": "6.17.7", - "@sentry/utils": "6.17.7", + "@sentry/core": "6.17.8-beta.0", + "@sentry/types": "6.17.8-beta.0", + "@sentry/utils": "6.17.8-beta.0", "tslib": "^1.9.3" }, "devDependencies": { diff --git a/packages/core/package.json b/packages/core/package.json index d04d1843d313..71a32c34ca9a 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@sentry/core", - "version": "6.17.7", + "version": "6.17.8-beta.0", "description": "Base implementation for all Sentry JavaScript SDKs", "repository": "git://github.com/getsentry/sentry-javascript.git", "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/core", @@ -16,10 +16,10 @@ "access": "public" }, "dependencies": { - "@sentry/hub": "6.17.7", - "@sentry/minimal": "6.17.7", - "@sentry/types": "6.17.7", - "@sentry/utils": "6.17.7", + "@sentry/hub": "6.17.8-beta.0", + "@sentry/minimal": "6.17.8-beta.0", + "@sentry/types": "6.17.8-beta.0", + "@sentry/utils": "6.17.8-beta.0", "tslib": "^1.9.3" }, "scripts": { diff --git a/packages/core/src/version.ts b/packages/core/src/version.ts index 9fef40546d58..494f1e0fd64a 100644 --- a/packages/core/src/version.ts +++ b/packages/core/src/version.ts @@ -1 +1 @@ -export const SDK_VERSION = '6.17.7'; +export const SDK_VERSION = '6.17.8-beta.0'; diff --git a/packages/ember/package.json b/packages/ember/package.json index b1a377ac97e8..eb3d24c36a39 100644 --- a/packages/ember/package.json +++ b/packages/ember/package.json @@ -1,6 +1,6 @@ { "name": "@sentry/ember", - "version": "6.17.7", + "version": "6.17.8-beta.0", "description": "Official Sentry SDK for Ember.js", "repository": "git://github.com/getsentry/sentry-javascript.git", "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/ember", @@ -31,10 +31,10 @@ }, "dependencies": { "@embroider/macros": "~0.47.2", - "@sentry/browser": "6.17.7", - "@sentry/tracing": "6.17.7", - "@sentry/types": "6.17.7", - "@sentry/utils": "6.17.7", + "@sentry/browser": "6.17.8-beta.0", + "@sentry/tracing": "6.17.8-beta.0", + "@sentry/types": "6.17.8-beta.0", + "@sentry/utils": "6.17.8-beta.0", "ember-auto-import": "^1.12.0 || ^2.2.0", "ember-cli-babel": "~7.26.6", "ember-cli-htmlbars": "^6.0.1", diff --git a/packages/eslint-config-sdk/package.json b/packages/eslint-config-sdk/package.json index 5169192c49bb..31ec4090cada 100644 --- a/packages/eslint-config-sdk/package.json +++ b/packages/eslint-config-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@sentry-internal/eslint-config-sdk", - "version": "6.17.7", + "version": "6.17.8-beta.0", "description": "Official Sentry SDK eslint config", "repository": "git://github.com/getsentry/sentry-javascript.git", "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sdk", @@ -19,8 +19,8 @@ "access": "public" }, "dependencies": { - "@sentry-internal/eslint-plugin-sdk": "6.17.7", - "@sentry-internal/typescript": "6.17.7", + "@sentry-internal/eslint-plugin-sdk": "6.17.8-beta.0", + "@sentry-internal/typescript": "6.17.8-beta.0", "@typescript-eslint/eslint-plugin": "^3.9.0", "@typescript-eslint/parser": "^3.9.0", "eslint-config-prettier": "^6.11.0", diff --git a/packages/eslint-plugin-sdk/package.json b/packages/eslint-plugin-sdk/package.json index db3e23f7f922..d644c9a5e918 100644 --- a/packages/eslint-plugin-sdk/package.json +++ b/packages/eslint-plugin-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@sentry-internal/eslint-plugin-sdk", - "version": "6.17.7", + "version": "6.17.8-beta.0", "description": "Official Sentry SDK eslint plugin", "repository": "git://github.com/getsentry/sentry-javascript.git", "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sdk", diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json index bf785558b314..c0d448829cf8 100644 --- a/packages/gatsby/package.json +++ b/packages/gatsby/package.json @@ -1,6 +1,6 @@ { "name": "@sentry/gatsby", - "version": "6.17.7", + "version": "6.17.8-beta.0", "description": "Official Sentry SDK for Gatsby.js", "repository": "git://github.com/getsentry/sentry-javascript.git", "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby", @@ -26,15 +26,15 @@ "access": "public" }, "dependencies": { - "@sentry/react": "6.17.7", - "@sentry/tracing": "6.17.7", + "@sentry/react": "6.17.8-beta.0", + "@sentry/tracing": "6.17.8-beta.0", "@sentry/webpack-plugin": "1.18.5" }, "peerDependencies": { "gatsby": "^2.0.0 || ^3.0.0 || ^4.0.0" }, "devDependencies": { - "@sentry/types": "6.17.7", + "@sentry/types": "6.17.8-beta.0", "@testing-library/react": "^10.4.9", "react": "^17.0.0" }, diff --git a/packages/hub/package.json b/packages/hub/package.json index 2e69ef1234bb..772cf3747225 100644 --- a/packages/hub/package.json +++ b/packages/hub/package.json @@ -1,6 +1,6 @@ { "name": "@sentry/hub", - "version": "6.17.7", + "version": "6.17.8-beta.0", "description": "Sentry hub which handles global state managment.", "repository": "git://github.com/getsentry/sentry-javascript.git", "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/hub", @@ -16,8 +16,8 @@ "access": "public" }, "dependencies": { - "@sentry/types": "6.17.7", - "@sentry/utils": "6.17.7", + "@sentry/types": "6.17.8-beta.0", + "@sentry/utils": "6.17.8-beta.0", "tslib": "^1.9.3" }, "scripts": { diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json index b9216d98ccb2..68b90fa2e457 100644 --- a/packages/integration-tests/package.json +++ b/packages/integration-tests/package.json @@ -1,6 +1,6 @@ { "name": "@sentry-internal/browser-integration-tests", - "version": "6.17.7", + "version": "6.17.8-beta.0", "main": "index.js", "license": "MIT", "engines": { diff --git a/packages/integrations/package.json b/packages/integrations/package.json index f1a5f2606072..f12976f37892 100644 --- a/packages/integrations/package.json +++ b/packages/integrations/package.json @@ -1,6 +1,6 @@ { "name": "@sentry/integrations", - "version": "6.17.7", + "version": "6.17.8-beta.0", "description": "Pluggable integrations that can be used to enhance JS SDKs", "repository": "git://github.com/getsentry/sentry-javascript.git", "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/integrations", @@ -16,8 +16,8 @@ "module": "esm/index.js", "types": "dist/index.d.ts", "dependencies": { - "@sentry/types": "6.17.7", - "@sentry/utils": "6.17.7", + "@sentry/types": "6.17.8-beta.0", + "@sentry/utils": "6.17.8-beta.0", "localforage": "^1.8.1", "tslib": "^1.9.3" }, diff --git a/packages/minimal/package.json b/packages/minimal/package.json index 6ff86187fb58..ae0a1b136261 100644 --- a/packages/minimal/package.json +++ b/packages/minimal/package.json @@ -1,6 +1,6 @@ { "name": "@sentry/minimal", - "version": "6.17.7", + "version": "6.17.8-beta.0", "description": "Sentry minimal library that can be used in other packages", "repository": "git://github.com/getsentry/sentry-javascript.git", "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/minimal", @@ -16,8 +16,8 @@ "access": "public" }, "dependencies": { - "@sentry/hub": "6.17.7", - "@sentry/types": "6.17.7", + "@sentry/hub": "6.17.8-beta.0", + "@sentry/types": "6.17.8-beta.0", "tslib": "^1.9.3" }, "scripts": { diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json index ddd2b6d93cc1..fa25309e94e8 100644 --- a/packages/nextjs/package.json +++ b/packages/nextjs/package.json @@ -1,6 +1,6 @@ { "name": "@sentry/nextjs", - "version": "6.17.7", + "version": "6.17.8-beta.0", "description": "Official Sentry SDK for Next.js", "repository": "git://github.com/getsentry/sentry-javascript.git", "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs", @@ -17,18 +17,18 @@ "access": "public" }, "dependencies": { - "@sentry/core": "6.17.7", - "@sentry/hub": "6.17.7", - "@sentry/integrations": "6.17.7", - "@sentry/node": "6.17.7", - "@sentry/react": "6.17.7", - "@sentry/tracing": "6.17.7", - "@sentry/utils": "6.17.7", + "@sentry/core": "6.17.8-beta.0", + "@sentry/hub": "6.17.8-beta.0", + "@sentry/integrations": "6.17.8-beta.0", + "@sentry/node": "6.17.8-beta.0", + "@sentry/react": "6.17.8-beta.0", + "@sentry/tracing": "6.17.8-beta.0", + "@sentry/utils": "6.17.8-beta.0", "@sentry/webpack-plugin": "1.18.5", "tslib": "^1.9.3" }, "devDependencies": { - "@sentry/types": "6.17.7", + "@sentry/types": "6.17.8-beta.0", "@types/webpack": "^4.41.31", "next": "10.1.3" }, diff --git a/packages/node/package.json b/packages/node/package.json index 8120a46aa333..d794d8c4fd09 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -1,6 +1,6 @@ { "name": "@sentry/node", - "version": "6.17.7", + "version": "6.17.8-beta.0", "description": "Official Sentry SDK for Node.js", "repository": "git://github.com/getsentry/sentry-javascript.git", "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node", @@ -16,11 +16,11 @@ "access": "public" }, "dependencies": { - "@sentry/core": "6.17.7", - "@sentry/hub": "6.17.7", - "@sentry/tracing": "6.17.7", - "@sentry/types": "6.17.7", - "@sentry/utils": "6.17.7", + "@sentry/core": "6.17.8-beta.0", + "@sentry/hub": "6.17.8-beta.0", + "@sentry/tracing": "6.17.8-beta.0", + "@sentry/types": "6.17.8-beta.0", + "@sentry/utils": "6.17.8-beta.0", "cookie": "^0.4.1", "https-proxy-agent": "^5.0.0", "lru_map": "^0.3.3", diff --git a/packages/react/package.json b/packages/react/package.json index 9abed4212e44..baf2c064546e 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@sentry/react", - "version": "6.17.7", + "version": "6.17.8-beta.0", "description": "Official Sentry SDK for React.js", "repository": "git://github.com/getsentry/sentry-javascript.git", "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react", @@ -16,10 +16,10 @@ "access": "public" }, "dependencies": { - "@sentry/browser": "6.17.7", - "@sentry/minimal": "6.17.7", - "@sentry/types": "6.17.7", - "@sentry/utils": "6.17.7", + "@sentry/browser": "6.17.8-beta.0", + "@sentry/minimal": "6.17.8-beta.0", + "@sentry/types": "6.17.8-beta.0", + "@sentry/utils": "6.17.8-beta.0", "hoist-non-react-statics": "^3.3.2", "tslib": "^1.9.3" }, diff --git a/packages/serverless/package.json b/packages/serverless/package.json index d1592771cf5f..b96dbb453b7f 100644 --- a/packages/serverless/package.json +++ b/packages/serverless/package.json @@ -1,6 +1,6 @@ { "name": "@sentry/serverless", - "version": "6.17.7", + "version": "6.17.8-beta.0", "description": "Official Sentry SDK for various serverless solutions", "repository": "git://github.com/getsentry/sentry-javascript.git", "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/serverless", @@ -16,11 +16,11 @@ "access": "public" }, "dependencies": { - "@sentry/minimal": "6.17.7", - "@sentry/node": "6.17.7", - "@sentry/tracing": "6.17.7", - "@sentry/types": "6.17.7", - "@sentry/utils": "6.17.7", + "@sentry/minimal": "6.17.8-beta.0", + "@sentry/node": "6.17.8-beta.0", + "@sentry/tracing": "6.17.8-beta.0", + "@sentry/types": "6.17.8-beta.0", + "@sentry/utils": "6.17.8-beta.0", "@types/aws-lambda": "^8.10.62", "@types/express": "^4.17.2", "tslib": "^1.9.3" diff --git a/packages/tracing/package.json b/packages/tracing/package.json index d200f06ddfa8..a66966c14b84 100644 --- a/packages/tracing/package.json +++ b/packages/tracing/package.json @@ -1,6 +1,6 @@ { "name": "@sentry/tracing", - "version": "6.17.7", + "version": "6.17.8-beta.0", "description": "Extensions for Sentry AM", "repository": "git://github.com/getsentry/sentry-javascript.git", "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tracing", @@ -16,14 +16,14 @@ "access": "public" }, "dependencies": { - "@sentry/hub": "6.17.7", - "@sentry/minimal": "6.17.7", - "@sentry/types": "6.17.7", - "@sentry/utils": "6.17.7", + "@sentry/hub": "6.17.8-beta.0", + "@sentry/minimal": "6.17.8-beta.0", + "@sentry/types": "6.17.8-beta.0", + "@sentry/utils": "6.17.8-beta.0", "tslib": "^1.9.3" }, "devDependencies": { - "@sentry/browser": "6.17.7", + "@sentry/browser": "6.17.8-beta.0", "@types/express": "^4.17.1", "@types/jsdom": "^16.2.3", "jsdom": "^16.2.2", diff --git a/packages/types/package.json b/packages/types/package.json index bb77c30ac838..2dc19d87952a 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@sentry/types", - "version": "6.17.7", + "version": "6.17.8-beta.0", "description": "Types for all Sentry JavaScript SDKs", "repository": "git://github.com/getsentry/sentry-javascript.git", "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/types", diff --git a/packages/typescript/package.json b/packages/typescript/package.json index 9131716d749b..6beaa54b658d 100644 --- a/packages/typescript/package.json +++ b/packages/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@sentry-internal/typescript", - "version": "6.17.7", + "version": "6.17.8-beta.0", "description": "Typescript configuration used at Sentry", "repository": "git://github.com/getsentry/sentry-javascript.git", "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/typescript", diff --git a/packages/utils/package.json b/packages/utils/package.json index 14b20abcdd22..f1a444bc7845 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@sentry/utils", - "version": "6.17.7", + "version": "6.17.8-beta.0", "description": "Utilities for all Sentry JavaScript SDKs", "repository": "git://github.com/getsentry/sentry-javascript.git", "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/utils", @@ -16,7 +16,7 @@ "access": "public" }, "dependencies": { - "@sentry/types": "6.17.7", + "@sentry/types": "6.17.8-beta.0", "tslib": "^1.9.3" }, "devDependencies": { diff --git a/packages/vue/package.json b/packages/vue/package.json index 1d176a2943a8..0d9c030dc369 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -1,6 +1,6 @@ { "name": "@sentry/vue", - "version": "6.17.7", + "version": "6.17.8-beta.0", "description": "Official Sentry SDK for Vue.js", "repository": "git://github.com/getsentry/sentry-javascript.git", "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/vue", @@ -16,11 +16,11 @@ "access": "public" }, "dependencies": { - "@sentry/browser": "6.17.7", - "@sentry/core": "6.17.7", - "@sentry/minimal": "6.17.7", - "@sentry/types": "6.17.7", - "@sentry/utils": "6.17.7", + "@sentry/browser": "6.17.8-beta.0", + "@sentry/core": "6.17.8-beta.0", + "@sentry/minimal": "6.17.8-beta.0", + "@sentry/types": "6.17.8-beta.0", + "@sentry/utils": "6.17.8-beta.0", "tslib": "^1.9.3" }, "peerDependencies": { diff --git a/packages/wasm/package.json b/packages/wasm/package.json index a6e5a9448e50..05f8ad302a2c 100644 --- a/packages/wasm/package.json +++ b/packages/wasm/package.json @@ -1,6 +1,6 @@ { "name": "@sentry/wasm", - "version": "6.17.7", + "version": "6.17.8-beta.0", "description": "Support for WASM.", "repository": "git://github.com/getsentry/sentry-javascript.git", "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/wasm", @@ -16,8 +16,8 @@ "access": "public" }, "dependencies": { - "@sentry/browser": "6.17.7", - "@sentry/types": "6.17.7", + "@sentry/browser": "6.17.8-beta.0", + "@sentry/types": "6.17.8-beta.0", "tslib": "^1.9.3" }, "devDependencies": {