fix custom sentry.op parameter not applying to ignoreSpans

Author: Lms24

dev-packages/browser-integration-tests/suites/tracing/ignoreSpans-streamed/child/init.js

@@ -5,7 +5,7 @@ window.Sentry = Sentry;
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   integrations: [Sentry.spanStreamingIntegration()],
-  ignoreSpans: [/ignore/],
+  ignoreSpans: [/ignore/, { op: 'ignored-op' }],
   parentSpanIsAlwaysRootSpan: false,
   tracesSampleRate: 1,
 });

dev-packages/browser-integration-tests/suites/tracing/ignoreSpans-streamed/child/subject.js

@@ -18,6 +18,14 @@ Sentry.startSpan({ name: 'parent-span' }, () => {
     Sentry.startSpan({ name: 'grandchild-2' }, () => {});
   });
 
+  // both dropped
+  Sentry.startSpan({ name: 'name-passes-but-op-not-span-1', op: 'ignored-op' }, () => {});
+  Sentry.startSpan(
+    // sentry.op attribute has precedence over top op argument
+    { name: 'name-passes-but-op-not-span-2', op: 'keep', attributes: { 'sentry.op': 'ignored-op' } },
+    () => {},
+  );
+
   // kept
   Sentry.startSpan({ name: 'another-keeper' }, () => {});
 });

dev-packages/browser-integration-tests/suites/tracing/ignoreSpans-streamed/child/test.ts

@@ -52,7 +52,7 @@ sentryTest('ignored child spans are dropped and their children are reparented',
   expect(clientReport.discarded_events).toEqual([
     {
       category: 'span',
-      quantity: 3, // 3 ignored child spans
+      quantity: 5, // 5 ignored child spans
       reason: 'ignored',
     },
   ]);

dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/children/instrument.mjs

@@ -7,6 +7,6 @@ Sentry.init({
   tracesSampleRate: 1.0,
   transport: loggingTransport,
   traceLifecycle: 'stream',
-  ignoreSpans: ['middleware - expressInit', 'custom-to-drop'],
+  ignoreSpans: ['middleware - expressInit', 'custom-to-drop', { op: 'ignored-op' }],
   clientReportFlushInterval: 1_000,
 });

dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/children/server.mjs

@@ -22,6 +22,12 @@ app.get('/test/express', (_req, res) => {
         () => {},
       );
     },
+    Sentry.startSpan({ name: 'name-passes-but-op-not-span-1', op: 'ignored-op' }, () => {}),
+    Sentry.startSpan(
+      // sentry.op attribute has precedence over top op argument
+      { name: 'name-passes-but-op-not-span-2', op: 'keep', attributes: { 'sentry.op': 'ignored-op' } },
+      () => {},
+    ),
   );
   res.send({ response: 'response 1' });
 });

dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/children/test.ts

@@ -16,7 +16,7 @@ describe('filtering child spans with ignoreSpans (streaming)', () => {
             discarded_events: [
               {
                 category: 'span',
-                quantity: 2,
+                quantity: 4,
                 reason: 'ignored',
               },
             ],

packages/core/src/tracing/trace.ts

@@ -594,7 +594,10 @@ function _shouldIgnoreStreamedSpan(client: Client | undefined, spanArguments: Se
   }
 
   return shouldIgnoreSpan(
-    { description: spanArguments.name || '', op: spanArguments.attributes?.[SEMANTIC_ATTRIBUTE_SENTRY_OP] },
+    {
+      description: spanArguments.name || '',
+      op: spanArguments.attributes?.[SEMANTIC_ATTRIBUTE_SENTRY_OP] || spanArguments.op,
+    },
     ignoreSpans,
   );
 }

packages/opentelemetry/src/sampler.ts

@@ -93,7 +93,12 @@ export class SentrySampler implements Sampler {
         if (parentSampled) {
           if (ignoreSpans?.length) {
             const { description: inferredChildName, op: childOp } = inferSpanData(spanName, spanAttributes, spanKind);
-            if (shouldIgnoreSpan({ description: inferredChildName, op: childOp }, ignoreSpans)) {
+            if (
+              shouldIgnoreSpan(
+                { description: inferredChildName, op: spanAttributes[SEMANTIC_ATTRIBUTE_SENTRY_OP] ?? childOp },
+                ignoreSpans,
+              )
+            ) {
               this._client.recordDroppedEvent('ignored', 'span');
               return wrapSamplingDecision({
                 decision: SamplingDecision.NOT_RECORD,
@@ -137,7 +142,10 @@ export class SentrySampler implements Sampler {
     if (
       this._isSpanStreaming &&
       ignoreSpans?.length &&
-      shouldIgnoreSpan({ description: inferredSpanName, op }, ignoreSpans)
+      shouldIgnoreSpan(
+        { description: inferredSpanName, op: mergedAttributes[SEMANTIC_ATTRIBUTE_SENTRY_OP] ?? op },
+        ignoreSpans,
+      )
     ) {
       this._client.recordDroppedEvent('ignored', 'span');
       return wrapSamplingDecision({