meta: beta.4

HazAT · kamilogorek · commit 422efcd357ef · 2019-11-01T11:27:38.000+01:00
diff --git a/packages/hub/src/hub.ts b/packages/hub/src/hub.ts
@@ -452,11 +452,11 @@ export class Hub implements HubInterface {
 
     // TODO: if sampled do what?
 
-    const finishedSpans = passedSpan.finishedSpans.filter(s => s !== span);
+    const finishedSpans = passedSpan.finishedSpans.filter(s => s !== passedSpan);
 
     const eventId = this.captureEvent({
       contexts: { trace: passedSpan.getTraceContext() },
-      spans: finishedSpans,
+      spans: finishedSpans.length > 0 ? finishedSpans : undefined,
       start_timestamp: passedSpan.startTimestamp,
       timestamp: passedSpan.timestamp,
       transaction: passedSpan.transaction,
diff --git a/packages/hub/test/hub.test.ts b/packages/hub/test/hub.test.ts
@@ -323,6 +323,18 @@ describe('Hub', () => {
         const span = hub.startSpan({ transaction: 'test' }, true) as any;
         expect(hub.finishSpan(span)).toBeDefined();
         expect(spy).toHaveBeenCalled();
+        expect(spy.mock.calls[0][0].spans).toBeUndefined();
+      });
+
+      test('finish a scope span with transaction + child span', () => {
+        const myScope = new Scope();
+        const hub = new Hub(clientFn, myScope);
+        const spy = jest.spyOn(hub as any, 'captureEvent');
+        const span = hub.startSpan({ transaction: 'test' }, true) as any;
+        hub.finishSpan(hub.startSpan());
+        expect(hub.finishSpan(span)).toBeDefined();
+        expect(spy).toHaveBeenCalled();
+        expect(spy.mock.calls[0][0].spans).toHaveLength(1);
       });
     });
   });
