Some cleanup

Author: andreiborza

packages/node-core/src/otel/instrument.ts

@@ -25,6 +25,7 @@ export function generateInstrumentOnce<
  */
 export function generateInstrumentOnce<Options>(
   name: string,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   creatorOrClass: (new (...args: any[]) => Instrumentation) | ((options?: Options) => Instrumentation),
   optionsCallback?: (options: Options) => unknown,
 ): ((options: Options) => Instrumentation) & { id: string } {

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

@@ -28,7 +28,9 @@
 
 /* eslint-disable @typescript-eslint/explicit-member-accessibility */
 /* eslint-disable @typescript-eslint/no-unused-vars */
+// eslint-disable-next-line import/no-duplicates
 import type * as http from 'node:http';
+// eslint-disable-next-line import/no-duplicates
 import type { OutgoingHttpHeaders } from 'node:http';
 import * as net from 'node:net';
 import * as tls from 'node:tls';

packages/node-core/test/helpers/mockSdkInit.ts

@@ -1,8 +1,21 @@
 import { context, propagation, ProxyTracerProvider, trace } from '@opentelemetry/api';
 import { Resource } from '@opentelemetry/resources';
 import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
-import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION, SEMRESATTRS_SERVICE_NAMESPACE } from '@opentelemetry/semantic-conventions';
-import { createTransport, getClient, getCurrentScope, getGlobalScope, getIsolationScope, logger, resolvedSyncPromise, SDK_VERSION } from '@sentry/core';
+import {
+  ATTR_SERVICE_NAME,
+  ATTR_SERVICE_VERSION,
+  SEMRESATTRS_SERVICE_NAMESPACE,
+} from '@opentelemetry/semantic-conventions';
+import {
+  createTransport,
+  getClient,
+  getCurrentScope,
+  getGlobalScope,
+  getIsolationScope,
+  logger,
+  resolvedSyncPromise,
+  SDK_VERSION,
+} from '@sentry/core';
 import { SentryPropagator, SentrySampler, SentrySpanProcessor } from '@sentry/opentelemetry';
 import type { NodeClient } from '../../src';
 import { SentryContextManager, validateOpenTelemetrySetup } from '../../src';
@@ -98,7 +111,6 @@ export function mockSdkInit(options?: Partial<NodeClientOptions>) {
   return client;
 }
 
-
 export function cleanupOtel(_provider?: BasicTracerProvider): void {
   const provider = getProvider(_provider);
 

packages/node-core/test/integration/breadcrumbs.test.ts

@@ -355,4 +355,4 @@ describe('Integration | breadcrumbs', () => {
       },
     );
   });
-});
+});

packages/node-core/test/integration/scope.test.ts

@@ -16,7 +16,7 @@ describe('Integration | Scope', () => {
       const beforeSend = vi.fn(() => null);
       const beforeSendTransaction = vi.fn(() => null);
 
-      const client = tracingEnabled 
+      const client = tracingEnabled
         ? mockSdkInit({ tracesSampleRate: 1, beforeSend, beforeSendTransaction })
         : mockSdkInit({ beforeSend, beforeSendTransaction });
 
@@ -135,7 +135,7 @@ describe('Integration | Scope', () => {
       const beforeSend = vi.fn(() => null);
       const beforeSendTransaction = vi.fn(() => null);
 
-      const client = tracingEnabled 
+      const client = tracingEnabled
         ? mockSdkInit({ tracesSampleRate: 1, beforeSend, beforeSendTransaction })
         : mockSdkInit({ beforeSend, beforeSendTransaction });
 
@@ -583,4 +583,4 @@ describe('Integration | Scope', () => {
       );
     });
   });
-});
+});

packages/node-core/test/sdk/api.test.ts

@@ -101,4 +101,4 @@ describe('withActiveSpan()', () => {
       expect.anything(),
     );
   });
-});
+});

packages/node-core/test/sdk/init.test.ts

@@ -1,7 +1,7 @@
 import type { Integration } from '@sentry/core';
 import { logger } from '@sentry/core';
 import * as SentryOpentelemetry from '@sentry/opentelemetry';
-import { type Mock, type MockInstance, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { type Mock, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { getClient } from '../../src/';
 import { init, validateOpenTelemetrySetup } from '../../src/sdk';
 import { NodeClient } from '../../src/sdk/client';
@@ -85,10 +85,8 @@ describe('init()', () => {
       expect(mockDefaultIntegrations[1]?.setupOnce as Mock).toHaveBeenCalledTimes(0);
       expect(newIntegration.setupOnce as Mock).toHaveBeenCalledTimes(1);
     });
-
   });
 
-
   it('returns initialized client', () => {
     const client = init({ dsn: PUBLIC_DSN, skipOpenTelemetrySetup: true });
 

packages/node/src/index.ts

@@ -3,39 +3,6 @@ import { logger } from '@sentry/node-core';
 export { httpIntegration } from './integrations/http';
 export { nativeNodeFetchIntegration } from './integrations/node-fetch';
 export { fsIntegration } from './integrations/fs';
-
-export {
-  nodeContextIntegration,
-  contextLinesIntegration,
-  localVariablesIntegration,
-  modulesIntegration,
-  onUncaughtExceptionIntegration,
-  onUnhandledRejectionIntegration,
-  anrIntegration,
-  disableAnrDetectionForCallback,
-  spotlightIntegration,
-  childProcessIntegration,
-  createSentryWinstonTransport,
-  SentryContextManager,
-  generateInstrumentOnce,
-  instrumentWhenWrapped,
-  INSTRUMENTED,
-  getSentryRelease,
-  defaultStackParser,
-  createGetModuleFromFilename,
-  makeNodeTransport,
-  NodeClient,
-  cron,
-  NODE_VERSION,
-  validateOpenTelemetrySetup,
-  addOriginToSpan,
-  getRequestUrl,
-  isCjs,
-  ensureIsWrapped,
-  createMissingInstrumentationContext,
-  envToBool,
-} from '@sentry/node-core';
-
 export { expressIntegration, expressErrorHandler, setupExpressErrorHandler } from './integrations/tracing/express';
 export { fastifyIntegration, setupFastifyErrorHandler } from './integrations/tracing/fastify';
 export { graphqlIntegration } from './integrations/tracing/graphql';
@@ -173,4 +140,36 @@ export type {
   FeatureFlagsIntegration,
 } from '@sentry/core';
 
+export {
+  nodeContextIntegration,
+  contextLinesIntegration,
+  localVariablesIntegration,
+  modulesIntegration,
+  onUncaughtExceptionIntegration,
+  onUnhandledRejectionIntegration,
+  anrIntegration,
+  disableAnrDetectionForCallback,
+  spotlightIntegration,
+  childProcessIntegration,
+  createSentryWinstonTransport,
+  SentryContextManager,
+  generateInstrumentOnce,
+  instrumentWhenWrapped,
+  INSTRUMENTED,
+  getSentryRelease,
+  defaultStackParser,
+  createGetModuleFromFilename,
+  makeNodeTransport,
+  NodeClient,
+  cron,
+  NODE_VERSION,
+  validateOpenTelemetrySetup,
+  addOriginToSpan,
+  getRequestUrl,
+  isCjs,
+  ensureIsWrapped,
+  createMissingInstrumentationContext,
+  envToBool,
+} from '@sentry/node-core';
+
 export { logger };

packages/node/src/init.ts

@@ -6,4 +6,4 @@ import { init } from './sdk';
  *
  * > SENTRY_DSN=https://[email protected]/0 SENTRY_TRACES_SAMPLE_RATE=1.0 node --import=@sentry/node/init app.mjs
  */
-init();
+init();

packages/node/test/integrations/tracing/graphql.test.ts

@@ -1,7 +1,7 @@
 import { GraphQLInstrumentation } from '@opentelemetry/instrumentation-graphql';
 import { type MockInstance, beforeEach, describe, expect, it, vi } from 'vitest';
-import { graphqlIntegration, instrumentGraphql } from '../../../src/integrations/tracing/graphql';
 import { INSTRUMENTED } from '../../../src/index';
+import { graphqlIntegration, instrumentGraphql } from '../../../src/integrations/tracing/graphql';
 
 vi.mock('@opentelemetry/instrumentation-graphql');
 

packages/node/test/integrations/tracing/koa.test.ts

@@ -1,7 +1,7 @@
 import { KoaInstrumentation } from '@opentelemetry/instrumentation-koa';
 import { type MockInstance, beforeEach, describe, expect, it, vi } from 'vitest';
-import { instrumentKoa, koaIntegration } from '../../../src/integrations/tracing/koa';
 import { INSTRUMENTED } from '../../../src/index';
+import { instrumentKoa, koaIntegration } from '../../../src/integrations/tracing/koa';
 
 vi.mock('@opentelemetry/instrumentation-koa');
 

packages/node/test/integrations/tracing/mongo.test.ts

@@ -1,11 +1,11 @@
 import { MongoDBInstrumentation } from '@opentelemetry/instrumentation-mongodb';
 import { type MockInstance, beforeEach, describe, expect, it, vi } from 'vitest';
+import { INSTRUMENTED } from '../../../src/index';
 import {
   _defaultDbStatementSerializer,
   instrumentMongo,
   mongoIntegration,
 } from '../../../src/integrations/tracing/mongo';
-import { INSTRUMENTED } from '../../../src/index';
 
 vi.mock('@opentelemetry/instrumentation-mongodb');
 

packages/node/test/sdk/init.test.ts

@@ -2,11 +2,9 @@ import type { Integration } from '@sentry/core';
 import { logger } from '@sentry/core';
 import * as SentryOpentelemetry from '@sentry/opentelemetry';
 import { type Mock, type MockInstance, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { getClient } from '../../src/';
+import { getClient, NodeClient, validateOpenTelemetrySetup } from '../../src/';
 import * as auto from '../../src/integrations/tracing';
 import { init } from '../../src/sdk';
-import { validateOpenTelemetrySetup } from '../../src/index';
-import { NodeClient } from '../../src/index';
 import { cleanupOtel } from '../helpers/mockSdkInit';
 
 // eslint-disable-next-line no-var