Merge branch 'main' into main

open-telemetry · Dec 6, 2024 · 6b1c370 · 6b1c370
2 parents 679a84e + 484af40
commit 6b1c370
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 434 deletions.
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/integration-tests/propagation-validation-server/package.json b/integration-tests/propagation-validation-server/package.json
@@ -17,7 +17,7 @@
     "@opentelemetry/sdk-trace-base": "1.29.0",
     "axios": "1.7.9",
     "body-parser": "1.20.3",
-    "express": "4.20.0"
+    "express": "4.21.2"
   },
   "devDependencies": {
     "typescript": "4.4.4"