Merge branch 'main' into http-agent-instance

Author: raphael-theriault-swi

.github/workflows/benchmark.yml

@@ -16,14 +16,26 @@ jobs:
       matrix:
         node_version:
           - "22"
-    runs-on: equinix-bare-metal
+    runs-on: oracle-bare-metal-64cpu-512gb-x86-64
+    container:
+      image: ubuntu:24.04
     timeout-minutes: 10
     env:
       NPM_CONFIG_UNSAFE_PERM: true
     steps:
+      # Apt packages:
+      # - git: Needed for 'npm run submodule'
+      - name: Setup container environment
+        run: |
+          apt-get update && apt-get install --fix-missing -y git
+
       - name: Checkout
         uses: actions/checkout@v4
 
+      # Avoid "detected dubious ownership in repository" error when running
+      # `npm run submodule`.
+      - run: git config --global --add safe.directory $GITHUB_WORKSPACE
+
       - uses: actions/setup-node@v4
         with:
           cache: 'npm'

.github/workflows/sbom.yml

@@ -65,7 +65,7 @@ jobs:
       contents: write
     steps:
       - name: Download artifact from generate-sboms
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: SBOM.zip
       - name: Upload release asset

.github/workflows/unit-test.yml

@@ -60,13 +60,13 @@ jobs:
         run: npm run compile
 
       - run: npm test
-        if: ${{ matrix.node_version != '23' && matrix.node_version != '24' }}
+        if: ${{ matrix.node_version != '22' && matrix.node_version != '23' && matrix.node_version != '24' }}
       # Node.js >= 23 type stripping conflicts with mocha usage of ts-node.
       # See https://github.com/open-telemetry/opentelemetry-js/issues/5415
       - run: npm test
         env:
           NODE_OPTIONS: '--no-experimental-strip-types'
-        if: ${{ matrix.node_version == '23' || matrix.node_version == '24' }}
+        if: ${{ matrix.node_version == '22' || matrix.node_version == '23' || matrix.node_version == '24' }}
 
       - name: Report Coverage
         uses: codecov/codecov-action@v5

examples/basic-tracer-node/package.json

@@ -24,11 +24,12 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/exporter-jaeger": "0.25.0",
-    "@opentelemetry/resources": "0.25.0",
-    "@opentelemetry/semantic-conventions": "^1.22.0",
-    "@opentelemetry/sdk-trace-base": "0.25.0"
+    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/context-async-hooks": "^2.0.1",
+    "@opentelemetry/exporter-jaeger": "^2.0.1",
+    "@opentelemetry/resources": "^2.0.1",
+    "@opentelemetry/sdk-trace-base": "^2.0.1",
+    "@opentelemetry/semantic-conventions": "^1.36.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/basic-tracer-node"
 }

package-lock.json

@@ -78,7 +78,7 @@
     "typescript": "5.0.4",
     "webpack": "5.99.9",
     "webpack-cli": "6.0.1",
-    "zone.js": "0.15.0"
+    "zone.js": "0.15.1"
   },
   "peerDependencies": {
     "@opentelemetry/api": ">=1.0.0 <1.10.0",