wip

Author: andreiborza

dev-packages/node-core-integration-tests/suites/anr/app-path.mjs

@@ -1,9 +1,9 @@
 import * as Sentry from '@sentry/node-core';
-import { setupOtel } from '../../utils/setupOtel.js';
 import * as assert from 'assert';
 import * as crypto from 'crypto';
 import * as path from 'path';
 import * as url from 'url';
+import { setupOtel } from '../../utils/setupOtel.js';
 
 global._sentryDebugIds = { [new Error().stack]: 'aaaaaaaa-aaaa-4aaa-aaaa-aaaaaaaaaa' };
 
@@ -19,7 +19,6 @@ const client = Sentry.init({
   integrations: [Sentry.anrIntegration({ captureStackTrace: true, anrThreshold: 100, appRootPath: __dirname })],
 });
 
-
 setupOtel(client);
 
 Sentry.setUser({ email: '[email protected]' });

dev-packages/node-core-integration-tests/suites/anr/basic-multiple.mjs

@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/node-core';
-import { setupOtel } from '../../utils/setupOtel.js';
 import * as assert from 'assert';
 import * as crypto from 'crypto';
+import { setupOtel } from '../../utils/setupOtel.js';
 
 global._sentryDebugIds = { [new Error().stack]: 'aaaaaaaa-aaaa-4aaa-aaaa-aaaaaaaaaa' };
 
@@ -15,7 +15,6 @@ const client = Sentry.init({
   integrations: [Sentry.anrIntegration({ captureStackTrace: true, anrThreshold: 100, maxAnrEvents: 2 })],
 });
 
-
 setupOtel(client);
 
 Sentry.setUser({ email: '[email protected]' });

dev-packages/node-core-integration-tests/suites/anr/basic.mjs

@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/node-core';
-import { setupOtel } from '../../utils/setupOtel.js';
 import * as assert from 'assert';
 import * as crypto from 'crypto';
+import { setupOtel } from '../../utils/setupOtel.js';
 
 global._sentryDebugIds = { [new Error().stack]: 'aaaaaaaa-aaaa-4aaa-aaaa-aaaaaaaaaa' };
 
@@ -15,7 +15,6 @@ const client = Sentry.init({
   integrations: [Sentry.anrIntegration({ captureStackTrace: true, anrThreshold: 100 })],
 });
 
-
 setupOtel(client);
 
 Sentry.setUser({ email: '[email protected]' });

dev-packages/node-core-integration-tests/suites/anr/indefinite.mjs

@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/node-core';
-import { setupOtel } from '../../utils/setupOtel.js';
 import * as assert from 'assert';
 import * as crypto from 'crypto';
+import { setupOtel } from '../../utils/setupOtel.js';
 
 setTimeout(() => {
   process.exit();
@@ -13,7 +13,6 @@ const client = Sentry.init({
   integrations: [Sentry.anrIntegration({ captureStackTrace: true, anrThreshold: 100 })],
 });
 
-
 setupOtel(client);
 
 Sentry.setUser({ email: '[email protected]' });

dev-packages/node-core-integration-tests/suites/anr/isolated.mjs

@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/node-core';
-import { setupOtel } from '../../utils/setupOtel.js';
 import * as assert from 'assert';
 import * as crypto from 'crypto';
+import { setupOtel } from '../../utils/setupOtel.js';
 
 setTimeout(() => {
   process.exit();
@@ -13,7 +13,6 @@ const client = Sentry.init({
   integrations: [Sentry.anrIntegration({ captureStackTrace: true, anrThreshold: 100 })],
 });
 
-
 setupOtel(client);
 
 async function longWork() {

dev-packages/node-core-integration-tests/suites/anr/should-exit-forced.js

@@ -6,10 +6,9 @@ function configureSentry() {
     dsn: 'https://[email protected]/1337',
     release: '1.0',
     debug: true,
-    integrations: [Sentry.anrIntegration({ captureStackTrace: true })
-
-setupOtel(client);],
+    integrations: [Sentry.anrIntegration({ captureStackTrace: true })],
   });
+  setupOtel(client);
 }
 
 async function main() {

dev-packages/node-core-integration-tests/suites/anr/should-exit.js

@@ -6,10 +6,9 @@ function configureSentry() {
     dsn: 'https://[email protected]/1337',
     release: '1.0',
     debug: true,
-    integrations: [Sentry.anrIntegration({ captureStackTrace: true })
-
-setupOtel(client);],
+    integrations: [Sentry.anrIntegration({ captureStackTrace: true })],
   });
+  setupOtel(client);
 }
 
 async function main() {

dev-packages/node-core-integration-tests/suites/breadcrumbs/process-thread/app.mjs

@@ -1,9 +1,9 @@
 import * as Sentry from '@sentry/node-core';
-import { setupOtel } from '../../../utils/setupOtel.js';
 import { loggingTransport } from '@sentry-internal/node-integration-tests';
 import { spawn } from 'child_process';
 import { join } from 'path';
 import { Worker } from 'worker_threads';
+import { setupOtel } from '../../../utils/setupOtel.js';
 
 const __dirname = new URL('.', import.meta.url).pathname;
 
@@ -14,7 +14,6 @@ const client = Sentry.init({
   transport: loggingTransport,
 });
 
-
 setupOtel(client);
 
 (async () => {

dev-packages/node-core-integration-tests/suites/child-process/fork.mjs

@@ -1,8 +1,8 @@
 import * as Sentry from '@sentry/node-core';
-import { setupOtel } from '../../utils/setupOtel.js';
 import { loggingTransport } from '@sentry-internal/node-integration-tests';
 import { fork } from 'child_process';
 import * as path from 'path';
+import { setupOtel } from '../../utils/setupOtel.js';
 
 const __dirname = new URL('.', import.meta.url).pathname;
 
@@ -13,7 +13,6 @@ const client = Sentry.init({
   transport: loggingTransport,
 });
 
-
 setupOtel(client);
 
 fork(path.join(__dirname, 'child.mjs'));

dev-packages/node-core-integration-tests/suites/child-process/worker.mjs

@@ -1,8 +1,8 @@
 import * as Sentry from '@sentry/node-core';
-import { setupOtel } from '../../utils/setupOtel.js';
 import { loggingTransport } from '@sentry-internal/node-integration-tests';
 import * as path from 'path';
 import { Worker } from 'worker_threads';
+import { setupOtel } from '../../utils/setupOtel.js';
 
 const __dirname = new URL('.', import.meta.url).pathname;
 
@@ -13,7 +13,6 @@ const client = Sentry.init({
   transport: loggingTransport,
 });
 
-
 setupOtel(client);
 
 new Worker(path.join(__dirname, 'child.mjs'));

dev-packages/node-core-integration-tests/suites/client-reports/drop-reasons/before-send/scenario.ts

@@ -1,6 +1,6 @@
 import * as Sentry from '@sentry/node-core';
-import { setupOtel } from '../../../../utils/setupOtel';
 import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import { setupOtel } from '../../../../utils/setupOtel';
 
 // eslint-disable-next-line @typescript-eslint/no-floating-promises
 (async () => {

dev-packages/node-core-integration-tests/suites/client-reports/drop-reasons/event-processors/scenario.ts

@@ -1,6 +1,6 @@
 import * as Sentry from '@sentry/node-core';
-import { setupOtel } from '../../../../utils/setupOtel';
 import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import { setupOtel } from '../../../../utils/setupOtel';
 
 // eslint-disable-next-line @typescript-eslint/no-floating-promises
 (async () => {

dev-packages/node-core-integration-tests/suites/client-reports/periodic-send/scenario.ts

@@ -1,6 +1,6 @@
 import * as Sentry from '@sentry/node-core';
-import { setupOtel } from '../../../utils/setupOtel';
 import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import { setupOtel } from '../../../utils/setupOtel';
 
 const client = Sentry.init({
   dsn: 'https://[email protected]/1337',
@@ -11,7 +11,6 @@ const client = Sentry.init({
   },
 });
 
-
 setupOtel(client);
 
 Sentry.captureException(new Error('this should get dropped by before send'));

dev-packages/node-core-integration-tests/suites/esm/modules-integration/app.mjs

@@ -1,6 +1,6 @@
 import * as Sentry from '@sentry/node-core';
-import { setupOtel } from '../../../utils/setupOtel.js';
 import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import { setupOtel } from '../../../utils/setupOtel.js';
 
 const client = Sentry.init({
   dsn: 'https://[email protected]/1337',
@@ -9,5 +9,4 @@ const client = Sentry.init({
   transport: loggingTransport,
 });
 
-
 setupOtel(client);

dev-packages/node-core-integration-tests/suites/esm/warn-esm/server.js

@@ -19,5 +19,4 @@ app.get('/test/success', (req, res) => {
   res.send({ response: 'response 3' });
 });
 
-
 startExpressServerAndSendPortToRunner(app);

dev-packages/node-core-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-strict.ts

@@ -1,6 +1,6 @@
 import * as Sentry from '@sentry/node-core';
-import { setupOtel } from '../../../utils/setupOtel';
 import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import { setupOtel } from '../../../utils/setupOtel';
 
 const client = Sentry.init({
   dsn: 'https://[email protected]/1337',
@@ -9,7 +9,6 @@ const client = Sentry.init({
   integrations: [Sentry.onUnhandledRejectionIntegration({ mode: 'strict' })],
 });
 
-
 setupOtel(client);
 
 // eslint-disable-next-line @typescript-eslint/no-floating-promises

dev-packages/node-core-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-warn.ts

@@ -1,14 +1,13 @@
 import * as Sentry from '@sentry/node-core';
-import { setupOtel } from '../../../utils/setupOtel';
 import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import { setupOtel } from '../../../utils/setupOtel';
 
 const client = Sentry.init({
   dsn: 'https://[email protected]/1337',
   release: '1.0',
   transport: loggingTransport,
 });
 
-
 setupOtel(client);
 
 // eslint-disable-next-line @typescript-eslint/no-floating-promises

packages/node-core/src/index.ts

@@ -6,6 +6,10 @@ export {
   type SentryHttpInstrumentationOptions,
 } from './integrations/http/SentryHttpInstrumentation';
 export { nativeNodeFetchIntegration } from './integrations/node-fetch';
+export {
+  SentryNodeFetchInstrumentation,
+  type SentryNodeFetchInstrumentationOptions,
+} from './integrations/node-fetch/SentryNodeFetchInstrumentation';
 
 export { nodeContextIntegration } from './integrations/context';
 export { contextLinesIntegration } from './integrations/contextlines';
@@ -20,12 +24,20 @@ export { childProcessIntegration } from './integrations/childProcess';
 export { createSentryWinstonTransport } from './integrations/winston';
 
 export { SentryContextManager } from './otel/contextManager';
-export { generateInstrumentOnce } from './otel/instrument';
+export { generateInstrumentOnce, instrumentWhenWrapped, INSTRUMENTED } from './otel/instrument';
 
 export { init, getDefaultIntegrations, initWithoutDefaultIntegrations, validateOpenTelemetrySetup } from './sdk';
+export { setIsolationScope } from './sdk/scope';
 export { getSentryRelease, defaultStackParser } from './sdk/api';
 export { createGetModuleFromFilename } from './utils/module';
-export { makeNodeTransport } from './transports';
+export { addOriginToSpan } from './utils/addOriginToSpan';
+export { getRequestUrl } from './utils/getRequestUrl';
+export { isCjs } from './utils/commonjs';
+export { ensureIsWrapped } from './utils/ensureIsWrapped';
+export { createMissingInstrumentationContext } from './utils/createMissingInstrumentationContext';
+export { envToBool } from './utils/envToBool';
+export { makeNodeTransport, type NodeTransportOptions } from './transports';
+export type { HTTPModuleRequestIncomingMessage } from './transports/http-module';
 export { NodeClient } from './sdk/client';
 export { cron } from './cron';
 export { NODE_VERSION } from './nodeVersion';

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

@@ -133,7 +133,9 @@ function _init(
 
   updateScopeFromEnvVariables();
 
-  setupOpenTelemetryLogger();
+  if (options.debug) {
+    setupOpenTelemetryLogger();
+  }
 
   enhanceDscWithOpenTelemetryRootSpanName(client);
   setupEventContextTrace(client);