Merge branch 'main' into metrics-ga

open-telemetry · Nov 15, 2022 · f88a25a · f88a25a
2 parents c60100a + e9fe8e1
commit f88a25a
Show file tree

Hide file tree

Showing 43 changed files with 246 additions and 248 deletions.
diff --git a/archive/opentelemetry-browser-extension-autoinjection/package.json b/archive/opentelemetry-browser-extension-autoinjection/package.json
@@ -26,10 +26,10 @@
     "node": ">=14"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/api": "^1.3.0",
     "@types/chrome": "0.0.154",
     "@types/jsdom": "16.2.13",
     "@types/mocha": "8.2.3",
@@ -67,16 +67,16 @@
     "@material-ui/icons": "4.11.2",
     "@material-ui/lab": "4.0.0-alpha.60",
     "@opentelemetry/context-zone": "^1.0.0",
-    "@opentelemetry/core": "^1.0.0",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.29.2",
+    "@opentelemetry/core": "^1.8.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.34.0",
     "@opentelemetry/exporter-zipkin": "^1.0.0",
-    "@opentelemetry/instrumentation": "^0.29.2",
+    "@opentelemetry/instrumentation": "^0.34.0",
     "@opentelemetry/instrumentation-document-load": "^0.29.0",
-    "@opentelemetry/instrumentation-fetch": "^0.29.2",
-    "@opentelemetry/instrumentation-xml-http-request": "^0.29.2",
-    "@opentelemetry/resources": "^1.0.0",
-    "@opentelemetry/sdk-trace-base": "^1.0.0",
-    "@opentelemetry/sdk-trace-web": "^1.0.0",
+    "@opentelemetry/instrumentation-fetch": "^0.34.0",
+    "@opentelemetry/instrumentation-xml-http-request": "^0.34.0",
+    "@opentelemetry/resources": "^1.8.0",
+    "@opentelemetry/sdk-trace-base": "^1.8.0",
+    "@opentelemetry/sdk-trace-web": "^1.8.0",
     "@opentelemetry/semantic-conventions": "^1.0.0",
     "change-case": "4.1.2",
     "json5": "2.2.0",

diff --git a/detectors/node/opentelemetry-resource-detector-instana/README.md b/detectors/node/opentelemetry-resource-detector-instana/README.md
@@ -36,13 +36,12 @@ const globalResource = new Resource({
 
 const sdk = new NodeSDK({
    autoDetectResources: false,
+   resourceDetectors: [envDetector, processDetector, instanaAgentDetector],
    resource: globalResource,
 });
 
 (async () => {
-   await sdk.detectResources({
-      detectors: [envDetector, processDetector, instanaAgentDetector],
-   });
+   await sdk.detectResources();
 
    await sdk.start();
 }());

diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json
@@ -39,9 +39,9 @@
     "access": "public"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/contrib-test-utils": "^0.32.0",
-    "@opentelemetry/sdk-node": "^0.32.0",
+    "@opentelemetry/sdk-node": "^0.34.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.11.7",
     "@types/semver": "7.3.8",
@@ -58,7 +58,7 @@
     "@opentelemetry/semantic-conventions": "^1.0.0"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-instana#readme"
 }
diff --git a/.../opentelemetry-resource-detector-instana/test/InstanaAgentDetectorIntegrationTest.test.ts b/.../opentelemetry-resource-detector-instana/test/InstanaAgentDetectorIntegrationTest.test.ts
@@ -54,13 +54,12 @@ describe('[Integration] instanaAgentDetector', () => {
 
     const sdk = new NodeSDK({
       autoDetectResources: false,
+      resourceDetectors: [envDetector, processDetector, instanaAgentDetector],
       resource: globalResource,
     });
 
     // attributes are automatically merged!
-    await sdk.detectResources({
-      detectors: [envDetector, processDetector, instanaAgentDetector],
-    });
+    await sdk.detectResources();
 
     const resource = sdk['_resource'];
 

diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json
@@ -30,10 +30,10 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/api": "^1.3.0",
     "@types/mocha": "7.0.2",
     "@types/node": "18.11.7",
     "@types/sinon": "10.0.2",
@@ -46,7 +46,7 @@
     "typescript": "4.3.5"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "^0.32.0",
+    "@opentelemetry/instrumentation": "^0.34.0",
     "@opentelemetry/instrumentation-amqplib": "^0.31.0",
     "@opentelemetry/instrumentation-aws-lambda": "^0.33.1",
     "@opentelemetry/instrumentation-aws-sdk": "^0.9.3",
@@ -60,9 +60,9 @@
     "@opentelemetry/instrumentation-fastify": "^0.30.1",
     "@opentelemetry/instrumentation-generic-pool": "^0.30.0",
     "@opentelemetry/instrumentation-graphql": "^0.32.0",
-    "@opentelemetry/instrumentation-grpc": "^0.32.0",
+    "@opentelemetry/instrumentation-grpc": "^0.34.0",
     "@opentelemetry/instrumentation-hapi": "^0.30.1",
-    "@opentelemetry/instrumentation-http": "^0.32.0",
+    "@opentelemetry/instrumentation-http": "^0.34.0",
     "@opentelemetry/instrumentation-ioredis": "^0.32.2",
     "@opentelemetry/instrumentation-knex": "^0.30.1",
     "@opentelemetry/instrumentation-koa": "^0.33.0",

diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json
@@ -30,11 +30,11 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "devDependencies": {
     "@babel/core": "7.15.0",
-    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/api": "^1.3.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.11.7",
     "@types/sinon": "10.0.2",
@@ -60,10 +60,10 @@
     "webpack-merge": "5.8.0"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "^0.32.0",
+    "@opentelemetry/instrumentation": "^0.34.0",
     "@opentelemetry/instrumentation-document-load": "^0.30.1",
-    "@opentelemetry/instrumentation-fetch": "^0.32.0",
+    "@opentelemetry/instrumentation-fetch": "^0.34.0",
     "@opentelemetry/instrumentation-user-interaction": "^0.31.1",
-    "@opentelemetry/instrumentation-xml-http-request": "^0.32.0"
+    "@opentelemetry/instrumentation-xml-http-request": "^0.34.0"
   }
 }
diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json
@@ -38,21 +38,21 @@
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-test-utils#readme",
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/api": "^1.3.0",
     "@types/node": "18.11.7",
     "gts": "3.1.0",
     "typescript": "4.3.5"
   },
   "dependencies": {
     "@opentelemetry/core": "^1.0.0",
     "@opentelemetry/exporter-jaeger": "^1.3.1",
-    "@opentelemetry/instrumentation": "^0.32.0",
-    "@opentelemetry/sdk-trace-node": "^1.3.1",
-    "@opentelemetry/resources": "^1.3.1",
-    "@opentelemetry/sdk-trace-base": "^1.3.1",
+    "@opentelemetry/instrumentation": "^0.34.0",
+    "@opentelemetry/sdk-trace-node": "^1.8.0",
+    "@opentelemetry/resources": "^1.8.0",
+    "@opentelemetry/sdk-trace-base": "^1.8.0",
     "@opentelemetry/semantic-conventions": "^1.0.0"
   }
 }
diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json
@@ -43,16 +43,16 @@
     "test:docker:run": "docker run -d --hostname demo-amqplib-rabbit --name amqplib-unittests -p 22221:5672 --env RABBITMQ_DEFAULT_USER=username --env RABBITMQ_DEFAULT_PASS=password rabbitmq:3"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "dependencies": {
-    "@opentelemetry/core": "^1.0.0",
-    "@opentelemetry/instrumentation": "^0.32.0",
+    "@opentelemetry/core": "^1.8.0",
+    "@opentelemetry/instrumentation": "^0.34.0",
     "@opentelemetry/semantic-conventions": "^1.0.0",
     "@types/amqplib": "^0.5.17"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/contrib-test-utils": "^0.32.0",
     "@types/lodash": "4.14.178",
     "@types/mocha": "8.2.3",

diff --git a/plugins/node/instrumentation-dataloader/package.json b/plugins/node/instrumentation-dataloader/package.json
@@ -43,13 +43,13 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/context-async-hooks": "^1.6.0",
-    "@opentelemetry/sdk-trace-base": "^1.6.0",
-    "@opentelemetry/sdk-trace-node": "^1.6.0",
+    "@opentelemetry/api": "^1.3.0",
+    "@opentelemetry/context-async-hooks": "^1.8.0",
+    "@opentelemetry/sdk-trace-base": "^1.8.0",
+    "@opentelemetry/sdk-trace-node": "^1.8.0",
     "@types/mocha": "7.0.2",
     "@types/node": "18.11.7",
     "dataloader": "2.0.0",
@@ -62,7 +62,7 @@
     "typescript": "4.3.5"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "^0.32.0"
+    "@opentelemetry/instrumentation": "^0.34.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-dataloader#readme"
 }
diff --git a/plugins/node/instrumentation-fs/package.json b/plugins/node/instrumentation-fs/package.json
@@ -39,14 +39,14 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/context-async-hooks": "^1.3.1",
-    "@opentelemetry/resources": "^1.3.1",
-    "@opentelemetry/sdk-trace-base": "^1.3.1",
-    "@opentelemetry/sdk-trace-node": "^1.3.1",
+    "@opentelemetry/api": "^1.3.0",
+    "@opentelemetry/context-async-hooks": "^1.8.0",
+    "@opentelemetry/resources": "^1.8.0",
+    "@opentelemetry/sdk-trace-base": "^1.8.0",
+    "@opentelemetry/sdk-trace-node": "^1.8.0",
     "@types/mocha": "7.0.2",
     "@types/node": "18.11.7",
     "@types/sinon": "^10.0.11",
@@ -59,8 +59,8 @@
     "typescript": "4.3.5"
   },
   "dependencies": {
-    "@opentelemetry/core": "^1.0.0",
-    "@opentelemetry/instrumentation": "^0.32.0",
+    "@opentelemetry/core": "^1.8.0",
+    "@opentelemetry/instrumentation": "^0.34.0",
     "@opentelemetry/semantic-conventions": "^1.0.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-fs#readme"

diff --git a/plugins/node/instrumentation-lru-memoizer/package.json b/plugins/node/instrumentation-lru-memoizer/package.json
@@ -39,10 +39,10 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/contrib-test-utils": "^0.32.0",
     "@types/lru-cache": "7.10.9",
     "@types/mocha": "8.2.3",
@@ -58,7 +58,7 @@
     "typescript": "4.3.5"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "^0.32.0"
+    "@opentelemetry/instrumentation": "^0.34.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-lru-memoizer#readme"
 }
diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json
@@ -42,12 +42,12 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/contrib-test-utils": "^0.32.0",
-    "@opentelemetry/sdk-trace-base": "^1.3.1",
+    "@opentelemetry/sdk-trace-base": "^1.8.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.11.7",
     "expect": "27.4.2",
@@ -61,8 +61,8 @@
     "typescript": "4.3.5"
   },
   "dependencies": {
-    "@opentelemetry/core": "^1.0.0",
-    "@opentelemetry/instrumentation": "^0.32.0",
+    "@opentelemetry/core": "^1.8.0",
+    "@opentelemetry/instrumentation": "^0.34.0",
     "@opentelemetry/semantic-conventions": "^1.0.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-mongoose#readme"

diff --git a/plugins/node/instrumentation-tedious/package.json b/plugins/node/instrumentation-tedious/package.json
@@ -44,13 +44,13 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/context-async-hooks": "^1.3.1",
+    "@opentelemetry/api": "^1.3.0",
+    "@opentelemetry/context-async-hooks": "^1.8.0",
     "@opentelemetry/contrib-test-utils": "^0.32.0",
-    "@opentelemetry/sdk-trace-base": "^1.3.1",
+    "@opentelemetry/sdk-trace-base": "^1.8.0",
     "@types/mocha": "7.0.2",
     "@types/node": "18.11.7",
     "gts": "3.1.0",
@@ -63,7 +63,7 @@
     "typescript": "4.3.5"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "^0.32.0",
+    "@opentelemetry/instrumentation": "^0.34.0",
     "@opentelemetry/semantic-conventions": "^1.0.0",
     "@types/tedious": "^4.0.6"
   },

diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json
@@ -42,13 +42,13 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/core": "^1.3.1",
-    "@opentelemetry/sdk-trace-base": "^1.3.1",
-    "@opentelemetry/sdk-trace-node": "^1.3.1",
+    "@opentelemetry/api": "^1.3.0",
+    "@opentelemetry/core": "^1.8.0",
+    "@opentelemetry/sdk-trace-base": "^1.8.0",
+    "@opentelemetry/sdk-trace-node": "^1.8.0",
     "@types/mocha": "7.0.2",
     "@types/node": "18.11.7",
     "gts": "3.1.0",
@@ -61,7 +61,7 @@
   "dependencies": {
     "@opentelemetry/instrumentation": "^0.32.0",
     "@opentelemetry/propagator-aws-xray": "^1.1.1",
-    "@opentelemetry/resources": "^1.0.0",
+    "@opentelemetry/resources": "^1.8.0",
     "@opentelemetry/semantic-conventions": "^1.0.0",
     "@types/aws-lambda": "8.10.81"
   },

diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json
@@ -43,11 +43,11 @@
     "watch": "tsc -w"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "dependencies": {
-    "@opentelemetry/core": "^1.0.0",
-    "@opentelemetry/instrumentation": "^0.32.0",
+    "@opentelemetry/core": "^1.8.0",
+    "@opentelemetry/instrumentation": "^0.34.0",
     "@opentelemetry/semantic-conventions": "^1.0.0",
     "@opentelemetry/propagation-utils": "^0.29.0"
   },
@@ -58,9 +58,9 @@
     "@aws-sdk/client-sqs": "3.85.0",
     "@aws-sdk/client-sns": "3.85.0",
     "@aws-sdk/types": "3.78.0",
-    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/contrib-test-utils": "^0.32.0",
-    "@opentelemetry/sdk-trace-base": "^1.3.1",
+    "@opentelemetry/sdk-trace-base": "^1.8.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.11.7",
     "@types/sinon": "10.0.6",