propagate op

Author: chargome

packages/opentelemetry/src/sampler.ts

@@ -224,6 +224,9 @@ export class SentrySampler implements Sampler {
       attributes: {
         // We set the sample rate on the span when a local sample rate was applied to better understand how traces were sampled in Sentry
         [SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: localSampleRateWasApplied ? sampleRate : undefined,
+        // For streamed spans, propagate the inferred op onto the span so it's included in the serialized attributes.
+        // Non-streamed spans get the op set during export in the SentrySpanExporter.
+        ...(this._isSpanStreaming && op ? { [SEMANTIC_ATTRIBUTE_SENTRY_OP]: op } : {}),
       },
     };
   }

packages/opentelemetry/test/sampler.test.ts

@@ -348,5 +348,35 @@ describe('SentrySampler', () => {
       expect(spyOnDroppedEvent).toHaveBeenCalledTimes(1);
       expect(spyOnDroppedEvent).toHaveBeenCalledWith('sample_rate', 'span');
     });
+
+    it('propagates inferred sentry.op onto streamed span attributes', () => {
+      const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1, traceLifecycle: 'stream' }));
+      const sampler = new SentrySampler(client);
+
+      const ctx = context.active();
+      const traceId = generateTraceId();
+      const spanName = 'GET /users';
+      const spanKind = SpanKind.SERVER;
+      const spanAttributes = { [ATTR_HTTP_REQUEST_METHOD]: 'GET' };
+
+      const actual = sampler.shouldSample(ctx, traceId, spanName, spanKind, spanAttributes, undefined);
+      expect(actual.decision).toBe(SamplingDecision.RECORD_AND_SAMPLED);
+      expect(actual.attributes?.['sentry.op']).toBe('http.server');
+    });
+
+    it('does not propagate sentry.op for non-streamed spans', () => {
+      const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
+      const sampler = new SentrySampler(client);
+
+      const ctx = context.active();
+      const traceId = generateTraceId();
+      const spanName = 'GET /users';
+      const spanKind = SpanKind.SERVER;
+      const spanAttributes = { [ATTR_HTTP_REQUEST_METHOD]: 'GET' };
+
+      const actual = sampler.shouldSample(ctx, traceId, spanName, spanKind, spanAttributes, undefined);
+      expect(actual.decision).toBe(SamplingDecision.RECORD_AND_SAMPLED);
+      expect(actual.attributes?.['sentry.op']).toBeUndefined();
+    });
   });
 });