Merge remote-tracking branch 'origin/main' into codex/otlp-env-proxy-6638

# Conflicts:
#	experimental/CHANGELOG.md

Author: LarryHu0217

.github/workflows/benchmark.yml

@@ -18,7 +18,7 @@ jobs:
           - ^26.3.0
     runs-on: oracle-bare-metal-64cpu-1024gb-x86-64-ubuntu-24
     container:
-      image: ubuntu:24.04@sha256:c4a8d5503dfb2a3eb8ab5f807da5bc69a85730fb49b5cfca2330194ebcc41c7b
+      image: ubuntu:26.04@sha256:3131b4cc82a783df6c9df078f86e01819a13594b865c2cad47bd1bca2b7063bb
     timeout-minutes: 10
     steps:
       # Apt packages:

.npmrc

@@ -1,2 +1,3 @@
 lockfile-version=3
 prefer-dedupe=true
+min-release-age=3

CHANGELOG.md

@@ -14,6 +14,16 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2
 
 ### :rocket: Features
 
+### :bug: Bug Fixes
+
+### :books: Documentation
+
+### :house: Internal
+
+## 2.10.0
+
+### :rocket: Features
+
 * feat(sdk-logs): implement log processor metrics [#6554](https://github.com/open-telemetry/opentelemetry-js/pull/6554) @anuraaga
 * feat(otlp-exporter): implement exporter metrics [#6480](https://github.com/open-telemetry/opentelemetry-js/pull/6480) @anuraaga
 * feat(propagator-jaeger):  *Notice*: The `@opentelemetry/propagator-jaeger` package will be removed in SDK 3.x, planned for approximately September 2026. @pichlermarc
@@ -24,8 +34,6 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2
 * fix(sdk-trace): reject `SimpleSpanProcessor.forceFlush()` when a pending export fails [#6771](https://github.com/open-telemetry/opentelemetry-js/issues/6771) @LarryHu0217
 * fix(sdk-trace): include trace IDs at the ratio 1 upper bound in `TraceIdRatioBasedSampler` [#6890](https://github.com/open-telemetry/opentelemetry-js/pull/6890) @LarryHu0217
 
-### :books: Documentation
-
 ### :house: Internal
 
 * chore: build on Node 26 in CI [#6887](https://github.com/open-telemetry/opentelemetry-js/pull/6887) @overbalance

api/package.json

@@ -71,7 +71,7 @@
     "@types/node": "^8.10.66",
     "@types/sinon": "17.0.4",
     "@types/webpack": "5.28.5",
-    "@types/webpack-env": "1.16.3",
+    "@types/webpack-env": "1.18.8",
     "babel-plugin-istanbul": "8.0.0",
     "dpdm": "4.2.0",
     "karma": "6.4.4",
@@ -88,7 +88,7 @@
     "ts-loader": "9.5.7",
     "typescript": "5.2.2",
     "unionfs": "4.5.4",
-    "webpack": "5.104.1"
+    "webpack": "5.108.4"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/api",
   "sideEffects": false

api/test/index-webpack.ts

@@ -3,6 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 {
-  const testsContext = require.context('./common', true);
+  // @types/node@8 (kept for Node.js 8 backcompat) is not augmented by
+  // @types/webpack-env, so type require.context explicitly here.
+  const testsContext = (
+    require as NodeRequire & {
+      context(
+        directory: string,
+        useSubdirectories?: boolean
+      ): __WebpackModuleApi.RequireContext;
+    }
+  ).context('./common', true);
   testsContext.keys().forEach(testsContext);
 }

api/test/index-webpack.worker.ts

@@ -3,6 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 {
-  const testsContext = require.context('./common', true);
+  // @types/node@8 (kept for Node.js 8 backcompat) is not augmented by
+  // @types/webpack-env, so type require.context explicitly here.
+  const testsContext = (
+    require as NodeRequire & {
+      context(
+        directory: string,
+        useSubdirectories?: boolean
+      ): __WebpackModuleApi.RequireContext;
+    }
+  ).context('./common', true);
   testsContext.keys().forEach(testsContext);
 }

doc/contributing/dependencies.md

@@ -11,7 +11,7 @@ This section refers to `"dependencies"` and `"devDependencies"` entries in `pack
 **Example:** `^1.2.3` might inadvertently lead to version `1.2.6` which includes unintended breaking changes).
 
 > [!NOTE]
-> As this approach might leave our project with outdated tooling, we adopt `renovate-bot`. This automated dependency update tool proactively opens pull requests upon the release of new patch/minor/major versions. The complete configuration for renovate-bot can be found in [renovate.json](../../renovate.json) file.
+> As this approach might leave our project with outdated tooling, we adopt `renovate-bot`. This automated dependency update tool proactively opens pull requests upon the release of new patch/minor/major versions. The complete configuration for renovate-bot can be found in [renovate.json5](../../renovate.json5) file.
 
 ## @opentelemetry/* dependencies
 

e2e-tests/package.json

@@ -15,13 +15,13 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/api-logs": "0.220.0",
-    "@opentelemetry/exporter-logs-otlp-proto": "0.220.0",
-    "@opentelemetry/exporter-metrics-otlp-proto": "0.220.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.220.0",
-    "@opentelemetry/sdk-logs": "0.220.0",
-    "@opentelemetry/sdk-metrics": "2.9.0",
-    "@opentelemetry/sdk-node": "0.220.0",
-    "@opentelemetry/sdk-trace": "2.9.0"
+    "@opentelemetry/api-logs": "0.221.0",
+    "@opentelemetry/exporter-logs-otlp-proto": "0.221.0",
+    "@opentelemetry/exporter-metrics-otlp-proto": "0.221.0",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.221.0",
+    "@opentelemetry/sdk-logs": "0.221.0",
+    "@opentelemetry/sdk-metrics": "2.10.0",
+    "@opentelemetry/sdk-node": "0.221.0",
+    "@opentelemetry/sdk-trace": "2.10.0"
   }
 }

examples/esm-http-ts/package.json

@@ -32,11 +32,11 @@
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/",
   "dependencies": {
     "@opentelemetry/api": "1.9.1",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.220.0",
-    "@opentelemetry/instrumentation": "0.220.0",
-    "@opentelemetry/instrumentation-http": "0.220.0",
-    "@opentelemetry/resources": "2.9.0",
-    "@opentelemetry/sdk-trace": "2.9.0",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.221.0",
+    "@opentelemetry/instrumentation": "0.221.0",
+    "@opentelemetry/instrumentation-http": "0.221.0",
+    "@opentelemetry/resources": "2.10.0",
+    "@opentelemetry/sdk-trace": "2.10.0",
     "@opentelemetry/semantic-conventions": "^1.29.0"
   }
 }

examples/http/package.json

@@ -30,13 +30,13 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/exporter-jaeger": "2.9.0",
-    "@opentelemetry/exporter-zipkin": "2.9.0",
-    "@opentelemetry/instrumentation": "0.220.0",
-    "@opentelemetry/instrumentation-http": "0.220.0",
-    "@opentelemetry/resources": "2.9.0",
-    "@opentelemetry/sdk-trace-base": "2.9.0",
-    "@opentelemetry/sdk-trace-node": "2.9.0",
+    "@opentelemetry/exporter-jaeger": "2.10.0",
+    "@opentelemetry/exporter-zipkin": "2.10.0",
+    "@opentelemetry/instrumentation": "0.221.0",
+    "@opentelemetry/instrumentation-http": "0.221.0",
+    "@opentelemetry/resources": "2.10.0",
+    "@opentelemetry/sdk-trace-base": "2.10.0",
+    "@opentelemetry/sdk-trace-node": "2.10.0",
     "@opentelemetry/semantic-conventions": "^1.29.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http",