From c74c259fbd4e63eea8907c1b926cd2ad2af54b1f Mon Sep 17 00:00:00 2001 From: warre Date: Mon, 14 Apr 2025 18:12:28 +0200 Subject: [PATCH] Deprecate configureTracerProvider and use configureTracer in tests --- nodejs/package-lock.json | 44 ++++++++++----------- nodejs/packages/layer/src/wrapper.ts | 3 ++ nodejs/packages/layer/test/handler.spec.mjs | 6 ++- nodejs/packages/layer/test/handler.spec.ts | 6 ++- 4 files changed, 33 insertions(+), 26 deletions(-) diff --git a/nodejs/package-lock.json b/nodejs/package-lock.json index 4fb6fd2ae9..13f36da669 100644 --- a/nodejs/package-lock.json +++ b/nodejs/package-lock.json @@ -15402,48 +15402,48 @@ "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.9.0", - "@opentelemetry/api-logs": "^0.57.0", + "@opentelemetry/api-logs": "^0.57.2", "@opentelemetry/context-async-hooks": "^1.30.1", "@opentelemetry/core": "^1.30.0", - "@opentelemetry/exporter-logs-otlp-http": "^0.57.0", - "@opentelemetry/exporter-metrics-otlp-http": "^0.57.0", - "@opentelemetry/exporter-trace-otlp-http": "^0.57.0", - "@opentelemetry/instrumentation": "^0.57.0", + "@opentelemetry/exporter-logs-otlp-http": "^0.57.2", + "@opentelemetry/exporter-metrics-otlp-http": "^0.57.2", + "@opentelemetry/exporter-trace-otlp-http": "^0.57.2", + "@opentelemetry/instrumentation": "^0.57.2", "@opentelemetry/instrumentation-amqplib": "^0.46.1", - "@opentelemetry/instrumentation-aws-lambda": "^0.50.0", - "@opentelemetry/instrumentation-aws-sdk": "^0.49.0", + "@opentelemetry/instrumentation-aws-lambda": "^0.50.3", + "@opentelemetry/instrumentation-aws-sdk": "^0.49.1", "@opentelemetry/instrumentation-bunyan": "^0.45.1", "@opentelemetry/instrumentation-cassandra-driver": "^0.45.1", "@opentelemetry/instrumentation-connect": "^0.43.1", "@opentelemetry/instrumentation-dataloader": "^0.16.1", - "@opentelemetry/instrumentation-dns": "^0.43.0", - "@opentelemetry/instrumentation-express": "^0.47.0", + "@opentelemetry/instrumentation-dns": "^0.43.1", + "@opentelemetry/instrumentation-express": "^0.47.1", "@opentelemetry/instrumentation-fs": "^0.19.1", - "@opentelemetry/instrumentation-graphql": "^0.47.0", - "@opentelemetry/instrumentation-grpc": "^0.57.0", - "@opentelemetry/instrumentation-hapi": "^0.45.0", - "@opentelemetry/instrumentation-http": "^0.57.0", - "@opentelemetry/instrumentation-ioredis": "^0.47.0", + "@opentelemetry/instrumentation-graphql": "^0.47.1", + "@opentelemetry/instrumentation-grpc": "^0.57.2", + "@opentelemetry/instrumentation-hapi": "^0.45.2", + "@opentelemetry/instrumentation-http": "^0.57.2", + "@opentelemetry/instrumentation-ioredis": "^0.47.1", "@opentelemetry/instrumentation-kafkajs": "^0.7.1", "@opentelemetry/instrumentation-knex": "^0.44.1", - "@opentelemetry/instrumentation-koa": "^0.47.0", + "@opentelemetry/instrumentation-koa": "^0.47.1", "@opentelemetry/instrumentation-memcached": "^0.43.1", "@opentelemetry/instrumentation-mongodb": "^0.52.0", "@opentelemetry/instrumentation-mongoose": "^0.46.1", - "@opentelemetry/instrumentation-mysql": "^0.45.0", + "@opentelemetry/instrumentation-mysql": "^0.45.1", "@opentelemetry/instrumentation-mysql2": "^0.45.2", "@opentelemetry/instrumentation-nestjs-core": "^0.44.1", - "@opentelemetry/instrumentation-net": "^0.43.0", - "@opentelemetry/instrumentation-pg": "^0.51.0", + "@opentelemetry/instrumentation-net": "^0.43.1", + "@opentelemetry/instrumentation-pg": "^0.51.1", "@opentelemetry/instrumentation-pino": "^0.46.1", - "@opentelemetry/instrumentation-redis": "^0.46.0", + "@opentelemetry/instrumentation-redis": "^0.46.1", "@opentelemetry/instrumentation-restify": "^0.45.1", "@opentelemetry/instrumentation-socket.io": "^0.46.1", "@opentelemetry/instrumentation-undici": "^0.10.1", "@opentelemetry/instrumentation-winston": "^0.44.1", - "@opentelemetry/propagator-aws-xray": "^1.26.0", - "@opentelemetry/propagator-aws-xray-lambda": "^0.53.0", - "@opentelemetry/resource-detector-aws": "^1.11.0", + "@opentelemetry/propagator-aws-xray": "^1.26.2", + "@opentelemetry/propagator-aws-xray-lambda": "^0.53.2", + "@opentelemetry/resource-detector-aws": "^1.12.0", "@opentelemetry/resources": "^1.30.0", "@opentelemetry/sdk-logs": "^0.57.0", "@opentelemetry/sdk-metrics": "^1.30.0", diff --git a/nodejs/packages/layer/src/wrapper.ts b/nodejs/packages/layer/src/wrapper.ts index 102ec430ce..274c03dc43 100644 --- a/nodejs/packages/layer/src/wrapper.ts +++ b/nodejs/packages/layer/src/wrapper.ts @@ -83,6 +83,9 @@ declare global { defaultSdkRegistration: SDKRegistrationConfig, ): SDKRegistrationConfig; function configureTracer(defaultConfig: TracerConfig): TracerConfig; + /** + * @deprecated please use {@link configureTracer} instead. + */ function configureTracerProvider(tracerProvider: BasicTracerProvider): void; // No explicit metric type here, but "unknown" type. diff --git a/nodejs/packages/layer/test/handler.spec.mjs b/nodejs/packages/layer/test/handler.spec.mjs index e7a7e2bd02..0104bec0e7 100644 --- a/nodejs/packages/layer/test/handler.spec.mjs +++ b/nodejs/packages/layer/test/handler.spec.mjs @@ -40,8 +40,10 @@ describe('when loading ESM module', async () => { const initializeHandler = async (handler) => { process.env._HANDLER = handler; - global.configureTracerProvider = (tracerProvider) => { - tracerProvider.addSpanProcessor(new BatchSpanProcessor(memoryExporter)); + global.configureTracer = (_) => { + return { + spanProcessors: [new BatchSpanProcessor(memoryExporter)], + }; }; global.configureMeter = (_) => { {} }; global.configureMeterProvider = (_) => {}; diff --git a/nodejs/packages/layer/test/handler.spec.ts b/nodejs/packages/layer/test/handler.spec.ts index ec7982aab5..cb321f629e 100644 --- a/nodejs/packages/layer/test/handler.spec.ts +++ b/nodejs/packages/layer/test/handler.spec.ts @@ -35,8 +35,10 @@ describe('when loading ESM module', async () => { const initializeHandler = async (handler: string) => { process.env._HANDLER = handler; - global.configureTracerProvider = tracerProvider => { - tracerProvider.addSpanProcessor(new BatchSpanProcessor(memoryExporter)); + global.configureTracer = _ => { + return { + spanProcessors: [new BatchSpanProcessor(memoryExporter)], + }; }; global.configureMeter = _ => { return {} as any;