@devopsplaybook.io/otel-utils 1.5.2-beta.35.3bee49a → 1.5.3-beta.36.4071915

package/dist/src/ModuleLogger.js

@@ -1,22 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModuleLogger = void 0;
-const api_logs_1 = require("@opentelemetry/api-logs");
+const api_1 = require("@opentelemetry/api");
 class ModuleLogger {
     constructor(module, standardLogger) {
         this.module = module;
         this.standardLogger = standardLogger;
     }
     info(message, context) {
-        this.display("info", message, api_logs_1.SeverityNumber.INFO, null, context);
+        this.display("info", message, api_1.SeverityNumber.INFO, null, context);
     }
     warn(message, context) {
-        this.display("warn", message, api_logs_1.SeverityNumber.WARN, null, context);
+        this.display("warn", message, api_1.SeverityNumber.WARN, null, context);
     }
     error(message, error, context) {
-        this.display("error", message, api_logs_1.SeverityNumber.ERROR, error, context);
+        this.display("error", message, api_1.SeverityNumber.ERROR, error, context);
     }
-    display(level, message, severityNumber = api_logs_1.SeverityNumber.INFO, error, context) {
+    display(level, message, severityNumber = api_1.SeverityNumber.INFO, error, context) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const attributes = { "log.type": "custom" };
         if (error) {

package/dist/src/StandardLogger.d.ts

@@ -1,4 +1,4 @@
-import { type Logger as OTelLogger } from "@opentelemetry/api-logs";
+import { type Logger as OTelLogger } from "@opentelemetry/api";
 import { ConfigOTelInterface } from "./models/ConfigOTelInterface";
 import { ModuleLogger } from "./ModuleLogger";
 import type { StandardLoggerInterface } from "./models/StandardLoggerInterface";

package/dist/src/StandardLogger.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StandardLogger = void 0;
-const api_logs_1 = require("@opentelemetry/api-logs");
+const api_1 = require("@opentelemetry/api");
 const exporter_logs_otlp_http_1 = require("@opentelemetry/exporter-logs-otlp-http");
 const sdk_logs_1 = require("@opentelemetry/sdk-logs");
 const createResource_1 = require("./utils/createResource");
@@ -31,7 +31,7 @@ class StandardLogger {
                 ],
                 resource: (0, createResource_1.createOTelResource)(this.serviceName, this.serviceVersion),
             });
-            api_logs_1.logs.setGlobalLoggerProvider(this.loggerProvider);
+            api_1.logs.setGlobalLoggerProvider(this.loggerProvider);
             this.logger = this.loggerProvider.getLogger(`${this.serviceName}:${this.serviceVersion}`);
         }
     }

package/dist/src/StandardTracer.d.ts

@@ -1,6 +1,6 @@
 import { SpanKind } from "@opentelemetry/api";
 import type { Span as ApiSpan } from "@opentelemetry/api";
-import { Span } from "@opentelemetry/sdk-trace-base";
+import { type Span } from "@opentelemetry/sdk-trace";
 import { ConfigOTelInterface } from "./models/ConfigOTelInterface";
 /**
  * Options accepted by {@link StandardTracer.startSpan}.

package/dist/src/StandardTracer.js

@@ -39,8 +39,7 @@ const context_async_hooks_1 = require("@opentelemetry/context-async-hooks");
 const core_1 = require("@opentelemetry/core");
 const exporter_trace_otlp_http_1 = require("@opentelemetry/exporter-trace-otlp-http");
 const id_generator_aws_xray_1 = require("@opentelemetry/id-generator-aws-xray");
-const sdk_trace_base_1 = require("@opentelemetry/sdk-trace-base");
-const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
+const sdk_trace_1 = require("@opentelemetry/sdk-trace");
 const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
 const createResource_1 = require("./utils/createResource");
 class StandardTracer {
@@ -58,15 +57,17 @@ class StandardTracer {
                 url: config.OPENTELEMETRY_COLLECTOR_HTTP_TRACES,
                 headers: exporterHeaders,
             });
-            spanProcessors.push(new sdk_trace_base_1.BatchSpanProcessor(exporter));
+            spanProcessors.push(new sdk_trace_1.BatchSpanProcessor({ exporter }));
         }
-        this.traceProvider = new sdk_trace_node_1.NodeTracerProvider({
+        this.traceProvider = new sdk_trace_1.TracerProvider({
             idGenerator: new id_generator_aws_xray_1.AWSXRayIdGenerator(),
             resource: (0, createResource_1.createOTelResource)(this.serviceName, this.serviceVersion),
             spanProcessors,
         });
-        this.traceProvider.register();
-        const contextManager = new context_async_hooks_1.AsyncHooksContextManager();
+        // OTel v3 removed TracerProvider.register(): the provider and the context
+        // manager must be installed on the global API explicitly.
+        api_1.trace.setGlobalTracerProvider(this.traceProvider);
+        const contextManager = new context_async_hooks_1.AsyncLocalStorageContextManager();
         contextManager.enable();
         api_1.default.context.setGlobalContextManager(contextManager);
         this.tracer = api_1.default.trace.getTracer(`${this.serviceName}:${this.serviceVersion}`);

package/dist/src/models/StandardLoggerInterface.d.ts

@@ -1,4 +1,4 @@
-import type { Logger } from "@opentelemetry/api-logs";
+import type { Logger } from "@opentelemetry/api";
 export interface StandardLoggerInterface {
     getLogger(): Logger | undefined;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devopsplaybook.io/otel-utils",
-  "version": "1.5.2-beta.35.3bee49a",
+  "version": "1.5.3-beta.36.4071915",
   "description": "Utility to simplify integration with Open Telemetry",
   "keywords": [
     "Open",
@@ -21,29 +21,27 @@
     "dependencies": ""
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.9.1",
-    "@opentelemetry/api-logs": "^0.223.0",
-    "@opentelemetry/context-async-hooks": "^2.12.0",
-    "@opentelemetry/core": "^2.12.0",
-    "@opentelemetry/exporter-logs-otlp-http": "^0.223.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "^0.223.0",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.223.0",
-    "@opentelemetry/id-generator-aws-xray": "^2.1.0",
-    "@opentelemetry/resources": "^2.12.0",
-    "@opentelemetry/sdk-logs": "^0.223.0",
-    "@opentelemetry/sdk-metrics": "^2.12.0",
-    "@opentelemetry/sdk-trace-base": "^2.12.0",
-    "@opentelemetry/sdk-trace-node": "^2.12.0",
+    "@opentelemetry/api": "^1.10.0",
+    "@opentelemetry/context-async-hooks": "^3.0.0",
+    "@opentelemetry/core": "^3.0.0",
+    "@opentelemetry/exporter-logs-otlp-http": "^0.300.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "^0.300.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.300.0",
+    "@opentelemetry/id-generator-aws-xray": "^3.0.0",
+    "@opentelemetry/resources": "^3.0.0",
+    "@opentelemetry/sdk-logs": "^3.0.0",
+    "@opentelemetry/sdk-metrics": "^3.0.0",
+    "@opentelemetry/sdk-trace": "^3.0.0",
     "@opentelemetry/semantic-conventions": "^1.43.0"
   },
   "devDependencies": {
-    "@swc/core": "^1.16.18",
+    "@swc/core": "^1.16.20",
     "@swc/jest": "^0.2.39",
     "@types/jest": "^30.0.0",
     "@types/node": "^26.6.5",
     "@types/sqlite3": "^5.1.0",
     "jest": "^30.5.2",
-    "oxlint": "^1.88.0",
+    "oxlint": "^1.89.0",
     "typescript": "^7.0.2"
   },
   "publishConfig": {

package/src/ModuleLogger.spec.ts

@@ -2,7 +2,7 @@ import type { Span } from "@opentelemetry/api";
 import {
   SeverityNumber,
   type Logger as OTelLogger,
-} from "@opentelemetry/api-logs";
+} from "@opentelemetry/api";
 import { ModuleLogger } from "./ModuleLogger";
 import type { StandardLoggerInterface } from "./models/StandardLoggerInterface";
 

package/src/ModuleLogger.ts

@@ -1,4 +1,4 @@
-import { SeverityNumber } from "@opentelemetry/api-logs";
+import { SeverityNumber } from "@opentelemetry/api";
 import type { Span } from "@opentelemetry/api";
 import { StandardLoggerInterface } from "./models/StandardLoggerInterface";
 

package/src/StandardLogger.spec.ts

@@ -1,4 +1,4 @@
-import { logs, SeverityNumber } from "@opentelemetry/api-logs";
+import { logs, SeverityNumber } from "@opentelemetry/api";
 import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";
 import { LoggerProvider } from "@opentelemetry/sdk-logs";
 import { StandardLogger } from "./StandardLogger";
@@ -91,7 +91,7 @@ describe("StandardLogger", () => {
     await logger.shutdown();
   });
 
-  it("flushes api-logs and module logger records on shutdown", async () => {
+  it("flushes OTel logs and module logger records on shutdown", async () => {
     const logger = new StandardLogger();
     logger.initOTel({
       ...collectorConfig("http://collector:4318/v1/logs"),

package/src/StandardLogger.ts

@@ -1,4 +1,4 @@
-import { logs, type Logger as OTelLogger } from "@opentelemetry/api-logs";
+import { logs, type Logger as OTelLogger } from "@opentelemetry/api";
 import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";
 import {
   BatchLogRecordProcessor,

package/src/StandardTracer.ts

@@ -6,12 +6,15 @@ import opentelemetry, {
   Tracer,
 } from "@opentelemetry/api";
 import type { Span as ApiSpan } from "@opentelemetry/api";
-import { AsyncHooksContextManager } from "@opentelemetry/context-async-hooks";
+import { AsyncLocalStorageContextManager } from "@opentelemetry/context-async-hooks";
 import { W3CTraceContextPropagator } from "@opentelemetry/core";
 import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
 import { AWSXRayIdGenerator } from "@opentelemetry/id-generator-aws-xray";
-import { BatchSpanProcessor, Span } from "@opentelemetry/sdk-trace-base";
-import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
+import {
+  BatchSpanProcessor,
+  type Span,
+  TracerProvider,
+} from "@opentelemetry/sdk-trace";
 import {
   ATTR_HTTP_REQUEST_METHOD,
   ATTR_HTTP_ROUTE,
@@ -37,7 +40,7 @@ export class StandardTracer {
   private static readonly SPAN_NAME_SANITIZE_RE = /[^a-zA-Z0-9-_/]/g;
   private static readonly PROPAGATOR = new W3CTraceContextPropagator();
 
-  private traceProvider: NodeTracerProvider;
+  private traceProvider: TracerProvider;
   private tracer: Tracer;
   private serviceVersion: string;
   private serviceName: string;
@@ -57,15 +60,17 @@ export class StandardTracer {
         url: config.OPENTELEMETRY_COLLECTOR_HTTP_TRACES,
         headers: exporterHeaders,
       });
-      spanProcessors.push(new BatchSpanProcessor(exporter));
+      spanProcessors.push(new BatchSpanProcessor({ exporter }));
     }
-    this.traceProvider = new NodeTracerProvider({
+    this.traceProvider = new TracerProvider({
       idGenerator: new AWSXRayIdGenerator(),
       resource: createOTelResource(this.serviceName, this.serviceVersion),
       spanProcessors,
     });
-    this.traceProvider.register();
-    const contextManager = new AsyncHooksContextManager();
+    // OTel v3 removed TracerProvider.register(): the provider and the context
+    // manager must be installed on the global API explicitly.
+    trace.setGlobalTracerProvider(this.traceProvider);
+    const contextManager = new AsyncLocalStorageContextManager();
     contextManager.enable();
     opentelemetry.context.setGlobalContextManager(contextManager);
     this.tracer = opentelemetry.trace.getTracer(

package/src/models/StandardLoggerInterface.ts

@@ -1,4 +1,4 @@
-import type { Logger } from "@opentelemetry/api-logs";
+import type { Logger } from "@opentelemetry/api";
 
 export interface StandardLoggerInterface {
   getLogger(): Logger | undefined;