ref: CodeReview

HazAT · HazAT · commit 045fd884d0c9 · 2020-06-17T12:27:37.000+02:00
diff --git a/packages/apm/test/hub.test.ts b/packages/apm/test/hub.test.ts
@@ -11,27 +11,23 @@ describe('Hub', () => {
     jest.useRealTimers();
   });
 
-  describe('getSpan', () => {
+  describe('getTransaction', () => {
     test('simple invoke', () => {
       const hub = new Hub(new BrowserClient({ tracesSampleRate: 1 }));
       const transaction = hub.startTransaction({ name: 'foo' });
       hub.configureScope(scope => {
         scope.setSpan(transaction);
       });
       hub.configureScope(s => {
-        s.getTransaction(t => {
-          expect(t).toBe(transaction);
-        });
+        expect(s.getTransaction()).toBe(transaction);
       });
     });
 
     test('not invoke', () => {
       const hub = new Hub(new BrowserClient({ tracesSampleRate: 1 }));
       const transaction = hub.startTransaction({ name: 'foo' });
       hub.configureScope(s => {
-        s.getTransaction(_ => {
-          expect(true).toBe(false);
-        });
+        expect(s.getTransaction()).toBeUndefined();
       });
       transaction.finish();
     });
diff --git a/packages/hub/src/scope.ts b/packages/hub/src/scope.ts
@@ -229,13 +229,14 @@ export class Scope implements ScopeInterface {
   /**
    * @inheritDoc
    */
-  public getTransaction(callback: (transaction: Transaction) => void): void {
+  public getTransaction(): Transaction | undefined {
     const span = this.getSpan() as Span & { spanRecorder: { spans: Span[] } };
     if (span) {
       if (span.spanRecorder && span.spanRecorder.spans[0]) {
-        callback(span.spanRecorder.spans[0] as Transaction);
+        return span.spanRecorder.spans[0] as Transaction;
       }
     }
+    return undefined;
   }
 
   /**
diff --git a/packages/types/src/scope.ts b/packages/types/src/scope.ts
@@ -90,15 +90,14 @@ export interface Scope {
   setSpan(span?: Span): this;
 
   /**
-   * Returns the current set span if there is one
+   * Returns the `Span` if there is one
    */
   getSpan(): Span | undefined;
 
   /**
-   * Callback to retrieve an ongoing Transaction in case there is one.
-   * @param callback Will only be invoked in case there is an active transaction
+   * Returns the `Transaction` if there is one
    */
-  getTransaction(callback: (transaction: Transaction) => void): void;
+  getTransaction(): Transaction | undefined;
 
   /**
    * Updates the scope with provided data. Can work in three variations:

Original file line number	Diff line number	Diff line change
`@@ -229,13 +229,14 @@ export class Scope implements ScopeInterface {`
`229`	`229`	`/**`
`230`	`230`	`* @inheritDoc`
`231`	`231`	`*/`
`232`		`- public getTransaction(callback: (transaction: Transaction) => void): void {`
	`232`	`+ public getTransaction(): Transaction \| undefined {`
`233`	`233`	`const span = this.getSpan() as Span & { spanRecorder: { spans: Span[] } };`
`234`	`234`	`if (span) {`
`235`	`235`	`if (span.spanRecorder && span.spanRecorder.spans[0]) {`
`236`		`- callback(span.spanRecorder.spans[0] as Transaction);`
	`236`	`+ return span.spanRecorder.spans[0] as Transaction;`
`237`	`237`	`}`
`238`	`238`	`}`
	`239`	`+ return undefined;`
`239`	`240`	`}`
`240`	`241`
`241`	`242`	`/**`