chore(instrumentation-runtime-node): merge main

open-telemetry · Nov 3, 2024 · cab7e6c · cab7e6c
2 parents 97d8d92 + a5b5614
commit cab7e6c
Show file tree

Hide file tree

Showing 222 changed files with 6,670 additions and 10,526 deletions.
diff --git a/.github/component-label-map.yml b/.github/component-label-map.yml
@@ -274,6 +274,14 @@ pkg:sql-common:
   - changed-files:
       - any-glob-to-any-file:
           - packages/opentelemetry-sql-common/**
+pkg:propagator-aws-xray:
+  - changed-files:
+      - any-glob-to-any-file:
+          - propagators/propagator-aws-xray/**
+pkg:propagator-aws-xray-lambda:
+  - changed-files:
+      - any-glob-to-any-file:
+          - propagators/propagator-aws-xray-lambda/**
 pkg-status:unmaintained:
   - changed-files:
       - any-glob-to-any-file:
@@ -296,3 +304,5 @@ pkg-status:unmaintained:
           - plugins/node/opentelemetry-instrumentation-restify/**
           - plugins/node/opentelemetry-instrumentation-router/**
           - propagators/opentelemetry-propagator-ot-trace/**
+          - propagators/propagator-aws-xray/**
+          - propagators/propagator-aws-xray-lambda/**
diff --git a/.github/component_owners.yml b/.github/component_owners.yml
@@ -145,6 +145,10 @@ components:
     - kirrg001
   propagators/opentelemetry-propagator-ot-trace: []
     # Unmaintained
+  propagators/propagator-aws-xray: [ ]
+  # Unmaintained
+  propagators/propagator-aws-xray-lambda: [ ]
+  # Unmaintained
 
 ignored-authors:
   - renovate-bot
diff --git a/.mocharc.yml b/.mocharc.yml
@@ -0,0 +1 @@
+require: 'ts-node/register/transpile-only'
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,64 +1,66 @@
 {
-  "detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.3",
-  "detectors/node/opentelemetry-resource-detector-aws": "1.6.2",
-  "detectors/node/opentelemetry-resource-detector-azure": "0.2.11",
-  "detectors/node/opentelemetry-resource-detector-container": "0.4.4",
-  "detectors/node/opentelemetry-resource-detector-gcp": "0.29.12",
+  "detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.4",
+  "detectors/node/opentelemetry-resource-detector-aws": "1.7.0",
+  "detectors/node/opentelemetry-resource-detector-azure": "0.2.12",
+  "detectors/node/opentelemetry-resource-detector-container": "0.5.0",
+  "detectors/node/opentelemetry-resource-detector-gcp": "0.29.13",
   "detectors/node/opentelemetry-resource-detector-github": "0.29.0",
-  "detectors/node/opentelemetry-resource-detector-instana": "0.13.0",
+  "detectors/node/opentelemetry-resource-detector-instana": "0.14.0",
   "metapackages/auto-configuration-propagators": "0.3.1",
-  "metapackages/auto-instrumentations-node": "0.51.0",
-  "metapackages/auto-instrumentations-web": "0.41.0",
+  "metapackages/auto-instrumentations-node": "0.52.0",
+  "metapackages/auto-instrumentations-web": "0.42.0",
   "packages/baggage-span-processor": "0.3.1",
   "packages/opentelemetry-host-metrics": "0.35.4",
   "packages/opentelemetry-id-generator-aws-xray": "1.2.2",
-  "packages/opentelemetry-propagation-utils": "0.30.11",
+  "packages/opentelemetry-propagation-utils": "0.30.12",
   "packages/opentelemetry-redis-common": "0.36.2",
   "packages/opentelemetry-sql-common": "0.40.1",
-  "packages/opentelemetry-test-utils": "0.41.0",
-  "packages/winston-transport": "0.6.0",
-  "plugins/node/instrumentation-amqplib": "0.42.0",
-  "plugins/node/instrumentation-cucumber": "0.9.0",
-  "plugins/node/instrumentation-dataloader": "0.12.0",
-  "plugins/node/instrumentation-fs": "0.15.0",
-  "plugins/node/instrumentation-kafkajs": "0.3.0",
-  "plugins/node/instrumentation-lru-memoizer": "0.40.0",
-  "plugins/node/instrumentation-mongoose": "0.42.0",
-  "plugins/node/instrumentation-runtime-node": "0.7.0",
-  "plugins/node/instrumentation-socket.io": "0.42.0",
-  "plugins/node/instrumentation-tedious": "0.14.0",
-  "plugins/node/instrumentation-undici": "0.6.0",
-  "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.45.0",
-  "plugins/node/opentelemetry-instrumentation-aws-sdk": "0.44.0",
-  "plugins/node/opentelemetry-instrumentation-bunyan": "0.41.0",
-  "plugins/node/opentelemetry-instrumentation-cassandra": "0.41.0",
-  "plugins/node/opentelemetry-instrumentation-connect": "0.39.0",
-  "plugins/node/opentelemetry-instrumentation-dns": "0.39.0",
-  "plugins/node/opentelemetry-instrumentation-express": "0.43.0",
-  "plugins/node/opentelemetry-instrumentation-fastify": "0.40.0",
-  "plugins/node/opentelemetry-instrumentation-generic-pool": "0.39.0",
-  "plugins/node/opentelemetry-instrumentation-graphql": "0.43.0",
-  "plugins/node/opentelemetry-instrumentation-hapi": "0.41.0",
-  "plugins/node/opentelemetry-instrumentation-ioredis": "0.43.0",
-  "plugins/node/opentelemetry-instrumentation-knex": "0.40.0",
-  "plugins/node/opentelemetry-instrumentation-koa": "0.43.0",
-  "plugins/node/opentelemetry-instrumentation-memcached": "0.39.0",
-  "plugins/node/opentelemetry-instrumentation-mongodb": "0.47.0",
-  "plugins/node/opentelemetry-instrumentation-mysql": "0.41.0",
-  "plugins/node/opentelemetry-instrumentation-mysql2": "0.41.0",
-  "plugins/node/opentelemetry-instrumentation-nestjs-core": "0.40.0",
-  "plugins/node/opentelemetry-instrumentation-net": "0.39.0",
-  "plugins/node/opentelemetry-instrumentation-pg": "0.46.0",
-  "plugins/node/opentelemetry-instrumentation-pino": "0.42.0",
-  "plugins/node/opentelemetry-instrumentation-redis": "0.42.0",
-  "plugins/node/opentelemetry-instrumentation-redis-4": "0.42.1",
-  "plugins/node/opentelemetry-instrumentation-restify": "0.41.0",
-  "plugins/node/opentelemetry-instrumentation-router": "0.40.0",
-  "plugins/node/opentelemetry-instrumentation-winston": "0.40.0",
-  "plugins/web/opentelemetry-instrumentation-document-load": "0.40.0",
-  "plugins/web/opentelemetry-instrumentation-long-task": "0.40.0",
-  "plugins/web/opentelemetry-instrumentation-user-interaction": "0.40.0",
+  "packages/opentelemetry-test-utils": "0.42.0",
+  "packages/winston-transport": "0.7.0",
+  "plugins/node/instrumentation-amqplib": "0.43.0",
+  "plugins/node/instrumentation-cucumber": "0.10.0",
+  "plugins/node/instrumentation-dataloader": "0.13.0",
+  "plugins/node/instrumentation-fs": "0.16.0",
+  "plugins/node/instrumentation-kafkajs": "0.4.0",
+  "plugins/node/instrumentation-lru-memoizer": "0.41.0",
+  "plugins/node/instrumentation-mongoose": "0.43.0",
+  "plugins/node/instrumentation-runtime-node": "0.8.0",
+  "plugins/node/instrumentation-socket.io": "0.43.0",
+  "plugins/node/instrumentation-tedious": "0.15.0",
+  "plugins/node/instrumentation-undici": "0.7.0",
+  "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.46.0",
+  "plugins/node/opentelemetry-instrumentation-aws-sdk": "0.45.0",
+  "plugins/node/opentelemetry-instrumentation-bunyan": "0.42.0",
+  "plugins/node/opentelemetry-instrumentation-cassandra": "0.42.0",
+  "plugins/node/opentelemetry-instrumentation-connect": "0.40.0",
+  "plugins/node/opentelemetry-instrumentation-dns": "0.40.0",
+  "plugins/node/opentelemetry-instrumentation-express": "0.44.0",
+  "plugins/node/opentelemetry-instrumentation-fastify": "0.41.0",
+  "plugins/node/opentelemetry-instrumentation-generic-pool": "0.40.0",
+  "plugins/node/opentelemetry-instrumentation-graphql": "0.44.0",
+  "plugins/node/opentelemetry-instrumentation-hapi": "0.42.0",
+  "plugins/node/opentelemetry-instrumentation-ioredis": "0.44.0",
+  "plugins/node/opentelemetry-instrumentation-knex": "0.41.0",
+  "plugins/node/opentelemetry-instrumentation-koa": "0.44.0",
+  "plugins/node/opentelemetry-instrumentation-memcached": "0.40.0",
+  "plugins/node/opentelemetry-instrumentation-mongodb": "0.48.0",
+  "plugins/node/opentelemetry-instrumentation-mysql": "0.42.0",
+  "plugins/node/opentelemetry-instrumentation-mysql2": "0.42.0",
+  "plugins/node/opentelemetry-instrumentation-nestjs-core": "0.41.0",
+  "plugins/node/opentelemetry-instrumentation-net": "0.40.0",
+  "plugins/node/opentelemetry-instrumentation-pg": "0.47.0",
+  "plugins/node/opentelemetry-instrumentation-pino": "0.43.0",
+  "plugins/node/opentelemetry-instrumentation-redis": "0.43.0",
+  "plugins/node/opentelemetry-instrumentation-redis-4": "0.43.0",
+  "plugins/node/opentelemetry-instrumentation-restify": "0.42.0",
+  "plugins/node/opentelemetry-instrumentation-router": "0.41.0",
+  "plugins/node/opentelemetry-instrumentation-winston": "0.41.0",
+  "plugins/web/opentelemetry-instrumentation-document-load": "0.41.0",
+  "plugins/web/opentelemetry-instrumentation-long-task": "0.41.0",
+  "plugins/web/opentelemetry-instrumentation-user-interaction": "0.41.0",
   "plugins/web/opentelemetry-plugin-react-load": "0.31.0",
   "propagators/opentelemetry-propagator-instana": "0.3.2",
-  "propagators/opentelemetry-propagator-ot-trace": "0.27.2"
+  "propagators/opentelemetry-propagator-ot-trace": "0.27.2",
+  "propagators/propagator-aws-xray": "1.26.0",
+  "propagators/propagator-aws-xray-lambda": "0.53.0"
 }
diff --git a/archive/opentelemetry-browser-extension-autoinjection/package.json b/archive/opentelemetry-browser-extension-autoinjection/package.json
@@ -12,7 +12,7 @@
     "lint:fix": "eslint . --fix",
     "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/browser-extension-autoinjection --include-dependencies",
     "prewatch": "npm run precompile",
-    "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
+    "test": "nyc mocha 'test/**/*.test.ts'",
     "tdd": "npm run test -- --watch-extensions ts --watch",
     "watch": "npx webpack --mode=development --watch",
     "watch:mv2": "npx webpack --mode=development --watch --env MV=2",
@@ -47,15 +47,13 @@
     "html-webpack-plugin": "5.3.2",
     "jimp": "0.16.1",
     "jsdom": "15.2.1",
-    "mocha": "7.2.0",
     "null-loader": "4.0.1",
     "nyc": "15.1.0",
     "responsive-loader": "2.3.0",
     "rimraf": "4.2.0",
     "sinon": "15.0.1",
     "sinon-chrome": "3.0.1",
     "ts-loader": "9.2.5",
-    "ts-mocha": "10.0.0",
     "typescript": "4.4.4",
     "webpack": "4.46.0",
     "webpack-cli": "4.7.2",

diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.29.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.3...resource-detector-alibaba-cloud-v0.29.4) (2024-10-25)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.41.0 to ^0.42.0
+
 ## [0.29.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.2...resource-detector-alibaba-cloud-v0.29.3) (2024-10-10)
 
 

diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-alibaba-cloud",
-  "version": "0.29.3",
+  "version": "0.29.4",
   "description": "OpenTelemetry resource detector for Alibaba Cloud",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -13,7 +13,7 @@
     "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-alibaba-cloud --include-dependencies",
     "prewatch": "npm run precompile",
     "prepublishOnly": "npm run compile",
-    "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
+    "test": "nyc mocha 'test/**/*.test.ts'",
     "tdd": "npm run test -- --watch-extensions ts --watch",
     "watch": "tsc -w"
   },
@@ -40,24 +40,22 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.41.0",
+    "@opentelemetry/contrib-test-utils": "^0.42.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.18.14",
     "@types/sinon": "10.0.20",
-    "mocha": "7.2.0",
     "nock": "13.3.3",
     "nyc": "15.1.0",
     "rimraf": "5.0.10",
     "sinon": "15.2.0",
-    "ts-mocha": "10.0.0",
     "typescript": "4.4.4"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
-    "@opentelemetry/resources": "^1.10.0",
     "@opentelemetry/core": "^1.26.0",
+    "@opentelemetry/resources": "^1.10.0",
     "@opentelemetry/semantic-conventions": "^1.27.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-alibaba-cloud#readme"

diff --git a/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [1.7.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.6.2...resource-detector-aws-v1.7.0) (2024-10-25)
+
+
+### Features
+
+* update "@opentelemetry/*" dependencies to 1.27.0/0.54.0 ([2822511](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/2822511a8acffb875ebd67ff2cf95980a9ddc01e))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.41.0 to ^0.42.0
+
 ## [1.6.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.6.1...resource-detector-aws-v1.6.2) (2024-10-08)
 
 

diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-aws",
-  "version": "1.6.2",
+  "version": "1.7.0",
   "description": "OpenTelemetry SDK resource detector for AWS",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -13,7 +13,7 @@
     "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-aws --include-dependencies",
     "prewatch": "npm run precompile",
     "prepublishOnly": "npm run compile",
-    "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
+    "test": "nyc mocha 'test/**/*.test.ts'",
     "tdd": "npm run test -- --watch-extensions ts --watch",
     "watch": "tsc -w"
   },
@@ -39,16 +39,14 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.41.0",
+    "@opentelemetry/contrib-test-utils": "^0.42.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.18.14",
     "@types/sinon": "10.0.20",
-    "mocha": "7.2.0",
     "nock": "13.3.3",
     "nyc": "15.1.0",
     "rimraf": "5.0.10",
     "sinon": "15.2.0",
-    "ts-mocha": "10.0.0",
     "typescript": "4.4.4"
   },
   "peerDependencies": {

diff --git a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsSuppressTracing.test.ts b/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsSuppressTracing.test.ts
@@ -32,9 +32,10 @@ describe('[Integration] Internal tracing', () => {
       'http://169.254.169.254/metadata';
 
     const memoryExporter = new InMemorySpanExporter();
+    const spanProcessor = new SimpleSpanProcessor(memoryExporter);
     const sdk = new NodeSDK({
       instrumentations: [new FsInstrumentation(), new HttpInstrumentation()],
-      spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
+      spanProcessors: [spanProcessor],
     });
     sdk.start();
 
@@ -58,7 +59,7 @@ describe('[Integration] Internal tracing', () => {
 
     // NOTE: the require process makes use of the fs API so spans are being exported.
     // We reset the exporter to have a clean state for assertions
-    await new Promise(r => setTimeout(r, 0));
+    await spanProcessor.forceFlush();
     memoryExporter.reset();
 
     const detectors = [

diff --git a/detectors/node/opentelemetry-resource-detector-azure/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-azure/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.2.12](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.2.11...resource-detector-azure-v0.2.12) (2024-10-25)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.41.0 to ^0.42.0
+
 ## [0.2.11](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.2.10...resource-detector-azure-v0.2.11) (2024-09-02)
 
 

diff --git a/detectors/node/opentelemetry-resource-detector-azure/package.json b/detectors/node/opentelemetry-resource-detector-azure/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-azure",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "description": "OpenTelemetry SDK resource detector for Azure",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -13,7 +13,7 @@
     "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-azure --include-dependencies",
     "prewatch": "npm run precompile",
     "prepublishOnly": "npm run compile",
-    "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
+    "test": "nyc mocha 'test/**/*.test.ts'",
     "tdd": "npm run test -- --watch-extensions ts --watch",
     "watch": "tsc -w"
   },
@@ -32,15 +32,13 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.41.0",
+    "@opentelemetry/contrib-test-utils": "^0.42.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.18.14",
     "@types/sinon": "10.0.20",
-    "mocha": "7.2.0",
     "nock": "13.3.3",
     "nyc": "15.1.0",
     "rimraf": "5.0.10",
-    "ts-mocha": "10.0.0",
     "typescript": "4.4.4"
   },
   "peerDependencies": {

diff --git a/detectors/node/opentelemetry-resource-detector-container/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-container/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.5.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.4.4...resource-detector-container-v0.5.0) (2024-10-25)
+
+
+### Features
+
+* update "@opentelemetry/*" dependencies to 1.27.0/0.54.0 ([2822511](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/2822511a8acffb875ebd67ff2cf95980a9ddc01e))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.41.0 to ^0.42.0
+
 ## [0.4.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.4.3...resource-detector-container-v0.4.4) (2024-10-16)