fixup! feat(cloudflare): Split alarms into multiple traces and link them

Author: JPeer264

packages/cloudflare/src/utils/traceLinks.ts

@@ -32,17 +32,22 @@ export function getTraceLinkKey(methodName: string): string {
 /**
  * Stores the current span context in Durable Object storage for trace linking.
  * Uses the original uninstrumented storage to avoid creating spans for internal operations.
+ * Errors are silently ignored to prevent internal storage failures from propagating to user code.
  */
 export async function storeSpanContext(originalStorage: DurableObjectStorage, methodName: string): Promise<void> {
-  const activeSpan = getActiveSpan();
-  if (activeSpan) {
-    const spanContext = activeSpan.spanContext();
-    const storedContext: StoredSpanContext = {
-      traceId: spanContext.traceId,
-      spanId: spanContext.spanId,
-      sampled: spanContext.traceFlags === TraceFlags.SAMPLED,
-    };
-    await originalStorage.put(getTraceLinkKey(methodName), storedContext);
+  try {
+    const activeSpan = getActiveSpan();
+    if (activeSpan) {
+      const spanContext = activeSpan.spanContext();
+      const storedContext: StoredSpanContext = {
+        traceId: spanContext.traceId,
+        spanId: spanContext.spanId,
+        sampled: spanContext.traceFlags === TraceFlags.SAMPLED,
+      };
+      await originalStorage.put(getTraceLinkKey(methodName), storedContext);
+    }
+  } catch {
+    // Silently ignore storage errors to prevent internal failures from affecting user code
   }
 }
 

packages/cloudflare/src/wrapMethodWithSentry.ts

@@ -162,10 +162,12 @@ export function wrapMethodWithSentry<T extends OriginalMethod>(
         }
 
         const spanName = wrapperOptions.spanName || methodName;
-        const attributes = {
-          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: wrapperOptions.spanOp || 'function',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.durable_object',
-        };
+        const attributes = wrapperOptions.spanOp
+          ? {
+              [SEMANTIC_ATTRIBUTE_SENTRY_OP]: wrapperOptions.spanOp,
+              [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.durable_object',
+            }
+          : {};
 
         const executeSpan = (): unknown => {
           return startSpan({ name: spanName, attributes, links }, async span => {

packages/cloudflare/test/traceLinks.test.ts

@@ -81,6 +81,23 @@ describe('traceLinks', () => {
 
       expect(mockStorage.put).not.toHaveBeenCalled();
     });
+
+    it('silently ignores storage errors', async () => {
+      const mockSpanContext = {
+        traceId: 'abc123def456789012345678901234ab',
+        spanId: '1234567890abcdef',
+        traceFlags: TraceFlags.SAMPLED,
+      };
+      const mockSpan = {
+        spanContext: vi.fn().mockReturnValue(mockSpanContext),
+      };
+      vi.mocked(sentryCore.getActiveSpan).mockReturnValue(mockSpan as any);
+
+      const mockStorage = createMockStorage();
+      mockStorage.put = vi.fn().mockRejectedValue(new Error('Storage quota exceeded'));
+
+      await expect(storeSpanContext(mockStorage, 'alarm')).resolves.toBeUndefined();
+    });
   });
 
   describe('getStoredSpanContext', () => {