ref(node-experimental): Use sdk-trace-base instead of sdk-trace-node

packages/node-experimental/package.json

@@ -23,22 +23,22 @@
     "access": "public"
   },
   "dependencies": {
-    "@opentelemetry/api": "~1.4.1",
-    "@opentelemetry/context-async-hooks": "~1.15.0",
-    "@opentelemetry/instrumentation": "~0.41.0",
-    "@opentelemetry/instrumentation-express": "~0.33.0",
-    "@opentelemetry/instrumentation-fastify": "~0.32.0",
-    "@opentelemetry/instrumentation-graphql": "~0.35.0",
-    "@opentelemetry/instrumentation-http": "~0.41.0",
-    "@opentelemetry/instrumentation-mongodb": "~0.36.0",
-    "@opentelemetry/instrumentation-mongoose": "~0.33.0",
-    "@opentelemetry/instrumentation-mysql": "~0.34.0",
-    "@opentelemetry/instrumentation-mysql2": "~0.34.0",
-    "@opentelemetry/instrumentation-nestjs-core": "~0.33.0",
-    "@opentelemetry/instrumentation-pg": "~0.36.0",
-    "@opentelemetry/sdk-trace-node": "~1.15.0",
-    "@opentelemetry/semantic-conventions": "~1.15.0",
-    "@prisma/instrumentation": "~5.0.0",
+    "@opentelemetry/api": "~1.6.0",
+    "@opentelemetry/context-async-hooks": "~1.17.0",
+    "@opentelemetry/instrumentation": "~0.43.0",
+    "@opentelemetry/instrumentation-express": "~0.33.1",
+    "@opentelemetry/instrumentation-fastify": "~0.32.2",
+    "@opentelemetry/instrumentation-graphql": "~0.35.1",
+    "@opentelemetry/instrumentation-http": "~0.43.0",
+    "@opentelemetry/instrumentation-mongodb": "~0.37.0",
+    "@opentelemetry/instrumentation-mongoose": "~0.33.1",
+    "@opentelemetry/instrumentation-mysql": "~0.34.1",
+    "@opentelemetry/instrumentation-mysql2": "~0.34.1",
+    "@opentelemetry/instrumentation-nestjs-core": "~0.33.1",
+    "@opentelemetry/instrumentation-pg": "~0.36.1",
+    "@opentelemetry/sdk-trace-base": "~1.17.0",
+    "@opentelemetry/semantic-conventions": "~1.17.0",
+    "@prisma/instrumentation": "~5.3.1",
     "@sentry/core": "7.70.0",
     "@sentry/node": "7.70.0",
     "@sentry/opentelemetry-node": "7.70.0",

packages/node-experimental/src/integrations/http.ts

@@ -2,15 +2,14 @@ import type { Attributes } from '@opentelemetry/api';
 import { SpanKind } from '@opentelemetry/api';
 import { registerInstrumentations } from '@opentelemetry/instrumentation';
 import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
-import type { Span as OtelSpan } from '@opentelemetry/sdk-trace-node';
 import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
 import { hasTracingEnabled, Transaction } from '@sentry/core';
 import { getCurrentHub } from '@sentry/node';
 import { _INTERNAL_getSentrySpan } from '@sentry/opentelemetry-node';
 import type { EventProcessor, Hub, Integration } from '@sentry/types';
 import type { ClientRequest, IncomingMessage, ServerResponse } from 'http';
 
-import type { NodeExperimentalClient } from '../types';
+import type { NodeExperimentalClient, OtelSpan } from '../types';
 import { getRequestSpanData } from '../utils/getRequestSpanData';
 
 interface TracingOptions {

packages/node-experimental/src/sdk/initOtel.ts

@@ -1,5 +1,5 @@
 import { diag, DiagLogLevel } from '@opentelemetry/api';
-import { AlwaysOnSampler, NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
+import { AlwaysOnSampler, BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
 import { getCurrentHub } from '@sentry/core';
 import { SentryPropagator, SentrySpanProcessor } from '@sentry/opentelemetry-node';
 import { logger } from '@sentry/utils';
@@ -26,14 +26,13 @@ export function initOtel(): () => void {
   }
 
   // Create and configure NodeTracerProvider
-  const provider = new NodeTracerProvider({
+  const provider = new BasicTracerProvider({
     sampler: new AlwaysOnSampler(),
   });
   provider.addSpanProcessor(new SentrySpanProcessor());
 
   // We use a custom context manager to keep context in sync with sentry scope
   const contextManager = new SentryContextManager();
-  contextManager.enable();
 
   // Initialize the provider
   provider.register({

packages/node-experimental/src/types.ts

@@ -1,4 +1,5 @@
 import type { Tracer } from '@opentelemetry/api';
+import type { Span as OtelSpan } from '@opentelemetry/sdk-trace-base';
 import type { NodeClient, NodeOptions } from '@sentry/node';
 import type { Breadcrumb, Transaction } from '@sentry/types';
 
@@ -24,3 +25,5 @@ export interface TransactionWithBreadcrumbs extends Transaction {
   /** Add a breadcrumb to this transaction. */
   addBreadcrumb(breadcrumb: Breadcrumb, maxBreadcrumbs?: number): void;
 }
+
+export type { OtelSpan };

packages/node-experimental/src/utils/addOriginToSpan.ts

@@ -1,3 +1,4 @@
+// We are using the broader OtelSpan type from api here, as this is also what integrations etc. use
 import type { Span as OtelSpan } from '@opentelemetry/api';
 import { _INTERNAL_getSentrySpan } from '@sentry/opentelemetry-node';
 import type { SpanOrigin } from '@sentry/types';

packages/node-experimental/src/utils/getRequestSpanData.ts

@@ -1,8 +1,9 @@
-import type { Span as OtelSpan } from '@opentelemetry/sdk-trace-base';
 import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
 import type { SanitizedRequestData } from '@sentry/types';
 import { getSanitizedUrlString, parseUrl } from '@sentry/utils';
 
+import type { OtelSpan } from '../types';
+
 /**
  * Get sanitizied request data from an OTEL span.
  */

packages/opentelemetry-node/package.json

@@ -34,11 +34,11 @@
     "@opentelemetry/semantic-conventions": "1.x"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^1.4.1",
+    "@opentelemetry/api": "^1.6.0",
     "@opentelemetry/core": "^1.7.0",
-    "@opentelemetry/sdk-trace-base": "^1.15.0",
-    "@opentelemetry/sdk-trace-node": "^1.15.0",
-    "@opentelemetry/semantic-conventions": "^1.7.0",
+    "@opentelemetry/sdk-trace-base": "^1.17.0",
+    "@opentelemetry/sdk-trace-node": "^1.17.0",
+    "@opentelemetry/semantic-conventions": "^1.17.0",
     "@sentry/node": "7.70.0"
   },
   "scripts": {

packages/opentelemetry-node/test/spanprocessor.test.ts

@@ -275,7 +275,7 @@ describe('SentrySpanProcessor', () => {
           'service.name': 'test-service',
           'telemetry.sdk.language': 'nodejs',
           'telemetry.sdk.name': 'opentelemetry',
-          'telemetry.sdk.version': '1.15.0',
+          'telemetry.sdk.version': '1.17.0',
         },
       },
     });
@@ -300,7 +300,7 @@ describe('SentrySpanProcessor', () => {
           'service.name': 'test-service',
           'telemetry.sdk.language': 'nodejs',
           'telemetry.sdk.name': 'opentelemetry',
-          'telemetry.sdk.version': '1.15.0',
+          'telemetry.sdk.version': '1.17.0',
         },
       },
     });