Merge branch 'develop' into feat-replay-add-more-dom-attributes-on-click

Author: billyvg

packages/core/src/tracing/idletransaction.ts

@@ -239,10 +239,10 @@ export class IdleTransaction extends Transaction {
       restartOnChildSpanChange: true,
     },
   ): void {
+    this._idleTimeoutCanceledPermanently = restartOnChildSpanChange === false;
     if (this._idleTimeoutID) {
       clearTimeout(this._idleTimeoutID);
       this._idleTimeoutID = undefined;
-      this._idleTimeoutCanceledPermanently = restartOnChildSpanChange === false;
 
       if (Object.keys(this.activities).length === 0 && this._idleTimeoutCanceledPermanently) {
         this._finishReason = IDLE_TRANSACTION_FINISH_REASONS[5];
@@ -269,7 +269,7 @@ export class IdleTransaction extends Transaction {
    * @param spanId The span id that represents the activity
    */
   private _pushActivity(spanId: string): void {
-    this.cancelIdleTimeout();
+    this.cancelIdleTimeout(undefined, { restartOnChildSpanChange: !this._idleTimeoutCanceledPermanently });
     __DEBUG_BUILD__ && logger.log(`[Tracing] pushActivity: ${spanId}`);
     this.activities[spanId] = true;
     __DEBUG_BUILD__ && logger.log('[Tracing] new activities count', Object.keys(this.activities).length);

packages/tracing-internal/src/index.ts

@@ -1,34 +1,14 @@
 export * from './exports';
 
-import { addExtensionMethods } from './extensions';
-import * as Integrations from './node/integrations';
-
-export { Integrations };
-
-// BrowserTracing is already exported as part of `Integrations` above (and for the moment will remain so for
-// backwards compatibility), but that interferes with treeshaking, so we also export it separately
-// here.
-//
-// Previously we expected users to import tracing integrations like
-//
-// import { Integrations } from '@sentry/tracing';
-// const instance = new Integrations.BrowserTracing();
-//
-// This makes the integrations unable to be treeshaken though. To address this, we now have
-// this individual export. We now expect users to consume BrowserTracing like so:
-//
-// import { BrowserTracing } from '@sentry/tracing';
-// const instance = new BrowserTracing();
-//
-// For an example of of the new usage of BrowserTracing, see @sentry/nextjs index.client.ts
-export { BrowserTracing } from './browser';
+export { Apollo, Express, GraphQL, Mongo, Mysql, Postgres, Prisma } from './node/integrations';
 
 export {
+  BrowserTracing,
   BROWSER_TRACING_INTEGRATION_ID,
   instrumentOutgoingRequests,
   defaultRequestInstrumentationOptions,
 } from './browser';
 
 export type { RequestInstrumentationOptions } from './browser';
 
-export { addExtensionMethods };
+export { addExtensionMethods } from './extensions';

packages/tracing-internal/src/node/integrations/index.ts

@@ -5,7 +5,3 @@ export { Mongo } from './mongo';
 export { Prisma } from './prisma';
 export { GraphQL } from './graphql';
 export { Apollo } from './apollo';
-
-// TODO(v8): Remove this export
-// Please see `src/index.ts` for more details.
-export { BrowserTracing } from '../../browser';

packages/tracing/src/index.ts

@@ -1,6 +1,49 @@
-export * from '@sentry-internal/tracing';
+export {
+  // BrowserTracing is already exported as part of `Integrations` below (and for the moment will remain so for
+  // backwards compatibility), but that interferes with treeshaking, so we also export it separately
+  // here.
+  BrowserTracing,
+  BROWSER_TRACING_INTEGRATION_ID,
+  IdleTransaction,
+  Span,
+  // eslint-disable-next-line deprecation/deprecation
+  SpanStatus,
+  TRACEPARENT_REGEXP,
+  Transaction,
+  addExtensionMethods,
+  defaultRequestInstrumentationOptions,
+  extractTraceparentData,
+  instrumentOutgoingRequests,
+  getActiveTransaction,
+  hasTracingEnabled,
+  spanStatusfromHttpCode,
+  startIdleTransaction,
+  stripUrlQueryAndFragment,
+} from '@sentry-internal/tracing';
+export type { RequestInstrumentationOptions, SpanStatusType } from '@sentry-internal/tracing';
 
-import { addExtensionMethods } from '@sentry-internal/tracing';
+import {
+  addExtensionMethods,
+  Apollo,
+  BrowserTracing,
+  Express,
+  GraphQL,
+  Mongo,
+  Mysql,
+  Postgres,
+  Prisma,
+} from '@sentry-internal/tracing';
+
+export const Integrations = {
+  BrowserTracing: BrowserTracing,
+  Apollo: Apollo,
+  Express: Express,
+  GraphQL: GraphQL,
+  Mongo: Mongo,
+  Mysql: Mysql,
+  Postgres: Postgres,
+  Prisma: Prisma,
+};
 
 // Treeshakable guard to remove all code related to tracing
 declare const __SENTRY_TRACING__: boolean;
@@ -10,5 +53,3 @@ if (typeof __SENTRY_TRACING__ === 'undefined' || __SENTRY_TRACING__) {
   // We are patching the global object with our hub extension methods
   addExtensionMethods();
 }
-
-export { addExtensionMethods };

packages/tracing/test/idletransaction.test.ts

@@ -248,6 +248,40 @@ describe('IdleTransaction', () => {
   });
 
   describe('cancelIdleTimeout', () => {
+    it('permanent idle timeout cancel is not restarted by child span start', () => {
+      const idleTimeout = 10;
+      const transaction = new IdleTransaction({ name: 'foo', startTimestamp: 1234 }, hub, idleTimeout);
+      transaction.initSpanRecorder(10);
+
+      const firstSpan = transaction.startChild({});
+      transaction.cancelIdleTimeout(undefined, { restartOnChildSpanChange: false });
+      const secondSpan = transaction.startChild({});
+      firstSpan.finish();
+      secondSpan.finish();
+
+      expect(transaction.endTimestamp).toBeDefined();
+    });
+
+    it('permanent idle timeout cancel finished the transaction with the last child', () => {
+      const idleTimeout = 10;
+      const transaction = new IdleTransaction({ name: 'foo', startTimestamp: 1234 }, hub, idleTimeout);
+      transaction.initSpanRecorder(10);
+
+      const firstSpan = transaction.startChild({});
+      transaction.cancelIdleTimeout(undefined, { restartOnChildSpanChange: false });
+      const secondSpan = transaction.startChild({});
+      const thirdSpan = transaction.startChild({});
+
+      firstSpan.finish();
+      expect(transaction.endTimestamp).toBeUndefined();
+
+      secondSpan.finish();
+      expect(transaction.endTimestamp).toBeUndefined();
+
+      thirdSpan.finish();
+      expect(transaction.endTimestamp).toBeDefined();
+    });
+
     it('permanent idle timeout cancel finishes transaction if there are no activities', () => {
       const idleTimeout = 10;
       const transaction = new IdleTransaction({ name: 'foo', startTimestamp: 1234 }, hub, idleTimeout);