feat: Improvements in transaction creating

HazAT · HazAT · commit c582e2dfb920 · 2019-11-08T14:26:48.000+01:00
diff --git a/packages/integrations/src/index.ts b/packages/integrations/src/index.ts
@@ -10,4 +10,5 @@ export { RewriteFrames } from './rewriteframes';
 export { SessionTiming } from './sessiontiming';
 export { Tracing } from './tracing';
 export { Transaction } from './transaction';
+export { TransactionActivity } from './transactionactivity';
 export { Vue } from './vue';
diff --git a/packages/integrations/src/transactionactivity.ts b/packages/integrations/src/transactionactivity.ts
@@ -1,4 +1,5 @@
 import { EventProcessor, Hub, Integration, Scope, Span, SpanContext } from '@sentry/types';
+import { timestampWithMs } from '@sentry/utils';
 
 /** JSDoc */
 interface TransactionActivityOptions {
@@ -69,8 +70,8 @@ export class TransactionActivity implements Integration {
    */
   private static _watchActivity(): void {
     const count = Object.keys(TransactionActivity._activities).length;
+    clearTimeout(TransactionActivity._debounce);
     if (count > 0) {
-      clearTimeout(TransactionActivity._debounce);
       setTimeout(() => {
         TransactionActivity._watchActivity();
       }, 10);
@@ -79,7 +80,7 @@ export class TransactionActivity implements Integration {
       TransactionActivity._debounce = (setTimeout(() => {
         const active = TransactionActivity._activeTransaction;
         if (active) {
-          active.finish(new Date().getTime() / 1000 - (timeout || 0));
+          active.finish(timestampWithMs() - (timeout || 0));
         }
       }, timeout) as any) as number; // TODO 500
     }
@@ -89,6 +90,13 @@ export class TransactionActivity implements Integration {
    * Starts a Transaction waiting for activity idle to finish
    */
   public static startIdleTransaction(name: string, spanContext?: SpanContext): Span | undefined {
+    const activeTransaction = TransactionActivity._activeTransaction;
+
+    if (activeTransaction) {
+      // We need to finish any active transaction before starting a new
+      activeTransaction.finish();
+    }
+
     const _getCurrentHub = TransactionActivity._getCurrentHub;
     if (!_getCurrentHub) {
       return undefined;
@@ -113,6 +121,18 @@ export class TransactionActivity implements Integration {
     return span;
   }
 
+  /**
+   * Update transaction
+   */
+  public static updateTransactionName(name: string): void {
+    const activeTransaction = TransactionActivity._activeTransaction;
+    if (!activeTransaction) {
+      return;
+    }
+    // TODO
+    (activeTransaction as any).transaction = name;
+  }
+
   /**
    * Starts tracking for a specifc activity
    */
diff --git a/packages/integrations/test/transactionactivity.test.ts b/packages/integrations/test/transactionactivity.test.ts
@@ -2,8 +2,8 @@ import { TransactionActivity } from '../src/transactionactivity';
 
 const transactionActivity: TransactionActivity = new TransactionActivity();
 
-const configureScope: any = jest.fn();
-const startSpan: any = jest.fn();
+const configureScope = jest.fn();
+const startSpan = jest.fn();
 
 const getCurrentHubMock: any = () => ({
   configureScope,
@@ -23,7 +23,7 @@ describe('TransactionActivity', () => {
   test('startSpan with transaction', () => {
     TransactionActivity.startIdleTransaction('test');
     expect(startSpan).toBeCalled();
-    expect(startSpan.mock.calls[0][0].transaction).toBe('test');
+    expect(startSpan).toBeCalledWith({ transaction: 'test' });
   });
 
   test('track activity', () => {
@@ -46,7 +46,7 @@ describe('TransactionActivity', () => {
     expect(Object.keys((TransactionActivity as any)._activities)).toHaveLength(2);
   });
 
-  test.only('finishing a transaction after debounce', () => {
+  test('finishing a transaction after debounce', () => {
     jest.useFakeTimers();
     const spy = jest.spyOn(TransactionActivity as any, '_watchActivity');
     TransactionActivity.startIdleTransaction('test');
@@ -57,6 +57,5 @@ describe('TransactionActivity', () => {
     expect(Object.keys((TransactionActivity as any)._activities)).toHaveLength(0);
     jest.runOnlyPendingTimers();
     expect(spy).toBeCalledTimes(2);
-    expect((TransactionActivity as any)._debounce).toBeTruthy();
   });
 });
