Merge remote-tracking branch 'origin/main' into specific-names

open-telemetry · Feb 3, 2021 · 2618f50 · 2618f50
2 parents 7f088e0 + 65277da
commit 2618f50
Show file tree

Hide file tree

Showing 108 changed files with 23,524 additions and 23,279 deletions.
diff --git a/backwards-compatability/node10/package-lock.json b/backwards-compatability/node10/package-lock.json
diff --git a/backwards-compatability/node10/package.json b/backwards-compatability/node10/package.json
@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "@types/node": "10.17.50",
-    "typescript": "3.9.7"
+    "typescript": "4.1.3"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0"

diff --git a/backwards-compatability/node12/package-lock.json b/backwards-compatability/node12/package-lock.json
diff --git a/backwards-compatability/node12/package.json b/backwards-compatability/node12/package.json
@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "@types/node": "12.19.13",
-    "typescript": "3.9.7"
+    "typescript": "4.1.3"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0"

diff --git a/backwards-compatability/node8/package-lock.json b/backwards-compatability/node8/package-lock.json
diff --git a/backwards-compatability/node8/package.json b/backwards-compatability/node8/package.json
@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "@types/node": "8.10.66",
-    "typescript": "3.9.7"
+    "typescript": "4.1.3"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0"

diff --git a/integration-tests/propagation-validation-server/package-lock.json b/integration-tests/propagation-validation-server/package-lock.json
diff --git a/integration-tests/propagation-validation-server/package.json b/integration-tests/propagation-validation-server/package.json
@@ -20,6 +20,6 @@
     "express": "4.17.1"
   },
   "devDependencies": {
-    "typescript": "3.9.7"
+    "typescript": "4.1.3"
   }
 }