fixup! fixup! fixup! fixup! fixup! feat(core, node): portable Express integration

Author: isaacs

packages/node-core/src/utils/ensureIsWrapped.ts

@@ -1,5 +1,13 @@
 import { isWrapped } from '@opentelemetry/instrumentation';
-import { consoleSandbox, getClient, getGlobalScope, hasSpansEnabled, isEnabled } from '@sentry/core';
+import {
+  consoleSandbox,
+  getClient,
+  getOriginalFunction,
+  getGlobalScope,
+  hasSpansEnabled,
+  isEnabled,
+  type WrappedFunction,
+} from '@sentry/core';
 import type { NodeClient } from '../sdk/client';
 import { createMissingInstrumentationContext } from './createMissingInstrumentationContext';
 import { isCjs } from './detection';
@@ -14,7 +22,10 @@ export function ensureIsWrapped(
   const clientOptions = getClient<NodeClient>()?.getOptions();
   if (
     !clientOptions?.disableInstrumentationWarnings &&
-    !isWrapped(maybeWrappedFunction) &&
+    !(
+      isWrapped(maybeWrappedFunction) ||
+      typeof getOriginalFunction(maybeWrappedFunction as WrappedFunction) === 'function'
+    ) &&
     isEnabled() &&
     hasSpansEnabled(clientOptions)
   ) {

packages/node-core/test/utils/ensureIsWrapped.test.ts

@@ -1,6 +1,7 @@
 import { afterEach, describe, expect, it, vi } from 'vitest';
 import { ensureIsWrapped } from '../../src/utils/ensureIsWrapped';
 import { cleanupOtel, mockSdkInit, resetGlobals } from '../helpers/mockSdkInit';
+import { markFunctionWrapped } from '@sentry/core';
 
 const unwrappedFunction = () => {};
 
@@ -69,4 +70,24 @@ describe('ensureIsWrapped', () => {
 
     expect(spyWarn).toHaveBeenCalledTimes(0);
   });
+
+  it('does not warn when the method is wrapped by @sentry/core', () => {
+    const spyWarn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+
+    mockSdkInit({ tracesSampleRate: 1 });
+
+    function originalFunction() {
+      return 'i am original';
+    }
+
+    function wrappedFunction() {
+      return originalFunction();
+    }
+
+    markFunctionWrapped(wrappedFunction, originalFunction);
+
+    ensureIsWrapped(wrappedfunction, 'express');
+
+    expect(spyWarn).toHaveBeenCalledTimes(0);
+  });
 });