improve tracing check, optimize svelteKitSpansIntegration

Author: Lms24

packages/sveltekit/src/server-common/handle.ts

@@ -162,7 +162,7 @@ async function instrumentHandle(
         }),
       });
 
-      const kitRootSpan = event.tracing?.root;
+      const kitRootSpan = event.tracing?.enabled ? event.tracing?.root : undefined;
 
       if (sentrySpan) {
         setHttpStatus(sentrySpan, res.status);

packages/sveltekit/src/server-common/integrations/svelteKitSpans.ts

@@ -12,7 +12,8 @@ export function svelteKitSpansIntegration(): Integration {
     // Using preprocessEvent to ensure the processing happens before user-configured
     // event processors are executed
     preprocessEvent(event) {
-      if (event.type === 'transaction') {
+      // only iterate over the spans if the root span was emitted by SvelteKit
+      if (event.type === 'transaction' && event.contexts?.trace?.data?.['sveltekit.tracing.original_name']) {
         event.spans?.forEach(_enhanceKitSpan);
       }
     },

packages/sveltekit/test/server-common/integrations/svelteKitSpans.test.ts

@@ -11,9 +11,18 @@ describe('svelteKitSpansIntegration', () => {
     expect(typeof integration.preprocessEvent).toBe('function');
   });
 
-  it('enhances spans from SvelteKit', () => {
+  it('enhances spans from SvelteKit, if root span was emitted by SvelteKit', () => {
     const event: TransactionEvent = {
       type: 'transaction',
+      contexts: {
+        trace: {
+          span_id: '123',
+          trace_id: 'abc',
+          data: {
+            'sveltekit.tracing.original_name': 'sveltekit.handle.root',
+          },
+        },
+      },
       spans: [
         {
           description: 'sveltekit.resolve',
@@ -37,6 +46,39 @@ describe('svelteKitSpansIntegration', () => {
     expect(event.spans?.[0]?.data[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]).toBe('auto.http.sveltekit');
   });
 
+  it('does not enhance spans from SvelteKit, if root span was not emitted by SvelteKit', () => {
+    const event: TransactionEvent = {
+      type: 'transaction',
+      contexts: {
+        trace: {
+          span_id: '123',
+          trace_id: 'abc',
+          data: {},
+        },
+      },
+      spans: [
+        {
+          description: 'sveltekit.resolve',
+          data: {
+            someAttribute: 'someValue',
+          },
+          span_id: '123',
+          trace_id: 'abc',
+          start_timestamp: 0,
+        },
+      ],
+    };
+
+    // @ts-expect-error -- passing in an empty option for client but it is unused in the integration
+    svelteKitSpansIntegration().preprocessEvent?.(event, {}, {});
+
+    expect(event.spans).toHaveLength(1);
+    expect(event.spans?.[0]?.op).toBeUndefined();
+    expect(event.spans?.[0]?.origin).toBeUndefined();
+    expect(event.spans?.[0]?.data[SEMANTIC_ATTRIBUTE_SENTRY_OP]).toBeUndefined();
+    expect(event.spans?.[0]?.data[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]).toBeUndefined();
+  });
+
   describe('_enhanceKitSpan', () => {
     it.each([
       ['sveltekit.resolve', 'function.sveltekit.resolve', 'auto.http.sveltekit'],