Merge branch 'main' into map-input-fix

open-telemetry · Dec 15, 2023 · 236ccc8 · 236ccc8
2 parents 8a3517f + 3e59291
commit 236ccc8
Show file tree

Hide file tree

Showing 80 changed files with 13,984 additions and 16,365 deletions.
diff --git a/.github/workflows/close-stale.yml b/.github/workflows/close-stale.yml
@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           days-before-stale: 60
           days-before-close: 14

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -19,7 +19,7 @@ jobs:
           cache: 'npm'
           cache-dependency-path: |
             package-lock.json
-          node-version: '16'
+          node-version: '20'
 
       - name: Lint changelog file
         uses: avto-dev/markdown-lint@v1

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -113,7 +113,7 @@ jobs:
       NPM_CONFIG_UNSAFE_PERM: true
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.0.0
+        uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           cache: 'npm'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,16 +11,29 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 
 ### :rocket: (Enhancement)
 
+* 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
 
 ### :bug: (Bug Fix)
 
+* fix(api-logs): allow for TimeInput type for LogRecord timestamps [#4345](https://github.com/open-telemetry/opentelemetry-js/pull/4345)
 * fix(sdk-trace-web): only access location if it is defined [#4063](https://github.com/open-telemetry/opentelemetry-js/pull/4063)
 * fix(sdk-trace-base): processor onStart called with a span having empty attributes
 

diff --git a/api/package.json b/api/package.json
@@ -66,10 +66,10 @@
     "access": "public"
   },
   "devDependencies": {
-    "@types/mocha": "10.0.4",
+    "@types/mocha": "10.0.6",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.20",
-    "@types/webpack": "4.41.36",
+    "@types/webpack": "5.28.5",
     "@types/webpack-env": "1.16.3",
     "babel-plugin-istanbul": "6.1.1",
     "codecov": "3.8.3",
@@ -91,7 +91,7 @@
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4",
     "unionfs": "4.5.1",
-    "webpack": "4.46.0"
+    "webpack": "5.89.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/api",
   "sideEffects": false

diff --git a/api/test/tree-shaking/tree-shaking.test.ts b/api/test/tree-shaking/tree-shaking.test.ts
@@ -24,6 +24,9 @@ import * as realFs from 'fs';
 /**
  * Verify that tree-shaking can be properly applied on the @opentelemetry/api package.
  * Unused optional apis should be able to be removed from the final bundle.
+ *
+ * Webpack doesn't run in node 8 because it requires BigInt. Since we are testing
+ * build tooling here, we can safely skip tooling we know can't run anyway.
  */
 describe('tree-shaking', () => {
   const allowedAPIs = ['ContextAPI', 'DiagAPI'];
@@ -56,11 +59,14 @@ describe('tree-shaking', () => {
   });
 
   for (const testAPI of testAPIs) {
-    it(`verify ${testAPI.name}`, async () => {
+    it(`verify ${testAPI.name}`, async function () {
+      if (parseInt(process.versions.node.split('.')[0], 10) < 10) {
+        this.skip();
+      }
       const sourceCode = `
-        import { ${testAPI.export} } from '../../';
-        console.log(${testAPI.export});
-      `;
+          import { ${testAPI.export} } from '../../';
+          console.log(${testAPI.export});
+        `;
       mfs.mkdirpSync(path.dirname(sourceCodePath));
       mfs.writeFileSync(sourceCodePath, sourceCode, { encoding: 'utf8' });
 

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": {
@@ -36,27 +36,27 @@
     "babel-loader": "^8.0.6",
     "ts-loader": "^9.2.6",
     "typescript": "^4.5.2",
-    "webpack": "^5.65.0",
-    "webpack-cli": "^4.10.0",
+    "webpack": "^5.89.0",
+    "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.5.0",
-    "webpack-merge": "^5.8.0"
+    "webpack-merge": "^5.10.0"
   },
   "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
@@ -8,15 +8,37 @@ All notable changes to experimental packages in this project will be documented
 
 ### :rocket: (Enhancement)
 
+### :bug: (Bug Fix)
+
+### :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)
+
 * feat(sdk-logs): add droppedAttributesCount field to ReadableLogRecord
 
 ### :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-fetch): compatibility with Map types for fetch headers
+* 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",