Merge branch 'main' into chore-update-semconv

open-telemetry · Jun 12, 2021 · 2c744f9 · 2c744f9
2 parents c60ace8 + 5b6573e
commit 2c744f9
Show file tree

Hide file tree

Showing 27 changed files with 54 additions and 54 deletions.
diff --git a/integration-tests/propagation-validation-server/package.json b/integration-tests/propagation-validation-server/package.json
@@ -19,10 +19,10 @@
     "express": "4.17.1"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "typescript": "4.3.2"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0"
+    "@opentelemetry/api": "^1.0.0"
   }
 }
diff --git a/packages/opentelemetry-api-metrics/package.json b/packages/opentelemetry-api-metrics/package.json
@@ -53,10 +53,10 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0"
+    "@opentelemetry/api": "^1.0.0"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.43",
     "@types/webpack-env": "1.16.0",

diff --git a/packages/opentelemetry-context-async-hooks/package.json b/packages/opentelemetry-context-async-hooks/package.json
@@ -40,7 +40,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.43",
     "@types/shimmer": "1.0.1",
@@ -53,6 +53,6 @@
     "typescript": "4.3.2"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0"
+    "@opentelemetry/api": "^1.0.0"
   }
 }
diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.14.0",
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.43",
     "@types/sinon": "9.0.11",
@@ -74,7 +74,7 @@
     "zone.js": "0.11.4"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "zone.js": "^0.10.2 || ^0.11.0"
   },
   "sideEffects": false

diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json
@@ -55,7 +55,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.43",
     "@types/semver": "7.3.5",
@@ -80,7 +80,7 @@
     "webpack": "4.46.0"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0"
+    "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
     "@opentelemetry/semantic-conventions": "0.21.0",

diff --git a/packages/opentelemetry-exporter-collector-grpc/package.json b/packages/opentelemetry-exporter-collector-grpc/package.json
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.14.0",
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/api-metrics": "0.21.0",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.43",
@@ -63,7 +63,7 @@
     "typescript": "4.3.2"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0"
+    "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.2.12",

diff --git a/packages/opentelemetry-exporter-collector-proto/package.json b/packages/opentelemetry-exporter-collector-proto/package.json
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.14.0",
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/api-metrics": "0.21.0",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.43",
@@ -63,7 +63,7 @@
     "typescript": "4.3.2"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0"
+    "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
     "@grpc/proto-loader": "^0.6.0",

diff --git a/packages/opentelemetry-exporter-collector/package.json b/packages/opentelemetry-exporter-collector/package.json
@@ -54,7 +54,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.14.0",
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.43",
     "@types/sinon": "9.0.11",
@@ -82,7 +82,7 @@
     "webpack-merge": "5.7.3"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0"
+    "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
     "@opentelemetry/api-metrics": "0.21.0",

diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json
@@ -40,7 +40,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/resources": "0.21.0",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.43",
@@ -56,7 +56,7 @@
     "typescript": "4.3.2"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0"
+    "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
     "@opentelemetry/core": "0.21.0",

diff --git a/packages/opentelemetry-exporter-prometheus/package.json b/packages/opentelemetry-exporter-prometheus/package.json
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.43",
     "@types/sinon": "9.0.11",
@@ -53,7 +53,7 @@
     "typescript": "4.3.2"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0"
+    "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
     "@opentelemetry/api-metrics": "0.21.0",

diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json
@@ -52,7 +52,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.14.0",
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.43",
     "@types/sinon": "9.0.11",
@@ -80,7 +80,7 @@
     "webpack-merge": "5.7.3"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0"
+    "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
     "@opentelemetry/core": "0.21.0",

diff --git a/packages/opentelemetry-instrumentation-fetch/package.json b/packages/opentelemetry-instrumentation-fetch/package.json
@@ -47,7 +47,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.14.0",
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/context-zone": "0.21.0",
     "@opentelemetry/propagator-b3": "0.21.0",
     "@opentelemetry/tracing": "0.21.0",
@@ -78,7 +78,7 @@
     "webpack-merge": "5.7.3"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0"
+    "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
     "@opentelemetry/core": "0.21.0",

diff --git a/packages/opentelemetry-instrumentation-grpc/package.json b/packages/opentelemetry-instrumentation-grpc/package.json
@@ -43,7 +43,7 @@
   "devDependencies": {
     "@grpc/grpc-js": "1.3.0",
     "@grpc/proto-loader": "0.6.1",
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/context-async-hooks": "0.21.0",
     "@opentelemetry/core": "0.21.0",
     "@opentelemetry/node": "0.21.0",
@@ -66,7 +66,7 @@
     "typescript": "4.3.2"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0"
+    "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
     "@opentelemetry/api-metrics": "0.21.0",

diff --git a/packages/opentelemetry-instrumentation-http/package.json b/packages/opentelemetry-instrumentation-http/package.json
@@ -41,7 +41,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/context-async-hooks": "0.21.0",
     "@opentelemetry/node": "0.21.0",
     "@opentelemetry/tracing": "0.21.0",
@@ -68,7 +68,7 @@
     "typescript": "4.3.2"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0"
+    "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
     "@opentelemetry/core": "0.21.0",

diff --git a/packages/opentelemetry-instrumentation-xml-http-request/package.json b/packages/opentelemetry-instrumentation-xml-http-request/package.json
@@ -47,7 +47,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.14.0",
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/context-zone": "0.21.0",
     "@opentelemetry/propagator-b3": "0.21.0",
     "@opentelemetry/tracing": "0.21.0",
@@ -77,7 +77,7 @@
     "webpack-merge": "5.7.3"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0"
+    "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
     "@opentelemetry/core": "0.21.0",

diff --git a/packages/opentelemetry-instrumentation/package.json b/packages/opentelemetry-instrumentation/package.json
@@ -65,11 +65,11 @@
     "shimmer": "^1.2.1"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0"
+    "@opentelemetry/api": "^1.0.0"
   },
   "devDependencies": {
     "@babel/core": "7.14.0",
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.43",
     "@types/semver": "7.3.5",

diff --git a/packages/opentelemetry-metrics/package.json b/packages/opentelemetry-metrics/package.json
@@ -44,7 +44,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "@types/lodash.merge": "4.6.6",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.43",
@@ -59,7 +59,7 @@
     "typescript": "4.3.2"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0"
+    "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
     "@opentelemetry/api-metrics": "0.21.0",

diff --git a/packages/opentelemetry-node/package.json b/packages/opentelemetry-node/package.json
@@ -41,7 +41,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/resources": "0.21.0",
     "@opentelemetry/semantic-conventions": "0.21.0",
     "@types/mocha": "8.2.2",
@@ -60,7 +60,7 @@
     "typescript": "4.3.2"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0"
+    "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
     "@opentelemetry/context-async-hooks": "0.21.0",

diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json
@@ -46,10 +46,10 @@
     "@opentelemetry/core": "0.21.0"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0"
+    "@opentelemetry/api": "^1.0.0"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.43",
     "codecov": "3.8.2",

diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json
@@ -47,7 +47,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.43",
     "@types/sinon": "9.0.11",
@@ -71,7 +71,7 @@
     "webpack": "4.46.0"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0"
+    "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
     "@opentelemetry/core": "0.21.0"

diff --git a/packages/opentelemetry-resource-detector-aws/package.json b/packages/opentelemetry-resource-detector-aws/package.json
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.43",
     "@types/sinon": "9.0.11",
@@ -54,7 +54,7 @@
     "typescript": "4.3.2"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0"
+    "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
     "@opentelemetry/core": "0.21.0",

diff --git a/packages/opentelemetry-resource-detector-gcp/package.json b/packages/opentelemetry-resource-detector-gcp/package.json
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/core": "0.21.0",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.43",
@@ -54,7 +54,7 @@
     "typescript": "4.3.2"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0"
+    "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
     "@opentelemetry/resources": "0.21.0",

diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json
@@ -48,7 +48,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^0.21.0",
+    "@opentelemetry/api": "^1.0.0",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.43",
     "@types/sinon": "9.0.11",
@@ -63,7 +63,7 @@
     "typescript": "4.3.2"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^0.21.0"
+    "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
     "@opentelemetry/core": "0.21.0",