Merge branch 'main' into 0.15.0-proposal

open-telemetry · Apr 1, 2021 · 18ec496 · 18ec496
2 parents 821a725 + a40df3c
commit 18ec496
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json
@@ -42,6 +42,7 @@
   },
   "devDependencies": {
     "@hapi/hapi": "20.0.1",
+    "@hapi/podium": "4.1.1",
     "@opentelemetry/context-async-hooks": "0.18.0",
     "@opentelemetry/node": "0.18.0",
     "@opentelemetry/tracing": "0.18.0",

diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json
@@ -45,7 +45,7 @@
     "@babel/core": "7.11.1",
     "@opentelemetry/context-zone-peer-dep": "0.18.0",
     "@opentelemetry/instrumentation-xml-http-request": "0.18.0",
-    "@opentelemetry/tracing": "0.18.0",
+    "@opentelemetry/tracing": "0.18.2",
     "@types/jquery": "3.5.1",
     "@types/mocha": "7.0.2",
     "@types/node": "14.0.27",