Merge pull request #4682 from dynatrace-oss-contrib/release/1.24.x-0.…

…51.x-2 chore: prepare release 1.24.1/0.51.1 (backport bugfixes)
open-telemetry · May 7, 2024 · 41c2626 · 41c2626
2 parents 3ab4f76 + 7cb72a6
commit 41c2626
Show file tree

Hide file tree

Showing 101 changed files with 1,054 additions and 940 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,16 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 
 ### :house: (Internal)
 
+## 1.24.1
+
+### :bug: (Bug Fix)
+
+* fix(core): align inconsistent behavior of `getEnv()` and `getEnvWithoutDefaults()` when a `process` polyfill is used [#4648](https://github.com/open-telemetry/opentelemetry-js/pull/4648) @pichlermarc
+  * `getEnvWithoutDefaults()` would use `process.env` if it was defined when running in a browser, while `getEnv()` would always use `_globalThis`. Now both use `_globalThis` when running in a browser.
+* fix(resources): prevent circular import (resource -> detector -> resource -> ...) [#4653](https://github.com/open-telemetry/opentelemetry-js/pull/4653) @pichlermarc
+  * fixes a circular import warning which would appear in rollup when bundling `@opentelemetry/resources`
+* fix(exporter-metrics-otlp-grpc): add explicit otlp-exporter-base dependency to exporter-metrics-otlp-grpc [#4678](https://github.com/open-telemetry/opentelemetry-js/pull/4678) @AkselAllas
+
 ## 1.24.0
 
 ### :rocket: (Enhancement)

diff --git a/examples/esm-http-ts/package.json b/examples/esm-http-ts/package.json
@@ -1,7 +1,7 @@
 {
   "name": "esm-http-ts",
   "private": true,
-  "version": "0.51.0",
+  "version": "0.51.1",
   "description": "Example of HTTP integration with OpenTelemetry using ESM and TypeScript",
   "main": "build/index.js",
   "type": "module",
@@ -31,12 +31,12 @@
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/",
   "dependencies": {
     "@opentelemetry/api": "1.8.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.51.0",
-    "@opentelemetry/instrumentation": "0.51.0",
-    "@opentelemetry/instrumentation-http": "0.51.0",
-    "@opentelemetry/resources": "1.24.0",
-    "@opentelemetry/sdk-trace-base": "1.24.0",
-    "@opentelemetry/sdk-trace-node": "1.24.0",
-    "@opentelemetry/semantic-conventions": "1.24.0"
+    "@opentelemetry/exporter-trace-otlp-proto": "0.51.1",
+    "@opentelemetry/instrumentation": "0.51.1",
+    "@opentelemetry/instrumentation-http": "0.51.1",
+    "@opentelemetry/resources": "1.24.1",
+    "@opentelemetry/sdk-trace-base": "1.24.1",
+    "@opentelemetry/sdk-trace-node": "1.24.1",
+    "@opentelemetry/semantic-conventions": "1.24.1"
   }
 }
diff --git a/examples/http/package.json b/examples/http/package.json
@@ -1,7 +1,7 @@
 {
   "name": "http-example",
   "private": true,
-  "version": "0.51.0",
+  "version": "0.51.1",
   "description": "Example of HTTP integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -29,14 +29,14 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/exporter-jaeger": "1.24.0",
-    "@opentelemetry/exporter-zipkin": "1.24.0",
-    "@opentelemetry/instrumentation": "0.51.0",
-    "@opentelemetry/instrumentation-http": "0.51.0",
-    "@opentelemetry/resources": "1.24.0",
-    "@opentelemetry/sdk-trace-base": "1.24.0",
-    "@opentelemetry/sdk-trace-node": "1.24.0",
-    "@opentelemetry/semantic-conventions": "1.24.0"
+    "@opentelemetry/exporter-jaeger": "1.24.1",
+    "@opentelemetry/exporter-zipkin": "1.24.1",
+    "@opentelemetry/instrumentation": "0.51.1",
+    "@opentelemetry/instrumentation-http": "0.51.1",
+    "@opentelemetry/resources": "1.24.1",
+    "@opentelemetry/sdk-trace-base": "1.24.1",
+    "@opentelemetry/sdk-trace-node": "1.24.1",
+    "@opentelemetry/semantic-conventions": "1.24.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http",
   "devDependencies": {

diff --git a/examples/https/package.json b/examples/https/package.json
@@ -1,7 +1,7 @@
 {
   "name": "https-example",
   "private": true,
-  "version": "0.51.0",
+  "version": "0.51.1",
   "description": "Example of HTTPs integration with OpenTelemetry",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -33,14 +33,14 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/exporter-jaeger": "1.24.0",
-    "@opentelemetry/exporter-zipkin": "1.24.0",
-    "@opentelemetry/instrumentation": "0.51.0",
-    "@opentelemetry/instrumentation-http": "0.51.0",
-    "@opentelemetry/resources": "1.24.0",
-    "@opentelemetry/sdk-trace-base": "1.24.0",
-    "@opentelemetry/sdk-trace-node": "1.24.0",
-    "@opentelemetry/semantic-conventions": "1.24.0"
+    "@opentelemetry/exporter-jaeger": "1.24.1",
+    "@opentelemetry/exporter-zipkin": "1.24.1",
+    "@opentelemetry/instrumentation": "0.51.1",
+    "@opentelemetry/instrumentation-http": "0.51.1",
+    "@opentelemetry/resources": "1.24.1",
+    "@opentelemetry/sdk-trace-base": "1.24.1",
+    "@opentelemetry/sdk-trace-node": "1.24.1",
+    "@opentelemetry/semantic-conventions": "1.24.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https",
   "devDependencies": {

diff --git a/examples/opentelemetry-web/package.json b/examples/opentelemetry-web/package.json
@@ -1,7 +1,7 @@
 {
   "name": "web-opentelemetry-example",
   "private": true,
-  "version": "0.51.0",
+  "version": "0.51.1",
   "description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser",
   "main": "index.js",
   "scripts": {
@@ -44,20 +44,20 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/context-zone": "1.24.0",
-    "@opentelemetry/core": "1.24.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.51.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.51.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.51.0",
-    "@opentelemetry/exporter-zipkin": "1.24.0",
-    "@opentelemetry/instrumentation": "0.51.0",
-    "@opentelemetry/instrumentation-fetch": "0.51.0",
-    "@opentelemetry/instrumentation-xml-http-request": "0.51.0",
-    "@opentelemetry/propagator-b3": "1.24.0",
-    "@opentelemetry/sdk-metrics": "1.24.0",
-    "@opentelemetry/sdk-trace-base": "1.24.0",
-    "@opentelemetry/sdk-trace-web": "1.24.0",
-    "@opentelemetry/semantic-conventions": "1.24.0"
+    "@opentelemetry/context-zone": "1.24.1",
+    "@opentelemetry/core": "1.24.1",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.51.1",
+    "@opentelemetry/exporter-trace-otlp-http": "0.51.1",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.51.1",
+    "@opentelemetry/exporter-zipkin": "1.24.1",
+    "@opentelemetry/instrumentation": "0.51.1",
+    "@opentelemetry/instrumentation-fetch": "0.51.1",
+    "@opentelemetry/instrumentation-xml-http-request": "0.51.1",
+    "@opentelemetry/propagator-b3": "1.24.1",
+    "@opentelemetry/sdk-metrics": "1.24.1",
+    "@opentelemetry/sdk-trace-base": "1.24.1",
+    "@opentelemetry/sdk-trace-web": "1.24.1",
+    "@opentelemetry/semantic-conventions": "1.24.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web"
 }
diff --git a/examples/otlp-exporter-node/package.json b/examples/otlp-exporter-node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "example-otlp-exporter-node",
   "private": true,
-  "version": "0.51.0",
+  "version": "0.51.1",
   "description": "Example of using @opentelemetry/collector-exporter in Node.js",
   "main": "index.js",
   "scripts": {
@@ -29,17 +29,17 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/core": "1.24.0",
-    "@opentelemetry/exporter-metrics-otlp-grpc": "0.51.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.51.0",
-    "@opentelemetry/exporter-metrics-otlp-proto": "0.51.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.51.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.51.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.51.0",
-    "@opentelemetry/resources": "1.24.0",
-    "@opentelemetry/sdk-metrics": "1.24.0",
-    "@opentelemetry/sdk-trace-base": "1.24.0",
-    "@opentelemetry/semantic-conventions": "1.24.0"
+    "@opentelemetry/core": "1.24.1",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "0.51.1",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.51.1",
+    "@opentelemetry/exporter-metrics-otlp-proto": "0.51.1",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.51.1",
+    "@opentelemetry/exporter-trace-otlp-http": "0.51.1",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.51.1",
+    "@opentelemetry/resources": "1.24.1",
+    "@opentelemetry/sdk-metrics": "1.24.1",
+    "@opentelemetry/sdk-trace-base": "1.24.1",
+    "@opentelemetry/semantic-conventions": "1.24.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
 }
diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
@@ -14,6 +14,12 @@ All notable changes to experimental packages in this project will be documented
 
 ### :house: (Internal)
 
+## 0.51.1
+
+### :bug: (Bug Fix)
+
+* fix(instrumentation): update import-in-the-middle to 1.7.4
+
 ## 0.51.0
 
 ### :boom: Breaking Change

diff --git a/experimental/backwards-compatibility/node14/package.json b/experimental/backwards-compatibility/node14/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node14",
-  "version": "0.51.0",
+  "version": "0.51.1",
   "private": true,
   "description": "Backwards compatibility app for node 14 types and the OpenTelemetry Node.js SDK",
   "main": "index.js",
@@ -9,8 +9,8 @@
     "peer-api-check": "node ../../../scripts/peer-api-check.js"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.51.0",
-    "@opentelemetry/sdk-trace-base": "1.24.0"
+    "@opentelemetry/sdk-node": "0.51.1",
+    "@opentelemetry/sdk-trace-base": "1.24.1"
   },
   "devDependencies": {
     "@types/node": "14.18.25",

diff --git a/experimental/backwards-compatibility/node16/package.json b/experimental/backwards-compatibility/node16/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node16",
-  "version": "0.51.0",
+  "version": "0.51.1",
   "private": true,
   "description": "Backwards compatibility app for node 16 types and the OpenTelemetry Node.js SDK",
   "main": "index.js",
@@ -9,8 +9,8 @@
     "peer-api-check": "node ../../../scripts/peer-api-check.js"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.51.0",
-    "@opentelemetry/sdk-trace-base": "1.24.0"
+    "@opentelemetry/sdk-node": "0.51.1",
+    "@opentelemetry/sdk-trace-base": "1.24.1"
   },
   "devDependencies": {
     "@types/node": "16.11.52",

diff --git a/experimental/examples/logs/package.json b/experimental/examples/logs/package.json
@@ -1,14 +1,14 @@
 {
   "name": "logs-example",
-  "version": "0.51.0",
+  "version": "0.51.1",
   "private": true,
   "scripts": {
     "start": "ts-node index.ts"
   },
   "dependencies": {
     "@opentelemetry/api": "^1.7.0",
-    "@opentelemetry/api-logs": "0.51.0",
-    "@opentelemetry/sdk-logs": "0.51.0"
+    "@opentelemetry/api-logs": "0.51.1",
+    "@opentelemetry/sdk-logs": "0.51.1"
   },
   "devDependencies": {
     "@types/node": "18.6.5",

diff --git a/experimental/examples/opencensus-shim/package.json b/experimental/examples/opencensus-shim/package.json
@@ -1,7 +1,7 @@
 {
   "name": "opencensus-shim",
   "private": true,
-  "version": "0.51.0",
+  "version": "0.51.1",
   "description": "Example of using @opentelemetry/shim-opencensus in Node.js",
   "main": "index.js",
   "scripts": {
@@ -31,13 +31,13 @@
     "@opencensus/instrumentation-http": "0.1.0",
     "@opencensus/nodejs-base": "0.1.0",
     "@opentelemetry/api": "1.8.0",
-    "@opentelemetry/exporter-prometheus": "0.51.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.51.0",
-    "@opentelemetry/resources": "1.24.0",
-    "@opentelemetry/sdk-metrics": "1.24.0",
-    "@opentelemetry/sdk-trace-node": "1.24.0",
-    "@opentelemetry/semantic-conventions": "1.24.0",
-    "@opentelemetry/shim-opencensus": "0.51.0"
+    "@opentelemetry/exporter-prometheus": "0.51.1",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.51.1",
+    "@opentelemetry/resources": "1.24.1",
+    "@opentelemetry/sdk-metrics": "1.24.1",
+    "@opentelemetry/sdk-trace-node": "1.24.1",
+    "@opentelemetry/semantic-conventions": "1.24.1",
+    "@opentelemetry/shim-opencensus": "0.51.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/examples/opencensus-shim"
 }
diff --git a/experimental/examples/prometheus/package.json b/experimental/examples/prometheus/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prometheus-example",
-  "version": "0.51.0",
+  "version": "0.51.1",
   "private": true,
   "description": "Example of using @opentelemetry/sdk-metrics and @opentelemetry/exporter-prometheus",
   "main": "index.js",
@@ -11,7 +11,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/exporter-prometheus": "0.51.0",
-    "@opentelemetry/sdk-metrics": "1.24.0"
+    "@opentelemetry/exporter-prometheus": "0.51.1",
+    "@opentelemetry/sdk-metrics": "1.24.1"
   }
 }
diff --git a/experimental/packages/api-events/package.json b/experimental/packages/api-events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/api-events",
-  "version": "0.51.0",
+  "version": "0.51.1",
   "description": "Public events API for OpenTelemetry",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
@@ -62,7 +62,7 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/api-logs": "0.51.0"
+    "@opentelemetry/api-logs": "0.51.1"
   },
   "devDependencies": {
     "@types/mocha": "10.0.6",

diff --git a/experimental/packages/api-logs/package.json b/experimental/packages/api-logs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/api-logs",
-  "version": "0.51.0",
+  "version": "0.51.1",
   "description": "Public logs API for OpenTelemetry",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",

diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-logs-otlp-grpc",
-  "version": "0.51.0",
+  "version": "0.51.1",
   "description": "OpenTelemetry Collector Exporter allows user to send collected log records to the OpenTelemetry Collector",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -50,9 +50,9 @@
   "devDependencies": {
     "@grpc/proto-loader": "^0.7.10",
     "@opentelemetry/api": "1.8.0",
-    "@opentelemetry/api-logs": "0.51.0",
-    "@opentelemetry/otlp-exporter-base": "0.51.0",
-    "@opentelemetry/resources": "1.24.0",
+    "@opentelemetry/api-logs": "0.51.1",
+    "@opentelemetry/otlp-exporter-base": "0.51.1",
+    "@opentelemetry/resources": "1.24.1",
     "@types/mocha": "10.0.6",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.20",
@@ -72,10 +72,10 @@
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.7.1",
-    "@opentelemetry/core": "1.24.0",
-    "@opentelemetry/otlp-grpc-exporter-base": "0.51.0",
-    "@opentelemetry/otlp-transformer": "0.51.0",
-    "@opentelemetry/sdk-logs": "0.51.0"
+    "@opentelemetry/core": "1.24.1",
+    "@opentelemetry/otlp-grpc-exporter-base": "0.51.1",
+    "@opentelemetry/otlp-transformer": "0.51.1",
+    "@opentelemetry/sdk-logs": "0.51.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-grpc",
   "sideEffects": false