From b9e7835716d56dba7e6f9f0e45a2a31dd7022391 Mon Sep 17 00:00:00 2001 From: Ricky Zhou <0x19951125@gmail.com> Date: Tue, 7 Dec 2021 00:50:30 +0800 Subject: [PATCH 1/2] refactor(opentelemetry-sdk-node): remove redundant judgments for metric (#2648) --- experimental/packages/opentelemetry-sdk-node/src/sdk.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/experimental/packages/opentelemetry-sdk-node/src/sdk.ts b/experimental/packages/opentelemetry-sdk-node/src/sdk.ts index 74c791fa6e..cf014d6bd2 100644 --- a/experimental/packages/opentelemetry-sdk-node/src/sdk.ts +++ b/experimental/packages/opentelemetry-sdk-node/src/sdk.ts @@ -84,14 +84,13 @@ export class NodeSDK { } if (configuration.metricExporter) { - const meterConfig: MeterConfig = {}; + const meterConfig: MeterConfig = { + exporter: configuration.metricExporter, + }; if (configuration.metricProcessor) { meterConfig.processor = configuration.metricProcessor; } - if (configuration.metricExporter) { - meterConfig.exporter = configuration.metricExporter; - } if (typeof configuration.metricInterval === 'number') { meterConfig.interval = configuration.metricInterval; } From f95debab3ae35f5d3bb3c0fbd76e974b088723f3 Mon Sep 17 00:00:00 2001 From: Svetlana Brennan <50715937+svetlanabrennan@users.noreply.github.com> Date: Mon, 6 Dec 2021 12:19:20 -0600 Subject: [PATCH 2/2] chore: update opentelemetry dependencies to latest versions (#2647) Co-authored-by: Daniel Dyla --- examples/grpc-js/package.json | 16 ++++++++-------- examples/grpc/package.json | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/grpc-js/package.json b/examples/grpc-js/package.json index 813035f475..5c437a1e1a 100644 --- a/examples/grpc-js/package.json +++ b/examples/grpc-js/package.json @@ -30,14 +30,14 @@ "dependencies": { "@grpc/grpc-js": "^1.3.7", "@opentelemetry/api": "^1.0.2", - "@opentelemetry/exporter-jaeger": "0.25.0", - "@opentelemetry/exporter-zipkin": "0.25.0", - "@opentelemetry/instrumentation": "0.25.0", - "@opentelemetry/instrumentation-grpc": "0.25.0", - "@opentelemetry/resources": "0.25.0", - "@opentelemetry/semantic-conventions": "0.25.0", - "@opentelemetry/sdk-trace-node": "0.25.0", - "@opentelemetry/sdk-trace-base": "0.25.0", + "@opentelemetry/exporter-jaeger": "^1.0.1", + "@opentelemetry/exporter-zipkin": "^1.0.1", + "@opentelemetry/instrumentation": "^0.27.0", + "@opentelemetry/instrumentation-grpc": "^0.27.0", + "@opentelemetry/resources": "^1.0.1", + "@opentelemetry/semantic-conventions": "^1.0.1", + "@opentelemetry/sdk-trace-base": "^1.0.1", + "@opentelemetry/sdk-trace-node": "^1.0.1", "google-protobuf": "^3.9.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", diff --git a/examples/grpc/package.json b/examples/grpc/package.json index 3d02872b2d..c11c410eeb 100644 --- a/examples/grpc/package.json +++ b/examples/grpc/package.json @@ -29,14 +29,14 @@ }, "dependencies": { "@opentelemetry/api": "^1.0.2", - "@opentelemetry/exporter-jaeger": "0.25.0", - "@opentelemetry/exporter-zipkin": "0.25.0", - "@opentelemetry/instrumentation": "0.25.0", - "@opentelemetry/instrumentation-grpc": "0.25.0", - "@opentelemetry/resources": "0.25.0", - "@opentelemetry/semantic-conventions": "0.25.0", - "@opentelemetry/sdk-trace-node": "0.25.0", - "@opentelemetry/sdk-trace-base": "0.25.0", + "@opentelemetry/exporter-jaeger": "^1.0.1", + "@opentelemetry/exporter-zipkin": "^1.0.1", + "@opentelemetry/instrumentation": "^0.27.0", + "@opentelemetry/instrumentation-grpc": "^0.27.0", + "@opentelemetry/resources": "^1.0.1", + "@opentelemetry/semantic-conventions": "^1.0.1", + "@opentelemetry/sdk-trace-base": "^1.0.1", + "@opentelemetry/sdk-trace-node": "^1.0.1", "google-protobuf": "^3.9.2", "grpc": "^1.23.3", "node-pre-gyp": "0.14.0"