Merge remote-tracking branch 'upstream/main' into hectorhdzg/logsinstr

open-telemetry · Jan 3, 2024 · e2926d3 · e2926d3
2 parents 16da82d + f4b681d
commit e2926d3
Show file tree

Hide file tree

Showing 76 changed files with 1,484 additions and 1,048 deletions.
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -16,7 +16,7 @@ jobs:
           cache: 'npm'
           cache-dependency-path: |
             package-lock.json
-          node-version: '18'
+          node-version: '20'
 
       - name: Install and Build 🔧
         run: |
@@ -29,8 +29,10 @@ jobs:
           NODE_OPTIONS: --max-old-space-size=6144
 
       - name: Deploy Documentation 🚀
-        uses: JamesIves/github-pages-deploy-action@releases/v3
+        uses: JamesIves/github-pages-deploy-action@releases/v4
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: gh-pages # The branch the action should deploy to.
-          FOLDER: docs # The folder the action should deploy.
+          branch: gh-pages # The branch the action should deploy to.
+          folder: docs # The folder the action should deploy.
+          # ensure we don't override benchmark data
+          clean-exclude: |
+            benchmarks/**
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,16 +9,25 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 
 ### :boom: Breaking Change
 
-* fix(otlp-exporter-base)!: decrease default concurrency limit to 30 [#4211](https://github.com/open-telemetry/opentelemetry-js/pull/4211) @pichlermarc
-  * fixes a memory leak on prolonged collector unavailability
-  * this change is marked as breaking as it changes defaults
-
 ### :rocket: (Enhancement)
 
+* perf(otlp-transformer): skip unnecessary base64 encode of span contexts [#4343](https://github.com/open-telemetry/opentelemetry-js/pull/4343) @seemk
+* feat(sdk-trace-base): improve log messages when dropping span events [#4223](https://github.com/open-telemetry/opentelemetry-js/pull/4223) @mkubliniak
+
+### :bug: (Bug Fix)
+
 ### :books: (Refine Doc)
 
 ### :house: (Internal)
 
+## 1.19.0
+
+### :rocket: (Enhancement)
+
+* feat: add node 20 support [#4336](https://github.com/open-telemetry/opentelemetry-js/pull/4336) @dyladan
+
+### :house: (Internal)
+
 * chore: type reference on zone.js [#4257](https://github.com/open-telemetry/opentelemetry-js/pull/4257) @legendecas
 * chore: no need for 'packages' in lerna.json [#4264](https://github.com/open-telemetry/opentelemetry-js/pull/4264) @trentm
 * test: add node 20 to test matrix [#4336](https://github.com/open-telemetry/opentelemetry-js/pull/4336) @dyladan

diff --git a/api/package.json b/api/package.json
@@ -69,7 +69,7 @@
     "@types/mocha": "10.0.6",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.20",
-    "@types/webpack": "4.41.38",
+    "@types/webpack": "5.28.5",
     "@types/webpack-env": "1.16.3",
     "babel-plugin-istanbul": "6.1.1",
     "codecov": "3.8.3",

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.45.1",
+  "version": "0.46.0",
   "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.7.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.45.1",
-    "@opentelemetry/instrumentation": "0.45.1",
-    "@opentelemetry/instrumentation-http": "0.45.1",
-    "@opentelemetry/resources": "1.18.1",
-    "@opentelemetry/sdk-trace-base": "1.18.1",
-    "@opentelemetry/sdk-trace-node": "1.18.1",
-    "@opentelemetry/semantic-conventions": "1.18.1"
+    "@opentelemetry/exporter-trace-otlp-proto": "0.46.0",
+    "@opentelemetry/instrumentation": "0.46.0",
+    "@opentelemetry/instrumentation-http": "0.46.0",
+    "@opentelemetry/resources": "1.19.0",
+    "@opentelemetry/sdk-trace-base": "1.19.0",
+    "@opentelemetry/sdk-trace-node": "1.19.0",
+    "@opentelemetry/semantic-conventions": "1.19.0"
   }
 }
diff --git a/examples/http/package.json b/examples/http/package.json
@@ -1,7 +1,7 @@
 {
   "name": "http-example",
   "private": true,
-  "version": "0.45.1",
+  "version": "0.46.0",
   "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.18.1",
-    "@opentelemetry/exporter-zipkin": "1.18.1",
-    "@opentelemetry/instrumentation": "0.45.1",
-    "@opentelemetry/instrumentation-http": "0.45.1",
-    "@opentelemetry/resources": "1.18.1",
-    "@opentelemetry/sdk-trace-base": "1.18.1",
-    "@opentelemetry/sdk-trace-node": "1.18.1",
-    "@opentelemetry/semantic-conventions": "1.18.1"
+    "@opentelemetry/exporter-jaeger": "1.19.0",
+    "@opentelemetry/exporter-zipkin": "1.19.0",
+    "@opentelemetry/instrumentation": "0.46.0",
+    "@opentelemetry/instrumentation-http": "0.46.0",
+    "@opentelemetry/resources": "1.19.0",
+    "@opentelemetry/sdk-trace-base": "1.19.0",
+    "@opentelemetry/sdk-trace-node": "1.19.0",
+    "@opentelemetry/semantic-conventions": "1.19.0"
   },
   "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.45.1",
+  "version": "0.46.0",
   "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.18.1",
-    "@opentelemetry/exporter-zipkin": "1.18.1",
-    "@opentelemetry/instrumentation": "0.45.1",
-    "@opentelemetry/instrumentation-http": "0.45.1",
-    "@opentelemetry/resources": "1.18.1",
-    "@opentelemetry/sdk-trace-base": "1.18.1",
-    "@opentelemetry/sdk-trace-node": "1.18.1",
-    "@opentelemetry/semantic-conventions": "1.18.1"
+    "@opentelemetry/exporter-jaeger": "1.19.0",
+    "@opentelemetry/exporter-zipkin": "1.19.0",
+    "@opentelemetry/instrumentation": "0.46.0",
+    "@opentelemetry/instrumentation-http": "0.46.0",
+    "@opentelemetry/resources": "1.19.0",
+    "@opentelemetry/sdk-trace-base": "1.19.0",
+    "@opentelemetry/sdk-trace-node": "1.19.0",
+    "@opentelemetry/semantic-conventions": "1.19.0"
   },
   "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.45.1",
+  "version": "0.46.0",
   "description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser",
   "main": "index.js",
   "scripts": {
@@ -43,20 +43,20 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/context-zone": "1.18.1",
-    "@opentelemetry/core": "1.18.1",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.45.1",
-    "@opentelemetry/exporter-trace-otlp-http": "0.45.1",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.45.1",
-    "@opentelemetry/exporter-zipkin": "1.18.1",
-    "@opentelemetry/instrumentation": "0.45.1",
-    "@opentelemetry/instrumentation-fetch": "0.45.1",
-    "@opentelemetry/instrumentation-xml-http-request": "0.45.1",
-    "@opentelemetry/propagator-b3": "1.18.1",
-    "@opentelemetry/sdk-metrics": "1.18.1",
-    "@opentelemetry/sdk-trace-base": "1.18.1",
-    "@opentelemetry/sdk-trace-web": "1.18.1",
-    "@opentelemetry/semantic-conventions": "1.18.1"
+    "@opentelemetry/context-zone": "1.19.0",
+    "@opentelemetry/core": "1.19.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.46.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.46.0",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.46.0",
+    "@opentelemetry/exporter-zipkin": "1.19.0",
+    "@opentelemetry/instrumentation": "0.46.0",
+    "@opentelemetry/instrumentation-fetch": "0.46.0",
+    "@opentelemetry/instrumentation-xml-http-request": "0.46.0",
+    "@opentelemetry/propagator-b3": "1.19.0",
+    "@opentelemetry/sdk-metrics": "1.19.0",
+    "@opentelemetry/sdk-trace-base": "1.19.0",
+    "@opentelemetry/sdk-trace-web": "1.19.0",
+    "@opentelemetry/semantic-conventions": "1.19.0"
   },
   "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.45.1",
+  "version": "0.46.0",
   "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.18.1",
-    "@opentelemetry/exporter-metrics-otlp-grpc": "0.45.1",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.45.1",
-    "@opentelemetry/exporter-metrics-otlp-proto": "0.45.1",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.45.1",
-    "@opentelemetry/exporter-trace-otlp-http": "0.45.1",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.45.1",
-    "@opentelemetry/resources": "1.18.1",
-    "@opentelemetry/sdk-metrics": "1.18.1",
-    "@opentelemetry/sdk-trace-base": "1.18.1",
-    "@opentelemetry/semantic-conventions": "1.18.1"
+    "@opentelemetry/core": "1.19.0",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "0.46.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.46.0",
+    "@opentelemetry/exporter-metrics-otlp-proto": "0.46.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.46.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.46.0",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.46.0",
+    "@opentelemetry/resources": "1.19.0",
+    "@opentelemetry/sdk-metrics": "1.19.0",
+    "@opentelemetry/sdk-trace-base": "1.19.0",
+    "@opentelemetry/semantic-conventions": "1.19.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
 }
diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
@@ -6,9 +6,26 @@ All notable changes to experimental packages in this project will be documented
 
 ### :boom: Breaking Change
 
-* fix(exporter-metrics-otlp-grpc): programatic headers take precedence over environment variables [#2370](https://github.com/open-telemetry/opentelemetry-js/pull/4334) @Vunovati
-* fix(exporter-metrics-otlp-http): programatic headers take precedence over environment variables [#2370](https://github.com/open-telemetry/opentelemetry-js/pull/4334) @Vunovati
-* fix(exporter-metrics-otlp-proto): programatic headers take precedence over environment variables [#2370](https://github.com/open-telemetry/opentelemetry-js/pull/4334) @Vunovati
+### :rocket: (Enhancement)
+
+### :bug: (Bug Fix)
+
+fix(instrumentation): use caret range on import-in-the-middle [#4380](https://github.com/open-telemetry/opentelemetry-js/pull/4380) @pichlermarc
+
+### :books: (Refine Doc)
+
+### :house: (Internal)
+
+## 0.46.0
+
+### :boom: Breaking Change
+
+* fix(exporter-metrics-otlp-grpc): programmatic headers take precedence over environment variables [#2370](https://github.com/open-telemetry/opentelemetry-js/pull/4334) @Vunovati
+* fix(exporter-metrics-otlp-http): programmatic headers take precedence over environment variables [#2370](https://github.com/open-telemetry/opentelemetry-js/pull/4334) @Vunovati
+* fix(exporter-metrics-otlp-proto): programmatic headers take precedence over environment variables [#2370](https://github.com/open-telemetry/opentelemetry-js/pull/4334) @Vunovati
+* fix(otlp-exporter-base)!: decrease default concurrency limit to 30 [#4211](https://github.com/open-telemetry/opentelemetry-js/pull/4211) @pichlermarc
+  * fixes a memory leak on prolonged collector unavailability
+  * this change is marked as breaking as it changes defaults
 
 ### :rocket: (Enhancement)
 
@@ -17,11 +34,13 @@ All notable changes to experimental packages in this project will be documented
 
 ### :bug: (Bug Fix)
 
+* fix(sdk-logs): await async resources in log processors
 * fix(sdk-logs): avoid map attribute set when count limit exceeded
 * fix(instrumentation-fetch): only access navigator if it is defined [#4063](https://github.com/open-telemetry/opentelemetry-js/pull/4063)
   * allows for experimental usage of this instrumentation with non-browser runtimes
 * fix(instrumentation-http): memory leak when responses are not resumed
 * fix(instrumentation-http): Do not mutate given headers object for outgoing http requests. Fixes aws-sdk signing error on retries. [#4346](https://github.com/open-telemetry/opentelemetry-js/pull/4346)
+* fix(instrumentation): support Node.js v18.19.0 by using [email protected]
 
 ## 0.45.1
 

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.45.1",
+  "version": "0.46.0",
   "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.45.1",
-    "@opentelemetry/sdk-trace-base": "1.18.1"
+    "@opentelemetry/sdk-node": "0.46.0",
+    "@opentelemetry/sdk-trace-base": "1.19.0"
   },
   "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.45.1",
+  "version": "0.46.0",
   "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.45.1",
-    "@opentelemetry/sdk-trace-base": "1.18.1"
+    "@opentelemetry/sdk-node": "0.46.0",
+    "@opentelemetry/sdk-trace-base": "1.19.0"
   },
   "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.45.1",
+  "version": "0.46.0",
   "private": true,
   "scripts": {
     "start": "ts-node index.ts"
   },
   "dependencies": {
     "@opentelemetry/api": "^1.7.0",
-    "@opentelemetry/api-logs": "0.45.1",
-    "@opentelemetry/sdk-logs": "0.45.1"
+    "@opentelemetry/api-logs": "0.46.0",
+    "@opentelemetry/sdk-logs": "0.46.0"
   },
   "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.45.1",
+  "version": "0.46.0",
   "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.7.0",
-    "@opentelemetry/exporter-prometheus": "0.45.1",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.45.1",
-    "@opentelemetry/resources": "1.18.1",
-    "@opentelemetry/sdk-metrics": "1.18.1",
-    "@opentelemetry/sdk-trace-node": "1.18.1",
-    "@opentelemetry/semantic-conventions": "1.18.1",
-    "@opentelemetry/shim-opencensus": "0.45.1"
+    "@opentelemetry/exporter-prometheus": "0.46.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.46.0",
+    "@opentelemetry/resources": "1.19.0",
+    "@opentelemetry/sdk-metrics": "1.19.0",
+    "@opentelemetry/sdk-trace-node": "1.19.0",
+    "@opentelemetry/semantic-conventions": "1.19.0",
+    "@opentelemetry/shim-opencensus": "0.46.0"
   },
   "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.45.1",
+  "version": "0.46.0",
   "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.45.1",
-    "@opentelemetry/sdk-metrics": "1.18.1"
+    "@opentelemetry/exporter-prometheus": "0.46.0",
+    "@opentelemetry/sdk-metrics": "1.19.0"
   }
 }
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.45.1",
+  "version": "0.46.0",
   "description": "Public events API for OpenTelemetry",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",