feat: support OpenTelemetry JS SDK 2.x

packages/otel/package.json

@@ -65,19 +65,18 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@opentelemetry/api": "^1.7.0",
-    "@opentelemetry/api-logs": "^0.46.0",
-    "@opentelemetry/context-async-hooks": "^1.19.0",
-    "@opentelemetry/core": "^1.19.0",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.46.0",
-    "@opentelemetry/instrumentation": "^0.46.0",
-    "@opentelemetry/otlp-exporter-base": "^0.46.0",
-    "@opentelemetry/otlp-proto-exporter-base": "^0.46.0",
-    "@opentelemetry/otlp-transformer": "^0.46.0",
-    "@opentelemetry/resources": "^1.19.0",
-    "@opentelemetry/sdk-logs": "^0.46.0",
-    "@opentelemetry/sdk-metrics": "^1.19.0",
-    "@opentelemetry/sdk-trace-base": "^1.19.0",
+    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/api-logs": "^0.200.0",
+    "@opentelemetry/context-async-hooks": "^2.0.0",
+    "@opentelemetry/core": "^2.0.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.200.0",
+    "@opentelemetry/instrumentation": "^0.200.0",
+    "@opentelemetry/otlp-exporter-base": "^0.200.0",
+    "@opentelemetry/otlp-transformer": "^0.200.0",
+    "@opentelemetry/resources": "^2.0.0",
+    "@opentelemetry/sdk-logs": "^0.200.0",
+    "@opentelemetry/sdk-metrics": "^2.0.0",
+    "@opentelemetry/sdk-trace-base": "^2.0.0",
     "@types/node": "18.15.11",
     "esbuild": "^0.19.4",
     "eslint-config": "workspace:*",
@@ -91,11 +90,11 @@
   },
   "peerDependencies": {
     "@opentelemetry/api": ">=1.7.0 <2.0.0",
-    "@opentelemetry/api-logs": ">=0.46.0 <0.200.0",
-    "@opentelemetry/instrumentation": ">=0.46.0 <0.200.0",
-    "@opentelemetry/resources": ">=1.19.0 <2.0.0",
-    "@opentelemetry/sdk-logs": ">=0.46.0 <0.200.0",
-    "@opentelemetry/sdk-metrics": ">=1.19.0 <2.0.0",
-    "@opentelemetry/sdk-trace-base": ">=1.19.0 <2.0.0"
+    "@opentelemetry/api-logs": ">=0.200.0 <0.300.0",
+    "@opentelemetry/instrumentation": ">=0.200.0 <0.300.0",
+    "@opentelemetry/resources": ">=2.0.0 <3.0.0",
+    "@opentelemetry/sdk-logs": ">=0.200.0 <0.300.0",
+    "@opentelemetry/sdk-metrics": ">=2.0.0 <3.0.0",
+    "@opentelemetry/sdk-trace-base": ">=2.0.0 <3.0.0"
   }
 }

packages/otel/src/exporters/exporter-trace-otlp-http-fetch.ts

@@ -1,6 +1,5 @@
 import type { ReadableSpan, SpanExporter } from "@opentelemetry/sdk-trace-base";
-import type { IExportTraceServiceRequest } from "@opentelemetry/otlp-transformer";
-import { createExportTraceServiceRequest } from "@opentelemetry/otlp-transformer/build/src/trace";
+import { JsonTraceSerializer } from "@opentelemetry/otlp-transformer/build/src/trace/json/trace";
 import type { ExportResult } from "@opentelemetry/core";
 import { OTLPExporterEdgeBase } from "./otlp-exporter-base";
 import { getDefaultUrl } from "./trace-config";
@@ -37,24 +36,19 @@ export class OTLPHttpJsonTraceExporter implements SpanExporter {
 }
 
 /** @internal */
-class Impl extends OTLPExporterEdgeBase<
-  ReadableSpan,
-  IExportTraceServiceRequest
-> {
-  convert(spans: ReadableSpan[]): IExportTraceServiceRequest {
-    return createExportTraceServiceRequest(spans, {
-      useHex: true,
-      useLongBits: false,
-    });
+class Impl extends OTLPExporterEdgeBase<ReadableSpan, ReadableSpan[]> {
+  convert(spans: ReadableSpan[]): ReadableSpan[] {
+    return spans;
   }
 
-  override toMessage(serviceRequest: IExportTraceServiceRequest): {
+  override toMessage(spans: ReadableSpan[]): {
     body: string | Uint8Array | Blob;
     contentType: string;
     headers?: Record<string, string> | undefined;
   } {
+    const serialized = JsonTraceSerializer.serializeRequest(spans);
     return {
-      body: JSON.stringify(serviceRequest),
+      body: new TextDecoder().decode(serialized),
       contentType: "application/json",
     };
   }

packages/otel/src/exporters/exporter-trace-otlp-proto-fetch.ts

@@ -1,49 +1,41 @@
 import type { ReadableSpan, SpanExporter } from "@opentelemetry/sdk-trace-base";
-import type { IExportTraceServiceRequest } from "@opentelemetry/otlp-transformer";
-import { createExportTraceServiceRequest } from "@opentelemetry/otlp-transformer/build/src/trace";
+import type { IExportTraceServiceRequest } from "@opentelemetry/otlp-transformer/build/src/trace/internal-types";
+import { createExportTraceServiceRequest } from "@opentelemetry/otlp-transformer/build/src/trace/internal";
 import type { ExportResult } from "@opentelemetry/core";
+import { encodeTraceServiceRequest } from "./proto";
 import { OTLPExporterEdgeBase } from "./otlp-exporter-base";
 import { getDefaultUrl } from "./trace-config";
 import type { OTLPExporterConfig } from "./config";
-import { encodeTraceServiceRequest } from "./proto";
 
-/**
- * OTLP exporter for the `http/protobuf` protocol. Compatible with the "edge" runtime.
- */
 export class OTLPHttpProtoTraceExporter implements SpanExporter {
-  /** @internal */
   private readonly impl: Impl;
 
   constructor(config: OTLPExporterConfig = {}) {
     this.impl = new Impl(config);
   }
 
-  /** See `SpanExporter#export()` */
   export(
     spans: ReadableSpan[],
     resultCallback: (result: ExportResult) => void
   ): void {
     this.impl.export(spans, resultCallback);
   }
 
-  /** See `SpanExporter#shutdown()` */
   shutdown(): Promise<void> {
     return this.impl.shutdown();
   }
 
-  /** See `SpanExporter#forceFlush()` */
   forceFlush(): Promise<void> {
     return this.impl.forceFlush();
   }
 }
 
-/** @internal */
 class Impl extends OTLPExporterEdgeBase<
   ReadableSpan,
   IExportTraceServiceRequest
 > {
   convert(spans: ReadableSpan[]): IExportTraceServiceRequest {
-    return createExportTraceServiceRequest(spans, undefined);
+    return createExportTraceServiceRequest(spans);
   }
 
   override toMessage(serviceRequest: IExportTraceServiceRequest): {

packages/otel/src/exporters/otlp-exporter-base.ts

@@ -1,21 +1,25 @@
 import type { OTLPExporterError } from "@opentelemetry/otlp-exporter-base";
-import { OTLPExporterBase } from "@opentelemetry/otlp-exporter-base/build/src/OTLPExporterBase";
 import { diag } from "@opentelemetry/api";
+import type { ExportResult } from "@opentelemetry/core";
 import type { OTLPExporterConfig } from "./config";
 
 /** @internal */
-export abstract class OTLPExporterEdgeBase<
-  ExportItem,
-  ServiceRequest,
-> extends OTLPExporterBase<OTLPExporterConfig, ExportItem, ServiceRequest> {
+export abstract class OTLPExporterEdgeBase<ExportItem, ServiceRequest> {
   /** @internal */
   private _headers: Record<string, unknown> | undefined;
+  /** @internal */
+  private _shutdownOnce = { isCalled: false };
+  /** @internal */
+  private _sendingPromises: Promise<void>[] = [];
+  /** @internal */
+  protected url: string;
 
   constructor(config: OTLPExporterConfig = {}) {
-    super(config);
+    this.url = config.url || this.getDefaultUrl(config);
     if (config.headers) {
       this._headers = config.headers;
     }
+    this.onInit();
   }
 
   onShutdown(): void {
@@ -26,6 +30,34 @@ export abstract class OTLPExporterEdgeBase<
     diag.debug("@vercel/otel/otlp: onInit");
   }
 
+  export(
+    items: ExportItem[],
+    resultCallback: (result: ExportResult) => void
+  ): void {
+    if (this._shutdownOnce.isCalled) {
+      diag.debug(
+        "@vercel/otel/otlp: Shutdown already started. Cannot send objects"
+      );
+      return;
+    }
+
+    this.send(
+      items,
+      () => resultCallback({ code: 0 }), // SUCCESS
+      (error: OTLPExporterError) => resultCallback({ code: 1, error }) // FAILED
+    );
+  }
+
+  async forceFlush(): Promise<void> {
+    await Promise.all(this._sendingPromises);
+  }
+
+  async shutdown(): Promise<void> {
+    this._shutdownOnce.isCalled = true;
+    this.onShutdown();
+    await this.forceFlush();
+  }
+
   send(
     items: ExportItem[],
     onSuccess: () => void,
@@ -53,7 +85,7 @@ export abstract class OTLPExporterEdgeBase<
 
     const promise = fetch(this.url, {
       method: "POST",
-      body,
+      body: body as BodyInit,
       headers: {
         ...this._headers,
         ...headers,
@@ -81,10 +113,8 @@ export abstract class OTLPExporterEdgeBase<
     this._sendingPromises.push(promise);
   }
 
-  getDefaultUrl(_config: OTLPExporterConfig): string {
-    throw new Error("Method not implemented.");
-  }
-
+  abstract convert(items: ExportItem[]): ServiceRequest;
+  abstract getDefaultUrl(config: OTLPExporterConfig): string;
   abstract toMessage(serviceRequest: ServiceRequest): {
     body: string | Uint8Array | Blob;
     contentType: string;