Better bundling?

Author: timfish

dev-packages/node-integration-tests/package.json

@@ -62,7 +62,7 @@
     "node-schedule": "^2.1.1",
     "openai": "5.18.1",
     "pg": "8.16.0",
-    "pino": "^9.9.4",
+    "pino": "9.9.4",
     "postgres": "^3.4.7",
     "prisma": "6.15.0",
     "proxy": "^2.1.1",

packages/core/src/utils/worldwide.ts

@@ -48,6 +48,7 @@ export type InternalGlobal = {
    */
   _sentryModuleMetadata?: Record<string, any>;
   _sentryEsmLoaderHookRegistered?: boolean;
+  _sentryInjectLoaderHookRegister?: () => void;
   _sentryInjectLoaderHookRegistered?: boolean;
 } & Carrier;
 

packages/node-core/src/integrations/pino.ts

@@ -63,16 +63,16 @@ export const pinoIntegration = ((options: Options = { eventLevels: ['error', 'fa
     setup: () => {
       addInstrumentationConfig({
         channelName: 'pino-log',
-        module: { name: 'pino', versionRange: '>=8.0.0 < 9.19.0', filePath: 'lib/tools.js' },
+        // From Pino v9.10.0 a tracing channel is available directly from Pino:
+        // https://github.com/pinojs/pino/pull/2281
+        module: { name: 'pino', versionRange: '>=8.0.0 < 9.10.0', filePath: 'lib/tools.js' },
         functionQuery: {
           functionName: 'asJson',
           kind: 'Sync',
         },
       });
 
       const injectedChannel = tracingChannel('orchestrion:pino:pino-log');
-      // From Pino v9.19.0 a tracing channel is available directly from Pino:
-      // https://github.com/pinojs/pino/pull/2281
       const integratedChannel = tracingChannel('pino_asJson');
 
       const onPinoStart = (data: unknown): void => {

packages/node-core/src/sdk/index.ts

@@ -7,6 +7,7 @@ import {
   functionToStringIntegration,
   getCurrentScope,
   getIntegrationsToSetup,
+  GLOBAL_OBJ,
   hasSpansEnabled,
   inboundFiltersIntegration,
   linkedErrorsIntegration,
@@ -40,7 +41,6 @@ import { envToBool } from '../utils/envToBool';
 import { defaultStackParser, getSentryRelease } from './api';
 import { NodeClient } from './client';
 import { initializeEsmLoader } from './esmLoader';
-import { initializeInjectionLoader } from './injectLoader';
 
 /**
  * Get default integrations for the Node-Core SDK.
@@ -132,7 +132,7 @@ function _init(
 
   client.init();
 
-  initializeInjectionLoader();
+  GLOBAL_OBJ._sentryInjectLoaderHookRegister?.();
 
   debug.log(`SDK initialized from ${isCjs() ? 'CommonJS' : 'ESM'}`);
 

packages/node-core/src/sdk/injectLoader.ts

@@ -5,10 +5,26 @@ import * as moduleModule from 'module';
 import { supportsEsmLoaderHooks } from '../utils/detection';
 
 let instrumentationConfigs: InstrumentationConfig[] | undefined;
-let setupHookFn: (() => void) | undefined;
 
-function setupHook(): void {
-  if (!GLOBAL_OBJ._sentryInjectLoaderHookRegistered) {
+/**
+ * Add an instrumentation config to be used by the injection loader.
+ */
+export function addInstrumentationConfig(config: InstrumentationConfig): void {
+  if (!supportsEsmLoaderHooks()) {
+    return;
+  }
+
+  if (!instrumentationConfigs) {
+    instrumentationConfigs = [];
+  }
+
+  instrumentationConfigs.push(config);
+
+  GLOBAL_OBJ._sentryInjectLoaderHookRegister = () => {
+    if (GLOBAL_OBJ._sentryInjectLoaderHookRegistered) {
+      return;
+    }
+
     GLOBAL_OBJ._sentryInjectLoaderHookRegistered = true;
 
     const instrumentations = instrumentationConfigs || [];
@@ -29,37 +45,5 @@ function setupHook(): void {
     } catch (error) {
       debug.warn("Failed to register '@apm-js-collab/tracing-hooks' hook", error);
     }
-  }
-}
-
-/**
- * Add an instrumentation config to be used by the injection loader.
- *
- * This should be called before `initializeInjectionLoader` is called.
- */
-export function addInstrumentationConfig(config: InstrumentationConfig): void {
-  if (!instrumentationConfigs) {
-    instrumentationConfigs = [];
-  }
-
-  instrumentationConfigs.push(config);
-
-  setupHookFn = setupHook;
-}
-
-/**
- * Initialize the injection loader - This method is private and not part of the public
- * API.
- *
- * @ignore
- */
-export function initializeInjectionLoader(): void {
-  if (!supportsEsmLoaderHooks()) {
-    return;
-  }
-
-  if (setupHookFn) {
-    setupHookFn();
-    setupHookFn = undefined;
-  }
+  };
 }