fix span name, origin inconsistencies

Author: Lms24

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

@@ -177,13 +177,13 @@ async function instrumentHandle(
 
         const routeName = kitRootSpanAttributes['http.route'];
         if (routeName && typeof routeName === 'string') {
-          updateSpanName(kitRootSpan, routeName);
+          updateSpanName(kitRootSpan, `${event.request.method ?? 'GET'} ${routeName}`);
         }
 
         kitRootSpan.setAttributes({
           [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.sveltejs.kit',
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: routeId ? 'route' : 'url',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.sveltekit',
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: routeName ? 'route' : 'url',
           'sveltekit.tracing.original_name': originalName,
         });
       }

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

@@ -29,9 +29,12 @@ export function _enhanceKitSpan(span: SpanJSON): void {
 
   const spanName = span.description;
 
+  const previousOp = span.op || span.data[SEMANTIC_ATTRIBUTE_SENTRY_OP];
+  const previousOrigin = span.origin || span.data[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN];
+
   switch (spanName) {
     case 'sveltekit.resolve':
-      op = 'http.sveltekit.resolve';
+      op = 'function.sveltekit.resolve';
       origin = 'auto.http.sveltekit';
       break;
     case 'sveltekit.load':
@@ -59,15 +62,12 @@ export function _enhanceKitSpan(span: SpanJSON): void {
     }
   }
 
-  const previousOp = span.op || span.data[SEMANTIC_ATTRIBUTE_SENTRY_OP];
-  const previousOrigin = span.origin || span.data[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN];
-
   if (!previousOp && op) {
     span.op = op;
     span.data[SEMANTIC_ATTRIBUTE_SENTRY_OP] = op;
   }
 
-  if (!previousOrigin && origin) {
+  if ((!previousOrigin || previousOrigin === 'manual') && origin) {
     span.origin = origin;
     span.data[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] = origin;
   }

packages/sveltekit/test/server-common/processKitSpans.test.ts

@@ -31,15 +31,15 @@ describe('svelteKitSpansIntegration', () => {
     svelteKitSpansIntegration().preprocessEvent?.(event, {}, {});
 
     expect(event.spans).toHaveLength(1);
-    expect(event.spans?.[0]?.op).toBe('http.sveltekit.resolve');
+    expect(event.spans?.[0]?.op).toBe('function.sveltekit.resolve');
     expect(event.spans?.[0]?.origin).toBe('auto.http.sveltekit');
-    expect(event.spans?.[0]?.data[SEMANTIC_ATTRIBUTE_SENTRY_OP]).toBe('http.sveltekit.resolve');
+    expect(event.spans?.[0]?.data[SEMANTIC_ATTRIBUTE_SENTRY_OP]).toBe('function.sveltekit.resolve');
     expect(event.spans?.[0]?.data[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]).toBe('auto.http.sveltekit');
   });
 
   describe('_enhanceKitSpan', () => {
     it.each([
-      ['sveltekit.resolve', 'http.sveltekit.resolve', 'auto.http.sveltekit'],
+      ['sveltekit.resolve', 'function.sveltekit.resolve', 'auto.http.sveltekit'],
       ['sveltekit.load', 'function.sveltekit.load', 'auto.function.sveltekit.load'],
       ['sveltekit.form_action', 'function.sveltekit.form_action', 'auto.function.sveltekit.action'],
       ['sveltekit.remote.call', 'function.sveltekit.remote', 'auto.rpc.sveltekit.remote'],
@@ -140,5 +140,24 @@ describe('svelteKitSpansIntegration', () => {
       expect(span.origin).toBe('auto.custom.origin');
       expect(span.data[SEMANTIC_ATTRIBUTE_SENTRY_OP]).toBe('custom.op');
     });
+
+    it('overwrites previously set "manual" origins on sveltekit spans', () => {
+      // for example, if users manually set this (for whatever reason)
+      const span = {
+        description: 'sveltekit.resolve',
+        origin: 'manual',
+        data: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'custom.op',
+        },
+        span_id: '123',
+        trace_id: 'abc',
+        start_timestamp: 0,
+      } as SpanJSON;
+
+      _enhanceKitSpan(span);
+
+      expect(span.origin).toBe('auto.http.sveltekit');
+      expect(span.data[SEMANTIC_ATTRIBUTE_SENTRY_OP]).toBe('custom.op');
+    });
   });
 });