fixup! fix(server-utils): Ensure orchestrion instrumentation lazy registers on Node (#22518)

Author: isaacs

packages/server-utils/src/orchestrion/instrumentation.ts

@@ -59,8 +59,14 @@ export function invokeOrchestrionInstrumentation<Callback extends Instrumentatio
   }
 
   const run = (): void => {
-    markInstrumented(callback);
+    // Mark as instrumented only if the channel binding actually lands.
+    // Avoids a very narrow case where the binding never arrives within the
+    // retry window. So, don't mark until we know we're actually calling.
     waitForTracingChannelBinding(() => {
+      if (hasBeenInstrumented(callback)) {
+        return;
+      }
+      markInstrumented(callback);
       callback(...args);
     });
   };

packages/server-utils/test/orchestrion/instrumentation.test.ts

@@ -58,6 +58,26 @@ describe('invokeOrchestrionInstrumentation', () => {
     expect(client.listenerCount()).toBe(0);
   });
 
+  it('does not mark the callback when the binding never becomes available, so a later attempt recovers', async () => {
+    GLOBAL_OBJ.__SENTRY_ORCHESTRION__ = { runtime: ['mysql'] };
+    // No async-context strategy, so `waitForTracingChannelBinding` finds no binding and gives up.
+    setAsyncContextStrategy(undefined);
+    const client = makeClient();
+    const callback = vi.fn();
+
+    invokeOrchestrionInstrumentation(client as never, ['mysql'], callback, []);
+
+    // Wait past `waitForTracingChannelBinding`'s single ~1ms retry; it bails without subscribing.
+    await new Promise(resolve => setTimeout(resolve, 10));
+    expect(callback).not.toHaveBeenCalled();
+
+    // The callback must NOT have been marked as instrumented — once the binding exists, a later
+    // invocation subscribes rather than being permanently skipped.
+    installBinding();
+    invokeOrchestrionInstrumentation(client as never, ['mysql'], callback, []);
+    expect(callback).toHaveBeenCalledTimes(1);
+  });
+
   it('does not subscribe until the module is injected at runtime', () => {
     const client = makeClient();
     const callback = vi.fn();