fixes

Author: mydea

packages/node-core/src/integrations/http/SentryHttpInstrumentation.ts

@@ -81,12 +81,6 @@ export type SentryHttpInstrumentationOptions = InstrumentationConfig & {
    */
   ignoreIncomingRequestBody?: (url: string, request: http.RequestOptions) => boolean;
 
-  /**
-   * A hook that can be used to mutate the span for incoming requests.
-   * This is triggered after the span is created, but before it is recorded.
-   */
-  incomingRequestSpanHook?: (span: Span, request: http.IncomingMessage, response: http.ServerResponse) => void;
-
   /**
    * @deprecated This no longer does anything.
    */

packages/node-core/src/integrations/http/httpServerIntegration.ts

@@ -149,8 +149,6 @@ function instrumentServer(
   const originalEmit: ServerEmit = server.emit;
 
   if (wrappedEmitFns.has(originalEmit)) {
-    DEBUG_BUILD &&
-      debug.log(INSTRUMENTATION_NAME, 'Incoming requests already instrumented, not instrumenting again...');
     return;
   }
 
@@ -223,7 +221,7 @@ function instrumentServer(
             return wrapInCallbacks(
               () => target.apply(thisArg, args),
               { request, response, normalizedRequest },
-              callbacks,
+              callbacks.slice(),
             );
           } else {
             return target.apply(thisArg, args);

packages/node-core/src/integrations/http/httpServerSpansIntegration.ts

@@ -166,7 +166,7 @@ const _httpServerSpansIntegration = ((options: HttpServerSpansIntegrationOptions
           },
         });
 
-        // TODO v11: Remove the following three hooks, only incomingRequestSpanHook should remain
+        // TODO v11: Remove the following three hooks, only onSpanCreated should remain
         requestHook?.(span, request);
         responseHook?.(span, response);
         applyCustomAttributesOnSpan?.(span, request, response);

packages/node/src/integrations/http.ts

@@ -76,6 +76,12 @@ interface HttpOptions {
    */
   ignoreIncomingRequests?: (urlPath: string, request: IncomingMessage) => boolean;
 
+  /**
+   * A hook that can be used to mutate the span for incoming requests.
+   * This is triggered after the span is created, but before it is recorded.
+   */
+  incomingRequestSpanHook?: (span: Span, request: IncomingMessage, response: ServerResponse) => void;
+
   /**
    * Whether to automatically ignore common static asset requests like favicon.ico, robots.txt, etc.
    * This helps reduce noise in your transactions.
@@ -210,6 +216,7 @@ export const httpIntegration = defineIntegration((options: HttpOptions = {}) =>
     ignoreStaticAssets: options.ignoreStaticAssets,
     ignoreStatusCodes: options.dropSpansForIncomingRequestStatusCodes,
     instrumentation: options.instrumentation,
+    onSpanCreated: options.incomingRequestSpanHook,
   } satisfies Parameters<typeof httpServerSpansIntegration>[0];
 
   const server = httpServerIntegration(serverOptions);