From 30733df5cbddb8bc60da5bc7a65f25a182f036d8 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 25 Aug 2021 10:09:43 +0200 Subject: [PATCH 1/3] fix(deps): roll back dependency @opentelemetry/instrumentation-express to ^0.24.0 (#2423) Co-authored-by: Bartlomiej Obecny --- getting-started/traced-example/package.json | 2 +- getting-started/ts-example/traced-example/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/getting-started/traced-example/package.json b/getting-started/traced-example/package.json index b9e4d93fa3..b51de03f72 100644 --- a/getting-started/traced-example/package.json +++ b/getting-started/traced-example/package.json @@ -11,7 +11,7 @@ "dependencies": { "@opentelemetry/core": "0.25.0", "@opentelemetry/exporter-zipkin": "0.25.0", - "@opentelemetry/instrumentation-express": "^0.25.0", + "@opentelemetry/instrumentation-express": "^0.24.0", "@opentelemetry/instrumentation-http": "0.25.0", "@opentelemetry/instrumentation": "0.25.0", "@opentelemetry/sdk-trace-node": "0.25.0", diff --git a/getting-started/ts-example/traced-example/package.json b/getting-started/ts-example/traced-example/package.json index af0b4eb638..3739e79b06 100644 --- a/getting-started/ts-example/traced-example/package.json +++ b/getting-started/ts-example/traced-example/package.json @@ -17,7 +17,7 @@ "@opentelemetry/core": "0.25.0", "@opentelemetry/exporter-zipkin": "0.25.0", "@opentelemetry/instrumentation": "0.25.0", - "@opentelemetry/instrumentation-express": "^0.25.0", + "@opentelemetry/instrumentation-express": "^0.24.0", "@opentelemetry/sdk-trace-node": "0.25.0", "@opentelemetry/instrumentation-http": "0.25.0", "@opentelemetry/sdk-trace-base": "0.25.0", From 4ff1c6cbf5ae69da3dd9b4c4c07ed8371d569324 Mon Sep 17 00:00:00 2001 From: Rauno Viskus Date: Thu, 26 Aug 2021 22:59:37 +0300 Subject: [PATCH 2/3] docs: make link to exporters filter only exporters (#2408) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b80090485d..2135c9b784 100644 --- a/README.md +++ b/README.md @@ -233,7 +233,7 @@ Maintainers ([@open-telemetry/js-maintainers](https://github.com/orgs/open-telem OpenTelemetry is vendor-agnostic and can upload data to any backend with various exporter implementations. Even though, OpenTelemetry provides support for many backends, vendors/users can also implement their own exporters for proprietary and unofficially supported backends. -See the [OpenTelemetry registry](https://opentelemetry.io/registry/?s=node.js) for a list of exporters available. +See the [OpenTelemetry registry](https://opentelemetry.io/registry/?language=js&component=exporter#) for a list of exporters available. ### Instrumentations From dfb597def863b15b37b24d965018e8c92d2ee70c Mon Sep 17 00:00:00 2001 From: Herman Date: Fri, 27 Aug 2021 20:17:11 +0200 Subject: [PATCH 3/3] Fix ReferenceError (#2434) When OTEL_TRACES_SAMPLER is used without OTEL_TRACES_SAMPLER_ARG there would be a ReferenceError due to getSamplerProbabilityFromEnv being called above the definition of DEFAULT_RATIO. ``` ReferenceError: Cannot access 'DEFAULT_RATIO' before initialization at null.getSamplerProbabilityFromEnv (/app/node_modules/@opentelemetry/tracing/src/config.ts:91:58) at null.buildSamplerFromEnv (/app/node_modules/@opentelemetry/tracing/src/config.ts:71:44) at Object. (/app/node_modules/@opentelemetry/tracing/src/config.ts:38:12) at Module._compile (internal/modules/cjs/loader.js:1085:14) at Object.Module._extensions..js (internal/modules/cjs/loader.js:1114:10) at Module.load (internal/modules/cjs/loader.js:950:32) at Function.Module._load (internal/modules/cjs/loader.js:784:16) at Module.require (internal/modules/cjs/loader.js:974:19) at require (internal/modules/cjs/helpers.js:92:18) at Object. (/app/node_modules/@opentelemetry/tracing/src/utility.ts:17:1)``` --- packages/opentelemetry-sdk-trace-base/src/config.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/opentelemetry-sdk-trace-base/src/config.ts b/packages/opentelemetry-sdk-trace-base/src/config.ts index 38c869cfa7..042427d04a 100644 --- a/packages/opentelemetry-sdk-trace-base/src/config.ts +++ b/packages/opentelemetry-sdk-trace-base/src/config.ts @@ -27,6 +27,7 @@ import { const env = getEnv(); const FALLBACK_OTEL_TRACES_SAMPLER = TracesSamplerValues.AlwaysOn; +const DEFAULT_RATIO = 1; /** * Default configuration. For fields with primitive values, any user-provided @@ -79,8 +80,6 @@ export function buildSamplerFromEnv( } } -const DEFAULT_RATIO = 1; - function getSamplerProbabilityFromEnv( env: Required ): number | undefined {