Merge branch 'main' into feature/auto_instrumentation_metrics

open-telemetry · Dec 12, 2024 · 6f848e1 · 6f848e1
2 parents 4f05f24 + e4d9c21
commit 6f848e1
Show file tree

Hide file tree

Showing 175 changed files with 3,886 additions and 10,431 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,7 +7,7 @@ Before creating a pull request, please make sure:
 - You have read the guide for contributing
   - See https://github.com/open-telemetry/opentelemetry-js/blob/main/CONTRIBUTING.md
 - You signed all your commits (otherwise we won't be able to merge the PR)
-  - See https://github.com/open-telemetry/community/blob/master/CONTRIBUTING.md#sign-the-cla
+  - See https://github.com/open-telemetry/community/blob/main/guides/contributor#sign-the-cla
 - You added unit tests for the new functionality
 - You mention in the PR description which issue it is addressing, e.g. "Fixes #xxx". This will auto-close
   the issue that your PR fixes (if such)

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -92,7 +92,7 @@ jobs:
           cache: 'npm'
           cache-dependency-path: |
             package-lock.json
-          node-version: 16
+          node-version: 22
 
       - name: Bootstrap
         run: npm ci
@@ -120,7 +120,7 @@ jobs:
           cache: 'npm'
           cache-dependency-path: |
             package-lock.json
-          node-version: 16
+          node-version: 22
 
       - name: Bootstrap
         run: npm ci

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,16 +11,26 @@ For semantic convention package changes, see the [semconv CHANGELOG](packages/se
 
 ### :boom: Breaking Change
 
-* feat(sdk-metrics): Add support for aggregation cardinality limit with a default limit of 2000. This limit can be customized via views [#5182](https://github.com/open-telemetry/opentelemetry-js/pull/5128)
-
 ### :rocket: (Enhancement)
 
+* feat(sdk-metrics): PeriodicExportingMetricReader now flushes pending tasks at shutdown [#5242](https://github.com/open-telemetry/opentelemetry-js/pull/5242)
+
 ### :bug: (Bug Fix)
 
+* fix(sdk-trace-base): do not load OTEL_ env vars on module load, but when needed [#5224](https://github.com/open-telemetry/opentelemetry-js/pull/5224)
+
+* fix(instrumentation-xhr, instrumentation-fetch): content length attributes no longer get removed with `ignoreNetworkEvents: true` being set [#5229](https://github.com/open-telemetry/opentelemetry-js/issues/5229)
+
 ### :books: (Refine Doc)
 
 ### :house: (Internal)
 
+## 1.29.0
+
+### :rocket: (Enhancement)
+
+* feat(sdk-metrics): Add support for aggregation cardinality limit with a default limit of 2000. This limit can be customized via views [#5128](https://github.com/open-telemetry/opentelemetry-js/pull/5128)
+
 ## 1.28.0
 
 ### :rocket: (Enhancement)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -79,7 +79,7 @@ Reporting bugs is an important contribution. Please make sure to include:
 ### Before you start
 
 Please read project contribution
-[guide](https://github.com/open-telemetry/community/blob/master/CONTRIBUTING.md)
+[guide](https://github.com/open-telemetry/community/blob/main/guides/contributor)
 for general practices for OpenTelemetry project.
 
 #### Conventional commit
@@ -145,7 +145,7 @@ git merge upstream/main
 
 Remember to always work in a branch of your local copy, as you might otherwise have to contend with conflicts in main.
 
-Please also see [GitHub workflow](https://github.com/open-telemetry/community/blob/master/CONTRIBUTING.md#github-workflow) section of general project contributing guide.
+Please also see [GitHub workflow](https://github.com/open-telemetry/community/blob/main/guides/contributor/processes.md#github-workflow) section of general project contributing guide.
 
 ## Development
 

diff --git a/README.md b/README.md
@@ -147,18 +147,25 @@ All stable packages are released with the same version, and all experimental pac
 The below table describes which versions of each set of packages are expected to work together.
 
 | Stable Packages | Experimental Packages |
-| --------------- | --------------------- |
-| 1.21.x          | 0.48.x                |
-| 1.20.x          | 0.47.x                |
-| 1.19.x          | 0.46.x                |
-| 1.18.x          | 0.45.x                |
-| 1.17.x          | 0.44.x                |
+|-----------------|-----------------------|
+| 1.29.x          | 0.56.x                |
+| 1.28.x          | 0.55.x                |
+| 1.27.x          | 0.54.x                |
+| 1.25.x          | 0.52.x                |
+| 1.24.x          | 0.51.x                |
 
 <details>
 <summary>Older version compatibility matrix</summary>
 
 <table>
 <tr><th>Stable Packages</th>                            <th>Experimental Packages</th></tr>
+<tr><td>1.23.x</td>                                                    <td>0.50.x</td></tr>
+<tr><td>1.22.x</td>                                                    <td>0.49.x</td></tr>
+<tr><td>1.21.x</td>                                                    <td>0.48.x</td></tr>
+<tr><td>1.20.x</td>                                                    <td>0.47.x</td></tr>
+<tr><td>1.19.x</td>                                                    <td>0.46.x</td></tr>
+<tr><td>1.18.x</td>                                                    <td>0.45.x</td></tr>
+<tr><td>1.17.x</td>                                                    <td>0.43.x, 0.44.x</td></tr>
 <tr><td>1.16.x</td>                                                    <td>0.42.x</td></tr>
 <tr><td>1.15.x</td>                                                    <td>0.41.x</td></tr>
 <tr><td>1.14.x</td>                                                    <td>0.40.x</td></tr>

diff --git a/api/src/platform/browser/globalThis.ts b/api/src/platform/browser/globalThis.ts
@@ -30,9 +30,9 @@ export const _globalThis: typeof globalThis =
   typeof globalThis === 'object'
     ? globalThis
     : typeof self === 'object'
-    ? self
-    : typeof window === 'object'
-    ? window
-    : typeof global === 'object'
-    ? global
-    : ({} as typeof globalThis);
+      ? self
+      : typeof window === 'object'
+        ? window
+        : typeof global === 'object'
+          ? global
+          : ({} as typeof globalThis);
diff --git a/api/test/tree-shaking/tree-shaking.test.ts b/api/test/tree-shaking/tree-shaking.test.ts
@@ -28,7 +28,7 @@ import * as realFs from 'fs';
  * 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', () => {
+describe('tree-shaking', function () {
   const allowedAPIs = ['ContextAPI', 'DiagAPI'];
   const testAPIs = [
     {
@@ -50,7 +50,7 @@ describe('tree-shaking', () => {
   const outputPath = path.join(__dirname, 'output');
   const outputFilename = path.join(outputPath, 'bundle.js');
 
-  afterEach(() => {
+  afterEach(function () {
     try {
       mfs.unlinkSync(outputFilename);
     } catch {
@@ -122,6 +122,6 @@ describe('tree-shaking', () => {
       allowedAPIs.forEach(it => matches.delete(it));
 
       assert.deepStrictEqual(Array.from(matches), [testAPI.name]);
-    });
+    }).timeout(5000);
   }
 });
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.55.0",
+  "version": "0.56.0",
   "description": "Example of HTTP integration with OpenTelemetry using ESM and TypeScript",
   "main": "build/index.js",
   "type": "module",
@@ -32,12 +32,12 @@
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/",
   "dependencies": {
     "@opentelemetry/api": "1.9.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.55.0",
-    "@opentelemetry/instrumentation": "0.55.0",
-    "@opentelemetry/instrumentation-http": "0.55.0",
-    "@opentelemetry/resources": "1.28.0",
-    "@opentelemetry/sdk-trace-base": "1.28.0",
-    "@opentelemetry/sdk-trace-node": "1.28.0",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.56.0",
+    "@opentelemetry/instrumentation": "0.56.0",
+    "@opentelemetry/instrumentation-http": "0.56.0",
+    "@opentelemetry/resources": "1.29.0",
+    "@opentelemetry/sdk-trace-base": "1.29.0",
+    "@opentelemetry/sdk-trace-node": "1.29.0",
     "@opentelemetry/semantic-conventions": "1.28.0"
   }
 }
diff --git a/examples/http/package.json b/examples/http/package.json
@@ -1,7 +1,7 @@
 {
   "name": "http-example",
   "private": true,
-  "version": "0.55.0",
+  "version": "0.56.0",
   "description": "Example of HTTP integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -30,13 +30,13 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/exporter-jaeger": "1.28.0",
-    "@opentelemetry/exporter-zipkin": "1.28.0",
-    "@opentelemetry/instrumentation": "0.55.0",
-    "@opentelemetry/instrumentation-http": "0.55.0",
-    "@opentelemetry/resources": "1.28.0",
-    "@opentelemetry/sdk-trace-base": "1.28.0",
-    "@opentelemetry/sdk-trace-node": "1.28.0",
+    "@opentelemetry/exporter-jaeger": "1.29.0",
+    "@opentelemetry/exporter-zipkin": "1.29.0",
+    "@opentelemetry/instrumentation": "0.56.0",
+    "@opentelemetry/instrumentation-http": "0.56.0",
+    "@opentelemetry/resources": "1.29.0",
+    "@opentelemetry/sdk-trace-base": "1.29.0",
+    "@opentelemetry/sdk-trace-node": "1.29.0",
     "@opentelemetry/semantic-conventions": "1.28.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http",

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

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.55.0",
+  "version": "0.56.0",
   "description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser",
   "main": "index.js",
   "scripts": {
@@ -45,19 +45,19 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/context-zone": "1.28.0",
-    "@opentelemetry/core": "1.28.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.55.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.55.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.55.0",
-    "@opentelemetry/exporter-zipkin": "1.28.0",
-    "@opentelemetry/instrumentation": "0.55.0",
-    "@opentelemetry/instrumentation-fetch": "0.55.0",
-    "@opentelemetry/instrumentation-xml-http-request": "0.55.0",
-    "@opentelemetry/propagator-b3": "1.28.0",
-    "@opentelemetry/sdk-metrics": "1.28.0",
-    "@opentelemetry/sdk-trace-base": "1.28.0",
-    "@opentelemetry/sdk-trace-web": "1.28.0",
+    "@opentelemetry/context-zone": "1.29.0",
+    "@opentelemetry/core": "1.29.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.56.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.56.0",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.56.0",
+    "@opentelemetry/exporter-zipkin": "1.29.0",
+    "@opentelemetry/instrumentation": "0.56.0",
+    "@opentelemetry/instrumentation-fetch": "0.56.0",
+    "@opentelemetry/instrumentation-xml-http-request": "0.56.0",
+    "@opentelemetry/propagator-b3": "1.29.0",
+    "@opentelemetry/sdk-metrics": "1.29.0",
+    "@opentelemetry/sdk-trace-base": "1.29.0",
+    "@opentelemetry/sdk-trace-web": "1.29.0",
     "@opentelemetry/semantic-conventions": "1.28.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.55.0",
+  "version": "0.56.0",
   "description": "Example of using @opentelemetry/collector-exporter in Node.js",
   "main": "index.js",
   "scripts": {
@@ -30,16 +30,16 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/core": "1.28.0",
-    "@opentelemetry/exporter-metrics-otlp-grpc": "0.55.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.55.0",
-    "@opentelemetry/exporter-metrics-otlp-proto": "0.55.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.55.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.55.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.55.0",
-    "@opentelemetry/resources": "1.28.0",
-    "@opentelemetry/sdk-metrics": "1.28.0",
-    "@opentelemetry/sdk-trace-base": "1.28.0",
+    "@opentelemetry/core": "1.29.0",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "0.56.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.56.0",
+    "@opentelemetry/exporter-metrics-otlp-proto": "0.56.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.56.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.56.0",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.56.0",
+    "@opentelemetry/resources": "1.29.0",
+    "@opentelemetry/sdk-metrics": "1.29.0",
+    "@opentelemetry/sdk-trace-base": "1.29.0",
     "@opentelemetry/semantic-conventions": "1.28.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"