fixup! feat(cloudflare): Continue the Cloudflare trace of the invocation

Author: JPeer264

packages/cloudflare/src/utils/cloudflareTrace.ts

@@ -23,10 +23,16 @@ const SPAN_ID_REGEXP = /^(?!0{16})[0-9a-f]{16}$/;
  * Sets the propagation context of the current scope to the Cloudflare trace of the invocation, so
  * errors, logs and spans get the trace id of the spans that Cloudflare exports.
  *
- * Does nothing when Cloudflare does not trace the invocation, or when the runtime does not expose
+ * Does nothing when the request `headers` have a `sentry-trace` header: an incoming Sentry trace
+ * keeps precedence, so traces from instrumented clients stay connected. Also does nothing when
+ * Cloudflare does not trace the invocation, or when the runtime does not expose
  * `Span.spanContext()`. The sampling decision is left to the SDK.
  */
-export function continueCloudflareTrace(context: unknown): void {
+export function continueCloudflareTrace(context: unknown, headers?: Headers): void {
+  if (headers?.get('sentry-trace')) {
+    return;
+  }
+
   let spanContext: CloudflareSpanContext | undefined;
   try {
     const span = (context as { tracing?: CloudflareTracing } | undefined)?.tracing?.getActiveSpan?.();

packages/cloudflare/src/wrapRequestHandlerWithInit.ts

@@ -159,10 +159,7 @@ export function wrapRequestHandlerWithInit(
     return continueTrace(
       { sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },
       () => {
-        // An incoming Sentry trace keeps precedence, so traces from instrumented clients stay connected.
-        if (!request.headers.get('sentry-trace')) {
-          continueCloudflareTrace(context);
-        }
+        continueCloudflareTrace(context, request.headers);
 
         // Note: This span will not have a duration unless I/O happens in the handler. This is
         // because of how the cloudflare workers runtime works.

packages/cloudflare/test/utils/cloudflareTrace.test.ts

@@ -27,6 +27,26 @@ describe('continueCloudflareTrace()', () => {
     });
   });
 
+  it('keeps the propagation context when the request has a sentry-trace header', () => {
+    const context = {
+      tracing: {
+        getActiveSpan: () => ({
+          isTraced: true,
+          spanContext: () => ({ traceId: CLOUDFLARE_TRACE_ID, spanId: CLOUDFLARE_SPAN_ID, traceFlags: 1 }),
+        }),
+      },
+    };
+    const headers = new Headers({ 'sentry-trace': '12345678901234567890123456789012-1234567890123456-1' });
+
+    withScope(scope => {
+      const propagationContext = scope.getPropagationContext();
+
+      continueCloudflareTrace(context, headers);
+
+      expect(scope.getPropagationContext()).toBe(propagationContext);
+    });
+  });
+
   it.each([
     ['there is no execution context', undefined],
     ['the runtime has no tracing API', {}],