fix(cloudflare): Remove redundant SpanLink type and optimize storage instrumentation

cursoragent · claude · cursoragent · commit 52d276ce19d5 · 2026-04-07T09:24:59.000Z
- Export SpanLink and SpanLinkJSON types from @sentry/core
- Replace local SpanLink type in cloudflare package with core export
- Optimize instrumentDurableObjectStorage to only apply teardown logic to setAlarm
- Remove unnecessary .then() wrapper and waitUntil calls for non-setAlarm methods

Co-Authored-By: Claude Sonnet 4.5 &lt;noreply@anthropic.com&gt;
diff --git a/packages/cloudflare/src/instrumentations/instrumentDurableObjectStorage.ts b/packages/cloudflare/src/instrumentations/instrumentDurableObjectStorage.ts
@@ -57,33 +57,35 @@ export function instrumentDurableObjectStorage(
             },
           },
           () => {
-            const teardown = async (): Promise<void> => {
-              // When setAlarm is called, store the current span context so that when the alarm
-              // fires later, it can link back to the trace that called setAlarm.
-              // We use the original (uninstrumented) storage (target) to avoid creating a span
-              // for this internal operation. The storage is deferred via waitUntil to not block.
-              if (methodName === 'setAlarm') {
-                await storeSpanContext(target, 'alarm');
-              }
-            };
-
             const result = (original as (...args: unknown[]) => unknown).apply(target, args);
 
-            if (!isThenable(result)) {
-              waitUntil?.(teardown());
+            // Only setAlarm needs teardown to store span context for trace linking
+            if (methodName === 'setAlarm') {
+              const teardown = async (): Promise<void> => {
+                // Store the current span context so that when the alarm fires later,
+                // it can link back to the trace that called setAlarm.
+                // We use the original (uninstrumented) storage (target) to avoid creating a span
+                // for this internal operation. The storage is deferred via waitUntil to not block.
+                await storeSpanContext(target, 'alarm');
+              };
+
+              if (!isThenable(result)) {
+                waitUntil?.(teardown());
+                return result;
+              }
 
-              return result;
+              return result.then(
+                res => {
+                  waitUntil?.(teardown());
+                  return res;
+                },
+                e => {
+                  throw e;
+                },
+              );
             }
 
-            return result.then(
-              res => {
-                waitUntil?.(teardown());
-                return res;
-              },
-              e => {
-                throw e;
-              },
-            );
+            return result;
           },
         );
       };
diff --git a/packages/cloudflare/src/utils/traceLinks.ts b/packages/cloudflare/src/utils/traceLinks.ts
@@ -1,6 +1,6 @@
 import type { DurableObjectStorage } from '@cloudflare/workers-types';
 import { TraceFlags } from '@opentelemetry/api';
-import { getActiveSpan } from '@sentry/core';
+import { getActiveSpan, type SpanLink } from '@sentry/core';
 
 /** Storage key prefix for the span context that links consecutive method invocations */
 const SENTRY_TRACE_LINK_KEY_PREFIX = '__SENTRY_TRACE_LINK__';
@@ -12,16 +12,6 @@ export interface StoredSpanContext {
   sampled: boolean;
 }
 
-/** Span link structure for connecting traces */
-export interface SpanLink {
-  context: {
-    traceId: string;
-    spanId: string;
-    traceFlags: number;
-  };
-  attributes?: Record<string, string>;
-}
-
 /**
  * Gets the storage key for a specific method's trace link.
  */
diff --git a/packages/cloudflare/src/wrapMethodWithSentry.ts b/packages/cloudflare/src/wrapMethodWithSentry.ts
@@ -90,7 +90,10 @@ export function wrapMethodWithSentry<T extends OriginalMethod>(
             // but the scope still holds a reference to it (e.g., alarm handlers in Durable Objects)
             // For startNewTrace, always create a fresh client
             if (startNewTrace || !scopeClient?.getTransport()) {
-              const client = init({ ...wrapperOptions.options, ctx: context as unknown as ExecutionContext | undefined });
+              const client = init({
+                ...wrapperOptions.options,
+                ctx: context as unknown as ExecutionContext | undefined,
+              });
               scope.setClient(client);
               scopeClient = client;
             }
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -361,6 +361,7 @@ export type {
   XhrBreadcrumbHint,
 } from './types-hoist/breadcrumb';
 export type { ClientReport, Outcome, EventDropReason } from './types-hoist/clientreport';
+export type { SpanLink, SpanLinkJSON } from './types-hoist/link';
 export type {
   Context,
   Contexts,
