fix tests

Author: mydea

packages/core/src/utils/spanUtils.ts

@@ -144,7 +144,7 @@ export function spanToJSON(span: Span): SpanJSON {
   return {
     span_id,
     trace_id,
-    start_timestamp: timestampInSeconds(),
+    start_timestamp: 0,
     data: {},
   };
 }

packages/core/test/lib/baseclient.test.ts

@@ -938,14 +938,14 @@ describe('BaseClient', () => {
         event_id: '972f45b826a248bba98e990878a177e1',
         spans: [
           {
-            data: { _sentry_extra_metrics: { M1: { value: 1 }, M2: { value: 2 } } },
             description: 'first-paint',
             timestamp: 1591603196.637835,
             op: 'paint',
             parent_span_id: 'a3df84a60c2e4e76',
             span_id: '9e15bf99fbe4bc80',
             start_timestamp: 1591603196.637835,
             trace_id: '86f39e84263a4de99c326acab3bfe3bd',
+            data: {},
           },
           {
             description: 'first-contentful-paint',
@@ -955,6 +955,7 @@ describe('BaseClient', () => {
             span_id: 'aa554c1f506b0783',
             start_timestamp: 1591603196.637835,
             trace_id: '86f39e84263a4de99c326acab3bfe3bd',
+            data: {},
           },
         ],
         start_timestamp: 1591603196.614865,
@@ -1016,12 +1017,14 @@ describe('BaseClient', () => {
             span_id: '9e15bf99fbe4bc80',
             start_timestamp: 1591603196.637835,
             trace_id: '86f39e84263a4de99c326acab3bfe3bd',
+            data: {},
           },
           {
             description: 'second span',
             span_id: 'aa554c1f506b0783',
             start_timestamp: 1591603196.637835,
             trace_id: '86f39e84263a4de99c326acab3bfe3bd',
+            data: {},
           },
         ],
       };
@@ -1076,9 +1079,9 @@ describe('BaseClient', () => {
         transaction: '/dogs/are/great',
         type: 'transaction',
         spans: [
-          { span_id: 'span1', trace_id: 'trace1', start_timestamp: 1234 },
-          { span_id: 'span2', trace_id: 'trace1', start_timestamp: 1234 },
-          { span_id: 'span3', trace_id: 'trace1', start_timestamp: 1234 },
+          { span_id: 'span1', trace_id: 'trace1', start_timestamp: 1234, data: {} },
+          { span_id: 'span2', trace_id: 'trace1', start_timestamp: 1234, data: {} },
+          { span_id: 'span3', trace_id: 'trace1', start_timestamp: 1234, data: {} },
         ],
       });
 
@@ -1107,12 +1110,14 @@ describe('BaseClient', () => {
             span_id: '9e15bf99fbe4bc80',
             start_timestamp: 1591603196.637835,
             trace_id: '86f39e84263a4de99c326acab3bfe3bd',
+            data: {},
           },
           {
             description: 'second span',
             span_id: 'aa554c1f506b0783',
             start_timestamp: 1591603196.637835,
             trace_id: '86f39e84263a4de99c326acab3bfe3bd',
+            data: {},
           },
         ],
       };
@@ -1181,12 +1186,14 @@ describe('BaseClient', () => {
             span_id: '9e15bf99fbe4bc80',
             start_timestamp: 1591603196.637835,
             trace_id: '86f39e84263a4de99c326acab3bfe3bd',
+            data: {},
           },
           {
             description: 'second span',
             span_id: 'aa554c1f506b0783',
             start_timestamp: 1591603196.637835,
             trace_id: '86f39e84263a4de99c326acab3bfe3bd',
+            data: {},
           },
         ],
       };

packages/core/test/lib/tracing/sentryNonRecordingSpan.test.ts

@@ -18,6 +18,8 @@ describe('SentryNonRecordingSpan', () => {
     expect(spanToJSON(span)).toEqual({
       span_id: expect.stringMatching(/[a-f0-9]{16}/),
       trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+      data: {},
+      start_timestamp: 0,
     });
 
     // Ensure all methods work
@@ -32,6 +34,8 @@ describe('SentryNonRecordingSpan', () => {
     expect(spanToJSON(span)).toEqual({
       span_id: expect.stringMatching(/[a-f0-9]{16}/),
       trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+      data: {},
+      start_timestamp: 0,
     });
   });
 });

packages/core/test/lib/utils/spanUtils.test.ts

@@ -287,10 +287,21 @@ describe('spanToJSON', () => {
     });
   });
 
-  it('returns empty object for unknown span implementation', () => {
-    const span = { other: 'other' };
-
-    expect(spanToJSON(span as unknown as Span)).toEqual({});
+  it('returns minimal object for unknown span implementation', () => {
+    const span = {
+      // This is the minimal interface we require from a span
+      spanContext: () => ({
+        spanId: 'SPAN-1',
+        traceId: 'TRACE-1',
+      }),
+    };
+
+    expect(spanToJSON(span as unknown as Span)).toEqual({
+      span_id: 'SPAN-1',
+      trace_id: 'TRACE-1',
+      start_timestamp: 0,
+      data: {}
+    });
   });
 });
 

packages/vue/test/router.test.ts

@@ -13,7 +13,9 @@ vi.mock('@sentry/core', async () => {
   const actual = await vi.importActual('@sentry/core');
   return {
     ...actual,
-    getActiveSpan: vi.fn().mockReturnValue({}),
+    getActiveSpan: vi.fn().mockReturnValue({
+      spanContext: () => ({ traceId: '1234', spanId: '5678' }),
+    }),
   };
 });