feat(opentelemetry): Widen peer dependencies to support Otel v2

Author: andreiborza

packages/opentelemetry/package.json

@@ -43,11 +43,11 @@
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/context-async-hooks": "^1.30.1",
-    "@opentelemetry/core": "^1.30.1",
-    "@opentelemetry/instrumentation": "^0.57.1",
-    "@opentelemetry/sdk-trace-base": "^1.30.1",
-    "@opentelemetry/semantic-conventions": "^1.28.0"
+    "@opentelemetry/context-async-hooks": "^1.30.1 || ^2.0.0",
+    "@opentelemetry/core": "^1.30.1 || ^2.0.0",
+    "@opentelemetry/instrumentation": "^0.57.1 || ^0.200.0",
+    "@opentelemetry/sdk-trace-base": "^1.30.1 || ^2.0.0",
+    "@opentelemetry/semantic-conventions": "^1.30.0"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.9.0",

packages/opentelemetry/src/custom/client.ts

@@ -49,12 +49,7 @@ export function wrapClientClass<
      */
     public async flush(timeout?: number): Promise<boolean> {
       const provider = this.traceProvider;
-      const spanProcessor = provider?.activeSpanProcessor;
-
-      if (spanProcessor) {
-        await spanProcessor.forceFlush();
-      }
-
+      await provider?.forceFlush();
       return super.flush(timeout);
     }
   }

packages/opentelemetry/src/spanExporter.ts

@@ -28,6 +28,7 @@ import {
 } from '@sentry/core';
 import { DEBUG_BUILD } from './debug-build';
 import { SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE } from './semanticAttributes';
+import { getParentSpanId } from './utils/getParentSpanId';
 import { getRequestSpanData } from './utils/getRequestSpanData';
 import type { SpanNode } from './utils/groupSpansWithParents';
 import { getLocalParentId, groupSpansWithParents } from './utils/groupSpansWithParents';
@@ -255,7 +256,7 @@ export function createTransactionForOtelSpan(span: ReadableSpan): TransactionEve
   // even if `span.parentSpanId` is set
   // this is the case when we are starting a new trace, where we have a virtual span based on the propagationContext
   // We only want to continue the traceId in this case, but ignore the parent span
-  const parent_span_id = span.parentSpanId;
+  const parent_span_id = getParentSpanId(span);
 
   const status = mapStatus(span);
 
@@ -321,8 +322,9 @@ function createAndFinishSpanForOtelSpan(node: SpanNode, spans: SpanJSON[], sentS
 
   const span_id = span.spanContext().spanId;
   const trace_id = span.spanContext().traceId;
+  const parentSpanId = getParentSpanId(span);
 
-  const { attributes, startTime, endTime, parentSpanId, links } = span;
+  const { attributes, startTime, endTime, links } = span;
 
   const { op, description, data, origin = 'manual' } = getSpanData(span);
   const allData = {

packages/opentelemetry/src/utils/getParentSpanId.ts

@@ -0,0 +1,16 @@
+import type { ReadableSpan } from '@opentelemetry/sdk-trace-base';
+
+/**
+ * Get the parent span id from a span.
+ * In OTel v1, the parent span id is accessed as `parentSpanId`
+ * In OTel v2, the parent span id is accessed as `spanId` on the `parentSpanContext`
+ */
+export function getParentSpanId(span: ReadableSpan): string | undefined {
+  if ('parentSpanId' in span) {
+    return span.parentSpanId as string | undefined;
+  } else if ('parentSpanContext' in span) {
+    return (span.parentSpanContext as { spanId?: string } | undefined)?.spanId;
+  }
+
+  return undefined;
+}

packages/opentelemetry/src/utils/groupSpansWithParents.ts

@@ -1,5 +1,6 @@
 import type { ReadableSpan } from '@opentelemetry/sdk-trace-base';
 import { SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE } from '../semanticAttributes';
+import { getParentSpanId } from './getParentSpanId';
 
 export interface SpanNode {
   id: string;
@@ -33,7 +34,7 @@ export function getLocalParentId(span: ReadableSpan): string | undefined {
   const parentIsRemote = span.attributes[SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE] === true;
   // If the parentId is the trace parent ID, we pretend it's undefined
   // As this means the parent exists somewhere else
-  return !parentIsRemote ? span.parentSpanId : undefined;
+  return !parentIsRemote ? getParentSpanId(span) : undefined;
 }
 
 function createOrUpdateSpanNodeAndRefs(nodeMap: SpanMap, span: ReadableSpan): void {

packages/opentelemetry/src/utils/spanTypes.ts

@@ -1,6 +1,7 @@
 import type { SpanKind, SpanStatus } from '@opentelemetry/api';
 import type { ReadableSpan, TimedEvent } from '@opentelemetry/sdk-trace-base';
 import type { AbstractSpan } from '../types';
+import { getParentSpanId } from './getParentSpanId';
 
 /**
  * Check if a given span has attributes.
@@ -55,7 +56,7 @@ export function spanHasParentId<SpanType extends AbstractSpan>(
   span: SpanType,
 ): span is SpanType & { parentSpanId: string } {
   const castSpan = span as ReadableSpan;
-  return !!castSpan.parentSpanId;
+  return !!getParentSpanId(castSpan);
 }
 
 /**