diff --git a/dev-packages/node-integration-tests/package.json b/dev-packages/node-integration-tests/package.json index ed25bcfa1f59..637f40e59d0f 100644 --- a/dev-packages/node-integration-tests/package.json +++ b/dev-packages/node-integration-tests/package.json @@ -70,7 +70,7 @@ "node-schedule": "^2.1.1", "openai": "5.18.1", "pg": "8.16.0", - "pino": "9.9.4", + "pino": "9.10.0", "pino-next": "npm:pino@^9.12.0", "postgres": "^3.4.7", "prisma": "6.15.0", diff --git a/packages/core/src/utils/worldwide.ts b/packages/core/src/utils/worldwide.ts index 2ea6b391c613..1955014f1345 100644 --- a/packages/core/src/utils/worldwide.ts +++ b/packages/core/src/utils/worldwide.ts @@ -54,8 +54,6 @@ export type InternalGlobal = { */ _sentryModuleMetadata?: Record; _sentryEsmLoaderHookRegistered?: boolean; - _sentryInjectLoaderHookRegister?: () => void; - _sentryInjectLoaderHookRegistered?: boolean; } & Carrier; /** Get's the global object for the current JavaScript runtime */ diff --git a/packages/node-core/package.json b/packages/node-core/package.json index ad99efc5fcba..d58d4acc8e73 100644 --- a/packages/node-core/package.json +++ b/packages/node-core/package.json @@ -66,13 +66,11 @@ "@opentelemetry/semantic-conventions": "^1.37.0" }, "dependencies": { - "@apm-js-collab/tracing-hooks": "^0.3.1", "@sentry/core": "10.32.1", "@sentry/opentelemetry": "10.32.1", "import-in-the-middle": "^2.0.1" }, "devDependencies": { - "@apm-js-collab/code-transformer": "^0.8.2", "@opentelemetry/api": "^1.9.0", "@opentelemetry/context-async-hooks": "^2.2.0", "@opentelemetry/core": "^2.2.0", diff --git a/packages/node-core/src/integrations/pino.ts b/packages/node-core/src/integrations/pino.ts index bd8c8ba40b4f..7392f6d34a1c 100644 --- a/packages/node-core/src/integrations/pino.ts +++ b/packages/node-core/src/integrations/pino.ts @@ -9,7 +9,6 @@ import { severityLevelFromString, withScope, } from '@sentry/core'; -import { addInstrumentationConfig } from '../sdk/injectLoader'; const SENTRY_TRACK_SYMBOL = Symbol('sentry-track-pino-logger'); @@ -128,18 +127,6 @@ const _pinoIntegration = defineIntegration((userOptions: DeepPartial { const enableLogs = !!client.getOptions().enableLogs; - addInstrumentationConfig({ - channelName: 'pino-log', - // 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 = diagnosticsChannel.tracingChannel('orchestrion:pino:pino-log'); const integratedChannel = diagnosticsChannel.tracingChannel('pino_asJson'); function onPinoStart(self: Pino, args: PinoHookArgs, result: PinoResult): void { @@ -192,11 +179,6 @@ const _pinoIntegration = defineIntegration((userOptions: DeepPartial { - const { self, arguments: args, result } = data as { self: Pino; arguments: PinoHookArgs; result: string }; - onPinoStart(self, args, JSON.parse(result)); - }); - integratedChannel.end.subscribe(data => { const { instance, diff --git a/packages/node-core/src/sdk/index.ts b/packages/node-core/src/sdk/index.ts index 0814ab401535..58b6f9b424e3 100644 --- a/packages/node-core/src/sdk/index.ts +++ b/packages/node-core/src/sdk/index.ts @@ -7,7 +7,6 @@ import { functionToStringIntegration, getCurrentScope, getIntegrationsToSetup, - GLOBAL_OBJ, hasSpansEnabled, inboundFiltersIntegration, linkedErrorsIntegration, @@ -132,8 +131,6 @@ function _init( client.init(); - GLOBAL_OBJ._sentryInjectLoaderHookRegister?.(); - debug.log(`SDK initialized from ${isCjs() ? 'CommonJS' : 'ESM'}`); client.startClientReportTracking(); diff --git a/packages/node-core/src/sdk/injectLoader.ts b/packages/node-core/src/sdk/injectLoader.ts deleted file mode 100644 index 667996ebbe53..000000000000 --- a/packages/node-core/src/sdk/injectLoader.ts +++ /dev/null @@ -1,46 +0,0 @@ -import type { InstrumentationConfig } from '@apm-js-collab/code-transformer'; -import ModulePatch from '@apm-js-collab/tracing-hooks'; -import { debug, GLOBAL_OBJ } from '@sentry/core'; -import * as moduleModule from 'module'; -import { supportsEsmLoaderHooks } from '../utils/detection'; - -let instrumentationConfigs: InstrumentationConfig[] | undefined; - -/** - * 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 || []; - - // Patch require to support CJS modules - const requirePatch = new ModulePatch({ instrumentations }); - requirePatch.patch(); - - // Add ESM loader to support ESM modules - try { - // @ts-expect-error register is available in these versions - moduleModule.register('@apm-js-collab/tracing-hooks/hook.mjs', import.meta.url, { - data: { instrumentations }, - }); - } catch (error) { - debug.warn("Failed to register '@apm-js-collab/tracing-hooks' hook", error); - } - }; -} diff --git a/yarn.lock b/yarn.lock index 268bb8529193..e69265625d58 100644 --- a/yarn.lock +++ b/yarn.lock @@ -342,20 +342,6 @@ dependencies: json-schema-to-ts "^3.1.1" -"@apm-js-collab/code-transformer@^0.8.0", "@apm-js-collab/code-transformer@^0.8.2": - version "0.8.2" - resolved "https://registry.yarnpkg.com/@apm-js-collab/code-transformer/-/code-transformer-0.8.2.tgz#a3160f16d1c4df9cb81303527287ad18d00994d1" - integrity sha512-YRjJjNq5KFSjDUoqu5pFUWrrsvGOxl6c3bu+uMFc9HNNptZ2rNU/TI2nLw4jnhQNtka972Ee2m3uqbvDQtPeCA== - -"@apm-js-collab/tracing-hooks@^0.3.1": - version "0.3.1" - resolved "https://registry.yarnpkg.com/@apm-js-collab/tracing-hooks/-/tracing-hooks-0.3.1.tgz#414d3a93c3a15d8be543a3fac561f7c602b6a588" - integrity sha512-Vu1CbmPURlN5fTboVuKMoJjbO5qcq9fA5YXpskx3dXe/zTBvjODFoerw+69rVBlRLrJpwPqSDqEuJDEKIrTldw== - dependencies: - "@apm-js-collab/code-transformer" "^0.8.0" - debug "^4.4.1" - module-details-from-path "^1.0.4" - "@apollo/protobufjs@1.2.6": version "1.2.6" resolved "https://registry.yarnpkg.com/@apollo/protobufjs/-/protobufjs-1.2.6.tgz#d601e65211e06ae1432bf5993a1a0105f2862f27" @@ -22708,7 +22694,7 @@ module-definition@^6.0.1: ast-module-types "^6.0.1" node-source-walk "^7.0.1" -module-details-from-path@^1.0.3, module-details-from-path@^1.0.4: +module-details-from-path@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/module-details-from-path/-/module-details-from-path-1.0.4.tgz#b662fdcd93f6c83d3f25289da0ce81c8d9685b94" integrity sha512-EGWKgxALGMgzvxYF1UyGTy0HXX/2vHLkw6+NvDKW2jypWbHpjQuj4UMcqQWXHERJhVGKikolT06G3bcKe4fi7w== @@ -25016,10 +25002,10 @@ pino-std-serializers@^7.0.0: resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-7.0.0.tgz#7c625038b13718dbbd84ab446bd673dc52259e3b" integrity sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA== -pino@9.9.4: - version "9.9.4" - resolved "https://registry.yarnpkg.com/pino/-/pino-9.9.4.tgz#21ed2c27cc177f797e3249c99d340f0bcd6b248e" - integrity sha512-d1XorUQ7sSKqVcYdXuEYs2h1LKxejSorMEJ76XoZ0pPDf8VzJMe7GlPXpMBZeQ9gE4ZPIp5uGD+5Nw7scxiigg== +pino@9.10.0: + version "9.10.0" + resolved "https://registry.yarnpkg.com/pino/-/pino-9.10.0.tgz#b78555637605ef6f4287e51a89b2087d66da4859" + integrity sha512-VOFxoNnxICtxaN8S3E73pR66c5MTFC+rwRcNRyHV/bV/c90dXvJqMfjkeRFsGBDXmlUN3LccJQPqGIufnaJePA== dependencies: atomic-sleep "^1.0.0" fast-redact "^3.1.1"