fixup! feat(cloudflare): Support tracing for queue producer

Author: JPeer264

packages/cloudflare/src/instrumentations/worker/instrumentQueueProducer.ts

@@ -84,10 +84,13 @@ export function instrumentQueueProducer<T extends Queue>(queue: T, bindingName:
           options?: QueueSendBatchOptions,
         ): Promise<void> {
           const messageArray = Array.from(messages);
-          const totalBodySize = messageArray.reduce<number>((acc, m) => {
+          const totalBodySize = messageArray.reduce<number | undefined>((acc, m) => {
             const size = getBodySize(m.body);
-            return size === undefined ? acc : acc + size;
-          }, 0);
+            if (size === undefined) {
+              return acc;
+            }
+            return (acc ?? 0) + size;
+          }, undefined);
 
           return startPublishSpan({ bindingName, bodySize: totalBodySize, messageCount: messageArray.length }, () =>
             Reflect.apply(original, target, [messageArray, options]),

packages/cloudflare/test/instrumentations/worker/instrumentQueueProducer.test.ts

@@ -139,6 +139,36 @@ describe('instrumentQueueProducer', () => {
       expect(Array.isArray(passed)).toBe(true);
       expect(passed).toHaveLength(2);
     });
+
+    test('omits body size when all payloads cannot be serialized', async () => {
+      const startSpanSpy = vi.spyOn(SentryCore, 'startSpan');
+      const queue = createMockQueue();
+      const wrapped = instrumentQueueProducer(queue, 'MY_QUEUE');
+
+      const circular1: Record<string, unknown> = {};
+      circular1.self = circular1;
+      const circular2: Record<string, unknown> = {};
+      circular2.self = circular2;
+
+      await wrapped.sendBatch([{ body: circular1 }, { body: circular2 }]);
+
+      const attrs = startSpanSpy.mock.calls[0]![0].attributes!;
+      expect(attrs['messaging.message.body.size']).toBeUndefined();
+    });
+
+    test('sums only sizable bodies when batch contains mixed payloads', async () => {
+      const startSpanSpy = vi.spyOn(SentryCore, 'startSpan');
+      const queue = createMockQueue();
+      const wrapped = instrumentQueueProducer(queue, 'MY_QUEUE');
+
+      const circular: Record<string, unknown> = {};
+      circular.self = circular;
+
+      await wrapped.sendBatch([{ body: 'aa' }, { body: circular }, { body: 'bbb' }]);
+
+      const attrs = startSpanSpy.mock.calls[0]![0].attributes!;
+      expect(attrs['messaging.message.body.size']).toBe(5);
+    });
   });
 
   test('forwards unknown property accesses transparently', () => {