Merge branch 'main' into chalin-website-gh-link-fix-2021-08-18

open-telemetry · Aug 27, 2021 · dcf5621 · dcf5621
2 parents 3c650dc + dfb597d
commit dcf5621
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git 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
 

diff --git 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
@@ -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",

diff --git 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<ENVIRONMENT>
 ): number | undefined {