diff --git a/auto-merge/contrib/.release-please-manifest.json b/auto-merge/contrib/.release-please-manifest.json index b56847c2f..d5aec867b 100644 --- a/auto-merge/contrib/.release-please-manifest.json +++ b/auto-merge/contrib/.release-please-manifest.json @@ -1 +1 @@ -{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.0","detectors/node/opentelemetry-resource-detector-aws":"1.3.0","detectors/node/opentelemetry-resource-detector-container":"0.3.0","detectors/node/opentelemetry-resource-detector-gcp":"0.29.0","detectors/node/opentelemetry-resource-detector-github":"0.28.0","detectors/node/opentelemetry-resource-detector-instana":"0.5.0","metapackages/auto-instrumentations-node":"0.38.0","metapackages/auto-instrumentations-web":"0.33.0","packages/opentelemetry-host-metrics":"0.33.0","packages/opentelemetry-id-generator-aws-xray":"1.2.0","packages/opentelemetry-propagation-utils":"0.30.0","packages/opentelemetry-redis-common":"0.36.0","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.34.0","plugins/node/instrumentation-amqplib":"0.33.0","plugins/node/instrumentation-cucumber":"0.0.1","plugins/node/instrumentation-dataloader":"0.5.0","plugins/node/instrumentation-fs":"0.8.0","plugins/node/instrumentation-lru-memoizer":"0.33.0","plugins/node/instrumentation-mongoose":"0.33.0","plugins/node/instrumentation-socket.io":"0.34.0","plugins/node/instrumentation-tedious":"0.6.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.36.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.35.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.32.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.33.0","plugins/node/opentelemetry-instrumentation-connect":"0.32.0","plugins/node/opentelemetry-instrumentation-dns":"0.32.0","plugins/node/opentelemetry-instrumentation-express":"0.33.0","plugins/node/opentelemetry-instrumentation-fastify":"0.32.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.0","plugins/node/opentelemetry-instrumentation-graphql":"0.35.0","plugins/node/opentelemetry-instrumentation-hapi":"0.32.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.35.0","plugins/node/opentelemetry-instrumentation-knex":"0.32.0","plugins/node/opentelemetry-instrumentation-koa":"0.35.0","plugins/node/opentelemetry-instrumentation-memcached":"0.32.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.36.0","plugins/node/opentelemetry-instrumentation-mysql":"0.34.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.0","plugins/node/opentelemetry-instrumentation-net":"0.32.0","plugins/node/opentelemetry-instrumentation-pg":"0.36.0","plugins/node/opentelemetry-instrumentation-pino":"0.34.0","plugins/node/opentelemetry-instrumentation-redis":"0.35.0","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.0","plugins/node/opentelemetry-instrumentation-restify":"0.33.0","plugins/node/opentelemetry-instrumentation-router":"0.33.0","plugins/node/opentelemetry-instrumentation-winston":"0.32.0","plugins/web/opentelemetry-instrumentation-document-load":"0.33.0","plugins/web/opentelemetry-instrumentation-long-task":"0.33.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.33.0","plugins/web/opentelemetry-plugin-react-load":"0.29.0","propagators/opentelemetry-propagator-aws-xray":"1.3.0","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.0","propagators/opentelemetry-propagator-instana":"0.3.0","propagators/opentelemetry-propagator-ot-trace":"0.27.0"} +{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.1","detectors/node/opentelemetry-resource-detector-aws":"1.3.1","detectors/node/opentelemetry-resource-detector-container":"0.3.1","detectors/node/opentelemetry-resource-detector-gcp":"0.29.1","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.5.1","metapackages/auto-instrumentations-node":"0.39.0","metapackages/auto-instrumentations-web":"0.33.1","packages/opentelemetry-host-metrics":"0.33.1","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.1","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.34.1","plugins/node/instrumentation-amqplib":"0.33.1","plugins/node/instrumentation-cucumber":"0.1.0","plugins/node/instrumentation-dataloader":"0.5.1","plugins/node/instrumentation-fs":"0.8.1","plugins/node/instrumentation-lru-memoizer":"0.33.1","plugins/node/instrumentation-mongoose":"0.33.1","plugins/node/instrumentation-socket.io":"0.34.1","plugins/node/instrumentation-tedious":"0.6.1","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.37.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.36.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.32.1","plugins/node/opentelemetry-instrumentation-cassandra":"0.33.1","plugins/node/opentelemetry-instrumentation-connect":"0.32.1","plugins/node/opentelemetry-instrumentation-dns":"0.32.1","plugins/node/opentelemetry-instrumentation-express":"0.33.1","plugins/node/opentelemetry-instrumentation-fastify":"0.32.1","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.1","plugins/node/opentelemetry-instrumentation-graphql":"0.35.1","plugins/node/opentelemetry-instrumentation-hapi":"0.33.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.35.1","plugins/node/opentelemetry-instrumentation-knex":"0.32.1","plugins/node/opentelemetry-instrumentation-koa":"0.36.0","plugins/node/opentelemetry-instrumentation-memcached":"0.32.1","plugins/node/opentelemetry-instrumentation-mongodb":"0.36.1","plugins/node/opentelemetry-instrumentation-mysql":"0.34.1","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.1","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.1","plugins/node/opentelemetry-instrumentation-net":"0.32.1","plugins/node/opentelemetry-instrumentation-pg":"0.36.1","plugins/node/opentelemetry-instrumentation-pino":"0.34.1","plugins/node/opentelemetry-instrumentation-redis":"0.35.1","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.1","plugins/node/opentelemetry-instrumentation-restify":"0.34.0","plugins/node/opentelemetry-instrumentation-router":"0.33.1","plugins/node/opentelemetry-instrumentation-winston":"0.32.1","plugins/web/opentelemetry-instrumentation-document-load":"0.33.1","plugins/web/opentelemetry-instrumentation-long-task":"0.33.1","plugins/web/opentelemetry-instrumentation-user-interaction":"0.33.1","plugins/web/opentelemetry-plugin-react-load":"0.29.1","propagators/opentelemetry-propagator-aws-xray":"1.3.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.1","propagators/opentelemetry-propagator-instana":"0.3.1","propagators/opentelemetry-propagator-ot-trace":"0.27.1"} diff --git a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md index f12bdd2de..b98ff8658 100644 --- a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md +++ b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md @@ -36,6 +36,20 @@ * devDependencies * @opentelemetry/contrib-test-utils bumped from ^0.33.3 to ^0.33.4 +## [0.28.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.28.0...resource-detector-alibaba-cloud-v0.28.1) (2023-08-14) + + +### Bug Fixes + +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.0 to ^0.34.1 + ## [0.28.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.27.7...resource-detector-alibaba-cloud-v0.28.0) (2023-07-12) diff --git a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json index e6bd34924..5b4876246 100644 --- a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json +++ b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resource-detector-alibaba-cloud", - "version": "0.28.0", + "version": "0.28.1", "description": "OpenTelemetry resource detector for Alibaba Cloud", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -43,7 +43,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/contrib-test-utils": "^0.34.0", + "@opentelemetry/contrib-test-utils": "^0.34.1", "@types/mocha": "8.2.3", "@types/node": "18.16.19", "@types/sinon": "10.0.16", diff --git a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md index 62193c329..3dc836c54 100644 --- a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md +++ b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md @@ -36,6 +36,20 @@ * devDependencies * @opentelemetry/contrib-test-utils bumped from ^0.33.3 to ^0.33.4 +## [1.3.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.3.0...resource-detector-aws-v1.3.1) (2023-08-14) + + +### Bug Fixes + +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.0 to ^0.34.1 + ## [1.3.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.2.5...resource-detector-aws-v1.3.0) (2023-07-12) diff --git a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-aws/package.json b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-aws/package.json index c1e52afb9..5fd6ac7a1 100644 --- a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-aws/package.json +++ b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-aws/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resource-detector-aws", - "version": "1.3.0", + "version": "1.3.1", "description": "OpenTelemetry SDK resource detector for AWS", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -42,7 +42,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/contrib-test-utils": "^0.34.0", + "@opentelemetry/contrib-test-utils": "^0.34.1", "@types/mocha": "8.2.3", "@types/node": "18.16.19", "@types/sinon": "10.0.16", diff --git a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-container/CHANGELOG.md b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-container/CHANGELOG.md index 25171400d..8c15de85e 100644 --- a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-container/CHANGELOG.md +++ b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-container/CHANGELOG.md @@ -30,6 +30,20 @@ * devDependencies * @opentelemetry/contrib-test-utils bumped from ^0.33.3 to ^0.33.4 +## [0.3.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.3.0...resource-detector-container-v0.3.1) (2023-08-14) + + +### Bug Fixes + +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.0 to ^0.34.1 + ## [0.3.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.2.5...resource-detector-container-v0.3.0) (2023-07-12) diff --git a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-container/package.json b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-container/package.json index 19c95d285..3db5c093b 100644 --- a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-container/package.json +++ b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-container/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resource-detector-container", - "version": "0.3.0", + "version": "0.3.1", "description": "Opentelemetry resource detector to get container resource attributes", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -36,7 +36,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/contrib-test-utils": "^0.34.0", + "@opentelemetry/contrib-test-utils": "^0.34.1", "@types/mocha": "8.2.3", "@types/node": "^18.0.0", "@types/sinon": "10.0.16", diff --git a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-gcp/CHANGELOG.md b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-gcp/CHANGELOG.md index d626ba109..7e2f5662c 100644 --- a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-gcp/CHANGELOG.md +++ b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-gcp/CHANGELOG.md @@ -36,6 +36,20 @@ * devDependencies * @opentelemetry/contrib-test-utils bumped from ^0.33.3 to ^0.33.4 +## [0.29.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-gcp-v0.29.0...resource-detector-gcp-v0.29.1) (2023-08-14) + + +### Bug Fixes + +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.0 to ^0.34.1 + ## [0.29.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-gcp-v0.28.3...resource-detector-gcp-v0.29.0) (2023-07-12) diff --git a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-gcp/package.json b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-gcp/package.json index 7d53bacca..df555c017 100644 --- a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-gcp/package.json +++ b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-gcp/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resource-detector-gcp", - "version": "0.29.0", + "version": "0.29.1", "description": "OpenTelemetry SDK resource detector for GCP", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -42,7 +42,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/contrib-test-utils": "^0.34.0", + "@opentelemetry/contrib-test-utils": "^0.34.1", "@types/mocha": "8.2.3", "@types/node": "18.16.19", "@types/semver": "7.5.0", diff --git a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-github/CHANGELOG.md b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-github/CHANGELOG.md index 1a0003bf0..989227e51 100644 --- a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-github/CHANGELOG.md +++ b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-github/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.28.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-github-v0.28.0...resource-detector-github-v0.28.1) (2023-08-14) + + +### Bug Fixes + +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.28.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-github-v0.27.1...resource-detector-github-v0.28.0) (2023-07-12) diff --git a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-github/package.json b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-github/package.json index 36af2ffce..bc2781ea2 100644 --- a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-github/package.json +++ b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-github/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resource-detector-github", - "version": "0.28.0", + "version": "0.28.1", "description": "OpenTelemetry SDK resource detector for GitHub", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-instana/CHANGELOG.md b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-instana/CHANGELOG.md index 1b4df2536..b38de3d25 100644 --- a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-instana/CHANGELOG.md +++ b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-instana/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [0.5.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-instana-v0.5.0...resource-detector-instana-v0.5.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.0 to ^0.34.1 + ## [0.5.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-instana-v0.4.4...resource-detector-instana-v0.5.0) (2023-07-12) diff --git a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-instana/package.json b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-instana/package.json index 35fb4e0cd..451da8a95 100644 --- a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-instana/package.json +++ b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-instana/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resource-detector-instana", - "version": "0.5.0", + "version": "0.5.1", "description": "OpenTelemetry SDK resource detector for Instana", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -40,7 +40,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.34.0", + "@opentelemetry/contrib-test-utils": "^0.34.1", "@opentelemetry/sdk-node": "^0.41.2", "@types/mocha": "8.2.3", "@types/node": "18.16.19", diff --git a/auto-merge/contrib/metapackages/auto-instrumentations-node/CHANGELOG.md b/auto-merge/contrib/metapackages/auto-instrumentations-node/CHANGELOG.md index 030e8cd31..857238706 100644 --- a/auto-merge/contrib/metapackages/auto-instrumentations-node/CHANGELOG.md +++ b/auto-merge/contrib/metapackages/auto-instrumentations-node/CHANGELOG.md @@ -87,6 +87,64 @@ * @opentelemetry/instrumentation-koa bumped from ^0.34.2 to ^0.34.3 * @opentelemetry/instrumentation-redis bumped from ^0.34.3 to ^0.34.4 +## [0.39.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.38.0...auto-instrumentations-node-v0.39.0) (2023-08-14) + + +### Features + +* **cucumber:** add instrumentation for @cucumber/cucumber ([#1252](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1252)) ([82267ab](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/82267ab02f8d9b27613b5926089c42d04d4a4a7e)) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/instrumentation-amqplib bumped from ^0.33.0 to ^0.33.1 + * @opentelemetry/instrumentation-aws-lambda bumped from ^0.36.0 to ^0.37.0 + * @opentelemetry/instrumentation-aws-sdk bumped from ^0.35.0 to ^0.36.0 + * @opentelemetry/instrumentation-bunyan bumped from ^0.32.0 to ^0.32.1 + * @opentelemetry/instrumentation-cassandra-driver bumped from ^0.33.0 to ^0.33.1 + * @opentelemetry/instrumentation-connect bumped from ^0.32.0 to ^0.32.1 + * @opentelemetry/instrumentation-cucumber bumped from ^0.0.1 to ^0.1.0 + * @opentelemetry/instrumentation-dataloader bumped from ^0.5.0 to ^0.5.1 + * @opentelemetry/instrumentation-dns bumped from ^0.32.0 to ^0.32.1 + * @opentelemetry/instrumentation-express bumped from ^0.33.0 to ^0.33.1 + * @opentelemetry/instrumentation-fs bumped from ^0.8.0 to ^0.8.1 + * @opentelemetry/instrumentation-fastify bumped from ^0.32.0 to ^0.32.1 + * @opentelemetry/instrumentation-generic-pool bumped from ^0.32.0 to ^0.32.1 + * @opentelemetry/instrumentation-graphql bumped from ^0.35.0 to ^0.35.1 + * @opentelemetry/instrumentation-hapi bumped from ^0.32.0 to ^0.33.0 + * @opentelemetry/instrumentation-ioredis bumped from ^0.35.0 to ^0.35.1 + * @opentelemetry/instrumentation-knex bumped from ^0.32.0 to ^0.32.1 + * @opentelemetry/instrumentation-koa bumped from ^0.35.0 to ^0.36.0 + * @opentelemetry/instrumentation-lru-memoizer bumped from ^0.33.0 to ^0.33.1 + * @opentelemetry/instrumentation-memcached bumped from ^0.32.0 to ^0.32.1 + * @opentelemetry/instrumentation-mongodb bumped from ^0.36.0 to ^0.36.1 + * @opentelemetry/instrumentation-mongoose bumped from ^0.33.0 to ^0.33.1 + * @opentelemetry/instrumentation-mysql bumped from ^0.34.0 to ^0.34.1 + * @opentelemetry/instrumentation-mysql2 bumped from ^0.34.0 to ^0.34.1 + * @opentelemetry/instrumentation-nestjs-core bumped from ^0.33.0 to ^0.33.1 + * @opentelemetry/instrumentation-net bumped from ^0.32.0 to ^0.32.1 + * @opentelemetry/instrumentation-pg bumped from ^0.36.0 to ^0.36.1 + * @opentelemetry/instrumentation-pino bumped from ^0.34.0 to ^0.34.1 + * @opentelemetry/instrumentation-redis bumped from ^0.35.0 to ^0.35.1 + * @opentelemetry/instrumentation-redis-4 bumped from ^0.35.0 to ^0.35.1 + * @opentelemetry/instrumentation-restify bumped from ^0.33.0 to ^0.34.0 + * @opentelemetry/instrumentation-router bumped from ^0.33.0 to ^0.33.1 + * @opentelemetry/instrumentation-socket.io bumped from ^0.34.0 to ^0.34.1 + * @opentelemetry/instrumentation-tedious bumped from ^0.6.0 to ^0.6.1 + * @opentelemetry/instrumentation-winston bumped from ^0.32.0 to ^0.32.1 + * @opentelemetry/resource-detector-alibaba-cloud bumped from ^0.28.0 to ^0.28.1 + * @opentelemetry/resource-detector-aws bumped from ^1.3.0 to ^1.3.1 + * @opentelemetry/resource-detector-container bumped from ^0.3.0 to ^0.3.1 + * @opentelemetry/resource-detector-gcp bumped from ^0.29.0 to ^0.29.1 + ## [0.38.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.37.1...auto-instrumentations-node-v0.38.0) (2023-07-12) diff --git a/auto-merge/contrib/metapackages/auto-instrumentations-node/package.json b/auto-merge/contrib/metapackages/auto-instrumentations-node/package.json index 4b82be75b..7423df60c 100644 --- a/auto-merge/contrib/metapackages/auto-instrumentations-node/package.json +++ b/auto-merge/contrib/metapackages/auto-instrumentations-node/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/auto-instrumentations-node", - "version": "0.38.0", + "version": "0.39.0", "description": "Metapackage which bundles opentelemetry node core and contrib instrumentations", "author": "OpenTelemetry Authors", "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/metapackages/auto-instrumentations-node#readme", @@ -50,47 +50,47 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.2", - "@opentelemetry/instrumentation-amqplib": "^0.33.0", - "@opentelemetry/instrumentation-aws-lambda": "^0.36.0", - "@opentelemetry/instrumentation-aws-sdk": "^0.35.0", - "@opentelemetry/instrumentation-bunyan": "^0.32.0", - "@opentelemetry/instrumentation-cassandra-driver": "^0.33.0", - "@opentelemetry/instrumentation-connect": "^0.32.0", - "@opentelemetry/instrumentation-cucumber": "^0.0.1", - "@opentelemetry/instrumentation-dataloader": "^0.5.0", - "@opentelemetry/instrumentation-dns": "^0.32.0", - "@opentelemetry/instrumentation-express": "^0.33.0", - "@opentelemetry/instrumentation-fs": "^0.8.0", - "@opentelemetry/instrumentation-fastify": "^0.32.0", - "@opentelemetry/instrumentation-generic-pool": "^0.32.0", - "@opentelemetry/instrumentation-graphql": "^0.35.0", + "@opentelemetry/instrumentation-amqplib": "^0.33.1", + "@opentelemetry/instrumentation-aws-lambda": "^0.37.0", + "@opentelemetry/instrumentation-aws-sdk": "^0.36.0", + "@opentelemetry/instrumentation-bunyan": "^0.32.1", + "@opentelemetry/instrumentation-cassandra-driver": "^0.33.1", + "@opentelemetry/instrumentation-connect": "^0.32.1", + "@opentelemetry/instrumentation-cucumber": "^0.1.0", + "@opentelemetry/instrumentation-dataloader": "^0.5.1", + "@opentelemetry/instrumentation-dns": "^0.32.1", + "@opentelemetry/instrumentation-express": "^0.33.1", + "@opentelemetry/instrumentation-fs": "^0.8.1", + "@opentelemetry/instrumentation-fastify": "^0.32.1", + "@opentelemetry/instrumentation-generic-pool": "^0.32.1", + "@opentelemetry/instrumentation-graphql": "^0.35.1", "@opentelemetry/instrumentation-grpc": "^0.41.2", - "@opentelemetry/instrumentation-hapi": "^0.32.0", + "@opentelemetry/instrumentation-hapi": "^0.33.0", "@opentelemetry/instrumentation-http": "^0.41.2", - "@opentelemetry/instrumentation-ioredis": "^0.35.0", - "@opentelemetry/instrumentation-knex": "^0.32.0", - "@opentelemetry/instrumentation-koa": "^0.35.0", - "@opentelemetry/instrumentation-lru-memoizer": "^0.33.0", - "@opentelemetry/instrumentation-memcached": "^0.32.0", - "@opentelemetry/instrumentation-mongodb": "^0.36.0", - "@opentelemetry/instrumentation-mongoose": "^0.33.0", - "@opentelemetry/instrumentation-mysql": "^0.34.0", - "@opentelemetry/instrumentation-mysql2": "^0.34.0", - "@opentelemetry/instrumentation-nestjs-core": "^0.33.0", - "@opentelemetry/instrumentation-net": "^0.32.0", - "@opentelemetry/instrumentation-pg": "^0.36.0", - "@opentelemetry/instrumentation-pino": "^0.34.0", - "@opentelemetry/instrumentation-redis": "^0.35.0", - "@opentelemetry/instrumentation-redis-4": "^0.35.0", - "@opentelemetry/instrumentation-restify": "^0.33.0", - "@opentelemetry/instrumentation-router": "^0.33.0", - "@opentelemetry/instrumentation-socket.io": "^0.34.0", - "@opentelemetry/instrumentation-tedious": "^0.6.0", - "@opentelemetry/instrumentation-winston": "^0.32.0", - "@opentelemetry/resource-detector-alibaba-cloud": "^0.28.0", - "@opentelemetry/resource-detector-aws": "^1.3.0", - "@opentelemetry/resource-detector-container": "^0.3.0", - "@opentelemetry/resource-detector-gcp": "^0.29.0", + "@opentelemetry/instrumentation-ioredis": "^0.35.1", + "@opentelemetry/instrumentation-knex": "^0.32.1", + "@opentelemetry/instrumentation-koa": "^0.36.0", + "@opentelemetry/instrumentation-lru-memoizer": "^0.33.1", + "@opentelemetry/instrumentation-memcached": "^0.32.1", + "@opentelemetry/instrumentation-mongodb": "^0.36.1", + "@opentelemetry/instrumentation-mongoose": "^0.33.1", + "@opentelemetry/instrumentation-mysql": "^0.34.1", + "@opentelemetry/instrumentation-mysql2": "^0.34.1", + "@opentelemetry/instrumentation-nestjs-core": "^0.33.1", + "@opentelemetry/instrumentation-net": "^0.32.1", + "@opentelemetry/instrumentation-pg": "^0.36.1", + "@opentelemetry/instrumentation-pino": "^0.34.1", + "@opentelemetry/instrumentation-redis": "^0.35.1", + "@opentelemetry/instrumentation-redis-4": "^0.35.1", + "@opentelemetry/instrumentation-restify": "^0.34.0", + "@opentelemetry/instrumentation-router": "^0.33.1", + "@opentelemetry/instrumentation-socket.io": "^0.34.1", + "@opentelemetry/instrumentation-tedious": "^0.6.1", + "@opentelemetry/instrumentation-winston": "^0.32.1", + "@opentelemetry/resource-detector-alibaba-cloud": "^0.28.1", + "@opentelemetry/resource-detector-aws": "^1.3.1", + "@opentelemetry/resource-detector-container": "^0.3.1", + "@opentelemetry/resource-detector-gcp": "^0.29.1", "@opentelemetry/resources": "^1.12.0", "@opentelemetry/sdk-node": "^0.41.2" } diff --git a/auto-merge/contrib/packages/opentelemetry-host-metrics/CHANGELOG.md b/auto-merge/contrib/packages/opentelemetry-host-metrics/CHANGELOG.md index 24fef2d60..d3e334ca1 100644 --- a/auto-merge/contrib/packages/opentelemetry-host-metrics/CHANGELOG.md +++ b/auto-merge/contrib/packages/opentelemetry-host-metrics/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.33.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/host-metrics-v0.33.0...host-metrics-v0.33.1) (2023-08-14) + + +### Bug Fixes + +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/host-metrics-v0.32.2...host-metrics-v0.33.0) (2023-07-12) diff --git a/auto-merge/contrib/packages/opentelemetry-host-metrics/package.json b/auto-merge/contrib/packages/opentelemetry-host-metrics/package.json index cbfaaf787..5e12fae80 100644 --- a/auto-merge/contrib/packages/opentelemetry-host-metrics/package.json +++ b/auto-merge/contrib/packages/opentelemetry-host-metrics/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/host-metrics", - "version": "0.33.0", + "version": "0.33.1", "description": "OpenTelemetry Host Metrics for Node.js", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/packages/opentelemetry-id-generator-aws-xray/CHANGELOG.md b/auto-merge/contrib/packages/opentelemetry-id-generator-aws-xray/CHANGELOG.md index 55ef243c5..ff5061547 100644 --- a/auto-merge/contrib/packages/opentelemetry-id-generator-aws-xray/CHANGELOG.md +++ b/auto-merge/contrib/packages/opentelemetry-id-generator-aws-xray/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.2.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/id-generator-aws-xray-v1.2.0...id-generator-aws-xray-v1.2.1) (2023-08-14) + + +### Bug Fixes + +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [1.2.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/id-generator-aws-xray-v1.1.2...id-generator-aws-xray-v1.2.0) (2023-07-12) diff --git a/auto-merge/contrib/packages/opentelemetry-id-generator-aws-xray/package.json b/auto-merge/contrib/packages/opentelemetry-id-generator-aws-xray/package.json index 71cd335ae..e85006398 100644 --- a/auto-merge/contrib/packages/opentelemetry-id-generator-aws-xray/package.json +++ b/auto-merge/contrib/packages/opentelemetry-id-generator-aws-xray/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/id-generator-aws-xray", - "version": "1.2.0", + "version": "1.2.1", "description": "AWS X-Ray ID generator for OpenTelemetry", "main": "build/src/index.js", "publishConfig": { diff --git a/auto-merge/contrib/packages/opentelemetry-propagation-utils/CHANGELOG.md b/auto-merge/contrib/packages/opentelemetry-propagation-utils/CHANGELOG.md index 5b0feb6c7..646d53873 100644 --- a/auto-merge/contrib/packages/opentelemetry-propagation-utils/CHANGELOG.md +++ b/auto-merge/contrib/packages/opentelemetry-propagation-utils/CHANGELOG.md @@ -24,6 +24,20 @@ * devDependencies * @opentelemetry/contrib-test-utils bumped from ^0.33.3 to ^0.33.4 +## [0.30.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/propagation-utils-v0.30.0...propagation-utils-v0.30.1) (2023-08-14) + + +### Bug Fixes + +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.0 to ^0.34.1 + ## [0.30.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/propagation-utils-v0.29.5...propagation-utils-v0.30.0) (2023-07-12) diff --git a/auto-merge/contrib/packages/opentelemetry-propagation-utils/package.json b/auto-merge/contrib/packages/opentelemetry-propagation-utils/package.json index 435f11f84..43cef7bf6 100644 --- a/auto-merge/contrib/packages/opentelemetry-propagation-utils/package.json +++ b/auto-merge/contrib/packages/opentelemetry-propagation-utils/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagation-utils", - "version": "0.30.0", + "version": "0.30.1", "description": "Propagation utilities for opentelemetry instrumentations", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -45,7 +45,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/contrib-test-utils": "^0.34.0", + "@opentelemetry/contrib-test-utils": "^0.34.1", "@types/mocha": "^9.1.1", "@types/node": "18.16.19", "@types/sinon": "^10.0.11", diff --git a/auto-merge/contrib/packages/opentelemetry-redis-common/CHANGELOG.md b/auto-merge/contrib/packages/opentelemetry-redis-common/CHANGELOG.md index a8856d1aa..c7959a4d6 100644 --- a/auto-merge/contrib/packages/opentelemetry-redis-common/CHANGELOG.md +++ b/auto-merge/contrib/packages/opentelemetry-redis-common/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.36.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/redis-common-v0.36.0...redis-common-v0.36.1) (2023-08-14) + + +### Bug Fixes + +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.36.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/redis-common-v0.35.1...redis-common-v0.36.0) (2023-07-12) diff --git a/auto-merge/contrib/packages/opentelemetry-redis-common/package.json b/auto-merge/contrib/packages/opentelemetry-redis-common/package.json index a90cc8aa6..c00df91c9 100644 --- a/auto-merge/contrib/packages/opentelemetry-redis-common/package.json +++ b/auto-merge/contrib/packages/opentelemetry-redis-common/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/redis-common", - "version": "0.36.0", + "version": "0.36.1", "description": "Redis utilities for redis instrumentations", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/packages/opentelemetry-test-utils/CHANGELOG.md b/auto-merge/contrib/packages/opentelemetry-test-utils/CHANGELOG.md index bb81d76fd..a9eb9c8b4 100644 --- a/auto-merge/contrib/packages/opentelemetry-test-utils/CHANGELOG.md +++ b/auto-merge/contrib/packages/opentelemetry-test-utils/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [0.34.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/contrib-test-utils-v0.34.0...contrib-test-utils-v0.34.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.34.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/contrib-test-utils-v0.33.4...contrib-test-utils-v0.34.0) (2023-07-12) diff --git a/auto-merge/contrib/packages/opentelemetry-test-utils/package.json b/auto-merge/contrib/packages/opentelemetry-test-utils/package.json index 3995735c5..b4de2b434 100644 --- a/auto-merge/contrib/packages/opentelemetry-test-utils/package.json +++ b/auto-merge/contrib/packages/opentelemetry-test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/contrib-test-utils", - "version": "0.34.0", + "version": "0.34.1", "description": "Test utilities for opentelemetry components", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/plugins/node/instrumentation-amqplib/CHANGELOG.md b/auto-merge/contrib/plugins/node/instrumentation-amqplib/CHANGELOG.md index 7dd0b6fe3..aba9ee3dc 100644 --- a/auto-merge/contrib/plugins/node/instrumentation-amqplib/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/instrumentation-amqplib/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [0.33.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-amqplib-v0.33.0...instrumentation-amqplib-v0.33.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.0 to ^0.34.1 + ## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-amqplib-v0.32.5...instrumentation-amqplib-v0.33.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/instrumentation-amqplib/package.json b/auto-merge/contrib/plugins/node/instrumentation-amqplib/package.json index 3505cbb61..cd1947970 100644 --- a/auto-merge/contrib/plugins/node/instrumentation-amqplib/package.json +++ b/auto-merge/contrib/plugins/node/instrumentation-amqplib/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-amqplib", - "version": "0.33.0", + "version": "0.33.1", "description": "OpenTelemetry automatic instrumentation for the `amqplib` package", "keywords": [ "amqplib", @@ -52,7 +52,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.34.0", + "@opentelemetry/contrib-test-utils": "^0.34.1", "@types/amqplib": "^0.5.17", "@types/lodash": "4.14.197", "@types/mocha": "8.2.3", diff --git a/auto-merge/contrib/plugins/node/instrumentation-cucumber/CHANGELOG.md b/auto-merge/contrib/plugins/node/instrumentation-cucumber/CHANGELOG.md new file mode 100644 index 000000000..da03cb7af --- /dev/null +++ b/auto-merge/contrib/plugins/node/instrumentation-cucumber/CHANGELOG.md @@ -0,0 +1,15 @@ +# Changelog + +## [0.1.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-cucumber-v0.0.1...instrumentation-cucumber-v0.1.0) (2023-08-14) + + +### Features + +* **cucumber:** add instrumentation for @cucumber/cucumber ([#1252](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1252)) ([82267ab](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/82267ab02f8d9b27613b5926089c42d04d4a4a7e)) +* upstream mocha instrumentation testing plugin from ext-js [#621](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/621) ([#669](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/669)) ([a5170c4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/a5170c494706a2bec3ba51e59966d0ca8a41d00e)) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* fix typescript compilation issue with koa types ([a53f643](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/a53f6438d616a6e07b35ff98d063e520adfda5d0)) diff --git a/auto-merge/contrib/plugins/node/instrumentation-cucumber/package.json b/auto-merge/contrib/plugins/node/instrumentation-cucumber/package.json index d23c06e90..b47bcee23 100644 --- a/auto-merge/contrib/plugins/node/instrumentation-cucumber/package.json +++ b/auto-merge/contrib/plugins/node/instrumentation-cucumber/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-cucumber", - "version": "0.0.1", + "version": "0.1.0", "description": "OpenTelemetry cucumber automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -46,7 +46,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@cucumber/cucumber": "^8.8.0", + "@cucumber/cucumber": "^9.0.0", "@opentelemetry/api": "^1.0.0", "@opentelemetry/core": "^1.3.1", "@opentelemetry/sdk-trace-base": "^1.3.1", diff --git a/auto-merge/contrib/plugins/node/instrumentation-dataloader/CHANGELOG.md b/auto-merge/contrib/plugins/node/instrumentation-dataloader/CHANGELOG.md index 02cb54984..d6b642aa9 100644 --- a/auto-merge/contrib/plugins/node/instrumentation-dataloader/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/instrumentation-dataloader/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [0.5.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-dataloader-v0.5.0...instrumentation-dataloader-v0.5.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.5.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-dataloader-v0.4.3...instrumentation-dataloader-v0.5.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/instrumentation-dataloader/package.json b/auto-merge/contrib/plugins/node/instrumentation-dataloader/package.json index 590b3886f..a3e04058b 100644 --- a/auto-merge/contrib/plugins/node/instrumentation-dataloader/package.json +++ b/auto-merge/contrib/plugins/node/instrumentation-dataloader/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-dataloader", - "version": "0.5.0", + "version": "0.5.1", "description": "OpenTelemetry instrumentation for dataloader", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/plugins/node/instrumentation-fs/CHANGELOG.md b/auto-merge/contrib/plugins/node/instrumentation-fs/CHANGELOG.md index 5d889a9bf..8198ae2a0 100644 --- a/auto-merge/contrib/plugins/node/instrumentation-fs/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/instrumentation-fs/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [0.8.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-fs-v0.8.0...instrumentation-fs-v0.8.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.8.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-fs-v0.7.4...instrumentation-fs-v0.8.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/instrumentation-fs/package.json b/auto-merge/contrib/plugins/node/instrumentation-fs/package.json index 4361e87fe..9440c9beb 100644 --- a/auto-merge/contrib/plugins/node/instrumentation-fs/package.json +++ b/auto-merge/contrib/plugins/node/instrumentation-fs/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-fs", - "version": "0.8.0", + "version": "0.8.1", "description": "OpenTelemetry automatic instrumentation package for fs", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/plugins/node/instrumentation-lru-memoizer/CHANGELOG.md b/auto-merge/contrib/plugins/node/instrumentation-lru-memoizer/CHANGELOG.md index 207bb3bc2..dc46ec394 100644 --- a/auto-merge/contrib/plugins/node/instrumentation-lru-memoizer/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/instrumentation-lru-memoizer/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [0.33.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-lru-memoizer-v0.33.0...instrumentation-lru-memoizer-v0.33.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.0 to ^0.34.1 + ## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-lru-memoizer-v0.32.4...instrumentation-lru-memoizer-v0.33.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/instrumentation-lru-memoizer/package.json b/auto-merge/contrib/plugins/node/instrumentation-lru-memoizer/package.json index ceccfb35e..efa60e0ca 100644 --- a/auto-merge/contrib/plugins/node/instrumentation-lru-memoizer/package.json +++ b/auto-merge/contrib/plugins/node/instrumentation-lru-memoizer/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-lru-memoizer", - "version": "0.33.0", + "version": "0.33.1", "description": "OpenTelemetry automatic instrumentation package for lru-memoizer", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -43,7 +43,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.34.0", + "@opentelemetry/contrib-test-utils": "^0.34.1", "@types/lru-cache": "7.10.9", "@types/mocha": "8.2.3", "@types/node": "18.16.19", diff --git a/auto-merge/contrib/plugins/node/instrumentation-mongoose/CHANGELOG.md b/auto-merge/contrib/plugins/node/instrumentation-mongoose/CHANGELOG.md index 214b8e526..34102f25c 100644 --- a/auto-merge/contrib/plugins/node/instrumentation-mongoose/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/instrumentation-mongoose/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [0.33.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mongoose-v0.33.0...instrumentation-mongoose-v0.33.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.0 to ^0.34.1 + ## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mongoose-v0.32.4...instrumentation-mongoose-v0.33.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/instrumentation-mongoose/package.json b/auto-merge/contrib/plugins/node/instrumentation-mongoose/package.json index 5f320f246..1792f23ed 100644 --- a/auto-merge/contrib/plugins/node/instrumentation-mongoose/package.json +++ b/auto-merge/contrib/plugins/node/instrumentation-mongoose/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-mongoose", - "version": "0.33.0", + "version": "0.33.1", "description": "OpenTelemetry automatic instrumentation package for mongoose", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -46,7 +46,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.34.0", + "@opentelemetry/contrib-test-utils": "^0.34.1", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", diff --git a/auto-merge/contrib/plugins/node/instrumentation-socket.io/CHANGELOG.md b/auto-merge/contrib/plugins/node/instrumentation-socket.io/CHANGELOG.md index afa984966..454f0eead 100644 --- a/auto-merge/contrib/plugins/node/instrumentation-socket.io/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/instrumentation-socket.io/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [0.34.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-socket.io-v0.34.0...instrumentation-socket.io-v0.34.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.0 to ^0.34.1 + ## [0.34.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-socket.io-v0.33.4...instrumentation-socket.io-v0.34.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/instrumentation-socket.io/package.json b/auto-merge/contrib/plugins/node/instrumentation-socket.io/package.json index 1e64ffb84..7f63a9d14 100644 --- a/auto-merge/contrib/plugins/node/instrumentation-socket.io/package.json +++ b/auto-merge/contrib/plugins/node/instrumentation-socket.io/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-socket.io", - "version": "0.34.0", + "version": "0.34.1", "description": "OpenTelemetry automatic instrumentation package for socket.io", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -43,7 +43,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.34.0", + "@opentelemetry/contrib-test-utils": "^0.34.1", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", diff --git a/auto-merge/contrib/plugins/node/instrumentation-tedious/CHANGELOG.md b/auto-merge/contrib/plugins/node/instrumentation-tedious/CHANGELOG.md index b9cdd5afb..1c33db128 100644 --- a/auto-merge/contrib/plugins/node/instrumentation-tedious/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/instrumentation-tedious/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [0.6.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-tedious-v0.6.0...instrumentation-tedious-v0.6.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.0 to ^0.34.1 + ## [0.6.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-tedious-v0.5.4...instrumentation-tedious-v0.6.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/instrumentation-tedious/package.json b/auto-merge/contrib/plugins/node/instrumentation-tedious/package.json index b9c4219a8..9f749f96a 100644 --- a/auto-merge/contrib/plugins/node/instrumentation-tedious/package.json +++ b/auto-merge/contrib/plugins/node/instrumentation-tedious/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-tedious", - "version": "0.6.0", + "version": "0.6.1", "description": "OpenTelemetry instrumentation for `tedious`", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -49,7 +49,7 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.34.0", + "@opentelemetry/contrib-test-utils": "^0.34.1", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/CHANGELOG.md index 8459346a3..02fc1577d 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/CHANGELOG.md @@ -1,5 +1,25 @@ # Changelog +## [0.37.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-lambda-v0.36.0...instrumentation-aws-lambda-v0.37.0) (2023-08-14) + + +### Features + +* **instrumentation-aws-lambda:** Adds lambdaHandler config option ([#1627](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1627)) ([c4a8e82](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/c4a8e8238d5876c030676fd53cb8718f95653993)) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/propagator-aws-xray bumped from ^1.3.0 to ^1.3.1 + ## [0.36.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-lambda-v0.35.3...instrumentation-aws-lambda-v0.36.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/README.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/README.md index d4e090b46..8a3c533c5 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/README.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/README.md @@ -52,6 +52,7 @@ In your Lambda function configuration, add or update the `NODE_OPTIONS` environm | `responseHook` | `ResponseHook` (function) | Hook for adding custom attributes before lambda returns the response. Receives params: `span, { err?, res? }` | | `disableAwsContextPropagation` | `boolean` | By default, this instrumentation will try to read the context from the `_X_AMZN_TRACE_ID` environment variable set by Lambda, set this to `true` or set the environment variable `OTEL_LAMBDA_DISABLE_AWS_CONTEXT_PROPAGATION=true` to disable this behavior | | `eventContextExtractor` | `EventContextExtractor` (function) | Function for providing custom context extractor in order to support different event types that are handled by AWS Lambda (e.g., SQS, CloudWatch, Kinesis, API Gateway). Applied only when `disableAwsContextPropagation` is set to `true`. Receives params: `event, context` | +| `lambdaHandler` | `string` | By default, this instrumentation automatically determines the Lambda handler function to instrument. This option is used to override that behavior by explicitly specifying the Lambda handler to instrument. See [Specifying the Lambda Handler](#specifying-the-lambda-handler) for additional information. | ### Hooks Usage Example @@ -69,6 +70,18 @@ new AwsLambdaInstrumentation({ }) ``` +### Specifying the Lambda Handler + +The instrumentation will attempt to automatically determine the Lambda handler function to instrument. To do this, it relies on the `_HANDLER` environment variable which is [set by the Lambda runtime](https://docs.aws.amazon.com/lambda/latest/dg/configuration-envvars.html#configuration-envvars-runtime). For most use cases, this will accurately represent the handler that should be targeted by this instrumentation. + +There exist use cases where the `_HANDLER` environment variable does not accurately represent the module that should be targeted by this instrumentation. For these use cases, the `lambdaHandler` option can be used to explicitly specify the Lambda handler that should be instrumented. + +To better explain when `lambdaHandler` should be specified, consider how some telemetry tools, such as [Datadog](https://www.datadoghq.com/), are instrumented into the Lambda runtime. Datadog does this by overriding the handler function with a wrapper function that is loaded via a [Lambda Layer](https://docs.aws.amazon.com/lambda/latest/dg/chapter-layers.html). In these examples, the Lambda's handler will point to the Datadog wrapper and not to the actual handler that should be instrumented. In cases like this, `lambdaHandler` should be used to explicitly specify the handler that should be instrumented. + +The `lambdaHandler` should be specified as a string in the format `.`, where `` is the name of the file that contains the handler and `` is the name of the handler function. For example, if the handler is defined in the file `index.js` and the handler function is named `handler`, the `lambdaHandler` should be specified as `index.handler`. + +One way to determine if the `lambdaHandler` option should be used is to check the handler defined on your Lambda. This can be done by determining the value of the `_HANDLER` environment variable or by viewing the **Runtime Settings** of your Lambda in AWS Console. If the handler is what you expect, then the instrumentation should work without the `lambdaHandler` option. If the handler points to something else, then the `lambdaHandler` option should be used to explicitly specify the handler that should be instrumented. + ## Useful links - For more information on OpenTelemetry, visit: diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index 415d231a3..ac6ae383c 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-aws-lambda", - "version": "0.36.0", + "version": "0.37.0", "description": "OpenTelemetry AWS Lambda automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -60,7 +60,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.2", - "@opentelemetry/propagator-aws-xray": "^1.3.0", + "@opentelemetry/propagator-aws-xray": "^1.3.1", "@opentelemetry/resources": "^1.8.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/aws-lambda": "8.10.119" diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/src/instrumentation.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/src/instrumentation.ts index 75adb7e33..ca3d173d8 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/src/instrumentation.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/src/instrumentation.ts @@ -97,10 +97,14 @@ export class AwsLambdaInstrumentation extends InstrumentationBase { init() { const taskRoot = process.env.LAMBDA_TASK_ROOT; - const handlerDef = process.env._HANDLER; + const handlerDef = this._config.lambdaHandler ?? process.env._HANDLER; // _HANDLER and LAMBDA_TASK_ROOT are always defined in Lambda but guard bail out if in the future this changes. if (!taskRoot || !handlerDef) { + diag.error( + 'Unable to initialize instrumentation for lambda. Cannot identify lambda handler or task root.', + { taskRoot, handlerDef } + ); return []; } @@ -123,6 +127,16 @@ export class AwsLambdaInstrumentation extends InstrumentationBase { } } + diag.debug('Instrumenting lambda handler', { + taskRoot, + handlerDef, + handler, + moduleRoot, + module, + filename, + functionName, + }); + return [ new InstrumentationNodeModuleDefinition( // NB: The patching infrastructure seems to match names backwards, this must be the filename, while diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/src/types.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/src/types.ts index da507efc0..279eb1a9a 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/src/types.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/src/types.ts @@ -40,4 +40,5 @@ export interface AwsLambdaInstrumentationConfig extends InstrumentationConfig { responseHook?: ResponseHook; disableAwsContextPropagation?: boolean; eventContextExtractor?: EventContextExtractor; + lambdaHandler?: string; } diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts index 573cab814..e8f9bea08 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts @@ -964,4 +964,25 @@ describe('lambda handler', () => { }); }); }); + + describe('custom handler', () => { + it('prioritizes instrumenting the handler specified on the config over the handler implied from the _HANDLER env var', async () => { + initializeHandler('not-a-real-handler', { + lambdaHandler: 'lambda-test/async.handler', + }); + + const otherEvent = {}; + const result = await lambdaRequire('lambda-test/async').handler( + otherEvent, + ctx + ); + + assert.strictEqual(result, 'ok'); + const spans = memoryExporter.getFinishedSpans(); + const [span] = spans; + assert.strictEqual(spans.length, 1); + assertSpanSuccess(span); + assert.strictEqual(span.parentSpanId, undefined); + }); + }); }); diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md index 04ee79009..f44ad0759 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md @@ -1,5 +1,29 @@ # Changelog +## [0.36.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-sdk-v0.35.0...instrumentation-aws-sdk-v0.36.0) (2023-08-14) + + +### Features + +* Add capacity information when applicable to dynamodb spans ([#1365](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1365)) ([ad94c5c](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/ad94c5c4fcb1125e91bcaf365365954944b6f9db)) + + +### Bug Fixes + +* **aws-sdk-instrumentation:** Patch new smithy client and middleware packages ([#1626](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1626)) ([3f2bfe8](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/3f2bfe8ed6feada3f1acc23677862501e8c06304)) +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* fix typescript compilation issue with koa types ([a53f643](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/a53f6438d616a6e07b35ff98d063e520adfda5d0)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/propagation-utils bumped from ^0.30.0 to ^0.30.1 + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.0 to ^0.34.1 + ## [0.35.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-sdk-v0.34.3...instrumentation-aws-sdk-v0.35.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index 7a382575e..27b3906fb 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-aws-sdk", - "version": "0.35.0", + "version": "0.36.0", "description": "OpenTelemetry automatic instrumentation for the `aws-sdk` package", "keywords": [ "aws", @@ -49,7 +49,7 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", - "@opentelemetry/propagation-utils": "^0.30.0" + "@opentelemetry/propagation-utils": "^0.30.1" }, "devDependencies": { "@aws-sdk/client-dynamodb": "3.85.0", @@ -59,7 +59,7 @@ "@aws-sdk/client-sns": "3.85.0", "@aws-sdk/types": "3.78.0", "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.34.0", + "@opentelemetry/contrib-test-utils": "^0.34.1", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/dynamodb.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/dynamodb.ts index 424cab5fa..657d71e40 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/dynamodb.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/dynamodb.ts @@ -194,20 +194,16 @@ export class DynamodbServiceExtension implements ServiceExtension { responseHook( response: NormalizedResponse, span: Span, - tracer: Tracer, - config: AwsSdkInstrumentationConfig + _tracer: Tracer, + _config: AwsSdkInstrumentationConfig ) { - const operation = response.request.commandName; - - if (operation === 'BatchGetItem') { - if (Array.isArray(response.data?.ConsumedCapacity)) { - span.setAttribute( - SemanticAttributes.AWS_DYNAMODB_CONSUMED_CAPACITY, - response.data.ConsumedCapacity.map( - (x: { [DictionaryKey: string]: any }) => JSON.stringify(x) - ) - ); - } + if (response.data?.ConsumedCapacity) { + span.setAttribute( + SemanticAttributes.AWS_DYNAMODB_CONSUMED_CAPACITY, + toArray(response.data.ConsumedCapacity).map( + (x: { [DictionaryKey: string]: any }) => JSON.stringify(x) + ) + ); } if (response.data?.ItemCollectionMetrics) { @@ -241,3 +237,7 @@ export class DynamodbServiceExtension implements ServiceExtension { } } } + +function toArray(values: T | T[]): T[] { + return Array.isArray(values) ? values : [values]; +} diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/test/dynamodb.test.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/test/dynamodb.test.ts index b8504d401..ab5f6b1db 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/test/dynamodb.test.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/test/dynamodb.test.ts @@ -633,4 +633,78 @@ describe('DynamoDB', () => { ); }); }); + + describe('ConsumedCapacity', () => { + it('should populate ConsumedCapacity attributes when they exist', done => { + mockV2AwsSend(responseMockSuccess, { + ConsumedCapacity: { + TableName: 'test-table', + CapacityUnits: 0.5, + Table: { CapacityUnits: 0.5 }, + }, + } as AWS.DynamoDB.Types.PutItemOutput); + + const dynamodb = new AWS.DynamoDB.DocumentClient(); + dynamodb.put( + { + TableName: 'test-table', + Item: { key1: 'val1' }, + ReturnConsumedCapacity: 'INDEXES', + }, + (err: AWSError, data: AWS.DynamoDB.DocumentClient.PutItemOutput) => { + const spans = getTestSpans(); + expect(spans.length).toStrictEqual(1); + const attrs = spans[0].attributes; + expect(attrs[SemanticAttributes.DB_SYSTEM]).toStrictEqual( + DbSystemValues.DYNAMODB + ); + expect(attrs[SemanticAttributes.DB_OPERATION]).toStrictEqual( + 'PutItem' + ); + expect( + attrs[SemanticAttributes.AWS_DYNAMODB_CONSUMED_CAPACITY] + ).toStrictEqual([ + JSON.stringify({ + TableName: 'test-table', + CapacityUnits: 0.5, + Table: { CapacityUnits: 0.5 }, + }), + ]); + expect(err).toBeFalsy(); + done(); + } + ); + }); + + it('should not populate ConsumedCapacity attributes when it is not returned', done => { + mockV2AwsSend(responseMockSuccess, { + ConsumedCapacity: undefined, + } as AWS.DynamoDB.Types.PutItemOutput); + + const dynamodb = new AWS.DynamoDB.DocumentClient(); + dynamodb.put( + { + TableName: 'test-table', + Item: { key1: 'val1' }, + ReturnConsumedCapacity: 'NONE', + }, + (err: AWSError, data: AWS.DynamoDB.DocumentClient.PutItemOutput) => { + const spans = getTestSpans(); + expect(spans.length).toStrictEqual(1); + const attrs = spans[0].attributes; + expect(attrs[SemanticAttributes.DB_SYSTEM]).toStrictEqual( + DbSystemValues.DYNAMODB + ); + expect(attrs[SemanticAttributes.DB_OPERATION]).toStrictEqual( + 'PutItem' + ); + expect(attrs).not.toHaveProperty( + SemanticAttributes.AWS_DYNAMODB_CONSUMED_CAPACITY + ); + expect(err).toBeFalsy(); + done(); + } + ); + }); + }); }); diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-bunyan/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-bunyan/CHANGELOG.md index 164f7231a..33e3cfc7e 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-bunyan/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-bunyan/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [0.32.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-bunyan-v0.32.0...instrumentation-bunyan-v0.32.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.32.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-bunyan-v0.31.4...instrumentation-bunyan-v0.32.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-bunyan/package.json index 70f8d8e6a..f8dc6a44e 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-bunyan", - "version": "0.32.0", + "version": "0.32.1", "description": "OpenTelemetry instrumentation for bunyan", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-cassandra/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-cassandra/CHANGELOG.md index fbec3a968..688597816 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-cassandra/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-cassandra/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [0.33.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-cassandra-driver-v0.33.0...instrumentation-cassandra-driver-v0.33.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.0 to ^0.34.1 + ## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-cassandra-driver-v0.32.4...instrumentation-cassandra-driver-v0.33.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-cassandra/package.json index 82b5e743b..8013cfb2f 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-cassandra-driver", - "version": "0.33.0", + "version": "0.33.1", "description": "OpenTelemetry instrumentation for cassandra-driver", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -48,7 +48,7 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.34.0", + "@opentelemetry/contrib-test-utils": "^0.34.1", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/CHANGELOG.md index fd62f6fe4..3bc2e2148 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [0.32.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-connect-v0.32.0...instrumentation-connect-v0.32.1) (2023-08-14) + + +### Bug Fixes + +* **connect:** fix wrong rpcMetada.route value not handle nested route ([#1555](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1555)) ([704f76f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/704f76f5b84793238bfb9f44ce018f02948738ce)) +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.32.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-connect-v0.31.4...instrumentation-connect-v0.32.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/package.json index 81adf97d4..9a0e442bf 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-connect", - "version": "0.32.0", + "version": "0.32.1", "description": "OpenTelemetry connect automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/src/instrumentation.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/src/instrumentation.ts index a2fce4cd4..97a06d8a3 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/src/instrumentation.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/src/instrumentation.ts @@ -23,7 +23,7 @@ import { ConnectNames, ConnectTypes, } from './enums/AttributeNames'; -import { Use, UseArgs, UseArgs2 } from './internal-types'; +import { PatchedRequest, Use, UseArgs, UseArgs2 } from './internal-types'; import { VERSION } from './version'; import { InstrumentationBase, @@ -32,6 +32,11 @@ import { isWrapped, } from '@opentelemetry/instrumentation'; import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; +import { + replaceCurrentStackRoute, + addNewStackLayer, + generateRoute, +} from './utils'; export const ANONYMOUS_NAME = 'anonymous'; @@ -65,6 +70,9 @@ export class ConnectInstrumentation extends InstrumentationBase { if (!isWrapped(patchedApp.use)) { this._wrap(patchedApp, 'use', this._patchUse.bind(this)); } + if (!isWrapped(patchedApp.handle)) { + this._wrap(patchedApp, 'handle', this._patchHandle.bind(this)); + } } private _patchConstructor(original: () => Server): () => Server { @@ -120,14 +128,20 @@ export class ConnectInstrumentation extends InstrumentationBase { if (!instrumentation.isEnabled()) { return (middleWare as any).apply(this, arguments); } - const [resArgIdx, nextArgIdx] = isErrorMiddleware ? [2, 3] : [1, 2]; + const [reqArgIdx, resArgIdx, nextArgIdx] = isErrorMiddleware + ? [1, 2, 3] + : [0, 1, 2]; + const req = arguments[reqArgIdx] as PatchedRequest; const res = arguments[resArgIdx] as ServerResponse; const next = arguments[nextArgIdx] as NextFunction; + replaceCurrentStackRoute(req, routeName); + const rpcMetadata = getRPCMetadata(context.active()); if (routeName && rpcMetadata?.type === RPCType.HTTP) { - rpcMetadata.route = routeName; + rpcMetadata.route = generateRoute(req); } + let spanName = ''; if (routeName) { spanName = `request handler - ${routeName}`; @@ -180,4 +194,30 @@ export class ConnectInstrumentation extends InstrumentationBase { return original.apply(this, args as UseArgs2); }; } + + public _patchHandle(original: Server['handle']): Server['handle'] { + const instrumentation = this; + return function (this: Server): ReturnType { + const [reqIdx, outIdx] = [0, 2]; + const req = arguments[reqIdx] as PatchedRequest; + const out = arguments[outIdx]; + const completeStack = addNewStackLayer(req); + + if (typeof out === 'function') { + arguments[outIdx] = instrumentation._patchOut( + out as NextFunction, + completeStack + ); + } + + return (original as any).apply(this, arguments); + }; + } + + public _patchOut(out: NextFunction, completeStack: () => void): NextFunction { + return function nextFunction(this: NextFunction, ...args: any[]): void { + completeStack(); + return Reflect.apply(out, this, args); + }; + } } diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/src/internal-types.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/src/internal-types.ts index 15947a401..b8fce41f3 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/src/internal-types.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/src/internal-types.ts @@ -14,9 +14,16 @@ * limitations under the License. */ -import type { HandleFunction, Server } from 'connect'; +import type { HandleFunction, IncomingMessage, Server } from 'connect'; + +export const _LAYERS_STORE_PROPERTY: unique symbol = Symbol( + 'opentelemetry.instrumentation-connect.request-route-stack' +); export type UseArgs1 = [HandleFunction]; export type UseArgs2 = [string, HandleFunction]; export type UseArgs = UseArgs1 | UseArgs2; export type Use = (...args: UseArgs) => Server; +export type PatchedRequest = { + [_LAYERS_STORE_PROPERTY]: string[]; +} & IncomingMessage; diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/src/utils.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/src/utils.ts new file mode 100644 index 000000000..02887ef51 --- /dev/null +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/src/utils.ts @@ -0,0 +1,55 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { diag } from '@opentelemetry/api'; +import { _LAYERS_STORE_PROPERTY, PatchedRequest } from './internal-types'; + +export const addNewStackLayer = (request: PatchedRequest) => { + if (Array.isArray(request[_LAYERS_STORE_PROPERTY]) === false) { + Object.defineProperty(request, _LAYERS_STORE_PROPERTY, { + enumerable: false, + value: [], + }); + } + request[_LAYERS_STORE_PROPERTY].push('/'); + + const stackLength = request[_LAYERS_STORE_PROPERTY].length; + + return () => { + if (stackLength === request[_LAYERS_STORE_PROPERTY].length) { + request[_LAYERS_STORE_PROPERTY].pop(); + } else { + diag.warn('Connect: Trying to pop the stack multiple time'); + } + }; +}; + +export const replaceCurrentStackRoute = ( + request: PatchedRequest, + newRoute?: string +) => { + if (newRoute) { + request[_LAYERS_STORE_PROPERTY].splice(-1, 1, newRoute); + } +}; + +// generage route from existing stack on request object. +// splash between stack layer will be dedup +// ["/first/", "/second", "/third/"] => /first/second/thrid/ +export const generateRoute = (request: PatchedRequest) => { + return request[_LAYERS_STORE_PROPERTY].reduce( + (acc, sub) => acc.replace(/\/+$/, '') + sub + ); +}; diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/test/instrumentation.test.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/test/instrumentation.test.ts index e871885e2..c6ab9456d 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/test/instrumentation.test.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/test/instrumentation.test.ts @@ -243,5 +243,88 @@ describe('connect', () => { changedRootSpan.spanContext().spanId ); }); + + it('should append nested route in RpcMetadata', async () => { + const rootSpan = tracer.startSpan('root span'); + const rpcMetadata: RPCMetadata = { type: RPCType.HTTP, span: rootSpan }; + app.use((req, res, next) => { + return context.with( + setRPCMetadata( + trace.setSpan(context.active(), rootSpan), + rpcMetadata + ), + next + ); + }); + + const nestedApp = connect(); + + app.use('/foo/', nestedApp); + nestedApp.use('/bar/', (req, res, next) => { + next(); + }); + + await httpRequest.get(`http://localhost:${PORT}/foo/bar`); + rootSpan.end(); + + assert.strictEqual(rpcMetadata.route, '/foo/bar/'); + }); + + it('should use latest match route when multiple route is match', async () => { + const rootSpan = tracer.startSpan('root span'); + const rpcMetadata: RPCMetadata = { type: RPCType.HTTP, span: rootSpan }; + app.use((req, res, next) => { + return context.with( + setRPCMetadata( + trace.setSpan(context.active(), rootSpan), + rpcMetadata + ), + next + ); + }); + + app.use('/foo', (req, res, next) => { + next(); + }); + + app.use('/foo/bar', (req, res, next) => { + next(); + }); + + await httpRequest.get(`http://localhost:${PORT}/foo/bar`); + rootSpan.end(); + + assert.strictEqual(rpcMetadata.route, '/foo/bar'); + }); + + it('should use latest match route when multiple route is match (with nested app)', async () => { + const rootSpan = tracer.startSpan('root span'); + const rpcMetadata: RPCMetadata = { type: RPCType.HTTP, span: rootSpan }; + app.use((req, res, next) => { + return context.with( + setRPCMetadata( + trace.setSpan(context.active(), rootSpan), + rpcMetadata + ), + next + ); + }); + + const nestedApp = connect(); + + app.use('/foo/', nestedApp); + nestedApp.use('/bar/', (req, res, next) => { + next(); + }); + + app.use('/foo/bar/test', (req, res, next) => { + next(); + }); + + await httpRequest.get(`http://localhost:${PORT}/foo/bar/test`); + rootSpan.end(); + + assert.strictEqual(rpcMetadata.route, '/foo/bar/test'); + }); }); }); diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/test/utils.test.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/test/utils.test.ts new file mode 100644 index 000000000..b62d3d6ab --- /dev/null +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/test/utils.test.ts @@ -0,0 +1,96 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import * as assert from 'assert'; + +import { PatchedRequest, _LAYERS_STORE_PROPERTY } from '../src/internal-types'; +import { + addNewStackLayer, + generateRoute, + replaceCurrentStackRoute, +} from '../src/utils'; + +describe('utils', () => { + describe('addNewStackLayer', () => { + it('should inject new array to symbol property if not exist', () => { + const fakeRequest = {} as PatchedRequest; + + addNewStackLayer(fakeRequest); + + assert.strictEqual(fakeRequest[_LAYERS_STORE_PROPERTY].length, 1); + }); + + it('should append new stack item if private symbol already exists', () => { + const stack = ['/first']; + const fakeRequest = { + [_LAYERS_STORE_PROPERTY]: stack, + } as PatchedRequest; + + addNewStackLayer(fakeRequest); + + assert.equal(fakeRequest[_LAYERS_STORE_PROPERTY], stack); + assert.strictEqual(fakeRequest[_LAYERS_STORE_PROPERTY].length, 2); + }); + + it('should return pop method to remove newly add stack', () => { + const fakeRequest = {} as PatchedRequest; + + const pop = addNewStackLayer(fakeRequest); + + assert.notStrictEqual(pop, undefined); + + pop(); + + assert.strictEqual(fakeRequest[_LAYERS_STORE_PROPERTY].length, 0); + }); + + it('should prevent pop the same stack item multiple time', () => { + const fakeRequest = {} as PatchedRequest; + + addNewStackLayer(fakeRequest); // add first stack item + const pop = addNewStackLayer(fakeRequest); // add second stack item + + pop(); + pop(); + + assert.strictEqual(fakeRequest[_LAYERS_STORE_PROPERTY].length, 1); + }); + }); + + describe('replaceCurrentStackRoute', () => { + it('should replace the last stack item with new value', () => { + const fakeRequest = { + [_LAYERS_STORE_PROPERTY]: ['/first', '/second'], + } as PatchedRequest; + + replaceCurrentStackRoute(fakeRequest, '/new_route'); + + assert.strictEqual(fakeRequest[_LAYERS_STORE_PROPERTY].length, 2); + assert.strictEqual(fakeRequest[_LAYERS_STORE_PROPERTY][1], '/new_route'); + }); + }); + + describe('generateRoute', () => { + it('should combine the stack and striped any slash between layer', () => { + const fakeRequest = { + [_LAYERS_STORE_PROPERTY]: ['/first/', '/second', '/third/'], + } as PatchedRequest; + + const route = generateRoute(fakeRequest); + + assert.strictEqual(route, '/first/second/third/'); + }); + }); +}); diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-dns/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-dns/CHANGELOG.md index 04e95eb85..17552ee8a 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-dns/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-dns/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [0.32.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-dns-v0.32.0...instrumentation-dns-v0.32.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.32.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-dns-v0.31.5...instrumentation-dns-v0.32.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-dns/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-dns/package.json index 0f6f62751..99cafb888 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-dns", - "version": "0.32.0", + "version": "0.32.1", "description": "OpenTelemetry dns automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/CHANGELOG.md index f19c0050e..9e907bbdd 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [0.33.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-express-v0.33.0...instrumentation-express-v0.33.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* **express:** make rpcMetadata.route capture the last layer even when if the last layer is not REQUEST_HANDLER ([#1620](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1620)) ([eeda32a](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/eeda32a03a4d75166013188bd0a295a17b2da1dc)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-express-v0.32.4...instrumentation-express-v0.33.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/package.json index 77de1e313..063d9b29a 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-express", - "version": "0.33.0", + "version": "0.33.1", "description": "OpenTelemetry express automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts index 0c27a8a88..c47664975 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts @@ -186,6 +186,7 @@ export class ExpressInstrumentation extends InstrumentationBase< const route = (req[_LAYERS_STORE_PROPERTY] as string[]) .filter(path => path !== '/' && path !== '/*') .join(''); + const attributes: SpanAttributes = { [SemanticAttributes.HTTP_ROUTE]: route.length > 0 ? route : '/', }; @@ -194,13 +195,8 @@ export class ExpressInstrumentation extends InstrumentationBase< AttributeNames.EXPRESS_TYPE ] as ExpressLayerType; - // Rename the root http span in case we haven't done it already - // once we reach the request handler const rpcMetadata = getRPCMetadata(context.active()); - if ( - type === ExpressLayerType.REQUEST_HANDLER && - rpcMetadata?.type === RPCType.HTTP - ) { + if (rpcMetadata?.type === RPCType.HTTP) { rpcMetadata.route = route || '/'; } @@ -211,6 +207,7 @@ export class ExpressInstrumentation extends InstrumentationBase< } return original.apply(this, arguments); } + if (trace.getSpan(context.active()) === undefined) { return original.apply(this, arguments); } @@ -259,6 +256,7 @@ export class ExpressInstrumentation extends InstrumentationBase< span.end(); } }; + // verify we have a callback const args = Array.from(arguments); const callbackIdx = args.findIndex(arg => typeof arg === 'function'); diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts index 79b5f2948..64d663140 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts @@ -275,6 +275,97 @@ describe('ExpressInstrumentation', () => { assert.strictEqual(memoryExporter.getFinishedSpans().length, 0); assert.strictEqual(res, 'test'); }); + + it('should update rpcMetadata.route with the bare middleware layer', async () => { + const rootSpan = tracer.startSpan('rootSpan'); + let rpcMetadata: RPCMetadata | undefined; + const httpServer = await serverWithMiddleware(tracer, rootSpan, app => { + app.use(express.json()); + app.use((req, res, next) => { + rpcMetadata = getRPCMetadata(context.active()); + next(); + }); + + app.use('/bare_middleware', (req, res) => { + return res.status(200).end('test'); + }); + }); + server = httpServer.server; + port = httpServer.port; + await context.with( + trace.setSpan(context.active(), rootSpan), + async () => { + const response = await httpRequest.get( + `http://localhost:${port}/bare_middleware/ignore_route_segment` + ); + assert.strictEqual(response, 'test'); + rootSpan.end(); + assert.strictEqual(rpcMetadata?.route, '/bare_middleware'); + } + ); + }); + + it('should update rpcMetadata.route with the latest middleware layer', async () => { + const rootSpan = tracer.startSpan('rootSpan'); + let rpcMetadata: RPCMetadata | undefined; + const httpServer = await serverWithMiddleware(tracer, rootSpan, app => { + app.use(express.json()); + app.use((req, res, next) => { + rpcMetadata = getRPCMetadata(context.active()); + next(); + }); + + const router = express.Router(); + + app.use('/router', router); + + router.use('/router_middleware', (req, res) => { + return res.status(200).end('test'); + }); + }); + server = httpServer.server; + port = httpServer.port; + await context.with( + trace.setSpan(context.active(), rootSpan), + async () => { + const response = await httpRequest.get( + `http://localhost:${port}/router/router_middleware/ignore_route_segment` + ); + assert.strictEqual(response, 'test'); + rootSpan.end(); + assert.strictEqual(rpcMetadata?.route, '/router/router_middleware'); + } + ); + }); + + it('should update rpcMetadata.route with the bare request handler layer', async () => { + const rootSpan = tracer.startSpan('rootSpan'); + let rpcMetadata: RPCMetadata | undefined; + const httpServer = await serverWithMiddleware(tracer, rootSpan, app => { + app.use(express.json()); + app.use((req, res, next) => { + rpcMetadata = getRPCMetadata(context.active()); + next(); + }); + + app.get('/bare_route', (req, res) => { + return res.status(200).end('test'); + }); + }); + server = httpServer.server; + port = httpServer.port; + await context.with( + trace.setSpan(context.active(), rootSpan), + async () => { + const response = await httpRequest.get( + `http://localhost:${port}/bare_route` + ); + assert.strictEqual(response, 'test'); + rootSpan.end(); + assert.strictEqual(rpcMetadata?.route, '/bare_route'); + } + ); + }); }); describe('Disabling plugin', () => { diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/test/ignore-all.test.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/test/ignore-all.test.ts index 92c7c7046..0fdebeabf 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/test/ignore-all.test.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/test/ignore-all.test.ts @@ -127,7 +127,7 @@ describe('ExpressInstrumentation', () => { ); }); - it('rpcMetadata.route should be modified to /todo/:id', async () => { + it('rpcMetadata.route still capture correct route', async () => { assert.strictEqual(memoryExporter.getFinishedSpans().length, 0); await context.with( trace.setSpan(context.active(), rootSpan), diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/CHANGELOG.md index 2f928199f..ea7538e3b 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [0.32.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-fastify-v0.32.0...instrumentation-fastify-v0.32.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* **fastify:** readme option table format ([#1619](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1619)) ([3d6c7be](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/3d6c7beffd7c1cc0ef99c7560bc21e01db28b431)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.32.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-fastify-v0.31.4...instrumentation-fastify-v0.32.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/package.json index 65c8c2cc8..61b2dbd42 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-fastify", - "version": "0.32.0", + "version": "0.32.1", "description": "OpenTelemetry fastify automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-generic-pool/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-generic-pool/CHANGELOG.md index 03ba9f770..05ea3686b 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-generic-pool/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-generic-pool/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [0.32.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-generic-pool-v0.32.0...instrumentation-generic-pool-v0.32.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.32.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-generic-pool-v0.31.4...instrumentation-generic-pool-v0.32.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-generic-pool/package.json index f89256489..2a1adf888 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-generic-pool/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-generic-pool", - "version": "0.32.0", + "version": "0.32.1", "description": "OpenTelemetry Generic Pool automatic instrumentation package", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-graphql/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-graphql/CHANGELOG.md index 583a16253..5d9255328 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-graphql/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-graphql/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [0.35.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-graphql-v0.35.0...instrumentation-graphql-v0.35.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.35.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-graphql-v0.34.3...instrumentation-graphql-v0.35.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-graphql/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-graphql/package.json index 7f7613997..29e2f78a6 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-graphql", - "version": "0.35.0", + "version": "0.35.1", "description": "OpenTelemetry @opentelemetry/instrumentation-graphql automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-hapi/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-hapi/CHANGELOG.md index 06bc9b2c2..76c073d21 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-hapi/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-hapi/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-hapi-v0.32.0...instrumentation-hapi-v0.33.0) (2023-08-14) + + +### Features + +* **hapi:** Skip update HTTP's span name and update RpcMetadata's route instead ([#1570](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1570)) ([10bdbf7](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/10bdbf73a7614236bba916907da8a035ce12db8f)) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.32.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-hapi-v0.31.4...instrumentation-hapi-v0.32.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-hapi/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-hapi/package.json index 464fca850..5eee760f2 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-hapi", - "version": "0.32.0", + "version": "0.33.0", "description": "OpenTelemetry Hapi automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-hapi/src/instrumentation.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-hapi/src/instrumentation.ts index af3fa98a1..964449762 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-hapi/src/instrumentation.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-hapi/src/instrumentation.ts @@ -45,7 +45,6 @@ import { getExtMetadata, isDirectExtInput, isPatchableExtMethod, - getRootSpanMetadata, } from './utils'; /** Hapi instrumentation for OpenTelemetry */ @@ -389,9 +388,7 @@ export class HapiInstrumentation extends InstrumentationBase { } const rpcMetadata = getRPCMetadata(api.context.active()); if (rpcMetadata?.type === RPCType.HTTP) { - const rootSpanMetadata = getRootSpanMetadata(route); - rpcMetadata.span.updateName(rootSpanMetadata.name); - rpcMetadata.span.setAttributes(rootSpanMetadata.attributes); + rpcMetadata.route = route.path; } const metadata = getRouteMetadata(route, pluginName); const span = instrumentation.tracer.startSpan(metadata.name, { diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-hapi/src/utils.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-hapi/src/utils.ts index 1ddebf0a5..14de86136 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-hapi/src/utils.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-hapi/src/utils.ts @@ -94,20 +94,6 @@ export const getRouteMetadata = ( }; }; -export const getRootSpanMetadata = ( - route: Hapi.ServerRoute -): { - attributes: SpanAttributes; - name: string; -} => { - return { - attributes: { - [SemanticAttributes.HTTP_ROUTE]: route.path, - }, - name: `${route.method} ${route.path}`, - }; -}; - export const getExtMetadata = ( extPoint: Hapi.ServerRequestExtType, pluginName?: string diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-hapi/test/hapi.test.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-hapi/test/hapi.test.ts index f255f762b..7f2baff72 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-hapi/test/hapi.test.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-hapi/test/hapi.test.ts @@ -15,8 +15,7 @@ */ import { context, trace, SpanStatusCode } from '@opentelemetry/api'; -import { RPCType, setRPCMetadata } from '@opentelemetry/core'; -import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; +import { RPCMetadata, RPCType, setRPCMetadata } from '@opentelemetry/core'; import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; import { @@ -379,7 +378,7 @@ describe('Hapi Instrumentation - Core Tests', () => { assert.deepStrictEqual(memoryExporter.getFinishedSpans().length, 0); }); - it('should rename root span with route information', async () => { + it('should update rpcMetadata.route information', async () => { const rootSpan = tracer.startSpan('rootSpan', {}); server.route({ method: 'GET', @@ -391,7 +390,7 @@ describe('Hapi Instrumentation - Core Tests', () => { await server.start(); assert.strictEqual(memoryExporter.getFinishedSpans().length, 0); - const rpcMetadata = { type: RPCType.HTTP, span: rootSpan }; + const rpcMetadata: RPCMetadata = { type: RPCType.HTTP, span: rootSpan }; await context.with( setRPCMetadata(trace.setSpan(context.active(), rootSpan), rpcMetadata), async () => { @@ -404,14 +403,7 @@ describe('Hapi Instrumentation - Core Tests', () => { rootSpan.end(); assert.deepStrictEqual(memoryExporter.getFinishedSpans().length, 2); - const exportedRootSpan = memoryExporter - .getFinishedSpans() - .find(span => span.name === 'GET /users/{userId}'); - assert.notStrictEqual(exportedRootSpan, undefined); - assert.strictEqual( - exportedRootSpan?.attributes[SemanticAttributes.HTTP_ROUTE], - '/users/{userId}' - ); + assert.strictEqual(rpcMetadata.route, '/users/{userId}'); } ); }); diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-ioredis/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-ioredis/CHANGELOG.md index e46622780..488363c2b 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-ioredis/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-ioredis/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +## [0.35.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-ioredis-v0.35.0...instrumentation-ioredis-v0.35.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/redis-common bumped from ^0.36.0 to ^0.36.1 + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.0 to ^0.34.1 + ## [0.35.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-ioredis-v0.34.3...instrumentation-ioredis-v0.35.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-ioredis/package.json index d5232bd68..c5913ef87 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-ioredis", - "version": "0.35.0", + "version": "0.35.1", "description": "OpenTelemetry ioredis automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -52,7 +52,7 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.34.0", + "@opentelemetry/contrib-test-utils": "^0.34.1", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", @@ -70,7 +70,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.2", - "@opentelemetry/redis-common": "^0.36.0", + "@opentelemetry/redis-common": "^0.36.1", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/ioredis4": "npm:@types/ioredis@^4.28.10" }, diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-knex/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-knex/CHANGELOG.md index 3487a3f6c..6943ec301 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-knex/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-knex/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [0.32.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-knex-v0.32.0...instrumentation-knex-v0.32.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* **knex:** nested queries result in wrong span names ([#1537](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1537)) ([f4df836](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/f4df836a279bd7512ecfeacc25db162e613a0e7e)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.32.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-knex-v0.31.4...instrumentation-knex-v0.32.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-knex/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-knex/package.json index 687e6f4ef..b0033f3a9 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-knex/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-knex/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-knex", - "version": "0.32.0", + "version": "0.32.1", "description": "OpenTelemetry Knex automatic instrumentation package", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/CHANGELOG.md index 3633e25a6..d1409118d 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.36.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-koa-v0.35.0...instrumentation-koa-v0.36.0) (2023-08-14) + + +### Features + +* **koa:** Skip update HTTP's span name and update RpcMetadata's route instead ([#1567](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1567)) ([825b5a8](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/825b5a89cb6e8a667c3fcfb3f25bb954d4c260dc)) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.35.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-koa-v0.34.6...instrumentation-koa-v0.35.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/package.json index 7332fa4c2..26a0a4765 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-koa", - "version": "0.35.0", + "version": "0.36.0", "description": "OpenTelemetry Koa automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/src/instrumentation.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/src/instrumentation.ts index f270875ef..df359e9c3 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/src/instrumentation.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/src/instrumentation.ts @@ -29,10 +29,9 @@ import { KoaLayerType, KoaInstrumentationConfig, } from './types'; -import { AttributeNames } from './enums/AttributeNames'; import { VERSION } from './version'; import { getMiddlewareMetadata, isLayerIgnored } from './utils'; -import { getRPCMetadata, RPCType, setRPCMetadata } from '@opentelemetry/core'; +import { getRPCMetadata, RPCType } from '@opentelemetry/core'; import { kLayerPatched, KoaPatchedMiddleware } from './internal-types'; /** Koa instrumentation for OpenTelemetry */ @@ -174,21 +173,8 @@ export class KoaInstrumentation extends InstrumentationBase { const rpcMetadata = getRPCMetadata(api.context.active()); - if ( - metadata.attributes[AttributeNames.KOA_TYPE] === KoaLayerType.ROUTER && - rpcMetadata?.type === RPCType.HTTP - ) { - rpcMetadata.span.updateName( - `${context.method} ${context._matchedRoute}` - ); - } - - let newContext = api.trace.setSpan(api.context.active(), span); - if (rpcMetadata?.type === RPCType.HTTP) { - newContext = setRPCMetadata( - newContext, - Object.assign(rpcMetadata, { route: context._matchedRoute }) - ); + if (rpcMetadata?.type === RPCType.HTTP && context._matchedRoute) { + rpcMetadata.route = context._matchedRoute.toString(); } if (this.getConfig().requestHook) { @@ -208,6 +194,7 @@ export class KoaInstrumentation extends InstrumentationBase { ); } + const newContext = api.trace.setSpan(api.context.active(), span); return api.context.with(newContext, async () => { try { return await middlewareLayer(context, next); diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/test/koa.test.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/test/koa.test.ts index 062db59cd..4d11b7d06 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/test/koa.test.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/test/koa.test.ts @@ -34,7 +34,7 @@ import * as sinon from 'sinon'; import { AddressInfo } from 'net'; import { KoaLayerType, KoaRequestInfo } from '../src/types'; import { AttributeNames } from '../src/enums/AttributeNames'; -import { RPCType, setRPCMetadata } from '@opentelemetry/core'; +import { RPCMetadata, RPCType, setRPCMetadata } from '@opentelemetry/core'; const httpRequest = { get: (options: http.ClientRequestArgs | string) => { @@ -134,7 +134,7 @@ describe('Koa Instrumentation', () => { describe('Instrumenting @koa/router calls', () => { it('should create a child span for middlewares', async () => { const rootSpan = tracer.startSpan('rootSpan'); - const rpcMetadata = { type: RPCType.HTTP, span: rootSpan }; + const rpcMetadata: RPCMetadata = { type: RPCType.HTTP, span: rootSpan }; app.use((ctx, next) => context.with( setRPCMetadata( @@ -174,17 +174,14 @@ describe('Koa Instrumentation', () => { '/post/:id' ); - const exportedRootSpan = memoryExporter - .getFinishedSpans() - .find(span => span.name === 'GET /post/:id'); - assert.notStrictEqual(exportedRootSpan, undefined); + assert.strictEqual(rpcMetadata.route, '/post/:id'); } ); }); it('should create a named child span for middlewares', async () => { const rootSpan = tracer.startSpan('rootSpan'); - const rpcMetadata = { type: RPCType.HTTP, span: rootSpan }; + const rpcMetadata: RPCMetadata = { type: RPCType.HTTP, span: rootSpan }; app.use((ctx, next) => context.with( setRPCMetadata( @@ -224,17 +221,14 @@ describe('Koa Instrumentation', () => { '/post/:id' ); - const exportedRootSpan = memoryExporter - .getFinishedSpans() - .find(span => span.name === 'GET /post/:id'); - assert.notStrictEqual(exportedRootSpan, undefined); + assert.strictEqual(rpcMetadata.route, '/post/:id'); } ); }); it('should correctly instrument nested routers', async () => { const rootSpan = tracer.startSpan('rootSpan'); - const rpcMetadata = { type: RPCType.HTTP, span: rootSpan }; + const rpcMetadata: RPCMetadata = { type: RPCType.HTTP, span: rootSpan }; app.use((ctx, next) => context.with( setRPCMetadata( @@ -276,17 +270,14 @@ describe('Koa Instrumentation', () => { '/:first/post/:id' ); - const exportedRootSpan = memoryExporter - .getFinishedSpans() - .find(span => span.name === 'GET /:first/post/:id'); - assert.notStrictEqual(exportedRootSpan, undefined); + assert.strictEqual(rpcMetadata.route, '/:first/post/:id'); } ); }); it('should correctly instrument prefixed routers', async () => { const rootSpan = tracer.startSpan('rootSpan'); - const rpcMetadata = { type: RPCType.HTTP, span: rootSpan }; + const rpcMetadata: RPCMetadata = { type: RPCType.HTTP, span: rootSpan }; app.use((ctx, next) => context.with( setRPCMetadata( @@ -326,10 +317,7 @@ describe('Koa Instrumentation', () => { '/:first/post/:id' ); - const exportedRootSpan = memoryExporter - .getFinishedSpans() - .find(span => span.name === 'GET /:first/post/:id'); - assert.notStrictEqual(exportedRootSpan, undefined); + assert.strictEqual(rpcMetadata.route, '/:first/post/:id'); } ); }); @@ -364,7 +352,9 @@ describe('Koa Instrumentation', () => { .find(span => span.name.includes('spanCreateMiddleware')); assert.notStrictEqual(fooParentSpan, undefined); - const fooSpan = memoryExporter.getFinishedSpans().find(span => 'foo'); + const fooSpan = memoryExporter + .getFinishedSpans() + .find(span => span.name === 'foo'); assert.notStrictEqual(fooSpan, undefined); assert.strictEqual( fooSpan!.parentSpanId, diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-memcached/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-memcached/CHANGELOG.md index 44aa792ba..9dcee27f5 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-memcached/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-memcached/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [0.32.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-memcached-v0.32.0...instrumentation-memcached-v0.32.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.0 to ^0.34.1 + ## [0.32.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-memcached-v0.31.4...instrumentation-memcached-v0.32.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-memcached/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-memcached/package.json index 2454c18ce..c74965293 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-memcached/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-memcached/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-memcached", - "version": "0.32.0", + "version": "0.32.1", "description": "OpenTelemetry memcached automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -49,7 +49,7 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.34.0", + "@opentelemetry/contrib-test-utils": "^0.34.1", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md index 298848c9e..95305cd62 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [0.36.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mongodb-v0.36.0...instrumentation-mongodb-v0.36.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.0 to ^0.34.1 + ## [0.36.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mongodb-v0.35.0...instrumentation-mongodb-v0.36.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mongodb/package.json index 241426f8f..bced6107b 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-mongodb", - "version": "0.36.0", + "version": "0.36.1", "description": "OpenTelemetry mongodb automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -53,7 +53,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.34.0", + "@opentelemetry/contrib-test-utils": "^0.34.1", "@opentelemetry/context-async-hooks": "^1.8.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mysql/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mysql/CHANGELOG.md index fad5b536e..c038212b9 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mysql/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mysql/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [0.34.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mysql-v0.34.0...instrumentation-mysql-v0.34.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.0 to ^0.34.1 + ## [0.34.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mysql-v0.33.3...instrumentation-mysql-v0.34.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mysql/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mysql/package.json index d9a09e3f2..145e9c932 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-mysql", - "version": "0.34.0", + "version": "0.34.1", "description": "OpenTelemetry mysql automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -49,7 +49,7 @@ "@opentelemetry/api": "^1.3.0", "@opentelemetry/sdk-metrics": "^1.8.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.34.0", + "@opentelemetry/contrib-test-utils": "^0.34.1", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mysql2/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mysql2/CHANGELOG.md index 25b5b5f5b..5f430cb17 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mysql2/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mysql2/CHANGELOG.md @@ -1,5 +1,21 @@ # Changelog +## [0.34.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mysql2-v0.34.0...instrumentation-mysql2-v0.34.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* **instrumentation-mysql2:** sql-common should be a dependency ([#1584](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1584)) ([00f7404](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/00f7404156350ef2dfe3b79e525265dbef359dac)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.0 to ^0.34.1 + ## [0.34.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mysql2-v0.33.4...instrumentation-mysql2-v0.34.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mysql2/package.json index 423274ead..56725c9ba 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-mysql2", - "version": "0.34.0", + "version": "0.34.1", "description": "OpenTelemetry mysql2 automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -49,7 +49,7 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.34.0", + "@opentelemetry/contrib-test-utils": "^0.34.1", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "7.0.2", "@types/mysql2": "github:types/mysql2", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-nestjs-core/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-nestjs-core/CHANGELOG.md index f465577aa..32e3ed196 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-nestjs-core/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-nestjs-core/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [0.33.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-nestjs-core-v0.33.0...instrumentation-nestjs-core-v0.33.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-nestjs-core-v0.32.5...instrumentation-nestjs-core-v0.33.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json index 7777b1b29..3eef3c20e 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-nestjs-core", - "version": "0.33.0", + "version": "0.33.1", "description": "OpenTelemetry NestJS automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-net/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-net/CHANGELOG.md index fd1e8ef3f..cd02bd74f 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-net/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-net/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [0.32.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-net-v0.32.0...instrumentation-net-v0.32.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.32.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-net-v0.31.4...instrumentation-net-v0.32.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-net/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-net/package.json index 82584add1..c03678824 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-net/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-net", - "version": "0.32.0", + "version": "0.32.1", "description": "OpenTelemetry net module automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pg/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pg/CHANGELOG.md index 79db223ad..142465537 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pg/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pg/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [0.36.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-pg-v0.36.0...instrumentation-pg-v0.36.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.0 to ^0.34.1 + ## [0.36.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-pg-v0.35.3...instrumentation-pg-v0.36.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pg/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pg/package.json index 03caf5426..ac2b6725a 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-pg", - "version": "0.36.0", + "version": "0.36.1", "description": "OpenTelemetry postgres automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -55,7 +55,7 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.34.0", + "@opentelemetry/contrib-test-utils": "^0.34.1", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/CHANGELOG.md index e07d91259..2e9727161 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [0.34.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-pino-v0.34.0...instrumentation-pino-v0.34.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.34.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-pino-v0.33.4...instrumentation-pino-v0.34.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/package.json index fbca6c4d7..32462b023 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-pino", - "version": "0.34.0", + "version": "0.34.1", "description": "OpenTelemetry instrumentation for pino", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis-4/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis-4/CHANGELOG.md index 06a7d17ee..5f8e60dc8 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis-4/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis-4/CHANGELOG.md @@ -6,6 +6,24 @@ * dependencies * @opentelemetry/redis-common bumped from ^0.34.0 to ^0.35.0 +## [0.35.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-redis-4-v0.35.0...instrumentation-redis-4-v0.35.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* **redis-4:** omit credentials from db.connection_string span attribute ([#1562](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1562)) ([ccf1efe](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/ccf1efe0cf8f144ab0d0aab490dfff499bd3158e)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/redis-common bumped from ^0.36.0 to ^0.36.1 + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.0 to ^0.34.1 + ## [0.35.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-redis-4-v0.34.6...instrumentation-redis-4-v0.35.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis-4/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis-4/package.json index 84e65f16d..0da797d48 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis-4/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis-4/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-redis-4", - "version": "0.35.0", + "version": "0.35.1", "description": "Automatic OpenTelemetry instrumentation for redis package version 4", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -54,7 +54,7 @@ "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", "@opentelemetry/core": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.34.0", + "@opentelemetry/contrib-test-utils": "^0.34.1", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", @@ -70,7 +70,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.2", - "@opentelemetry/redis-common": "^0.36.0", + "@opentelemetry/redis-common": "^0.36.1", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-redis-4#readme" diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis/CHANGELOG.md index 0dfa4a4ec..26e5a0e56 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis/CHANGELOG.md @@ -6,6 +6,23 @@ * dependencies * @opentelemetry/redis-common bumped from ^0.34.0 to ^0.35.0 +## [0.35.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-redis-v0.35.0...instrumentation-redis-v0.35.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/redis-common bumped from ^0.36.0 to ^0.36.1 + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.0 to ^0.34.1 + ## [0.35.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-redis-v0.34.7...instrumentation-redis-v0.35.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis/package.json index 114097676..4f2970af3 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-redis", - "version": "0.35.0", + "version": "0.35.1", "description": "Automatic OpenTelemetry instrumentation for redis package version 2 and 3", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -54,7 +54,7 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.34.0", + "@opentelemetry/contrib-test-utils": "^0.34.1", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", @@ -71,7 +71,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.2", - "@opentelemetry/redis-common": "^0.36.0", + "@opentelemetry/redis-common": "^0.36.1", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-redis#readme" diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-restify/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-restify/CHANGELOG.md index 4dfd96d09..b55d231ed 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-restify/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-restify/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.34.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-restify-v0.33.0...instrumentation-restify-v0.34.0) (2023-08-14) + + +### Features + +* **restify:** Skip update HTTP's span name and update RpcMetadata's route instead ([#1571](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1571)) ([7d4b13e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/7d4b13eb1391c3fb774254bf651f95a834d0b1c8)) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-restify-v0.32.4...instrumentation-restify-v0.33.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-restify/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-restify/package.json index 10f36902a..a53ab9ced 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-restify", - "version": "0.33.0", + "version": "0.34.0", "description": "OpenTelemetry restify automatic instrumentation package", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-restify/src/instrumentation.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-restify/src/instrumentation.ts index 9be36c8e1..fcb6e68bb 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-restify/src/instrumentation.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-restify/src/instrumentation.ts @@ -32,7 +32,7 @@ import { } from '@opentelemetry/instrumentation'; import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import { isPromise, isAsyncFunction } from './utils'; -import { getRPCMetadata, RPCType, setRPCMetadata } from '@opentelemetry/core'; +import { getRPCMetadata, RPCType } from '@opentelemetry/core'; import type { RestifyInstrumentationConfig } from './types'; const { diag } = api; @@ -176,7 +176,7 @@ export class RestifyInstrumentation extends InstrumentationBase { // replace HTTP instrumentations name with one that contains a route const httpMetadata = getRPCMetadata(api.context.active()); if (httpMetadata?.type === RPCType.HTTP) { - httpMetadata.span.updateName(`${req.method} ${route}`); + httpMetadata.route = route; } const fnName = handler.name || undefined; @@ -237,13 +237,7 @@ export class RestifyInstrumentation extends InstrumentationBase { }); }; - let newContext = api.trace.setSpan(api.context.active(), span); - if (httpMetadata) { - newContext = setRPCMetadata( - newContext, - Object.assign(httpMetadata, { route }) - ); - } + const newContext = api.trace.setSpan(api.context.active(), span); return api.context.with( newContext, (req: types.Request, res: restify.Response, next: restify.Next) => { diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-restify/test/restify.test.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-restify/test/restify.test.ts index 0e381bf96..2722c9cbd 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-restify/test/restify.test.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-restify/test/restify.test.ts @@ -16,7 +16,7 @@ import { context, trace, Span } from '@opentelemetry/api'; import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; -import { RPCType, setRPCMetadata } from '@opentelemetry/core'; +import { RPCMetadata, RPCType, setRPCMetadata } from '@opentelemetry/core'; import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; import { @@ -292,14 +292,14 @@ describe('Restify Instrumentation', () => { ); }); - it('should rename HTTP span', async () => { + it('should update rpcMetadata.route', async () => { const httpSpan: types.InstrumentationSpan = tracer.startSpan('HTTP GET'); + const rpcMetadata: RPCMetadata = { + type: RPCType.HTTP, + span: httpSpan, + }; const testLocalServer = await createServer((server: restify.Server) => { - const rpcMetadata = { - type: RPCType.HTTP, - span: httpSpan, - }; server.pre((req, res, next) => { // to simulate HTTP instrumentation context.with( @@ -320,7 +320,7 @@ describe('Restify Instrumentation', () => { ); httpSpan.end(); assert.strictEqual(memoryExporter.getFinishedSpans().length, 3); - assert.strictEqual(httpSpan.name, 'GET /route/:param'); + assert.strictEqual(rpcMetadata.route, '/route/:param'); assert.strictEqual(res, '{"route":"hello"}'); } finally { testLocalServer.close(); diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-router/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-router/CHANGELOG.md index 81c8f2e46..44dcdc6a0 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-router/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-router/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [0.33.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-router-v0.33.0...instrumentation-router-v0.33.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-router-v0.32.4...instrumentation-router-v0.33.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-router/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-router/package.json index 8b0a04924..9e1dd493e 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-router/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-router/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-router", - "version": "0.33.0", + "version": "0.33.1", "description": "OpenTelemetry Router automatic instrumentation package", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-winston/CHANGELOG.md b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-winston/CHANGELOG.md index a11e34c03..6fda978c8 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-winston/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-winston/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [0.32.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-winston-v0.32.0...instrumentation-winston-v0.32.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.32.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-winston-v0.31.4...instrumentation-winston-v0.32.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-winston/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-winston/package.json index 713fd7c89..09e7efc5e 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-winston", - "version": "0.32.0", + "version": "0.32.1", "description": "OpenTelemetry instrumentation for winston", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/plugins/web/opentelemetry-plugin-react-load/CHANGELOG.md b/auto-merge/contrib/plugins/web/opentelemetry-plugin-react-load/CHANGELOG.md index 358a95f95..5dcbd08d2 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-plugin-react-load/CHANGELOG.md +++ b/auto-merge/contrib/plugins/web/opentelemetry-plugin-react-load/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.29.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/plugin-react-load-v0.29.0...plugin-react-load-v0.29.1) (2023-08-14) + + +### Bug Fixes + +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.29.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/plugin-react-load-v0.28.2...plugin-react-load-v0.29.0) (2023-07-12) diff --git a/auto-merge/contrib/plugins/web/opentelemetry-plugin-react-load/package.json b/auto-merge/contrib/plugins/web/opentelemetry-plugin-react-load/package.json index da73ea9a2..a2d0d47a2 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/auto-merge/contrib/plugins/web/opentelemetry-plugin-react-load/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/plugin-react-load", - "version": "0.29.0", + "version": "0.29.1", "description": "OpenTelemetry React loading automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/auto-merge/contrib/propagators/opentelemetry-propagator-aws-xray/CHANGELOG.md b/auto-merge/contrib/propagators/opentelemetry-propagator-aws-xray/CHANGELOG.md index b40d7bb2e..3a072e7e0 100644 --- a/auto-merge/contrib/propagators/opentelemetry-propagator-aws-xray/CHANGELOG.md +++ b/auto-merge/contrib/propagators/opentelemetry-propagator-aws-xray/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.3.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/propagator-aws-xray-v1.3.0...propagator-aws-xray-v1.3.1) (2023-08-14) + + +### Bug Fixes + +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [1.3.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/propagator-aws-xray-v1.2.1...propagator-aws-xray-v1.3.0) (2023-07-12) diff --git a/auto-merge/contrib/propagators/opentelemetry-propagator-aws-xray/package.json b/auto-merge/contrib/propagators/opentelemetry-propagator-aws-xray/package.json index 7d4fe027c..8584b4575 100644 --- a/auto-merge/contrib/propagators/opentelemetry-propagator-aws-xray/package.json +++ b/auto-merge/contrib/propagators/opentelemetry-propagator-aws-xray/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-aws-xray", - "version": "1.3.0", + "version": "1.3.1", "description": "OpenTelemetry AWS Xray propagator provides context propagation for systems that are using AWS X-Ray format.", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/auto-merge/contrib/propagators/opentelemetry-propagator-grpc-census-binary/CHANGELOG.md b/auto-merge/contrib/propagators/opentelemetry-propagator-grpc-census-binary/CHANGELOG.md index b55e21ced..55adb18c0 100644 --- a/auto-merge/contrib/propagators/opentelemetry-propagator-grpc-census-binary/CHANGELOG.md +++ b/auto-merge/contrib/propagators/opentelemetry-propagator-grpc-census-binary/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.27.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/propagator-grpc-census-binary-v0.27.0...propagator-grpc-census-binary-v0.27.1) (2023-08-14) + + +### Bug Fixes + +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.27.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/propagator-grpc-census-binary-v0.26.1...propagator-grpc-census-binary-v0.27.0) (2023-07-12) diff --git a/auto-merge/contrib/propagators/opentelemetry-propagator-grpc-census-binary/package.json b/auto-merge/contrib/propagators/opentelemetry-propagator-grpc-census-binary/package.json index 44e32383c..4b80ad2e7 100644 --- a/auto-merge/contrib/propagators/opentelemetry-propagator-grpc-census-binary/package.json +++ b/auto-merge/contrib/propagators/opentelemetry-propagator-grpc-census-binary/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-grpc-census-binary", - "version": "0.27.0", + "version": "0.27.1", "description": "OpenTelemetry gRPC Census propagator provides a context propagator for OpenTelemetry that can use the gRPC binary header: 'grpc-trace-bin' for interoperability with OpenCensus", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/contrib/propagators/opentelemetry-propagator-instana/CHANGELOG.md b/auto-merge/contrib/propagators/opentelemetry-propagator-instana/CHANGELOG.md index 363f18007..087b0b72f 100644 --- a/auto-merge/contrib/propagators/opentelemetry-propagator-instana/CHANGELOG.md +++ b/auto-merge/contrib/propagators/opentelemetry-propagator-instana/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.3.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/propagator-instana-v0.3.0...propagator-instana-v0.3.1) (2023-08-14) + + +### Bug Fixes + +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.3.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/propagator-instana-v0.2.2...propagator-instana-v0.3.0) (2023-07-12) diff --git a/auto-merge/contrib/propagators/opentelemetry-propagator-instana/package.json b/auto-merge/contrib/propagators/opentelemetry-propagator-instana/package.json index c4290cc40..cd8ea5369 100644 --- a/auto-merge/contrib/propagators/opentelemetry-propagator-instana/package.json +++ b/auto-merge/contrib/propagators/opentelemetry-propagator-instana/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-instana", - "version": "0.3.0", + "version": "0.3.1", "description": "The OpenTelemetry Instana Propagator implements the propagation format used by IBM Observability by Instana", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/auto-merge/contrib/propagators/opentelemetry-propagator-ot-trace/CHANGELOG.md b/auto-merge/contrib/propagators/opentelemetry-propagator-ot-trace/CHANGELOG.md index 2630db118..85778a7de 100644 --- a/auto-merge/contrib/propagators/opentelemetry-propagator-ot-trace/CHANGELOG.md +++ b/auto-merge/contrib/propagators/opentelemetry-propagator-ot-trace/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.27.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/propagator-ot-trace-v0.27.0...propagator-ot-trace-v0.27.1) (2023-08-14) + + +### Bug Fixes + +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.27.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/propagator-ot-trace-v0.26.3...propagator-ot-trace-v0.27.0) (2023-07-12) diff --git a/auto-merge/contrib/propagators/opentelemetry-propagator-ot-trace/package.json b/auto-merge/contrib/propagators/opentelemetry-propagator-ot-trace/package.json index a36c753cd..d9b82d2db 100644 --- a/auto-merge/contrib/propagators/opentelemetry-propagator-ot-trace/package.json +++ b/auto-merge/contrib/propagators/opentelemetry-propagator-ot-trace/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-ot-trace", - "version": "0.27.0", + "version": "0.27.1", "description": "The OpenTelemetry OTTracepropagator implements the propagation format used by the \"basic tracer\" implementations from the OpenTracing project", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/auto-merge/js/experimental/CHANGELOG.md b/auto-merge/js/experimental/CHANGELOG.md index 0c7912b3a..64b4debd3 100644 --- a/auto-merge/js/experimental/CHANGELOG.md +++ b/auto-merge/js/experimental/CHANGELOG.md @@ -16,7 +16,7 @@ All notable changes to experimental packages in this project will be documented ### :house: (Internal) -## 0.42.2 +## 0.41.2 ### :bug: (Bug Fix) diff --git a/common/config/rush/npm-shrinkwrap.json b/common/config/rush/npm-shrinkwrap.json index e8dc0a8ac..ec4ebd7bf 100644 --- a/common/config/rush/npm-shrinkwrap.json +++ b/common/config/rush/npm-shrinkwrap.json @@ -922,7 +922,7 @@ "node_modules/@rush-temp/sandbox-auto-instrumentations-web": { "version": "0.0.0", "resolved": "file:projects/sandbox-auto-instrumentations-web.tgz", - "integrity": "sha512-1/H3hih5YLg1J9widhpJAOvcaeri3Qji8KVjdKL4vqewmFAkXMRK4g4yDBX2EnuC+zDotpxsNjnC+u7pBVokTg==", + "integrity": "sha512-cBjFwubRIpEsoEox1O6ol+hBzfIRoePfL94KtDeVbr/KcIueiepTCUBK+0KXRZ7x1zz1z/Z3/kB1BvkryVz9cw==", "dependencies": { "@babel/core": "7.22.10", "@jsdevtools/coverage-istanbul-loader": "3.0.5", diff --git a/pkgs/instrumentations/web/auto/CHANGELOG.md b/pkgs/instrumentations/web/auto/CHANGELOG.md index 8269ad067..ee8fe5033 100644 --- a/pkgs/instrumentations/web/auto/CHANGELOG.md +++ b/pkgs/instrumentations/web/auto/CHANGELOG.md @@ -12,6 +12,22 @@ * dependencies * @opentelemetry/instrumentation-document-load bumped from ^0.31.1 to ^0.31.2 +## [0.33.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-web-v0.33.0...auto-instrumentations-web-v0.33.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/instrumentation-document-load bumped from ^0.33.0 to ^0.33.1 + * @opentelemetry/instrumentation-user-interaction bumped from ^0.33.0 to ^0.33.1 + ## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-web-v0.32.3...auto-instrumentations-web-v0.33.0) (2023-07-12) diff --git a/pkgs/instrumentations/web/auto/package.json b/pkgs/instrumentations/web/auto/package.json index 0e80bde75..a1871ea05 100644 --- a/pkgs/instrumentations/web/auto/package.json +++ b/pkgs/instrumentations/web/auto/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-auto-instrumentations-web", - "version": "0.33.0", + "version": "0.33.1", "description": "Metapackage which bundles opentelemetry node core and contrib instrumentations", "author": "OpenTelemetry Authors", "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/metapackages/auto-instrumentations-web#readme", @@ -86,9 +86,9 @@ }, "dependencies": { "@opentelemetry/sandbox-instrumentation": "0.41.2", - "@opentelemetry/sandbox-instrumentation-document-load": "0.33.0", + "@opentelemetry/sandbox-instrumentation-document-load": "0.33.1", "@opentelemetry/sandbox-instrumentation-fetch": "0.41.2", - "@opentelemetry/sandbox-instrumentation-user-interaction": "0.33.0", + "@opentelemetry/sandbox-instrumentation-user-interaction": "0.33.1", "@opentelemetry/sandbox-instrumentation-xml-http-request": "0.41.2" } } \ No newline at end of file diff --git a/pkgs/instrumentations/web/document-load/CHANGELOG.md b/pkgs/instrumentations/web/document-load/CHANGELOG.md index 4230bfda0..9472175d2 100644 --- a/pkgs/instrumentations/web/document-load/CHANGELOG.md +++ b/pkgs/instrumentations/web/document-load/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [0.33.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-document-load-v0.33.0...instrumentation-document-load-v0.33.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-document-load-v0.32.3...instrumentation-document-load-v0.33.0) (2023-07-12) diff --git a/pkgs/instrumentations/web/document-load/package.json b/pkgs/instrumentations/web/document-load/package.json index f1d1f8f2f..4a26bfdd3 100644 --- a/pkgs/instrumentations/web/document-load/package.json +++ b/pkgs/instrumentations/web/document-load/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-instrumentation-document-load", - "version": "0.33.0", + "version": "0.33.1", "description": "OpenTelemetry document-load automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/pkgs/instrumentations/web/long-task/CHANGELOG.md b/pkgs/instrumentations/web/long-task/CHANGELOG.md index fb7d9c17e..1b29a525c 100644 --- a/pkgs/instrumentations/web/long-task/CHANGELOG.md +++ b/pkgs/instrumentations/web/long-task/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [0.33.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-long-task-v0.33.0...instrumentation-long-task-v0.33.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-long-task-v0.32.5...instrumentation-long-task-v0.33.0) (2023-07-12) diff --git a/pkgs/instrumentations/web/long-task/package.json b/pkgs/instrumentations/web/long-task/package.json index 2803035f0..13615b66d 100644 --- a/pkgs/instrumentations/web/long-task/package.json +++ b/pkgs/instrumentations/web/long-task/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-instrumentation-long-task", - "version": "0.33.0", + "version": "0.33.1", "description": "OpenTelemetry long task API automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/pkgs/instrumentations/web/user-interaction/CHANGELOG.md b/pkgs/instrumentations/web/user-interaction/CHANGELOG.md index 16732bf9e..c7630f0f8 100644 --- a/pkgs/instrumentations/web/user-interaction/CHANGELOG.md +++ b/pkgs/instrumentations/web/user-interaction/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [0.33.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-user-interaction-v0.33.0...instrumentation-user-interaction-v0.33.1) (2023-08-14) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.41.2 ([#1628](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1628)) ([4f11245](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4f1124524aee565c3cfbf3975aa5d3d039377621)) +* Revert "feat(minification): Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545))" ([#1611](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1611)) ([e5bca5f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4)) + ## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-user-interaction-v0.32.4...instrumentation-user-interaction-v0.33.0) (2023-07-12) diff --git a/pkgs/instrumentations/web/user-interaction/package.json b/pkgs/instrumentations/web/user-interaction/package.json index a97657db1..ff1314b64 100644 --- a/pkgs/instrumentations/web/user-interaction/package.json +++ b/pkgs/instrumentations/web/user-interaction/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-instrumentation-user-interaction", - "version": "0.33.0", + "version": "0.33.1", "description": "OpenTelemetry UserInteraction automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js",