fixup! fix(cloudflare): Auto-instrument classes re-exported from the worker entry

Author: JPeer264

packages/cloudflare/src/vite/transform.ts

@@ -237,6 +237,12 @@ interface TransformState {
    * wrapped with. `wrappedClasses` counts both.
    */
   autoWrapped: Set<ExportName>;
+  /**
+   * Top-level bindings already assigned an `instrument*WithSentry(...)` result
+   * (`const MyDO = instrumentDurableObjectWithSentry(...)`). Exporting one by
+   * specifier must report it as wrapped rather than wrap it a second time.
+   */
+  manuallyWrappedLocals: Set<string>;
 }
 
 /**
@@ -263,12 +269,6 @@ function buildMergedOptionsDeclaration(
     `const opts = (${optionsFn})(env); ` +
     `return { ...opts, rpcTracePropagationBindings: [${names}, ...(opts?.rpcTracePropagationBindings ?? [])] }; };\n`
   );
-  /**
-   * Top-level bindings already assigned an `instrument*WithSentry(...)` result
-   * (`const MyDO = instrumentDurableObjectWithSentry(...)`). Exporting one by
-   * specifier must report it as wrapped rather than wrap it a second time.
-   */
-  manuallyWrappedLocals: Set<string>;
 }
 
 /**
@@ -538,7 +538,7 @@ function wrapCrossModuleSpecifier(
   // The class may already be hand-wrapped in its own module, which this transform cannot see. The
   // emitted guard returns such a class as-is instead of nesting a second wrapper around it.
   prelude.push(
-    `const ${wrappedName} = __SENTRY__._INTERNAL_wrapUnlessInstrumented(__SENTRY__.${WRAPPER_METHODS[kind]}, ${ctx.optionsFn}, ${target});`,
+    `const ${wrappedName} = __SENTRY__._INTERNAL_wrapUnlessInstrumented(__SENTRY__.${WRAPPER_METHODS[kind]}, ${state.optionsFn}, ${target});`,
   );
   state.wrappedClasses.add(exportedName);
   state.autoWrapped.add(exportedName);

packages/cloudflare/test/vite/autoInstrument.test.ts

@@ -315,8 +315,9 @@ describe('sentryCloudflareAutoInstrumentPlugin', () => {
       expect(result.code).toBe(
         [
           "import * as __SENTRY__ from '@sentry/cloudflare';",
+          'const __SENTRY_OPTIONS__ = (env) => { const opts = (() => undefined)(env); return { ...opts, rpcTracePropagationBindings: ["MY_AGENT", ...(opts?.rpcTracePropagationBindings ?? [])] }; };',
           "import { MyAgent } from './agent';",
-          'const __SENTRY_WRAPPED_MyAgent__ = __SENTRY__._INTERNAL_wrapUnlessInstrumented(__SENTRY__.instrumentAgentWithSentry, () => undefined, MyAgent);',
+          'const __SENTRY_WRAPPED_MyAgent__ = __SENTRY__._INTERNAL_wrapUnlessInstrumented(__SENTRY__.instrumentAgentWithSentry, __SENTRY_OPTIONS__, MyAgent);',
           'export { __SENTRY_WRAPPED_MyAgent__ as MyAgent };',
         ].join('\n'),
       );
@@ -332,8 +333,9 @@ describe('sentryCloudflareAutoInstrumentPlugin', () => {
       expect(result.code).toBe(
         [
           "import * as __SENTRY__ from '@sentry/cloudflare';",
+          'const __SENTRY_OPTIONS__ = (env) => { const opts = (() => undefined)(env); return { ...opts, rpcTracePropagationBindings: ["MY_AGENT", ...(opts?.rpcTracePropagationBindings ?? [])] }; };',
           "import { MyAgent as __SENTRY_REEXPORT_MyAgent__ } from './agent';",
-          'const __SENTRY_WRAPPED_MyAgent__ = __SENTRY__._INTERNAL_wrapUnlessInstrumented(__SENTRY__.instrumentAgentWithSentry, () => undefined, __SENTRY_REEXPORT_MyAgent__);',
+          'const __SENTRY_WRAPPED_MyAgent__ = __SENTRY__._INTERNAL_wrapUnlessInstrumented(__SENTRY__.instrumentAgentWithSentry, __SENTRY_OPTIONS__, __SENTRY_REEXPORT_MyAgent__);',
           'export { __SENTRY_WRAPPED_MyAgent__ as MyAgent };',
         ].join('\n'),
       );
@@ -352,8 +354,9 @@ describe('sentryCloudflareAutoInstrumentPlugin', () => {
       expect(result.code).toBe(
         [
           "import * as __SENTRY__ from '@sentry/cloudflare';",
+          'const __SENTRY_OPTIONS__ = (env) => { const opts = (() => undefined)(env); return { ...opts, rpcTracePropagationBindings: ["MY_AGENT", ...(opts?.rpcTracePropagationBindings ?? [])] }; };',
           "import { MyAgent as __SENTRY_REEXPORT_MyAgent__ } from './do';",
-          'const __SENTRY_WRAPPED_MyAgent__ = __SENTRY__._INTERNAL_wrapUnlessInstrumented(__SENTRY__.instrumentDurableObjectWithSentry, () => undefined, __SENTRY_REEXPORT_MyAgent__);',
+          'const __SENTRY_WRAPPED_MyAgent__ = __SENTRY__._INTERNAL_wrapUnlessInstrumented(__SENTRY__.instrumentDurableObjectWithSentry, __SENTRY_OPTIONS__, __SENTRY_REEXPORT_MyAgent__);',
           'export { __SENTRY_WRAPPED_MyAgent__ as MyAgent };',
         ].join('\n'),
       );

packages/cloudflare/test/vite/transform.test.ts

@@ -922,7 +922,7 @@ describe('same-worker RPC binding floor', () => {
     expect(result.code).not.toContain('rpcTracePropagationBindings');
   });
 
-  it('drops a binding whose class is re-exported from another module', () => {
+  it('keeps a binding whose class is re-exported from another module', () => {
     const code = ['export { MyDO } from "./myDo";', 'export default { fetch() {} };'].join('\n');
 
     const result = transform(code, {
@@ -931,8 +931,10 @@ describe('same-worker RPC binding floor', () => {
       sameWorkerBindings: [{ bindingName: 'MY_DO', className: 'MyDO' }],
     })!;
 
-    expect(result.code).toContain('const __SENTRY_OPTIONS__ = () => undefined;');
-    expect(result.code).not.toContain('rpcTracePropagationBindings');
+    expect(result.code).toContain('rpcTracePropagationBindings: ["MY_DO",');
+    expect(result.code).toContain(
+      '__SENTRY__._INTERNAL_wrapUnlessInstrumented(__SENTRY__.instrumentDurableObjectWithSentry, __SENTRY_OPTIONS__, __SENTRY_REEXPORT_MyDO__)',
+    );
   });
 
   it('leaves the output untouched when there are no same-worker bindings', () => {