zero counter

Author: AbhiPrasad

packages/tracing/src/idletransaction.ts

@@ -72,6 +72,8 @@ export class IdleTransaction extends Transaction {
 
   private _finishCallback: Function | undefined = undefined;
 
+  private _zeroActivityCounter: number = 0;
+
   private readonly _idleHub: Hub | undefined;
 
   public constructor(transactionContext: TransactionContext, hub?: Hub, idleTimeout: number = 500) {
@@ -82,7 +84,7 @@ export class IdleTransaction extends Transaction {
     if (hub) {
       // We set the transaction here on the scope so error events pick up the trace
       // context and attach it to the error.
-      logger.log('Setting transaction on scope');
+      logger.log('Setting idle transaction on scope');
       hub.configureScope(scope => scope.setSpan(this));
     }
 
@@ -140,6 +142,8 @@ export class IdleTransaction extends Transaction {
    * Unsets the current active transaction + activities
    */
   private _resetActiveTransaction(): void {
+    this._finished = true;
+    this.activities = {};
     if (this._idleHub) {
       const scope = this._idleHub.getScope();
       if (scope) {
@@ -155,11 +159,10 @@ export class IdleTransaction extends Transaction {
    * Finish the current active idle transaction
    */
   public finishIdleTransaction(endTimestamp: number): void {
-    this._finished = true;
     this._resetActiveTransaction();
 
     if (this.spanRecorder) {
-      logger.log('[Tracing] finishing IdleTransaction', new Date(endTimestamp * 1000).toISOString());
+      logger.log('[Tracing] finishing IdleTransaction', new Date(endTimestamp * 1000).toISOString(), this.op);
 
       if (this._finishCallback) {
         this._finishCallback(this);
@@ -201,8 +204,8 @@ export class IdleTransaction extends Transaction {
    */
   private _pushActivity(spanId: string): void {
     logger.log(`[Tracing] pushActivity: ${spanId}`);
-    logger.log('[Tracing] activities count', Object.keys(this.activities).length);
     this.activities[spanId] = true;
+    logger.log('[Tracing] new activities count', Object.keys(this.activities).length);
   }
 
   /**
@@ -214,18 +217,20 @@ export class IdleTransaction extends Transaction {
       logger.log(`[Tracing] popActivity ${spanId}`);
       // tslint:disable-next-line: no-dynamic-delete
       delete this.activities[spanId];
-      logger.log('[Tracing] activities count', Object.keys(this.activities).length);
+      logger.log('[Tracing] new activities count', Object.keys(this.activities).length);
     }
 
-    const count = Object.keys(this.activities).length;
-    if (count === 0) {
+    if (Object.keys(this.activities).length === 0) {
+      this._zeroActivityCounter += 1;
       const timeout = this._idleTimeout;
       // 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;
       setTimeout(() => {
         if (!this._finished) {
-          this.finishIdleTransaction(end);
+          if (Object.keys(this.activities).length === 0 || this._zeroActivityCounter >= 3) {
+            this.finishIdleTransaction(end);
+          }
         }
       }, timeout);
     }

packages/tracing/src/integrations/tracing/router.ts

@@ -175,7 +175,7 @@ export class RouterTracing implements RoutingInstrumentation {
   ): void {
     if (this._activeTransaction) {
       logger.log(`[Tracing] force ending previous transaction`);
-      this._activeTransaction.finish(timestampWithMs());
+      this._activeTransaction.finishIdleTransaction(timestampWithMs());
     }
     logger.log(`[Tracing] starting navigation transaction`);
     this._activeTransaction = this.startIdleTransaction(hub, 'navigation', transactionContext);
@@ -194,12 +194,14 @@ export class RouterTracing implements RoutingInstrumentation {
   ): void {
     const { startTransactionOnPageLoad, startTransactionOnLocationChange } = this.options;
     if (startTransactionOnPageLoad) {
+      logger.log('START PAGELOAD!!');
       this.startPageloadTransaction(hub, beforeFinish, transactionContext);
     }
 
     addInstrumentationHandler({
       callback: () => {
         if (startTransactionOnLocationChange) {
+          logger.log('START NAVIGATION!!');
           this.startNavigationTransaction(hub, beforeFinish, transactionContext);
         }
       },