diff --git a/auto-merge/contrib/.github/workflows/close-stale.yml b/auto-merge/contrib/.github/workflows/close-stale.yml index 2d098a006..15bfec637 100644 --- a/auto-merge/contrib/.github/workflows/close-stale.yml +++ b/auto-merge/contrib/.github/workflows/close-stale.yml @@ -17,5 +17,5 @@ jobs: close-pr-message: 'This PR was closed because it has been stale for 14 days with no activity.' stale-issue-label: stale stale-pr-label: stale - exempt-issue-labels: never-stale,instrumentation-request + exempt-issue-labels: never-stale,instrumentation-request,bug exempt-pr-labels: never-stale diff --git a/auto-merge/contrib/.release-please-manifest.json b/auto-merge/contrib/.release-please-manifest.json index b29210643..0f570774e 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.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.2","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.2","plugins/node/opentelemetry-instrumentation-express":"0.33.1","plugins/node/opentelemetry-instrumentation-fastify":"0.32.2","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.2","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.37.0","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"} +{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.2","detectors/node/opentelemetry-resource-detector-aws":"1.3.2","detectors/node/opentelemetry-resource-detector-container":"0.3.2","detectors/node/opentelemetry-resource-detector-gcp":"0.29.2","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.5.2","metapackages/auto-instrumentations-node":"0.39.4","metapackages/auto-instrumentations-web":"0.33.2","packages/opentelemetry-host-metrics":"0.33.1","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.2","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.34.2","plugins/node/instrumentation-amqplib":"0.33.2","plugins/node/instrumentation-cucumber":"0.1.1","plugins/node/instrumentation-dataloader":"0.5.2","plugins/node/instrumentation-fs":"0.8.2","plugins/node/instrumentation-lru-memoizer":"0.33.2","plugins/node/instrumentation-mongoose":"0.33.2","plugins/node/instrumentation-socket.io":"0.34.2","plugins/node/instrumentation-tedious":"0.6.2","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.37.1","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.36.1","plugins/node/opentelemetry-instrumentation-bunyan":"0.32.2","plugins/node/opentelemetry-instrumentation-cassandra":"0.33.2","plugins/node/opentelemetry-instrumentation-connect":"0.32.2","plugins/node/opentelemetry-instrumentation-dns":"0.32.3","plugins/node/opentelemetry-instrumentation-express":"0.33.2","plugins/node/opentelemetry-instrumentation-fastify":"0.32.3","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.3","plugins/node/opentelemetry-instrumentation-graphql":"0.35.2","plugins/node/opentelemetry-instrumentation-hapi":"0.33.1","plugins/node/opentelemetry-instrumentation-ioredis":"0.35.2","plugins/node/opentelemetry-instrumentation-knex":"0.32.2","plugins/node/opentelemetry-instrumentation-koa":"0.36.1","plugins/node/opentelemetry-instrumentation-memcached":"0.32.2","plugins/node/opentelemetry-instrumentation-mongodb":"0.37.1","plugins/node/opentelemetry-instrumentation-mysql":"0.34.2","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.2","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.2","plugins/node/opentelemetry-instrumentation-net":"0.32.2","plugins/node/opentelemetry-instrumentation-pg":"0.36.2","plugins/node/opentelemetry-instrumentation-pino":"0.34.2","plugins/node/opentelemetry-instrumentation-redis":"0.35.2","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.3","plugins/node/opentelemetry-instrumentation-restify":"0.34.1","plugins/node/opentelemetry-instrumentation-router":"0.33.2","plugins/node/opentelemetry-instrumentation-winston":"0.32.2","plugins/web/opentelemetry-instrumentation-document-load":"0.33.2","plugins/web/opentelemetry-instrumentation-long-task":"0.33.2","plugins/web/opentelemetry-instrumentation-user-interaction":"0.33.2","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 b98ff8658..40f687894 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,12 @@ * devDependencies * @opentelemetry/contrib-test-utils bumped from ^0.33.3 to ^0.33.4 +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2 + ## [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) 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 ca5f1eb10..76691190b 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.1", + "version": "0.28.2", "description": "OpenTelemetry resource detector for Alibaba Cloud", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -43,14 +43,14 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/contrib-test-utils": "^0.34.1", + "@opentelemetry/contrib-test-utils": "^0.34.2", "@types/mocha": "8.2.3", "@types/node": "18.6.5", - "@types/sinon": "10.0.16", + "@types/sinon": "10.0.18", "mocha": "7.2.0", "nock": "13.3.3", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "sinon": "15.2.0", "ts-mocha": "10.0.0", "typescript": "4.4.4" 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 3dc836c54..d4ee6c2cd 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,12 @@ * devDependencies * @opentelemetry/contrib-test-utils bumped from ^0.33.3 to ^0.33.4 +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2 + ## [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) 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 148d24f70..3ebc6f31a 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.1", + "version": "1.3.2", "description": "OpenTelemetry SDK resource detector for AWS", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -42,14 +42,14 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/contrib-test-utils": "^0.34.1", + "@opentelemetry/contrib-test-utils": "^0.34.2", "@types/mocha": "8.2.3", "@types/node": "18.6.5", - "@types/sinon": "10.0.16", + "@types/sinon": "10.0.18", "mocha": "7.2.0", "nock": "13.3.3", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "sinon": "15.2.0", "ts-mocha": "10.0.0", "typescript": "4.4.4" 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 8c15de85e..6468ef081 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.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.3.1...resource-detector-container-v0.3.2) (2023-10-10) + + +### Bug Fixes + +* Update defect of of wrong resource attribute of "container.id" ([#1682](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1682)) ([5675c49](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/5675c49b2b58e6b159a47d1a9ff5b00bc30a94a0)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2 + ## [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) 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 418b48ca2..7568333b2 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.1", + "version": "0.3.2", "description": "Opentelemetry resource detector to get container resource attributes", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -36,15 +36,15 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/contrib-test-utils": "^0.34.1", + "@opentelemetry/contrib-test-utils": "^0.34.2", "@types/mocha": "8.2.3", "@types/node": "18.6.5", - "@types/sinon": "10.0.16", + "@types/sinon": "10.0.18", "eslint-plugin-header": "^3.1.1", "mocha": "7.2.0", "nock": "13.3.3", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "sinon": "15.2.0", "ts-mocha": "10.0.0", "typescript": "4.4.4" 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 7e2f5662c..ef7d1d10d 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.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-gcp-v0.29.1...resource-detector-gcp-v0.29.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update all patch versions ([#1687](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1687)) ([47301c0](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/47301c038e4dc7d24797cb0b8426033ecc0374e6)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2 + ## [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) 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 4ef37c194..e4b529b53 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.1", + "version": "0.29.2", "description": "OpenTelemetry SDK resource detector for GCP", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -42,14 +42,14 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/contrib-test-utils": "^0.34.1", + "@opentelemetry/contrib-test-utils": "^0.34.2", "@types/mocha": "8.2.3", "@types/node": "18.6.5", - "@types/semver": "7.5.2", + "@types/semver": "7.5.3", "mocha": "7.2.0", "nock": "13.3.3", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, 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 7280c3c40..571b70473 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 @@ -48,10 +48,10 @@ "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "18.6.5", - "@types/sinon": "10.0.16", + "@types/sinon": "10.0.18", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "sinon": "15.2.0", "ts-mocha": "10.0.0", "typescript": "4.4.4" 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 b38de3d25..fd7e42763 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,21 @@ # Changelog +## [0.5.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-instana-v0.5.1...resource-detector-instana-v0.5.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update all patch versions ([#1687](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1687)) ([47301c0](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/47301c038e4dc7d24797cb0b8426033ecc0374e6)) +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2 + ## [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) 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 d7f106af3..1e9e571cc 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.1", + "version": "0.5.2", "description": "OpenTelemetry SDK resource detector for Instana", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -40,15 +40,15 @@ }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.34.1", - "@opentelemetry/sdk-node": "^0.43.0", + "@opentelemetry/contrib-test-utils": "^0.34.2", + "@opentelemetry/sdk-node": "^0.44.0", "@types/mocha": "8.2.3", "@types/node": "18.6.5", - "@types/semver": "7.5.2", + "@types/semver": "7.5.3", "mocha": "7.2.0", "nock": "13.3.3", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, diff --git a/auto-merge/contrib/metapackages/auto-instrumentations-node/CHANGELOG.md b/auto-merge/contrib/metapackages/auto-instrumentations-node/CHANGELOG.md index e1d34fc42..5bcc883c1 100644 --- a/auto-merge/contrib/metapackages/auto-instrumentations-node/CHANGELOG.md +++ b/auto-merge/contrib/metapackages/auto-instrumentations-node/CHANGELOG.md @@ -101,6 +101,65 @@ * @opentelemetry/instrumentation-fastify bumped from ^0.32.1 to ^0.32.2 * @opentelemetry/instrumentation-mongodb bumped from ^0.36.1 to ^0.37.0 +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/instrumentation-redis-4 bumped from ^0.35.2 to ^0.35.3 + +## [0.39.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.39.2...auto-instrumentations-node-v0.39.3) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/instrumentation-amqplib bumped from ^0.33.1 to ^0.33.2 + * @opentelemetry/instrumentation-aws-lambda bumped from ^0.37.0 to ^0.37.1 + * @opentelemetry/instrumentation-aws-sdk bumped from ^0.36.0 to ^0.36.1 + * @opentelemetry/instrumentation-bunyan bumped from ^0.32.1 to ^0.32.2 + * @opentelemetry/instrumentation-cassandra-driver bumped from ^0.33.1 to ^0.33.2 + * @opentelemetry/instrumentation-connect bumped from ^0.32.1 to ^0.32.2 + * @opentelemetry/instrumentation-cucumber bumped from ^0.1.0 to ^0.1.1 + * @opentelemetry/instrumentation-dataloader bumped from ^0.5.1 to ^0.5.2 + * @opentelemetry/instrumentation-dns bumped from ^0.32.2 to ^0.32.3 + * @opentelemetry/instrumentation-express bumped from ^0.33.1 to ^0.33.2 + * @opentelemetry/instrumentation-fs bumped from ^0.8.1 to ^0.8.2 + * @opentelemetry/instrumentation-fastify bumped from ^0.32.2 to ^0.32.3 + * @opentelemetry/instrumentation-generic-pool bumped from ^0.32.2 to ^0.32.3 + * @opentelemetry/instrumentation-graphql bumped from ^0.35.1 to ^0.35.2 + * @opentelemetry/instrumentation-hapi bumped from ^0.33.0 to ^0.33.1 + * @opentelemetry/instrumentation-ioredis bumped from ^0.35.1 to ^0.35.2 + * @opentelemetry/instrumentation-knex bumped from ^0.32.1 to ^0.32.2 + * @opentelemetry/instrumentation-koa bumped from ^0.36.0 to ^0.36.1 + * @opentelemetry/instrumentation-lru-memoizer bumped from ^0.33.1 to ^0.33.2 + * @opentelemetry/instrumentation-memcached bumped from ^0.32.1 to ^0.32.2 + * @opentelemetry/instrumentation-mongodb bumped from ^0.37.0 to ^0.37.1 + * @opentelemetry/instrumentation-mongoose bumped from ^0.33.1 to ^0.33.2 + * @opentelemetry/instrumentation-mysql bumped from ^0.34.1 to ^0.34.2 + * @opentelemetry/instrumentation-mysql2 bumped from ^0.34.1 to ^0.34.2 + * @opentelemetry/instrumentation-nestjs-core bumped from ^0.33.1 to ^0.33.2 + * @opentelemetry/instrumentation-net bumped from ^0.32.1 to ^0.32.2 + * @opentelemetry/instrumentation-pg bumped from ^0.36.1 to ^0.36.2 + * @opentelemetry/instrumentation-pino bumped from ^0.34.1 to ^0.34.2 + * @opentelemetry/instrumentation-redis bumped from ^0.35.1 to ^0.35.2 + * @opentelemetry/instrumentation-redis-4 bumped from ^0.35.1 to ^0.35.2 + * @opentelemetry/instrumentation-restify bumped from ^0.34.0 to ^0.34.1 + * @opentelemetry/instrumentation-router bumped from ^0.33.1 to ^0.33.2 + * @opentelemetry/instrumentation-socket.io bumped from ^0.34.1 to ^0.34.2 + * @opentelemetry/instrumentation-tedious bumped from ^0.6.1 to ^0.6.2 + * @opentelemetry/instrumentation-winston bumped from ^0.32.1 to ^0.32.2 + * @opentelemetry/resource-detector-alibaba-cloud bumped from ^0.28.1 to ^0.28.2 + * @opentelemetry/resource-detector-aws bumped from ^1.3.1 to ^1.3.2 + * @opentelemetry/resource-detector-container bumped from ^0.3.1 to ^0.3.2 + * @opentelemetry/resource-detector-gcp bumped from ^0.29.1 to ^0.29.2 + ## [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) diff --git a/auto-merge/contrib/metapackages/auto-instrumentations-node/package.json b/auto-merge/contrib/metapackages/auto-instrumentations-node/package.json index 4963a1d62..32b28a9ef 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.39.2", + "version": "0.39.4", "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", @@ -40,58 +40,58 @@ "@opentelemetry/api": "^1.4.1", "@types/mocha": "7.0.2", "@types/node": "18.6.5", - "@types/sinon": "10.0.16", + "@types/sinon": "10.0.18", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "sinon": "15.2.0", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.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.2", - "@opentelemetry/instrumentation-express": "^0.33.1", - "@opentelemetry/instrumentation-fs": "^0.8.1", - "@opentelemetry/instrumentation-fastify": "^0.32.2", - "@opentelemetry/instrumentation-generic-pool": "^0.32.2", - "@opentelemetry/instrumentation-graphql": "^0.35.1", - "@opentelemetry/instrumentation-grpc": "^0.43.0", - "@opentelemetry/instrumentation-hapi": "^0.33.0", - "@opentelemetry/instrumentation-http": "^0.43.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.37.0", - "@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/instrumentation": "^0.44.0", + "@opentelemetry/instrumentation-amqplib": "^0.33.2", + "@opentelemetry/instrumentation-aws-lambda": "^0.37.1", + "@opentelemetry/instrumentation-aws-sdk": "^0.36.1", + "@opentelemetry/instrumentation-bunyan": "^0.32.2", + "@opentelemetry/instrumentation-cassandra-driver": "^0.33.2", + "@opentelemetry/instrumentation-connect": "^0.32.2", + "@opentelemetry/instrumentation-cucumber": "^0.1.1", + "@opentelemetry/instrumentation-dataloader": "^0.5.2", + "@opentelemetry/instrumentation-dns": "^0.32.3", + "@opentelemetry/instrumentation-express": "^0.33.2", + "@opentelemetry/instrumentation-fs": "^0.8.2", + "@opentelemetry/instrumentation-fastify": "^0.32.3", + "@opentelemetry/instrumentation-generic-pool": "^0.32.3", + "@opentelemetry/instrumentation-graphql": "^0.35.2", + "@opentelemetry/instrumentation-grpc": "^0.44.0", + "@opentelemetry/instrumentation-hapi": "^0.33.1", + "@opentelemetry/instrumentation-http": "^0.44.0", + "@opentelemetry/instrumentation-ioredis": "^0.35.2", + "@opentelemetry/instrumentation-knex": "^0.32.2", + "@opentelemetry/instrumentation-koa": "^0.36.1", + "@opentelemetry/instrumentation-lru-memoizer": "^0.33.2", + "@opentelemetry/instrumentation-memcached": "^0.32.2", + "@opentelemetry/instrumentation-mongodb": "^0.37.1", + "@opentelemetry/instrumentation-mongoose": "^0.33.2", + "@opentelemetry/instrumentation-mysql": "^0.34.2", + "@opentelemetry/instrumentation-mysql2": "^0.34.2", + "@opentelemetry/instrumentation-nestjs-core": "^0.33.2", + "@opentelemetry/instrumentation-net": "^0.32.2", + "@opentelemetry/instrumentation-pg": "^0.36.2", + "@opentelemetry/instrumentation-pino": "^0.34.2", + "@opentelemetry/instrumentation-redis": "^0.35.2", + "@opentelemetry/instrumentation-redis-4": "^0.35.3", + "@opentelemetry/instrumentation-restify": "^0.34.1", + "@opentelemetry/instrumentation-router": "^0.33.2", + "@opentelemetry/instrumentation-socket.io": "^0.34.2", + "@opentelemetry/instrumentation-tedious": "^0.6.2", + "@opentelemetry/instrumentation-winston": "^0.32.2", + "@opentelemetry/resource-detector-alibaba-cloud": "^0.28.2", + "@opentelemetry/resource-detector-aws": "^1.3.2", + "@opentelemetry/resource-detector-container": "^0.3.2", + "@opentelemetry/resource-detector-gcp": "^0.29.2", "@opentelemetry/resources": "^1.12.0", - "@opentelemetry/sdk-node": "^0.43.0" + "@opentelemetry/sdk-node": "^0.44.0" } } diff --git a/auto-merge/contrib/packages/opentelemetry-host-metrics/package.json b/auto-merge/contrib/packages/opentelemetry-host-metrics/package.json index 778c831d5..a026cb1cc 100644 --- a/auto-merge/contrib/packages/opentelemetry-host-metrics/package.json +++ b/auto-merge/contrib/packages/opentelemetry-host-metrics/package.json @@ -49,10 +49,10 @@ "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", "@types/node": "18.6.5", - "@types/sinon": "10.0.16", + "@types/sinon": "10.0.18", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "sinon": "15.2.0", "ts-mocha": "10.0.0", "typescript": "4.4.4" 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 6a297cc8f..b967ccfee 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 @@ -57,7 +57,7 @@ "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "18.6.5", - "@types/sinon": "10.0.16", + "@types/sinon": "10.0.18", "@types/webpack-env": "1.16.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", "karma": "6.3.16", @@ -68,7 +68,7 @@ "karma-webpack": "4.0.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "sinon": "15.2.0", "ts-loader": "8.3.0", "ts-mocha": "10.0.0", diff --git a/auto-merge/contrib/packages/opentelemetry-propagation-utils/CHANGELOG.md b/auto-merge/contrib/packages/opentelemetry-propagation-utils/CHANGELOG.md index 646d53873..6915a7bc0 100644 --- a/auto-merge/contrib/packages/opentelemetry-propagation-utils/CHANGELOG.md +++ b/auto-merge/contrib/packages/opentelemetry-propagation-utils/CHANGELOG.md @@ -24,6 +24,12 @@ * devDependencies * @opentelemetry/contrib-test-utils bumped from ^0.33.3 to ^0.33.4 +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2 + ## [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) diff --git a/auto-merge/contrib/packages/opentelemetry-propagation-utils/package.json b/auto-merge/contrib/packages/opentelemetry-propagation-utils/package.json index dd918e191..b317ffdad 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.1", + "version": "0.30.2", "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.1", + "@opentelemetry/contrib-test-utils": "^0.34.2", "@types/mocha": "^9.1.1", "@types/node": "18.6.5", "@types/sinon": "^10.0.11", diff --git a/auto-merge/contrib/packages/opentelemetry-sampler-aws-xray/package.json b/auto-merge/contrib/packages/opentelemetry-sampler-aws-xray/package.json index d5ccc476d..097a699a6 100644 --- a/auto-merge/contrib/packages/opentelemetry-sampler-aws-xray/package.json +++ b/auto-merge/contrib/packages/opentelemetry-sampler-aws-xray/package.json @@ -54,7 +54,7 @@ "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", "@types/node": "18.6.5", - "@types/sinon": "10.0.16", + "@types/sinon": "10.0.18", "eslint": "8.7.0", "expect": "29.2.0", "mocha": "7.2.0", diff --git a/auto-merge/contrib/packages/opentelemetry-test-utils/CHANGELOG.md b/auto-merge/contrib/packages/opentelemetry-test-utils/CHANGELOG.md index a9eb9c8b4..2686475c8 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.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/contrib-test-utils-v0.34.1...contrib-test-utils-v0.34.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [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) diff --git a/auto-merge/contrib/packages/opentelemetry-test-utils/package.json b/auto-merge/contrib/packages/opentelemetry-test-utils/package.json index ce7892a03..5f90d2516 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.1", + "version": "0.34.2", "description": "Test utilities for opentelemetry components", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -48,7 +48,7 @@ "dependencies": { "@opentelemetry/core": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.3.1", - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@opentelemetry/resources": "^1.8.0", "@opentelemetry/sdk-trace-base": "^1.8.0", diff --git a/auto-merge/contrib/plugins/node/instrumentation-amqplib/CHANGELOG.md b/auto-merge/contrib/plugins/node/instrumentation-amqplib/CHANGELOG.md index aba9ee3dc..eca540238 100644 --- a/auto-merge/contrib/plugins/node/instrumentation-amqplib/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/instrumentation-amqplib/CHANGELOG.md @@ -1,5 +1,21 @@ # Changelog +## [0.33.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-amqplib-v0.33.1...instrumentation-amqplib-v0.33.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update all patch versions ([#1687](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1687)) ([47301c0](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/47301c038e4dc7d24797cb0b8426033ecc0374e6)) +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2 + ## [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) diff --git a/auto-merge/contrib/plugins/node/instrumentation-amqplib/package.json b/auto-merge/contrib/plugins/node/instrumentation-amqplib/package.json index 15e6d1ccf..5c603dcec 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.1", + "version": "0.33.2", "description": "OpenTelemetry automatic instrumentation for the `amqplib` package", "keywords": [ "amqplib", @@ -47,16 +47,16 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.34.1", + "@opentelemetry/contrib-test-utils": "^0.34.2", "@types/amqplib": "^0.5.17", "@types/lodash": "4.14.199", "@types/mocha": "8.2.3", - "@types/sinon": "10.0.16", + "@types/sinon": "10.0.18", "@types/node": "18.6.5", "amqplib": "0.8.0", "expect": "29.2.0", diff --git a/auto-merge/contrib/plugins/node/instrumentation-cucumber/CHANGELOG.md b/auto-merge/contrib/plugins/node/instrumentation-cucumber/CHANGELOG.md index da03cb7af..ef3694ae1 100644 --- a/auto-merge/contrib/plugins/node/instrumentation-cucumber/CHANGELOG.md +++ b/auto-merge/contrib/plugins/node/instrumentation-cucumber/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [0.1.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-cucumber-v0.1.0...instrumentation-cucumber-v0.1.1) (2023-10-10) + + +### Bug Fixes + +* **deps:** update all patch versions ([#1687](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1687)) ([47301c0](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/47301c038e4dc7d24797cb0b8426033ecc0374e6)) +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [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) diff --git a/auto-merge/contrib/plugins/node/instrumentation-cucumber/package.json b/auto-merge/contrib/plugins/node/instrumentation-cucumber/package.json index 2b953cd35..75428285f 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.1.0", + "version": "0.1.1", "description": "OpenTelemetry cucumber automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -52,12 +52,12 @@ "@opentelemetry/sdk-trace-base": "^1.3.1", "@opentelemetry/sdk-trace-node": "^1.3.1", "@types/mocha": "7.0.2", - "@types/semver": "7.5.2", - "@types/shimmer": "1.0.2", - "@types/sinon": "10.0.16", + "@types/semver": "7.5.3", + "@types/shimmer": "1.0.3", + "@types/sinon": "10.0.18", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "semver": "7.5.4", "sinon": "15.2.0", "test-all-versions": "5.0.1", @@ -65,7 +65,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-cucumber#readme" diff --git a/auto-merge/contrib/plugins/node/instrumentation-dataloader/CHANGELOG.md b/auto-merge/contrib/plugins/node/instrumentation-dataloader/CHANGELOG.md index d6b642aa9..d4ecc73a0 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.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-dataloader-v0.5.1...instrumentation-dataloader-v0.5.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [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) diff --git a/auto-merge/contrib/plugins/node/instrumentation-dataloader/package.json b/auto-merge/contrib/plugins/node/instrumentation-dataloader/package.json index 2256da270..96e497899 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.1", + "version": "0.5.2", "description": "OpenTelemetry instrumentation for dataloader", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -55,13 +55,13 @@ "dataloader": "2.2.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0" + "@opentelemetry/instrumentation": "^0.44.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-dataloader#readme" } diff --git a/auto-merge/contrib/plugins/node/instrumentation-fs/CHANGELOG.md b/auto-merge/contrib/plugins/node/instrumentation-fs/CHANGELOG.md index 8198ae2a0..1b67dd19b 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.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-fs-v0.8.1...instrumentation-fs-v0.8.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [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) diff --git a/auto-merge/contrib/plugins/node/instrumentation-fs/package.json b/auto-merge/contrib/plugins/node/instrumentation-fs/package.json index c9e23ace0..707283d85 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.1", + "version": "0.8.2", "description": "OpenTelemetry automatic instrumentation package for fs", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -52,14 +52,14 @@ "@types/sinon": "^10.0.11", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "sinon": "15.2.0", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-fs#readme" diff --git a/auto-merge/contrib/plugins/node/instrumentation-lru-memoizer/CHANGELOG.md b/auto-merge/contrib/plugins/node/instrumentation-lru-memoizer/CHANGELOG.md index dc46ec394..63cd52484 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.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-lru-memoizer-v0.33.1...instrumentation-lru-memoizer-v0.33.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2 + ## [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) 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 6e84990a2..8a3aca676 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.1", + "version": "0.33.2", "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.1", + "@opentelemetry/contrib-test-utils": "^0.34.2", "@types/lru-cache": "7.10.9", "@types/mocha": "8.2.3", "@types/node": "18.6.5", @@ -51,13 +51,13 @@ "lru-memoizer": "2.1.4", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0" + "@opentelemetry/instrumentation": "^0.44.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-lru-memoizer#readme" } diff --git a/auto-merge/contrib/plugins/node/instrumentation-mongoose/CHANGELOG.md b/auto-merge/contrib/plugins/node/instrumentation-mongoose/CHANGELOG.md index 34102f25c..281924f71 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.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mongoose-v0.33.1...instrumentation-mongoose-v0.33.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2 + ## [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) diff --git a/auto-merge/contrib/plugins/node/instrumentation-mongoose/package.json b/auto-merge/contrib/plugins/node/instrumentation-mongoose/package.json index 6cef46ca6..ada722c74 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.1", + "version": "0.33.2", "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.1", + "@opentelemetry/contrib-test-utils": "^0.34.2", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "8.2.3", "@types/node": "18.6.5", @@ -54,14 +54,14 @@ "mocha": "7.2.0", "mongoose": "6.11.5", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-mongoose#readme" diff --git a/auto-merge/contrib/plugins/node/instrumentation-socket.io/CHANGELOG.md b/auto-merge/contrib/plugins/node/instrumentation-socket.io/CHANGELOG.md index 454f0eead..c2e02463c 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.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-socket.io-v0.34.1...instrumentation-socket.io-v0.34.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2 + ## [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) 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 bb429736b..352fba531 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.1", + "version": "0.34.2", "description": "OpenTelemetry automatic instrumentation package for socket.io", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -43,14 +43,14 @@ }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.34.1", + "@opentelemetry/contrib-test-utils": "^0.34.2", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "8.2.3", "@types/node": "18.6.5", "expect": "27.4.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "socket.io": "^4.1.3", "socket.io-client": "^4.1.3", "test-all-versions": "5.0.1", @@ -58,7 +58,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-socket.io#readme" diff --git a/auto-merge/contrib/plugins/node/instrumentation-tedious/CHANGELOG.md b/auto-merge/contrib/plugins/node/instrumentation-tedious/CHANGELOG.md index 1c33db128..fafb3eb18 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.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-tedious-v0.6.1...instrumentation-tedious-v0.6.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2 + ## [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) diff --git a/auto-merge/contrib/plugins/node/instrumentation-tedious/package.json b/auto-merge/contrib/plugins/node/instrumentation-tedious/package.json index b5b6c4a41..06d0ac09b 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.1", + "version": "0.6.2", "description": "OpenTelemetry instrumentation for `tedious`", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -49,20 +49,20 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.34.1", + "@opentelemetry/contrib-test-utils": "^0.34.2", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.6.5", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "tedious": "15.1.3", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/tedious": "^4.0.10" }, 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 02fc1577d..33b9b5853 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,14 @@ # Changelog +## [0.37.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-lambda-v0.37.0...instrumentation-aws-lambda-v0.37.1) (2023-10-10) + + +### Bug Fixes + +* **deps:** update all patch versions ([#1687](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1687)) ([47301c0](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/47301c038e4dc7d24797cb0b8426033ecc0374e6)) +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [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) 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 538ecb70c..c30158eb5 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.37.0", + "version": "0.37.1", "description": "OpenTelemetry AWS Lambda automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -54,12 +54,12 @@ "@types/node": "18.6.5", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/propagator-aws-xray": "^1.3.1", "@opentelemetry/resources": "^1.8.0", "@opentelemetry/semantic-conventions": "^1.0.0", 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 f44ad0759..0bbd484e7 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,22 @@ # Changelog +## [0.36.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-sdk-v0.36.0...instrumentation-aws-sdk-v0.36.1) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/propagation-utils bumped from ^0.30.1 to ^0.30.2 + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2 + ## [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) 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 e487b8a02..09d0ee663 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.36.0", + "version": "0.36.1", "description": "OpenTelemetry automatic instrumentation for the `aws-sdk` package", "keywords": [ "aws", @@ -47,9 +47,9 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@opentelemetry/propagation-utils": "^0.30.1" + "@opentelemetry/propagation-utils": "^0.30.2" }, "devDependencies": { "@aws-sdk/client-dynamodb": "3.85.0", @@ -59,18 +59,18 @@ "@aws-sdk/client-sns": "3.85.0", "@aws-sdk/types": "3.78.0", "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.34.1", + "@opentelemetry/contrib-test-utils": "^0.34.2", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "8.2.3", "@types/node": "18.6.5", - "@types/sinon": "10.0.16", + "@types/sinon": "10.0.18", "aws-sdk": "2.1008.0", "eslint": "8.7.0", "expect": "29.2.0", "mocha": "7.2.0", "nock": "13.3.3", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "sinon": "15.2.0", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", 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 33e3cfc7e..d5db19c13 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,14 @@ # Changelog +## [0.32.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-bunyan-v0.32.1...instrumentation-bunyan-v0.32.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update all patch versions ([#1687](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1687)) ([47301c0](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/47301c038e4dc7d24797cb0b8426033ecc0374e6)) +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [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) 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 9286eccdf..5c905a750 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.1", + "version": "0.32.2", "description": "OpenTelemetry instrumentation for bunyan", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -53,18 +53,18 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.6.5", - "@types/sinon": "10.0.16", + "@types/sinon": "10.0.18", "bunyan": "1.8.15", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "sinon": "15.2.0", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@types/bunyan": "1.8.9" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-bunyan#readme" 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 688597816..770c8bafe 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,21 @@ # Changelog +## [0.33.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-cassandra-driver-v0.33.1...instrumentation-cassandra-driver-v0.33.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update all patch versions ([#1687](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1687)) ([47301c0](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/47301c038e4dc7d24797cb0b8426033ecc0374e6)) +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2 + ## [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) 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 f790f80c7..722a7fa6d 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.1", + "version": "0.33.2", "description": "OpenTelemetry instrumentation for cassandra-driver", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -48,23 +48,23 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.34.1", + "@opentelemetry/contrib-test-utils": "^0.34.2", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.6.5", - "@types/semver": "7.5.2", - "@types/sinon": "10.0.16", + "@types/semver": "7.5.3", + "@types/sinon": "10.0.18", "cassandra-driver": "4.6.4", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "sinon": "15.2.0", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-cassandra#readme" 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 3bc2e2148..8ff03a7d8 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,13 @@ # Changelog +## [0.32.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-connect-v0.32.1...instrumentation-connect-v0.32.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [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) 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 94d452e55..07b64fbbf 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.1", + "version": "0.32.2", "description": "OpenTelemetry connect automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -53,13 +53,13 @@ "connect": "3.7.0", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/connect": "3.4.36" }, 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 e20f9927d..e7819d11a 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,14 @@ # Changelog +## [0.32.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-dns-v0.32.2...instrumentation-dns-v0.32.3) (2023-10-10) + + +### Bug Fixes + +* **deps:** update all patch versions ([#1687](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1687)) ([47301c0](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/47301c038e4dc7d24797cb0b8426033ecc0374e6)) +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [0.32.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-dns-v0.32.1...instrumentation-dns-v0.32.2) (2023-08-30) 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 f1cbbe6e3..6ba9c4793 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.2", + "version": "0.32.3", "description": "OpenTelemetry dns automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -51,18 +51,18 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.6.5", - "@types/semver": "7.5.2", - "@types/shimmer": "1.0.2", - "@types/sinon": "10.0.16", + "@types/semver": "7.5.3", + "@types/shimmer": "1.0.3", + "@types/sinon": "10.0.18", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "sinon": "15.2.0", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0", "semver": "^7.5.4" }, 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 9e907bbdd..316a458b7 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.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-express-v0.33.1...instrumentation-express-v0.33.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update all patch versions ([#1687](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1687)) ([47301c0](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/47301c038e4dc7d24797cb0b8426033ecc0374e6)) +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [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) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/examples/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/examples/package.json index 7e2e2d11d..9452aab58 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/examples/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-express/examples/package.json @@ -32,9 +32,9 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.0.0", "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/instrumentation-express": "0.28.0", - "@opentelemetry/instrumentation-http": "^0.43.0", + "@opentelemetry/instrumentation-http": "^0.44.0", "@opentelemetry/resources": "^1.0.0", "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-node": "^1.0.0", 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 f6510d467..a1c45723d 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.1", + "version": "0.33.2", "description": "OpenTelemetry express automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -54,11 +54,11 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.6.5", - "@types/sinon": "10.0.16", + "@types/sinon": "10.0.18", "express": "4.17.3", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "sinon": "15.2.0", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", @@ -66,7 +66,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/express": "4.17.18" }, diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/.tav.yml b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/.tav.yml new file mode 100644 index 000000000..d20da709a --- /dev/null +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/.tav.yml @@ -0,0 +1,5 @@ +"fastify": + - versions: "4.23.2" + commands: npm run test +"typescript": + - versions: "4.7.4" 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 82b74cdf8..1f42f51ea 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,17 @@ # Changelog +## [0.32.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-fastify-v0.32.2...instrumentation-fastify-v0.32.3) (2023-10-10) + + +### Bug Fixes + +* **deps:** update all patch versions ([#1687](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1687)) ([47301c0](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/47301c038e4dc7d24797cb0b8426033ecc0374e6)) +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) +* **fastify:** Use plugin name for middleware span name ([#1680](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1680)) ([4503d3e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4503d3efe98c0b440582101df69a6df49a6cdb97)) +* **instrumentation-fastify:** add tav script ([#1710](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1710)) ([52dd42d](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/52dd42d4748f6aef43988e62f464d95b808a06a6)) +* Removed deprecated properties usage in Fastify instrumentation ([#1679](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1679)) ([d3328f8](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/d3328f8f55c6e3e2e7405a8e499d50555e9bec1a)) + ## [0.32.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-fastify-v0.32.1...instrumentation-fastify-v0.32.2) (2023-08-30) 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 7d2163dd0..9d110cccc 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.2", + "version": "0.32.3", "description": "OpenTelemetry fastify automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -13,6 +13,7 @@ "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-fastify --include-dependencies", "prepare": "npm run compile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", + "test-all-versions": "tav", "version:update": "node ../../../scripts/version-update.js", "prewatch": "npm run precompile", "watch": "tsc -w" @@ -48,22 +49,23 @@ "@fastify/express": "^2.0.2", "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/instrumentation-http": "0.43.0", + "@opentelemetry/instrumentation-http": "0.44.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/express": "4.17.18", "@types/mocha": "7.0.2", - "@types/node": "18.6.5", + "@types/node": "18.15.3", "fastify": "4.18.0", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", + "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-fastify#readme" diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/src/instrumentation.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/src/instrumentation.ts index ff7cc504a..ba96a020d 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/src/instrumentation.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/src/instrumentation.ts @@ -93,8 +93,11 @@ export class FastifyInstrumentation extends InstrumentationBase { } instrumentation._wrap(reply, 'send', instrumentation._patchSend()); + const anyRequest = request as any; + const rpcMetadata = getRPCMetadata(context.active()); - const routeName = request.routerPath; + const routeName = + anyRequest.routeOptions?.config?.url || request.routerPath; if (routeName && rpcMetadata?.type === RPCType.HTTP) { rpcMetadata.route = routeName; } @@ -176,7 +179,7 @@ export class FastifyInstrumentation extends InstrumentationBase { const handler = args[1] as HandlerOriginal; const pluginName = this.pluginName; if (applicationHookNames.includes(name)) { - return original.apply(this, [name as any, handler]); + return original.apply(this, [name, handler] as never); } const syncFunctionWithDone = @@ -184,14 +187,14 @@ export class FastifyInstrumentation extends InstrumentationBase { handler.constructor.name !== 'AsyncFunction'; return original.apply(this, [ - name as any, + name, instrumentation._wrapHandler( pluginName, name, handler, syncFunctionWithDone ), - ]); + ] as never); }; }; } @@ -259,8 +262,12 @@ export class FastifyInstrumentation extends InstrumentationBase { if (!instrumentation.isEnabled()) { return done(); } - const requestContext = (request as any).context || {}; - const handlerName = (requestContext.handler?.name || '').substr(6); + const anyRequest = request as any; + + const handler = + anyRequest.routeOptions?.handler || anyRequest.context?.handler || {}; + + const handlerName = handler?.name.substr(6); const spanName = `${FastifyNames.REQUEST_HANDLER} - ${ handlerName || this.pluginName || ANONYMOUS_NAME }`; @@ -268,7 +275,8 @@ export class FastifyInstrumentation extends InstrumentationBase { const spanAttributes: SpanAttributes = { [AttributeNames.PLUGIN_NAME]: this.pluginName, [AttributeNames.FASTIFY_TYPE]: FastifyTypes.REQUEST_HANDLER, - [SemanticAttributes.HTTP_ROUTE]: request.routerPath, + [SemanticAttributes.HTTP_ROUTE]: + anyRequest.routeOptions?.config?.url || request.routerPath, }; if (handlerName) { spanAttributes[AttributeNames.FASTIFY_NAME] = handlerName; diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/src/utils.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/src/utils.ts index 0ff05492a..84874607e 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/src/utils.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/src/utils.ts @@ -14,12 +14,7 @@ * limitations under the License. */ -import { - Span, - SpanAttributes, - SpanStatusCode, - Tracer, -} from '@opentelemetry/api'; +import { Attributes, Span, SpanStatusCode, Tracer } from '@opentelemetry/api'; import { spanRequestSymbol } from './constants'; import type { PluginFastifyReply } from './internal-types'; @@ -35,13 +30,14 @@ export function startSpan( reply: PluginFastifyReply, tracer: Tracer, spanName: string, - spanAttributes: SpanAttributes = {} + spanAttributes: Attributes = {} ) { const span = tracer.startSpan(spanName, { attributes: spanAttributes }); const spans: Span[] = reply[spanRequestSymbol] || []; spans.push(span); + // eslint-disable-next-line @typescript-eslint/no-floating-promises Object.defineProperty(reply, spanRequestSymbol, { enumerable: false, configurable: true, diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/test/instrumentation.test.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/test/instrumentation.test.ts index b5869f434..90a881a32 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/test/instrumentation.test.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/test/instrumentation.test.ts @@ -190,7 +190,7 @@ describe('fastify', () => { async function subsystem(fastify: FastifyInstance) { fastify.addHook( 'onRequest', - async ( + ( req: FastifyRequest, res: FastifyReply, next: HookHandlerDoneFunction 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 c6e22d315..aa1607278 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,14 @@ # Changelog +## [0.32.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-generic-pool-v0.32.2...instrumentation-generic-pool-v0.32.3) (2023-10-10) + + +### Bug Fixes + +* **deps:** update all patch versions ([#1687](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1687)) ([47301c0](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/47301c038e4dc7d24797cb0b8426033ecc0374e6)) +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [0.32.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-generic-pool-v0.32.1...instrumentation-generic-pool-v0.32.2) (2023-08-16) 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 852916990..63dc4730f 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.2", + "version": "0.32.3", "description": "OpenTelemetry Generic Pool automatic instrumentation package", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -52,17 +52,17 @@ "@types/generic-pool": "^3.1.9", "@types/mocha": "7.0.2", "@types/node": "18.6.5", - "@types/semver": "7.5.2", + "@types/semver": "7.5.3", "generic-pool": "3.8.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "semver": "7.5.4", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-generic-pool#readme" 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 5d9255328..06a5a06f4 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.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-graphql-v0.35.1...instrumentation-graphql-v0.35.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [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) 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 aa1fcaf87..fd9c769bd 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.1", + "version": "0.35.2", "description": "OpenTelemetry @opentelemetry/instrumentation-graphql automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -55,13 +55,13 @@ "graphql": "^16.5.0", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0" + "@opentelemetry/instrumentation": "^0.44.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-graphql#readme" } 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 76c073d21..caa3c3682 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,13 @@ # Changelog +## [0.33.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-hapi-v0.33.0...instrumentation-hapi-v0.33.1) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [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) 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 2ccb7d892..6661a1db3 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.33.0", + "version": "0.33.1", "description": "OpenTelemetry Hapi automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -54,13 +54,13 @@ "@types/node": "18.6.5", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/hapi__hapi": "20.0.13" }, 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 488363c2b..2555a9413 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,20 @@ # Changelog +## [0.35.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-ioredis-v0.35.1...instrumentation-ioredis-v0.35.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2 + ## [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) 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 22b2ba623..cfbad0dc2 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.1", + "version": "0.35.2", "description": "OpenTelemetry ioredis automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -52,24 +52,24 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.34.1", + "@opentelemetry/contrib-test-utils": "^0.34.2", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/sinon": "10.0.16", + "@types/sinon": "10.0.18", "@types/node": "18.6.5", "cross-env": "7.0.3", "ioredis": "5.2.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "sinon": "15.2.0", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.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 6943ec301..bb8c83847 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,13 @@ # Changelog +## [0.32.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-knex-v0.32.1...instrumentation-knex-v0.32.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [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) 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 d6913e1a2..10b5b8073 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.1", + "version": "0.32.2", "description": "OpenTelemetry Knex automatic instrumentation package", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -54,13 +54,13 @@ "knex": "0.95.9", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "sqlite3": "5.1.6", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-knex#readme" 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 d1409118d..a3cc0c424 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,14 @@ # Changelog +## [0.36.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-koa-v0.36.0...instrumentation-koa-v0.36.1) (2023-10-10) + + +### Bug Fixes + +* **deps:** update all patch versions ([#1687](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1687)) ([47301c0](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/47301c038e4dc7d24797cb0b8426033ecc0374e6)) +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [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) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/examples/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/examples/package.json index a6a1daab9..04b1de66d 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/examples/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/examples/package.json @@ -34,8 +34,8 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.0.0", "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.43.0", - "@opentelemetry/instrumentation-http": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", + "@opentelemetry/instrumentation-http": "^0.44.0", "@opentelemetry/instrumentation-koa": "^0.31.0", "@opentelemetry/sdk-trace-node": "^1.0.0", "@opentelemetry/sdk-trace-base": "^1.0.0", 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 78be7fb99..2ff233796 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.36.0", + "version": "0.36.1", "description": "OpenTelemetry Koa automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -56,11 +56,11 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.6.5", - "@types/sinon": "10.0.16", + "@types/sinon": "10.0.18", "koa": "2.13.1", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "sinon": "15.2.0", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", @@ -68,7 +68,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/koa": "2.13.9", "@types/koa__router": "12.0.1" 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 9dcee27f5..76ad8018d 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.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-memcached-v0.32.1...instrumentation-memcached-v0.32.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2 + ## [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) 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 c746f016b..d560fb689 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.1", + "version": "0.32.2", "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.1", + "@opentelemetry/contrib-test-utils": "^0.34.2", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", @@ -58,12 +58,12 @@ "memcached": "2.2.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/memcached": "^2.2.6" }, 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 a74be0b8d..ddb006c4c 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.37.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mongodb-v0.37.0...instrumentation-mongodb-v0.37.1) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2 + ## [0.37.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mongodb-v0.36.1...instrumentation-mongodb-v0.37.0) (2023-08-30) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json index b98952415..124776ff4 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json @@ -33,8 +33,8 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.0.0", "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.43.0", - "@opentelemetry/instrumentation-http": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", + "@opentelemetry/instrumentation-http": "^0.44.0", "@opentelemetry/instrumentation-mongodb": "^0.32.0", "@opentelemetry/sdk-trace-node": "^1.0.0", "@opentelemetry/sdk-trace-base": "^1.0.0", 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 b97637501..374ced020 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.37.0", + "version": "0.37.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.1", + "@opentelemetry/contrib-test-utils": "^0.34.2", "@opentelemetry/context-async-hooks": "^1.8.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", @@ -64,14 +64,14 @@ "mocha": "7.2.0", "mongodb": "3.6.11", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { "@opentelemetry/sdk-metrics": "^1.9.1", - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mongodb#readme" 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 c038212b9..953cc261a 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.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mysql-v0.34.1...instrumentation-mysql-v0.34.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2 + ## [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) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json index a4ba336a8..b257832c7 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json @@ -34,12 +34,12 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.0.0", "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.43.0", - "@opentelemetry/instrumentation-http": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", + "@opentelemetry/instrumentation-http": "^0.44.0", "@opentelemetry/instrumentation-mysql": "^0.31.0", "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-node": "^1.0.0", - "@opentelemetry/exporter-metrics-otlp-grpc": "0.43.0", + "@opentelemetry/exporter-metrics-otlp-grpc": "0.44.0", "mysql": "^2.18.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", 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 3985b15bd..18b7b9add 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.1", + "version": "0.34.2", "description": "OpenTelemetry mysql automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -49,23 +49,23 @@ "@opentelemetry/api": "^1.3.0", "@opentelemetry/sdk-metrics": "^1.8.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.34.1", + "@opentelemetry/contrib-test-utils": "^0.34.2", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.6.5", - "@types/sinon": "10.0.16", + "@types/sinon": "10.0.18", "mocha": "7.2.0", "mysql": "2.18.1", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "sinon": "15.2.0", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/mysql": "2.15.21" + "@types/mysql": "2.15.22" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mysql#readme" } 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 5f430cb17..6b22fcaf2 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.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mysql2-v0.34.1...instrumentation-mysql2-v0.34.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update all patch versions ([#1687](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1687)) ([47301c0](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/47301c038e4dc7d24797cb0b8426033ecc0374e6)) +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2 + ## [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) 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 40c3ce773..dec0a017e 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.1", + "version": "0.34.2", "description": "OpenTelemetry mysql2 automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -49,23 +49,23 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.34.1", + "@opentelemetry/contrib-test-utils": "^0.34.2", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "7.0.2", "@types/mysql2": "github:types/mysql2", "@types/node": "18.6.5", - "@types/semver": "7.5.2", + "@types/semver": "7.5.3", "mocha": "7.2.0", "mysql2": "2.3.3", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "semver": "7.5.4", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@opentelemetry/sql-common": "^0.40.0" }, 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 32e3ed196..bc2cb872f 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,14 @@ # Changelog +## [0.33.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-nestjs-core-v0.33.1...instrumentation-nestjs-core-v0.33.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update all patch versions ([#1687](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1687)) ([47301c0](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/47301c038e4dc7d24797cb0b8426033ecc0374e6)) +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [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) 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 219d5d72b..f04ef4455 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.1", + "version": "0.33.2", "description": "OpenTelemetry NestJS automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -59,12 +59,12 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.6.5", - "@types/semver": "7.5.2", + "@types/semver": "7.5.3", "cross-env": "7.0.3", "mocha": "7.2.0", "nyc": "15.1.0", "reflect-metadata": "0.1.13", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "rxjs": "7.3.0", "rxjs-compat": "6.6.7", "semver": "7.5.4", @@ -73,7 +73,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-nestjs-core#readme" 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 cd02bd74f..35cb5614a 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.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-net-v0.32.1...instrumentation-net-v0.32.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [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) 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 45754534c..5af5a30bf 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.1", + "version": "0.32.2", "description": "OpenTelemetry net module automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -52,16 +52,16 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.6.5", - "@types/sinon": "10.0.16", + "@types/sinon": "10.0.18", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "sinon": "15.2.0", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-net#readme" 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 142465537..f892adad8 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,21 @@ # Changelog +## [0.36.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-pg-v0.36.1...instrumentation-pg-v0.36.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update all patch versions ([#1687](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1687)) ([47301c0](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/47301c038e4dc7d24797cb0b8426033ecc0374e6)) +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2 + ## [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) 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 7a1b3efb2..28eebe4a2 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.1", + "version": "0.36.2", "description": "OpenTelemetry postgres automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -55,18 +55,18 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.34.1", + "@opentelemetry/contrib-test-utils": "^0.34.2", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.6.5", - "@types/sinon": "10.0.16", + "@types/sinon": "10.0.18", "cross-env": "7.0.3", "mocha": "7.2.0", "nyc": "15.1.0", "pg": "8.7.1", "pg-pool": "3.4.1", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "safe-stable-stringify": "^2.4.1", "sinon": "15.2.0", "test-all-versions": "5.0.1", @@ -75,7 +75,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@opentelemetry/sql-common": "^0.40.0", "@types/pg": "8.6.1", 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 2e9727161..1a36a325d 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,14 @@ # Changelog +## [0.34.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-pino-v0.34.1...instrumentation-pino-v0.34.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update all patch versions ([#1687](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1687)) ([47301c0](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/47301c038e4dc7d24797cb0b8426033ecc0374e6)) +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [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) 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 b1dc8c25e..f46c9ffa2 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.1", + "version": "0.34.2", "description": "OpenTelemetry instrumentation for pino", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -53,12 +53,12 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.6.5", - "@types/semver": "7.5.2", - "@types/sinon": "10.0.16", + "@types/semver": "7.5.3", + "@types/sinon": "10.0.18", "mocha": "7.2.0", "nyc": "15.1.0", "pino": "8.3.1", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "semver": "7.5.4", "sinon": "15.2.0", "test-all-versions": "5.0.1", @@ -66,7 +66,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0" + "@opentelemetry/instrumentation": "^0.44.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-pino#readme" } 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 5f8e60dc8..ceb7e0693 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,29 @@ * dependencies * @opentelemetry/redis-common bumped from ^0.34.0 to ^0.35.0 +## [0.35.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-redis-4-v0.35.2...instrumentation-redis-4-v0.35.3) (2023-10-13) + + +### Bug Fixes + +* **instrumentation-redis-4:** avoid shimmer warning by only wrapping multi/MULTI if they exist ([#1729](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1729)) ([247a81c](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/247a81c047264ba638abb9a2ef2ca14801094040)) +* **instrumentation-redis-4:** fix unhandledRejection in client.multi(...) handling ([#1730](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1730)) ([d953531](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/d95353179279e3cf35ec37b6ca18f1e920691e16)) + +## [0.35.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-redis-4-v0.35.1...instrumentation-redis-4-v0.35.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2 + ## [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) 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 6986efa9b..cf0e3b89f 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.1", + "version": "0.35.3", "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.1", + "@opentelemetry/contrib-test-utils": "^0.34.2", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", @@ -63,13 +63,13 @@ "mocha": "7.2.0", "nyc": "15.1.0", "redis": "4.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/redis-common": "^0.36.1", "@opentelemetry/semantic-conventions": "^1.0.0" }, diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis-4/src/instrumentation.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis-4/src/instrumentation.ts index 07628f205..3ac531847 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis-4/src/instrumentation.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis-4/src/instrumentation.ts @@ -166,23 +166,31 @@ export class RedisInstrumentation extends InstrumentationBase { this._diag.debug('Patching redis client'); const redisClientPrototype = moduleExports?.default?.prototype; - if (isWrapped(redisClientPrototype?.multi)) { - this._unwrap(redisClientPrototype, 'multi'); + // In some @redis/client versions 'multi' is a method. In later + // versions, as of https://github.com/redis/node-redis/pull/2324, + // 'MULTI' is a method and 'multi' is a property defined in the + // constructor that points to 'MULTI', and therefore it will not + // be defined on the prototype. + if (redisClientPrototype?.multi) { + if (isWrapped(redisClientPrototype?.multi)) { + this._unwrap(redisClientPrototype, 'multi'); + } + this._wrap( + redisClientPrototype, + 'multi', + this._getPatchRedisClientMulti() + ); } - this._wrap( - redisClientPrototype, - 'multi', - this._getPatchRedisClientMulti() - ); - - if (isWrapped(redisClientPrototype?.MULTI)) { - this._unwrap(redisClientPrototype, 'MULTI'); + if (redisClientPrototype?.MULTI) { + if (isWrapped(redisClientPrototype?.MULTI)) { + this._unwrap(redisClientPrototype, 'MULTI'); + } + this._wrap( + redisClientPrototype, + 'MULTI', + this._getPatchRedisClientMulti() + ); } - this._wrap( - redisClientPrototype, - 'MULTI', - this._getPatchRedisClientMulti() - ); if (isWrapped(redisClientPrototype?.sendCommand)) { this._unwrap(redisClientPrototype, 'sendCommand'); @@ -278,41 +286,61 @@ export class RedisInstrumentation extends InstrumentationBase { return execRes; } - execRes.then((redisRes: unknown[]) => { - const openSpans = this[OTEL_OPEN_SPANS]; - if (!openSpans) { - return plugin._diag.error( - 'cannot find open spans to end for redis multi command' - ); - } - if (redisRes.length !== openSpans.length) { - return plugin._diag.error( - 'number of multi command spans does not match response from redis' - ); - } - for (let i = 0; i < openSpans.length; i++) { - const { span, commandName, commandArgs } = openSpans[i]; - const currCommandRes = redisRes[i]; - if (currCommandRes instanceof Error) { - plugin._endSpanWithResponse( - span, - commandName, - commandArgs, - null, - currCommandRes + return execRes + .then((redisRes: unknown[]) => { + const openSpans = this[OTEL_OPEN_SPANS]; + if (!openSpans) { + return plugin._diag.error( + 'cannot find open spans to end for redis multi command' + ); + } + if (redisRes.length !== openSpans.length) { + return plugin._diag.error( + 'number of multi command spans does not match response from redis' + ); + } + for (let i = 0; i < openSpans.length; i++) { + const { span, commandName, commandArgs } = openSpans[i]; + const currCommandRes = redisRes[i]; + if (currCommandRes instanceof Error) { + plugin._endSpanWithResponse( + span, + commandName, + commandArgs, + null, + currCommandRes + ); + } else { + plugin._endSpanWithResponse( + span, + commandName, + commandArgs, + currCommandRes, + undefined + ); + } + } + return redisRes; + }) + .catch((err: Error) => { + const openSpans = this[OTEL_OPEN_SPANS]; + if (!openSpans) { + return plugin._diag.error( + 'cannot find open spans to end for redis multi command' ); - } else { + } + for (let i = 0; i < openSpans.length; i++) { + const { span, commandName, commandArgs } = openSpans[i]; plugin._endSpanWithResponse( span, commandName, commandArgs, - currCommandRes, - undefined + null, + err ); } - } - }); - return execRes; + return Promise.reject(err); + }); }; }; } diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis-4/test/redis.test.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis-4/test/redis.test.ts index ac5abf5bc..74fa7b699 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis-4/test/redis.test.ts +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis-4/test/redis.test.ts @@ -32,7 +32,7 @@ const instrumentation = registerInstrumentationTesting( new RedisInstrumentation() ); -import { createClient } from 'redis'; +import { createClient, WatchError } from 'redis'; import { Span, SpanKind, @@ -398,6 +398,26 @@ describe('redis@^4.0.0', () => { ); }); + it('multi command that rejects', async () => { + const watchedKey = 'watched-key'; + await client.watch(watchedKey); + await client.set(watchedKey, 'a different value'); + try { + await client.multi().get(watchedKey).exec(); + assert.fail('expected WatchError to be thrown and caught in try/catch'); + } catch (error) { + assert.ok(error instanceof WatchError); + } + + // All the multi spans' status are set to ERROR. + const [_watchSpan, _setSpan, multiGetSpan] = getTestSpans(); + assert.strictEqual(multiGetSpan?.status.code, SpanStatusCode.ERROR); + assert.strictEqual( + multiGetSpan?.status.message, + 'One (or more) of the watched keys has been changed' + ); + }); + it('duration covers create until server response', async () => { await client.set('another-key', 'another-value'); const multiClient = client.multi(); 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 26e5a0e56..1cc28b8ce 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,21 @@ * dependencies * @opentelemetry/redis-common bumped from ^0.34.0 to ^0.35.0 +## [0.35.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-redis-v0.35.1...instrumentation-redis-v0.35.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2 + ## [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) diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis/examples/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis/examples/package.json index 5150fe300..c5c228182 100644 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis/examples/package.json +++ b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-redis/examples/package.json @@ -34,8 +34,8 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.0.0", "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.43.0", - "@opentelemetry/instrumentation-http": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", + "@opentelemetry/instrumentation-http": "^0.44.0", "@opentelemetry/instrumentation-redis": "^0.32.0", "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-node": "^1.0.0", 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 2ac7fd0aa..e172524f4 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.1", + "version": "0.35.2", "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.1", + "@opentelemetry/contrib-test-utils": "^0.34.2", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", @@ -63,14 +63,14 @@ "mocha": "7.2.0", "nyc": "15.1.0", "redis": "3.1.2", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4", "@types/redis": "2.8.32" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/redis-common": "^0.36.1", "@opentelemetry/semantic-conventions": "^1.0.0" }, 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 b55d231ed..dfee785a7 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,14 @@ # Changelog +## [0.34.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-restify-v0.34.0...instrumentation-restify-v0.34.1) (2023-10-10) + + +### Bug Fixes + +* **deps:** update all patch versions ([#1687](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1687)) ([47301c0](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/47301c038e4dc7d24797cb0b8426033ecc0374e6)) +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [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) 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 0ae9310eb..b2f32efaf 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.34.0", + "version": "0.34.1", "description": "OpenTelemetry restify automatic instrumentation package", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -52,12 +52,12 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.6.5", - "@types/restify": "4.3.9", - "@types/semver": "7.5.2", + "@types/restify": "4.3.10", + "@types/semver": "7.5.3", "mocha": "7.2.0", "nyc": "15.1.0", "restify": "11.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "semver": "7.5.4", "test-all-versions": "^5.0.1", "ts-mocha": "10.0.0", @@ -65,7 +65,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-restify#readme" 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 44dcdc6a0..c27d3c290 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.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-router-v0.33.1...instrumentation-router-v0.33.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [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) 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 06679fff6..fe8f94537 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.1", + "version": "0.33.2", "description": "OpenTelemetry Router automatic instrumentation package", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -53,13 +53,13 @@ "@types/node": "18.6.5", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "router": "1.3.8", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.44.0", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-router#readme" 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 6fda978c8..a8ebd6618 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.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-winston-v0.32.1...instrumentation-winston-v0.32.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [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) 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 cf38d3f1c..1f7c27b7e 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.1", + "version": "0.32.2", "description": "OpenTelemetry instrumentation for winston", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -53,11 +53,11 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.6.5", - "@types/sinon": "10.0.16", + "@types/sinon": "10.0.18", "@types/triple-beam": "^1.3.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "sinon": "15.2.0", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", @@ -66,7 +66,7 @@ "winston2": "npm:winston@2.4.7" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.43.0" + "@opentelemetry/instrumentation": "^0.44.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-winston#readme" } 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 9f230ba5f..5922c9e6f 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 @@ -52,11 +52,11 @@ "@opentelemetry/propagator-b3": "^1.3.1", "@types/mocha": "7.0.2", "@types/node": "18.6.5", - "@types/react": "17.0.65", + "@types/react": "17.0.67", "@types/react-addons-test-utils": "0.14.26", "@types/react-dom": "18.0.2", - "@types/shimmer": "1.0.2", - "@types/sinon": "10.0.16", + "@types/shimmer": "1.0.3", + "@types/sinon": "10.0.18", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", @@ -70,7 +70,7 @@ "nyc": "15.1.0", "react": "17.0.2", "react-dom": "17.0.2", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "sinon": "15.2.0", "ts-loader": "8.3.0", "ts-mocha": "10.0.0", 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 1e1e78eef..9478aaf75 100644 --- a/auto-merge/contrib/propagators/opentelemetry-propagator-aws-xray/package.json +++ b/auto-merge/contrib/propagators/opentelemetry-propagator-aws-xray/package.json @@ -61,7 +61,7 @@ "karma-webpack": "4.0.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "ts-loader": "8.3.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", 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 692c128b6..885139af8 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 @@ -51,7 +51,7 @@ "grpc": "1.24.11", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.1", + "rimraf": "5.0.5", "ts-loader": "8.3.0", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/auto-merge/js/.github/workflows/benchmark.yml b/auto-merge/js/.github/workflows/benchmark.yml new file mode 100644 index 000000000..04961b83d --- /dev/null +++ b/auto-merge/js/.github/workflows/benchmark.yml @@ -0,0 +1,63 @@ +name: Benchmark Tests + +on: + push: + branches: [ main ] + +jobs: + benchmark-tests: + strategy: + fail-fast: false + matrix: + node_version: + - "18" + runs-on: self-hosted + timeout-minutes: 10 + env: + NPM_CONFIG_UNSAFE_PERM: true + steps: + - name: Checkout + uses: actions/checkout@v3 + + - uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node_version }} + + - run: npm install -g npm@latest + + - name: restore lerna + id: cache + uses: actions/cache@v3 + with: + path: | + node_modules + package-lock.json + packages/*/node_modules + packages/*/package-lock.json + experimental/packages/*/node_modules + experimental/packages/*/package-lock.json + key: node-tests-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}-04292022 + + - name: Bootstrap + run: | + npm install --ignore-scripts + npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests + + - name: Build 🔧 + run: | + npm run compile + + - name: Benchmark tests + run: | + npm run test:bench + find . -name .benchmark-results.txt -exec cat {} + > combined_benchmarks.txt + + - name: Store benchmark results + uses: benchmark-action/github-action-benchmark@v1 + with: + tool: 'benchmarkjs' + output-file-path: combined_benchmarks.txt + gh-pages-branch: gh-pages + github-token: ${{ secrets.GITHUB_TOKEN }} + benchmark-data-dir-path: "benchmarks" + auto-push: true diff --git a/auto-merge/js/.gitignore b/auto-merge/js/.gitignore index 90ef9bd3f..59141394b 100644 --- a/auto-merge/js/.gitignore +++ b/auto-merge/js/.gitignore @@ -89,3 +89,6 @@ package.json.lerna_backup #IDEA .idea *.iml + +# non-aggregated benchmark results +.benchmark-results.txt diff --git a/auto-merge/js/CHANGELOG.md b/auto-merge/js/CHANGELOG.md index d65dae2bd..40b17374f 100644 --- a/auto-merge/js/CHANGELOG.md +++ b/auto-merge/js/CHANGELOG.md @@ -11,9 +11,22 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ ### :rocket: (Enhancement) +* feat(metrics): prototype experimental advice support [#3876](https://github.com/open-telemetry/opentelemetry-js/pull/3876) @legendecas + ### :bug: (Bug Fix) +### :books: (Refine Doc) + +### :house: (Internal) + +## 1.17.1 + +### :bug: (Bug Fix) + +* fix(sdk-trace-base): BatchSpanProcessor flushes when `maxExportBatchSize` is reached [#3958](https://github.com/open-telemetry/opentelemetry-js/pull/3958) @nordfjord * fix(sdk-metrics): allow instrument names to contain '/' [#4155](https://github.com/open-telemetry/opentelemetry-js/pull/4155) +* fix(sdk-metrics): prevent per-reader storages from keeping unreported accumulations in memory [#4163](https://github.com/open-telemetry/opentelemetry-js/pull/4163) @pichlermarc + * fixes a memory leak which occurred when two or more `MetricReader` instances are registered to a `MeterProvider` * fix(sdk-metrics): do not report empty scopes and metrics [#4135](https://github.com/open-telemetry/opentelemetry-js/pull/4135) @pichlermarc * Instruments that were created, but did not have measurements will not be exported anymore * Meters (Scopes) that were created, but did not have any instruments with measurements under them will not be exported anymore. @@ -21,9 +34,12 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ ### :books: (Refine Doc) +* docs(contributing): added guidelines for adding benchmark tests [#4169](https://github.com/open-telemetry/opentelemetry-js/pull/4169) + ### :house: (Internal) * test: added a performance benchmark test for span creation [#4105](https://github.com/open-telemetry/opentelemetry-js/pull/4105) +* test: added a workflow to run performance benchmark tests automatically [#4144](https://github.com/open-telemetry/opentelemetry-js/pull/4144) ## 1.17.0 diff --git a/auto-merge/js/doc/contributing/benchmark-tests.md b/auto-merge/js/doc/contributing/benchmark-tests.md new file mode 100644 index 000000000..e97b1659b --- /dev/null +++ b/auto-merge/js/doc/contributing/benchmark-tests.md @@ -0,0 +1,53 @@ + +# Performance Benchmark Testing Guide + +Benchmark tests are intended to measure performance of small units of code. + +It is recommended that operations that have a high impact on the performance of the SDK (or potential for) are accompanied by a benchmark test. This helps end-users understand the performance trend over time, and it also helps maintainers catch performance regressions. + +Benchmark tests are run automatically with every merge to main, and the results are available at . + +## Running benchmark tests + +Performance benchmark tests can be run from the root for all modules or from a single module directory only for that module: + +``` bash +# benchmark all modules +npm run test:bench + +# benchmark a single module +cd packages/opentelemetry-sdk-trace-base +npm run test:bench +``` + +## Adding a benchmark test + +Unlike unit tests, benchmark tests should be written in plain JavaScript (not Typescript). + +Add a new test file in folder `test/performance/benchmark` using the following as a template: + +``` javascript +const Benchmark = require('benchmark'); + +const suite = new Benchmark.Suite(); + +suite.on('cycle', event => { + console.log(String(event.target)); +}); + +suite.add('new benchmark test', function() { + // write code to test ... +}); + +suite.run(); +``` + +## Automatically running benchmark tests + +If you want your test to run automatically with every merge to main (to track trend over time), register the new test file by requiring it in `test/performance/benchmark/index.js`. + +Add the `test:bench` script in package.json, if the module does not contain it already. + +``` json +"test:bench": "node test/performance/benchmark/index.js | tee .benchmark-results.txt" +``` diff --git a/auto-merge/js/doc/library-author.md b/auto-merge/js/doc/library-author.md deleted file mode 100644 index 44e5f1e97..000000000 --- a/auto-merge/js/doc/library-author.md +++ /dev/null @@ -1,3 +0,0 @@ -# OpenTelemetry for Library Authors - -TODO diff --git a/auto-merge/js/doc/metrics.md b/auto-merge/js/doc/metrics.md index e2f2b5a14..3f48775e4 100644 --- a/auto-merge/js/doc/metrics.md +++ b/auto-merge/js/doc/metrics.md @@ -1,6 +1,6 @@ # Metrics -This quick start is for end users of OpenTelemetry who wish to manually measure their applications. If you are a library author, please see the [Library Authors Guide](library-author.md). If you wish to automatically instrument your application, see the automatic instrumentation documentation for the SDK you wish to use. +This quick start is for end users of OpenTelemetry who wish to manually measure their applications. If you wish to automatically instrument your application, see the automatic instrumentation documentation for the SDK you wish to use. For a high-level overview of OpenTelemetry metrics in general and definitions of some common terms, you can refer to the [OpenTelemetry Specification Overview][spec-overview] @@ -286,7 +286,7 @@ await myTask() ## Describing a instrument measurement -Using attributes, kind, and the related [semantic conventions](https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/metrics/semantic_conventions), we can more accurately describe the measurement in a way our metrics backend will more easily understand. The following example uses these mechanisms, which are described below, for recording a measurement +Using attributes, kind, and the related [semantic conventions](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/general/metrics.md), we can more accurately describe the measurement in a way our metrics backend will more easily understand. The following example uses these mechanisms, which are described below, for recording a measurement of a HTTP request. Each metric instruments allows to associate a description, unit of measure, and the value type. @@ -343,7 +343,7 @@ One problem with metrics names and attributes is recognizing, categorizing, and The use of semantic conventions is always recommended where applicable, but they are merely conventions. For example, you may find that some name other than the name suggested by the semantic conventions more accurately describes your metric, you may decide not to include a metric attribute which is suggested by semantic conventions for privacy reasons, or you may wish to add a custom attribute which isn't covered by semantic conventions. All of these cases are fine, but please keep in mind that if you stray from the semantic conventions, the categorization of metrics in your metrics backend may be affected. -_See the current metrics semantic conventions in the OpenTelemetry Specification repository: _ +_See the current metrics semantic conventions in the OpenTelemetry Specification repository: _ [spec-overview]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/overview.md diff --git a/auto-merge/js/doc/processor-api.md b/auto-merge/js/doc/processor-api.md deleted file mode 100644 index 58d7916e5..000000000 --- a/auto-merge/js/doc/processor-api.md +++ /dev/null @@ -1,147 +0,0 @@ -# Processor API Guide - - - -The processor has two responsibilities: choosing which aggregator to choose for a metric instrument and store the last record for each metric ready to be exported. - -## Selecting a specific aggregator for metrics - -Sometimes you may want to use a specific aggregator for one of your metric, export an average of the last X values instead of just the last one. - -Here is what an aggregator that does that would look like: - -```ts -import { Aggregator } from '@opentelemetry/sdk-metrics'; -import { hrTime } from '@opentelemetry/core'; - -export class AverageAggregator implements Aggregator { - - private _values: number[] = []; - private _limit: number; - - constructor (limit?: number) { - this._limit = limit ?? 10; - } - - update (value: number) { - this._values.push(value); - if (this._values.length >= this._limit) { - this._values = this._values.slice(0, 10); - } - } - - toPoint() { - const sum =this._values.reduce((agg, value) => { - agg += value; - return agg; - }, 0); - return { - value: this._values.length > 0 ? sum / this._values.length : 0, - timestamp: hrTime(), - } - } -} -``` - -Now we will need to implement our own processor to configure the sdk to use our new aggregator. To simplify even more, we will just extend the `UngroupedProcessor` (which is the default) to avoid re-implementing the whole `Aggregator` interface. - -Here the result: - -```ts -import { - UngroupedProcessor, - MetricDescriptor, - CounterSumAggregator, - ObserverAggregator, - MeasureExactAggregator, -} from '@opentelemetry/sdk-metrics'; - -export class CustomProcessor extends UngroupedProcessor { - aggregatorFor (metricDescriptor: MetricDescriptor) { - if (metricDescriptor.name === 'requests') { - return new AverageAggregator(10); - } - // this is exactly what the "UngroupedProcessor" does, we will re-use it - // to fallback on the default behavior - switch (metricDescriptor.metricKind) { - case MetricKind.COUNTER: - return new CounterSumAggregator(); - case MetricKind.OBSERVER: - return new ObserverAggregator(); - default: - return new MeasureExactAggregator(); - } - } -} -``` - -Finally, we need to specify to the `MeterProvider` to use our `CustomProcessor` when creating new meter: - -```ts -import { - UngroupedProcessor, - MetricDescriptor, - CounterSumAggregator, - ObserverAggregator, - MeasureExactAggregator, - MeterProvider, - Aggregator, -} from '@opentelemetry/sdk-metrics'; -import { hrTime } from '@opentelemetry/core'; - -export class AverageAggregator implements Aggregator { - - private _values: number[] = []; - private _limit: number; - - constructor (limit?: number) { - this._limit = limit ?? 10; - } - - update (value: number) { - this._values.push(value); - if (this._values.length >= this._limit) { - this._values = this._values.slice(0, 10); - } - } - - toPoint() { - const sum =this._values.reduce((agg, value) => { - agg += value; - return agg; - }, 0); - return { - value: this._values.length > 0 ? sum / this._values.length : 0, - timestamp: hrTime(), - } - } -} - -export class CustomProcessor extends UngroupedProcessor { - aggregatorFor (metricDescriptor: MetricDescriptor) { - if (metricDescriptor.name === 'requests') { - return new AverageAggregator(10); - } - // this is exactly what the "UngroupedProcessor" does, we will re-use it - // to fallback on the default behavior - switch (metricDescriptor.metricKind) { - case MetricKind.COUNTER: - return new CounterSumAggregator(); - case MetricKind.OBSERVER: - return new ObserverAggregator(); - default: - return new MeasureExactAggregator(); - } - } -} - -const meter = new MeterProvider({ - processor: new CustomProcessor(), - interval: 1000, -}).getMeter('example-custom-processor'); - -const requestsLatency = meter.createHistogram('requests', { - monotonic: true, - description: 'Average latency' -}); -``` diff --git a/auto-merge/js/doc/tracing.md b/auto-merge/js/doc/tracing.md index fb3371d4f..392ca9573 100644 --- a/auto-merge/js/doc/tracing.md +++ b/auto-merge/js/doc/tracing.md @@ -1,6 +1,6 @@ # Tracing -This quick start is for end users of OpenTelemetry who wish to manually trace their applications. If you are a library author, please see the [Library Authors Guide](library-author.md). If you wish to automatically instrument your application, see the automatic instrumentation documentation for the SDK you wish to use. +This quick start is for end users of OpenTelemetry who wish to manually trace their applications. If you wish to automatically instrument your application, see the automatic instrumentation documentation for the SDK you wish to use. For a high-level overview of OpenTelemetry tracing in general and definitions of some common terms, you can refer to the [OpenTelemetry Specification Overview][spec-overview] @@ -76,7 +76,7 @@ server.on("GET", "/user/:id", onGet); ## Describing a Span -Using span relationships, attributes, kind, and the related [semantic conventions](https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/trace/semantic_conventions), we can more accurately describe the span in a way our tracing backend will more easily understand. The following example uses these mechanisms, which are described below. +Using span relationships, attributes, kind, and the related [semantic conventions](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/general/trace.md), we can more accurately describe the span in a way our tracing backend will more easily understand. The following example uses these mechanisms, which are described below. ```typescript import { NetTransportValues, SemanticAttributes } from '@opentelemetry/semantic-conventions'; @@ -209,6 +209,6 @@ Consumer spans represent the processing of a job created by a producer and may s One problem with span names and attributes is recognizing, categorizing, and analyzing them in your tracing backend. Between different applications, libraries, and tracing backends there might be different names and expected values for various attributes. For example, your application may use `http.status` to describe the HTTP status code, but a library you use may use `http.status_code`. In order to solve this problem, OpenTelemetry uses a library of semantic conventions which describe the name and attributes which should be used for specific types of spans. The use of semantic conventions is always recommended where applicable, but they are merely conventions. For example, you may find that some name other than the name suggested by the semantic conventions more accurately describes your span, you may decide not to include a span attribute which is suggested by semantic conventions for privacy reasons, or you may wish to add a custom attribute which isn't covered by semantic conventions. All of these cases are fine, but please keep in mind that if you stray from the semantic conventions, the categorization of spans in your tracing backend may be affected. -_See the current trace semantic conventions in the OpenTelemetry Specification repository: _ +_See the current trace semantic conventions in the OpenTelemetry Specification repository: _ [spec-overview]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/overview.md diff --git a/auto-merge/js/examples/esm-http-ts/package.json b/auto-merge/js/examples/esm-http-ts/package.json index 046ab7fe0..8920f1167 100644 --- a/auto-merge/js/examples/esm-http-ts/package.json +++ b/auto-merge/js/examples/esm-http-ts/package.json @@ -1,7 +1,7 @@ { "name": "esm-http-ts", "private": true, - "version": "0.43.0", + "version": "0.44.0", "description": "Example of HTTP integration with OpenTelemetry using ESM and TypeScript", "main": "build/index.js", "type": "module", @@ -31,12 +31,12 @@ "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/", "dependencies": { "@opentelemetry/api": "1.6.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.43.0", - "@opentelemetry/instrumentation": "0.43.0", - "@opentelemetry/instrumentation-http": "0.43.0", - "@opentelemetry/resources": "1.17.0", - "@opentelemetry/sdk-trace-base": "1.17.0", - "@opentelemetry/sdk-trace-node": "1.17.0", - "@opentelemetry/semantic-conventions": "1.17.0" + "@opentelemetry/exporter-trace-otlp-proto": "0.44.0", + "@opentelemetry/instrumentation": "0.44.0", + "@opentelemetry/instrumentation-http": "0.44.0", + "@opentelemetry/resources": "1.17.1", + "@opentelemetry/sdk-trace-base": "1.17.1", + "@opentelemetry/sdk-trace-node": "1.17.1", + "@opentelemetry/semantic-conventions": "1.17.1" } } diff --git a/auto-merge/js/examples/http/package.json b/auto-merge/js/examples/http/package.json index 9a3bcb2de..4ea1cafe3 100644 --- a/auto-merge/js/examples/http/package.json +++ b/auto-merge/js/examples/http/package.json @@ -1,7 +1,7 @@ { "name": "http-example", "private": true, - "version": "0.43.0", + "version": "0.44.0", "description": "Example of HTTP integration with OpenTelemetry", "main": "index.js", "scripts": { @@ -29,14 +29,14 @@ }, "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-jaeger": "1.17.0", - "@opentelemetry/exporter-zipkin": "1.17.0", - "@opentelemetry/instrumentation": "0.43.0", - "@opentelemetry/instrumentation-http": "0.43.0", - "@opentelemetry/resources": "1.17.0", - "@opentelemetry/sdk-trace-base": "1.17.0", - "@opentelemetry/sdk-trace-node": "1.17.0", - "@opentelemetry/semantic-conventions": "1.17.0" + "@opentelemetry/exporter-jaeger": "1.17.1", + "@opentelemetry/exporter-zipkin": "1.17.1", + "@opentelemetry/instrumentation": "0.44.0", + "@opentelemetry/instrumentation-http": "0.44.0", + "@opentelemetry/resources": "1.17.1", + "@opentelemetry/sdk-trace-base": "1.17.1", + "@opentelemetry/sdk-trace-node": "1.17.1", + "@opentelemetry/semantic-conventions": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http", "devDependencies": { diff --git a/auto-merge/js/examples/https/package.json b/auto-merge/js/examples/https/package.json index 3653c96ff..13434d915 100644 --- a/auto-merge/js/examples/https/package.json +++ b/auto-merge/js/examples/https/package.json @@ -1,7 +1,7 @@ { "name": "https-example", "private": true, - "version": "0.43.0", + "version": "0.44.0", "description": "Example of HTTPs integration with OpenTelemetry", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -33,14 +33,14 @@ }, "dependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/exporter-jaeger": "1.17.0", - "@opentelemetry/exporter-zipkin": "1.17.0", - "@opentelemetry/instrumentation": "0.43.0", - "@opentelemetry/instrumentation-http": "0.43.0", - "@opentelemetry/resources": "1.17.0", - "@opentelemetry/sdk-trace-base": "1.17.0", - "@opentelemetry/sdk-trace-node": "1.17.0", - "@opentelemetry/semantic-conventions": "1.17.0" + "@opentelemetry/exporter-jaeger": "1.17.1", + "@opentelemetry/exporter-zipkin": "1.17.1", + "@opentelemetry/instrumentation": "0.44.0", + "@opentelemetry/instrumentation-http": "0.44.0", + "@opentelemetry/resources": "1.17.1", + "@opentelemetry/sdk-trace-base": "1.17.1", + "@opentelemetry/sdk-trace-node": "1.17.1", + "@opentelemetry/semantic-conventions": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https", "devDependencies": { diff --git a/auto-merge/js/examples/otlp-exporter-node/package.json b/auto-merge/js/examples/otlp-exporter-node/package.json index 5091af083..871a2a423 100644 --- a/auto-merge/js/examples/otlp-exporter-node/package.json +++ b/auto-merge/js/examples/otlp-exporter-node/package.json @@ -1,7 +1,7 @@ { "name": "example-otlp-exporter-node", "private": true, - "version": "0.43.0", + "version": "0.44.0", "description": "Example of using @opentelemetry/collector-exporter in Node.js", "main": "index.js", "scripts": { @@ -29,17 +29,17 @@ }, "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/core": "1.17.0", - "@opentelemetry/exporter-metrics-otlp-grpc": "0.43.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.43.0", - "@opentelemetry/exporter-metrics-otlp-proto": "0.43.0", - "@opentelemetry/exporter-trace-otlp-grpc": "0.43.0", - "@opentelemetry/exporter-trace-otlp-http": "0.43.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.43.0", - "@opentelemetry/resources": "1.17.0", - "@opentelemetry/sdk-metrics": "1.17.0", - "@opentelemetry/sdk-trace-base": "1.17.0", - "@opentelemetry/semantic-conventions": "1.17.0" + "@opentelemetry/core": "1.17.1", + "@opentelemetry/exporter-metrics-otlp-grpc": "0.44.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.44.0", + "@opentelemetry/exporter-metrics-otlp-proto": "0.44.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.44.0", + "@opentelemetry/exporter-trace-otlp-http": "0.44.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.44.0", + "@opentelemetry/resources": "1.17.1", + "@opentelemetry/sdk-metrics": "1.17.1", + "@opentelemetry/sdk-trace-base": "1.17.1", + "@opentelemetry/semantic-conventions": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node" } diff --git a/auto-merge/js/experimental/CHANGELOG.md b/auto-merge/js/experimental/CHANGELOG.md index 72f028957..cfb4d189b 100644 --- a/auto-merge/js/experimental/CHANGELOG.md +++ b/auto-merge/js/experimental/CHANGELOG.md @@ -4,8 +4,18 @@ All notable changes to experimental packages in this project will be documented ## Unreleased +### :boom: Breaking Change + +### :rocket: (Enhancement) + +### :bug: (Bug Fix) + ### :books: (Refine Doc) +### :house: (Internal) + +## 0.44.0 + ### :boom: Breaking Change * fix(exporter-logs-otlp-proto): change OTLPLogExporter to OTLPLogExporter [#4140](https://github.com/open-telemetry/opentelemetry-js/pull/4140) @Vunovati @@ -22,10 +32,7 @@ All notable changes to experimental packages in this project will be documented ### :bug: (Bug Fix) * fix(otlp-exporter-base): replaced usage of window with _globalThis [#4157](https://github.com/open-telemetry/opentelemetry-js/pull/4157) @cristianmadularu - -### :books: (Refine Doc) - -### :house: (Internal) +* fix(otlp-transformer): Avoid precision loss when converting from HrTime to unix nanoseconds. [#4062](https://github.com/open-telemetry/opentelemetry-js/pull/4062) ## 0.43.0 @@ -56,7 +63,6 @@ All notable changes to experimental packages in this project will be documented ### :bug: (Bug Fix) -* fix(otlp-transformer): Avoid precision loss when converting from HrTime to unix nanoseconds. [#4062](https://github.com/open-telemetry/opentelemetry-js/pull/4062) * fix(exporter-logs-otlp-http): add @opentelemetry/api-logs as dependency ## 0.41.2 diff --git a/auto-merge/js/experimental/backwards-compatibility/node14/package.json b/auto-merge/js/experimental/backwards-compatibility/node14/package.json index 5e7509407..41ac4219e 100644 --- a/auto-merge/js/experimental/backwards-compatibility/node14/package.json +++ b/auto-merge/js/experimental/backwards-compatibility/node14/package.json @@ -1,6 +1,6 @@ { "name": "backcompat-node14", - "version": "0.43.0", + "version": "0.44.0", "private": true, "description": "Backwards compatibility app for node 14 types and the OpenTelemetry Node.js SDK", "main": "index.js", @@ -9,8 +9,8 @@ "peer-api-check": "node ../../../scripts/peer-api-check.js" }, "dependencies": { - "@opentelemetry/sdk-node": "0.43.0", - "@opentelemetry/sdk-trace-base": "1.17.0" + "@opentelemetry/sdk-node": "0.44.0", + "@opentelemetry/sdk-trace-base": "1.17.1" }, "devDependencies": { "@types/node": "14.18.25", diff --git a/auto-merge/js/experimental/backwards-compatibility/node16/package.json b/auto-merge/js/experimental/backwards-compatibility/node16/package.json index 2c8c2f8e7..a48907167 100644 --- a/auto-merge/js/experimental/backwards-compatibility/node16/package.json +++ b/auto-merge/js/experimental/backwards-compatibility/node16/package.json @@ -1,6 +1,6 @@ { "name": "backcompat-node16", - "version": "0.43.0", + "version": "0.44.0", "private": true, "description": "Backwards compatibility app for node 16 types and the OpenTelemetry Node.js SDK", "main": "index.js", @@ -9,8 +9,8 @@ "peer-api-check": "node ../../../scripts/peer-api-check.js" }, "dependencies": { - "@opentelemetry/sdk-node": "0.43.0", - "@opentelemetry/sdk-trace-base": "1.17.0" + "@opentelemetry/sdk-node": "0.44.0", + "@opentelemetry/sdk-trace-base": "1.17.1" }, "devDependencies": { "@types/node": "16.11.52", diff --git a/auto-merge/js/experimental/examples/logs/package.json b/auto-merge/js/experimental/examples/logs/package.json index 03ff3e05b..b39d19b95 100644 --- a/auto-merge/js/experimental/examples/logs/package.json +++ b/auto-merge/js/experimental/examples/logs/package.json @@ -1,6 +1,6 @@ { "name": "logs-example", - "version": "0.43.0", + "version": "0.44.0", "private": true, "scripts": { "start": "ts-node index.ts" diff --git a/auto-merge/js/experimental/examples/opencensus-shim/package.json b/auto-merge/js/experimental/examples/opencensus-shim/package.json index bd97c726c..189070844 100644 --- a/auto-merge/js/experimental/examples/opencensus-shim/package.json +++ b/auto-merge/js/experimental/examples/opencensus-shim/package.json @@ -1,7 +1,7 @@ { "name": "opencensus-shim", "private": true, - "version": "0.43.0", + "version": "0.44.0", "description": "Example of using @opentelemetry/shim-opencensus in Node.js", "main": "index.js", "scripts": { @@ -31,13 +31,13 @@ "@opencensus/instrumentation-http": "0.1.0", "@opencensus/nodejs-base": "0.1.0", "@opentelemetry/api": "1.6.0", - "@opentelemetry/exporter-prometheus": "0.43.0", - "@opentelemetry/exporter-trace-otlp-grpc": "0.43.0", - "@opentelemetry/resources": "1.17.0", - "@opentelemetry/sdk-metrics": "1.17.0", - "@opentelemetry/sdk-trace-node": "1.17.0", - "@opentelemetry/semantic-conventions": "1.17.0", - "@opentelemetry/shim-opencensus": "0.43.0" + "@opentelemetry/exporter-prometheus": "0.44.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.44.0", + "@opentelemetry/resources": "1.17.1", + "@opentelemetry/sdk-metrics": "1.17.1", + "@opentelemetry/sdk-trace-node": "1.17.1", + "@opentelemetry/semantic-conventions": "1.17.1", + "@opentelemetry/shim-opencensus": "0.44.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/examples/opencensus-shim" } diff --git a/auto-merge/js/experimental/examples/prometheus/package.json b/auto-merge/js/experimental/examples/prometheus/package.json index 9a7beb79e..7c7f8f571 100644 --- a/auto-merge/js/experimental/examples/prometheus/package.json +++ b/auto-merge/js/experimental/examples/prometheus/package.json @@ -1,6 +1,6 @@ { "name": "prometheus-example", - "version": "0.43.0", + "version": "0.44.0", "private": true, "description": "Example of using @opentelemetry/sdk-metrics and @opentelemetry/exporter-prometheus", "main": "index.js", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-prometheus": "0.43.0", - "@opentelemetry/sdk-metrics": "1.17.0" + "@opentelemetry/exporter-prometheus": "0.44.0", + "@opentelemetry/sdk-metrics": "1.17.1" } } diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-grpc/package.json b/auto-merge/js/experimental/packages/exporter-logs-otlp-grpc/package.json index eb79af287..6be018bab 100644 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-grpc/package.json +++ b/auto-merge/js/experimental/packages/exporter-logs-otlp-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-logs-otlp-grpc", - "version": "0.43.0", + "version": "0.44.0", "description": "OpenTelemetry Collector Exporter allows user to send collected log records to the OpenTelemetry Collector", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -49,14 +49,14 @@ }, "devDependencies": { "@babel/core": "7.22.20", - "@grpc/proto-loader": "^0.7.3", + "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.6.0", - "@opentelemetry/api-logs": "0.43.0", - "@opentelemetry/otlp-exporter-base": "0.43.0", - "@opentelemetry/resources": "1.17.0", + "@opentelemetry/api-logs": "0.44.0", + "@opentelemetry/otlp-exporter-base": "0.44.0", + "@opentelemetry/resources": "1.17.1", "@types/mocha": "10.0.2", "@types/node": "18.6.5", - "@types/sinon": "10.0.17", + "@types/sinon": "10.0.18", "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", @@ -73,10 +73,10 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.17.0", - "@opentelemetry/otlp-grpc-exporter-base": "0.43.0", - "@opentelemetry/otlp-transformer": "0.43.0", - "@opentelemetry/sdk-logs": "0.43.0" + "@opentelemetry/core": "1.17.1", + "@opentelemetry/otlp-grpc-exporter-base": "0.44.0", + "@opentelemetry/otlp-transformer": "0.44.0", + "@opentelemetry/sdk-logs": "0.44.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-grpc", "sideEffects": false diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-grpc/package.json b/auto-merge/js/experimental/packages/exporter-trace-otlp-grpc/package.json index 4fb4e0ae1..bc14408e5 100644 --- a/auto-merge/js/experimental/packages/exporter-trace-otlp-grpc/package.json +++ b/auto-merge/js/experimental/packages/exporter-trace-otlp-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-trace-otlp-grpc", - "version": "0.43.0", + "version": "0.44.0", "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -48,12 +48,12 @@ }, "devDependencies": { "@babel/core": "7.22.20", - "@grpc/proto-loader": "^0.7.3", + "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.6.0", - "@opentelemetry/otlp-exporter-base": "0.43.0", + "@opentelemetry/otlp-exporter-base": "0.44.0", "@types/mocha": "10.0.2", "@types/node": "18.6.5", - "@types/sinon": "10.0.17", + "@types/sinon": "10.0.18", "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", @@ -70,11 +70,11 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.17.0", - "@opentelemetry/otlp-grpc-exporter-base": "0.43.0", - "@opentelemetry/otlp-transformer": "0.43.0", - "@opentelemetry/resources": "1.17.0", - "@opentelemetry/sdk-trace-base": "1.17.0" + "@opentelemetry/core": "1.17.1", + "@opentelemetry/otlp-grpc-exporter-base": "0.44.0", + "@opentelemetry/otlp-transformer": "0.44.0", + "@opentelemetry/resources": "1.17.1", + "@opentelemetry/sdk-trace-base": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-grpc", "sideEffects": false diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json index 1a6550dc6..7c612bf03 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json +++ b/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-metrics-otlp-grpc", - "version": "0.43.0", + "version": "0.44.0", "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -48,11 +48,11 @@ }, "devDependencies": { "@babel/core": "7.22.20", - "@grpc/proto-loader": "^0.7.3", + "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.6.0", "@types/mocha": "10.0.2", "@types/node": "18.6.5", - "@types/sinon": "10.0.17", + "@types/sinon": "10.0.18", "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", @@ -69,12 +69,12 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.17.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.43.0", - "@opentelemetry/otlp-grpc-exporter-base": "0.43.0", - "@opentelemetry/otlp-transformer": "0.43.0", - "@opentelemetry/resources": "1.17.0", - "@opentelemetry/sdk-metrics": "1.17.0" + "@opentelemetry/core": "1.17.1", + "@opentelemetry/exporter-metrics-otlp-http": "0.44.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.44.0", + "@opentelemetry/otlp-transformer": "0.44.0", + "@opentelemetry/resources": "1.17.1", + "@opentelemetry/sdk-metrics": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc", "sideEffects": false diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json index 12defa7e8..f9ddf74a6 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json +++ b/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-metrics-otlp-proto", - "version": "0.43.0", + "version": "0.44.0", "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector using protobuf over HTTP", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -59,7 +59,7 @@ "@opentelemetry/api": "1.6.0", "@types/mocha": "10.0.2", "@types/node": "18.6.5", - "@types/sinon": "10.0.17", + "@types/sinon": "10.0.18", "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", @@ -75,13 +75,13 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.17.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.43.0", - "@opentelemetry/otlp-exporter-base": "0.43.0", - "@opentelemetry/otlp-proto-exporter-base": "0.43.0", - "@opentelemetry/otlp-transformer": "0.43.0", - "@opentelemetry/resources": "1.17.0", - "@opentelemetry/sdk-metrics": "1.17.0" + "@opentelemetry/core": "1.17.1", + "@opentelemetry/exporter-metrics-otlp-http": "0.44.0", + "@opentelemetry/otlp-exporter-base": "0.44.0", + "@opentelemetry/otlp-proto-exporter-base": "0.44.0", + "@opentelemetry/otlp-transformer": "0.44.0", + "@opentelemetry/resources": "1.17.1", + "@opentelemetry/sdk-metrics": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-proto", "sideEffects": false diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-prometheus/package.json b/auto-merge/js/experimental/packages/opentelemetry-exporter-prometheus/package.json index f445d8bd1..15cdcffe9 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-exporter-prometheus/package.json +++ b/auto-merge/js/experimental/packages/opentelemetry-exporter-prometheus/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-prometheus", - "version": "0.43.0", + "version": "0.44.0", "description": "OpenTelemetry Exporter Prometheus provides a metrics endpoint for Prometheus", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -44,10 +44,10 @@ }, "devDependencies": { "@opentelemetry/api": "1.6.0", - "@opentelemetry/semantic-conventions": "1.17.0", + "@opentelemetry/semantic-conventions": "1.17.1", "@types/mocha": "10.0.2", "@types/node": "18.6.5", - "@types/sinon": "10.0.17", + "@types/sinon": "10.0.18", "codecov": "3.8.3", "cross-var": "1.1.0", "lerna": "7.1.5", @@ -61,9 +61,9 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.17.0", - "@opentelemetry/resources": "1.17.0", - "@opentelemetry/sdk-metrics": "1.17.0" + "@opentelemetry/core": "1.17.1", + "@opentelemetry/resources": "1.17.1", + "@opentelemetry/sdk-metrics": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-prometheus", "sideEffects": false diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/auto-merge/js/experimental/packages/opentelemetry-instrumentation-grpc/package.json index 1b3e5c47d..72dc5034b 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-grpc/package.json +++ b/auto-merge/js/experimental/packages/opentelemetry-instrumentation-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-grpc", - "version": "0.43.0", + "version": "0.44.0", "description": "OpenTelemetry grpc automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -48,19 +48,19 @@ "devDependencies": { "@bufbuild/buf": "1.21.0-1", "@grpc/grpc-js": "^1.7.1", - "@grpc/proto-loader": "^0.7.3", + "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.6.0", - "@opentelemetry/context-async-hooks": "1.17.0", - "@opentelemetry/core": "1.17.0", - "@opentelemetry/sdk-trace-base": "1.17.0", - "@opentelemetry/sdk-trace-node": "1.17.0", + "@opentelemetry/context-async-hooks": "1.17.1", + "@opentelemetry/core": "1.17.1", + "@opentelemetry/sdk-trace-base": "1.17.1", + "@opentelemetry/sdk-trace-node": "1.17.1", "@protobuf-ts/grpc-transport": "2.9.1", "@protobuf-ts/runtime": "2.9.1", "@protobuf-ts/runtime-rpc": "2.9.1", "@types/mocha": "10.0.2", "@types/node": "18.6.5", "@types/semver": "7.5.3", - "@types/sinon": "10.0.17", + "@types/sinon": "10.0.18", "codecov": "3.8.3", "cross-var": "1.1.0", "lerna": "7.1.5", @@ -75,8 +75,8 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/instrumentation": "0.43.0", - "@opentelemetry/semantic-conventions": "1.17.0" + "@opentelemetry/instrumentation": "0.44.0", + "@opentelemetry/semantic-conventions": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-grpc", "sideEffects": false diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-http/package.json b/auto-merge/js/experimental/packages/opentelemetry-instrumentation-http/package.json index c18ac517d..1c1d524e8 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-http/package.json +++ b/auto-merge/js/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-http", - "version": "0.43.0", + "version": "0.44.0", "description": "OpenTelemetry http/https automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -46,15 +46,15 @@ }, "devDependencies": { "@opentelemetry/api": "1.6.0", - "@opentelemetry/context-async-hooks": "1.17.0", - "@opentelemetry/sdk-metrics": "1.17.0", - "@opentelemetry/sdk-trace-base": "1.17.0", - "@opentelemetry/sdk-trace-node": "1.17.0", + "@opentelemetry/context-async-hooks": "1.17.1", + "@opentelemetry/sdk-metrics": "1.17.1", + "@opentelemetry/sdk-trace-base": "1.17.1", + "@opentelemetry/sdk-trace-node": "1.17.1", "@types/mocha": "10.0.2", "@types/node": "18.6.5", "@types/request-promise-native": "1.0.19", "@types/semver": "7.5.3", - "@types/sinon": "10.0.17", + "@types/sinon": "10.0.18", "@types/superagent": "4.1.19", "axios": "1.5.1", "codecov": "3.8.3", @@ -74,9 +74,9 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.17.0", - "@opentelemetry/instrumentation": "0.43.0", - "@opentelemetry/semantic-conventions": "1.17.0", + "@opentelemetry/core": "1.17.1", + "@opentelemetry/instrumentation": "0.44.0", + "@opentelemetry/semantic-conventions": "1.17.1", "semver": "^7.5.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-http", diff --git a/auto-merge/js/experimental/packages/opentelemetry-sdk-node/package.json b/auto-merge/js/experimental/packages/opentelemetry-sdk-node/package.json index 0f94bc438..6a5261623 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-sdk-node/package.json +++ b/auto-merge/js/experimental/packages/opentelemetry-sdk-node/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-node", - "version": "0.43.0", + "version": "0.44.0", "description": "OpenTelemetry SDK for Node.js", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -17,8 +17,7 @@ "watch": "tsc --build --watch", "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", "prewatch": "npm run precompile", - "peer-api-check": "node ../../../scripts/peer-api-check.js", - "postinstall": "node -e \"console.log(\\\"\\x1b[95m%s\\x1b[0m\\\", \\\"@opentelemetry/sdk-node - warning: Starting with 0.44.0 '@opentelemetry/exporter-jaeger' will no longer be automatically installed by this package. To continue using '@opentelemetry/exporter-jaeger', please install it manually.\\n(NOTE: '@opentelemetry/exporter-jaeger' is deprecated, consider switching to one of the alternatives described in https://www.npmjs.com/package/@opentelemetry/exporter-jaeger)\\\");\"" + "peer-api-check": "node ../../../scripts/peer-api-check.js" }, "keywords": [ "opentelemetry", @@ -45,32 +44,32 @@ "access": "public" }, "dependencies": { - "@opentelemetry/api-logs": "0.43.0", - "@opentelemetry/core": "1.17.0", - "@opentelemetry/exporter-jaeger": "1.17.0", - "@opentelemetry/exporter-trace-otlp-grpc": "0.43.0", - "@opentelemetry/exporter-trace-otlp-http": "0.43.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.43.0", - "@opentelemetry/exporter-zipkin": "1.17.0", - "@opentelemetry/instrumentation": "0.43.0", - "@opentelemetry/resources": "1.17.0", - "@opentelemetry/sdk-logs": "0.43.0", - "@opentelemetry/sdk-metrics": "1.17.0", - "@opentelemetry/sdk-trace-base": "1.17.0", - "@opentelemetry/sdk-trace-node": "1.17.0", - "@opentelemetry/semantic-conventions": "1.17.0" + "@opentelemetry/api-logs": "0.44.0", + "@opentelemetry/core": "1.17.1", + "@opentelemetry/exporter-jaeger": "1.17.1", + "@opentelemetry/exporter-trace-otlp-grpc": "0.44.0", + "@opentelemetry/exporter-trace-otlp-http": "0.44.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.44.0", + "@opentelemetry/exporter-zipkin": "1.17.1", + "@opentelemetry/instrumentation": "0.44.0", + "@opentelemetry/resources": "1.17.1", + "@opentelemetry/sdk-logs": "0.44.0", + "@opentelemetry/sdk-metrics": "1.17.1", + "@opentelemetry/sdk-trace-base": "1.17.1", + "@opentelemetry/sdk-trace-node": "1.17.1", + "@opentelemetry/semantic-conventions": "1.17.1" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.7.0" }, "devDependencies": { "@opentelemetry/api": "1.6.0", - "@opentelemetry/context-async-hooks": "1.17.0", + "@opentelemetry/context-async-hooks": "1.17.1", "@opentelemetry/exporter-jaeger": "1.17.0", "@types/mocha": "10.0.2", "@types/node": "18.6.5", "@types/semver": "7.5.3", - "@types/sinon": "10.0.17", + "@types/sinon": "10.0.18", "codecov": "3.8.3", "cross-var": "1.1.0", "lerna": "7.1.5", diff --git a/auto-merge/js/experimental/packages/otlp-grpc-exporter-base/package.json b/auto-merge/js/experimental/packages/otlp-grpc-exporter-base/package.json index dbf84414c..4be5e7d7b 100644 --- a/auto-merge/js/experimental/packages/otlp-grpc-exporter-base/package.json +++ b/auto-merge/js/experimental/packages/otlp-grpc-exporter-base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/otlp-grpc-exporter-base", - "version": "0.43.0", + "version": "0.44.0", "description": "OpenTelemetry OTLP-gRPC Exporter base (for internal use only)", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -50,12 +50,12 @@ "devDependencies": { "@babel/core": "7.22.20", "@opentelemetry/api": "1.6.0", - "@opentelemetry/otlp-transformer": "0.43.0", - "@opentelemetry/resources": "1.17.0", - "@opentelemetry/sdk-trace-base": "1.17.0", + "@opentelemetry/otlp-transformer": "0.44.0", + "@opentelemetry/resources": "1.17.1", + "@opentelemetry/sdk-trace-base": "1.17.1", "@types/mocha": "10.0.2", "@types/node": "18.6.5", - "@types/sinon": "10.0.17", + "@types/sinon": "10.0.18", "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", @@ -73,8 +73,8 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.17.0", - "@opentelemetry/otlp-exporter-base": "0.43.0", + "@opentelemetry/core": "1.17.1", + "@opentelemetry/otlp-exporter-base": "0.44.0", "protobufjs": "^7.2.3" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-grpc-exporter-base", diff --git a/auto-merge/js/experimental/packages/shim-opencensus/package.json b/auto-merge/js/experimental/packages/shim-opencensus/package.json index 3ec28d7ae..12fcba77e 100644 --- a/auto-merge/js/experimental/packages/shim-opencensus/package.json +++ b/auto-merge/js/experimental/packages/shim-opencensus/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/shim-opencensus", - "version": "0.43.0", + "version": "0.44.0", "description": "OpenCensus to OpenTelemetry shim", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -50,11 +50,11 @@ "devDependencies": { "@opencensus/core": "0.1.0", "@opentelemetry/api": "1.6.0", - "@opentelemetry/context-async-hooks": "1.17.0", - "@opentelemetry/sdk-trace-base": "1.17.0", + "@opentelemetry/context-async-hooks": "1.17.1", + "@opentelemetry/sdk-trace-base": "1.17.1", "@types/mocha": "10.0.2", "@types/node": "18.6.5", - "@types/sinon": "10.0.17", + "@types/sinon": "10.0.18", "codecov": "3.8.3", "cross-var": "1.1.0", "lerna": "7.1.5", @@ -69,9 +69,9 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.17.0", - "@opentelemetry/resources": "1.17.0", - "@opentelemetry/sdk-metrics": "1.17.0", + "@opentelemetry/core": "1.17.1", + "@opentelemetry/resources": "1.17.1", + "@opentelemetry/sdk-metrics": "1.17.1", "require-in-the-middle": "^7.1.1", "semver": "^7.5.2" }, diff --git a/auto-merge/js/integration-tests/propagation-validation-server/package.json b/auto-merge/js/integration-tests/propagation-validation-server/package.json index 2b5fcd340..927d8057a 100644 --- a/auto-merge/js/integration-tests/propagation-validation-server/package.json +++ b/auto-merge/js/integration-tests/propagation-validation-server/package.json @@ -1,6 +1,6 @@ { "name": "propagation-validation-server", - "version": "1.17.0", + "version": "1.18.0", "description": "server for w3c tests", "main": "validation_server.js", "private": true, @@ -12,9 +12,9 @@ }, "dependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/context-async-hooks": "1.17.0", - "@opentelemetry/core": "1.17.0", - "@opentelemetry/sdk-trace-base": "1.17.0", + "@opentelemetry/context-async-hooks": "1.17.1", + "@opentelemetry/core": "1.17.1", + "@opentelemetry/sdk-trace-base": "1.17.1", "axios": "1.5.1", "body-parser": "1.19.0", "express": "4.17.3" diff --git a/auto-merge/js/packages/opentelemetry-context-async-hooks/package.json b/auto-merge/js/packages/opentelemetry-context-async-hooks/package.json index ea0da0acb..063ca2ed6 100644 --- a/auto-merge/js/packages/opentelemetry-context-async-hooks/package.json +++ b/auto-merge/js/packages/opentelemetry-context-async-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/context-async-hooks", - "version": "1.17.0", + "version": "1.17.1", "description": "OpenTelemetry AsyncHooks-based Context Manager", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/auto-merge/js/packages/opentelemetry-exporter-jaeger/package.json b/auto-merge/js/packages/opentelemetry-exporter-jaeger/package.json index 3fba91d4f..b412ade12 100644 --- a/auto-merge/js/packages/opentelemetry-exporter-jaeger/package.json +++ b/auto-merge/js/packages/opentelemetry-exporter-jaeger/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-jaeger", - "version": "1.17.0", + "version": "1.17.1", "description": "OpenTelemetry Exporter Jaeger allows user to send collected traces to Jaeger", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -45,10 +45,10 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/resources": "1.17.0", + "@opentelemetry/resources": "1.17.1", "@types/mocha": "10.0.2", "@types/node": "18.6.5", - "@types/sinon": "10.0.17", + "@types/sinon": "10.0.18", "codecov": "3.8.3", "cross-var": "1.1.0", "lerna": "7.1.5", @@ -63,9 +63,9 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.17.0", - "@opentelemetry/sdk-trace-base": "1.17.0", - "@opentelemetry/semantic-conventions": "1.17.0", + "@opentelemetry/core": "1.17.1", + "@opentelemetry/sdk-trace-base": "1.17.1", + "@opentelemetry/semantic-conventions": "1.17.1", "jaeger-client": "^3.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-jaeger", diff --git a/auto-merge/js/packages/opentelemetry-propagator-jaeger/package.json b/auto-merge/js/packages/opentelemetry-propagator-jaeger/package.json index 7735971bf..ee8455ef1 100644 --- a/auto-merge/js/packages/opentelemetry-propagator-jaeger/package.json +++ b/auto-merge/js/packages/opentelemetry-propagator-jaeger/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-jaeger", - "version": "1.17.0", + "version": "1.17.1", "description": "OpenTelemetry Jaeger propagator provides HTTP header propagation for systems that are using Jaeger HTTP header format.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -57,7 +57,7 @@ "@opentelemetry/api": ">=1.0.0 <1.7.0", "@types/mocha": "10.0.2", "@types/node": "18.6.5", - "@types/sinon": "10.0.17", + "@types/sinon": "10.0.18", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", @@ -81,7 +81,7 @@ "@opentelemetry/api": ">=1.0.0 <1.7.0" }, "dependencies": { - "@opentelemetry/core": "1.17.0" + "@opentelemetry/core": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-propagator-jaeger", "sideEffects": false diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-node/package.json b/auto-merge/js/packages/opentelemetry-sdk-trace-node/package.json index d18133ec7..666fb058e 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-node/package.json +++ b/auto-merge/js/packages/opentelemetry-sdk-trace-node/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-trace-node", - "version": "1.17.0", + "version": "1.17.1", "description": "OpenTelemetry Node SDK provides automatic telemetry (tracing, metrics, etc) for Node.js applications", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -46,12 +46,12 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.7.0", - "@opentelemetry/resources": "1.17.0", - "@opentelemetry/semantic-conventions": "1.17.0", + "@opentelemetry/resources": "1.17.1", + "@opentelemetry/semantic-conventions": "1.17.1", "@types/mocha": "10.0.2", "@types/node": "18.6.5", "@types/semver": "7.5.3", - "@types/sinon": "10.0.17", + "@types/sinon": "10.0.18", "codecov": "3.8.3", "cross-var": "1.1.0", "lerna": "7.1.5", @@ -65,11 +65,11 @@ "@opentelemetry/api": ">=1.0.0 <1.7.0" }, "dependencies": { - "@opentelemetry/context-async-hooks": "1.17.0", - "@opentelemetry/core": "1.17.0", - "@opentelemetry/propagator-b3": "1.17.0", - "@opentelemetry/propagator-jaeger": "1.17.0", - "@opentelemetry/sdk-trace-base": "1.17.0", + "@opentelemetry/context-async-hooks": "1.17.1", + "@opentelemetry/core": "1.17.1", + "@opentelemetry/propagator-b3": "1.17.1", + "@opentelemetry/propagator-jaeger": "1.17.1", + "@opentelemetry/sdk-trace-base": "1.17.1", "semver": "^7.5.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-node", diff --git a/auto-merge/js/packages/opentelemetry-shim-opentracing/package.json b/auto-merge/js/packages/opentelemetry-shim-opentracing/package.json index 78381872e..3e6fa8101 100644 --- a/auto-merge/js/packages/opentelemetry-shim-opentracing/package.json +++ b/auto-merge/js/packages/opentelemetry-shim-opentracing/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/shim-opentracing", - "version": "1.17.0", + "version": "1.17.1", "description": "OpenTracing to OpenTelemetry shim", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -43,9 +43,9 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.7.0", - "@opentelemetry/propagator-b3": "1.17.0", - "@opentelemetry/propagator-jaeger": "1.17.0", - "@opentelemetry/sdk-trace-base": "1.17.0", + "@opentelemetry/propagator-b3": "1.17.1", + "@opentelemetry/propagator-jaeger": "1.17.1", + "@opentelemetry/sdk-trace-base": "1.17.1", "@types/mocha": "10.0.2", "@types/node": "18.6.5", "codecov": "3.8.3", @@ -60,8 +60,8 @@ "@opentelemetry/api": ">=1.0.0 <1.7.0" }, "dependencies": { - "@opentelemetry/core": "1.17.0", - "@opentelemetry/semantic-conventions": "1.17.0", + "@opentelemetry/core": "1.17.1", + "@opentelemetry/semantic-conventions": "1.17.1", "opentracing": "^0.14.4" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-shim-opentracing", diff --git a/auto-merge/js/packages/template/package.json b/auto-merge/js/packages/template/package.json index b7836e540..a5f1e971b 100644 --- a/auto-merge/js/packages/template/package.json +++ b/auto-merge/js/packages/template/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/template", - "version": "1.17.0", + "version": "1.17.1", "private": true, "publishConfig": { "access": "restricted" diff --git a/auto-merge/js/selenium-tests/package.json b/auto-merge/js/selenium-tests/package.json index 9592f050d..4ddf94829 100644 --- a/auto-merge/js/selenium-tests/package.json +++ b/auto-merge/js/selenium-tests/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/selenium-tests", - "version": "1.17.0", + "version": "1.18.0", "private": true, "description": "OpenTelemetry Selenium Tests", "main": "index.js", @@ -56,16 +56,16 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/context-zone-peer-dep": "1.17.0", - "@opentelemetry/core": "1.17.0", - "@opentelemetry/exporter-trace-otlp-http": "0.43.0", - "@opentelemetry/exporter-zipkin": "1.17.0", - "@opentelemetry/instrumentation": "0.43.0", - "@opentelemetry/instrumentation-fetch": "0.43.0", - "@opentelemetry/instrumentation-xml-http-request": "0.43.0", - "@opentelemetry/sdk-metrics": "1.17.0", - "@opentelemetry/sdk-trace-base": "1.17.0", - "@opentelemetry/sdk-trace-web": "1.17.0", + "@opentelemetry/context-zone-peer-dep": "1.17.1", + "@opentelemetry/core": "1.17.1", + "@opentelemetry/exporter-trace-otlp-http": "0.44.0", + "@opentelemetry/exporter-zipkin": "1.17.1", + "@opentelemetry/instrumentation": "0.44.0", + "@opentelemetry/instrumentation-fetch": "0.44.0", + "@opentelemetry/instrumentation-xml-http-request": "0.44.0", + "@opentelemetry/sdk-metrics": "1.17.1", + "@opentelemetry/sdk-trace-base": "1.17.1", + "@opentelemetry/sdk-trace-web": "1.17.1", "zone.js": "0.11.4" } } diff --git a/common/config/rush/npm-shrinkwrap.json b/common/config/rush/npm-shrinkwrap.json index e24ade3c6..d42d81abe 100644 --- a/common/config/rush/npm-shrinkwrap.json +++ b/common/config/rush/npm-shrinkwrap.json @@ -136,27 +136,27 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz", - "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz", + "integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.0.tgz", - "integrity": "sha512-97z/ju/Jy1rZmDxybphrBuI+jtJjFVoz7Mr9yUQVVVi+DNZE333uFQeMOqcCIy1x3WYBIbWftUSLmbNXNT7qFQ==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz", + "integrity": "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==", "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.22.13", "@babel/generator": "^7.23.0", "@babel/helper-compilation-targets": "^7.22.15", "@babel/helper-module-transforms": "^7.23.0", - "@babel/helpers": "^7.23.0", + "@babel/helpers": "^7.23.2", "@babel/parser": "^7.23.0", "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.0", + "@babel/traverse": "^7.23.2", "@babel/types": "^7.23.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", @@ -337,12 +337,12 @@ } }, "node_modules/@babel/helpers": { - "version": "7.23.1", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.1.tgz", - "integrity": "sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz", + "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==", "dependencies": { "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.0", + "@babel/traverse": "^7.23.2", "@babel/types": "^7.23.0" }, "engines": { @@ -387,9 +387,9 @@ } }, "node_modules/@babel/traverse": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz", - "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", + "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", "dependencies": { "@babel/code-frame": "^7.22.13", "@babel/generator": "^7.23.0", @@ -442,9 +442,9 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.0.tgz", - "integrity": "sha512-zJmuCWj2VLBt4c25CfBIbMZLGLyhkvs7LznyVX5HfpzeocThgIj5XQK4L+g3U36mMcx8bPMhGyPpwCATamC4jQ==", + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz", + "integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==", "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } @@ -477,9 +477,9 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" }, "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.22.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.22.0.tgz", - "integrity": "sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw==", + "version": "13.23.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", + "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", "dependencies": { "type-fest": "^0.20.2" }, @@ -513,9 +513,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz", - "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==", + "version": "8.51.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.51.0.tgz", + "integrity": "sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg==", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } @@ -927,7 +927,7 @@ "node_modules/@rush-temp/sandbox-auto-instrumentations-web": { "version": "0.0.0", "resolved": "file:projects/sandbox-auto-instrumentations-web.tgz", - "integrity": "sha512-BV6A3ny24reiFihXxq2XvzoOVumFbMJkuFFVmWd3d047e1bhLeBEfIHPXTJ0pqEmIEYs/3qB4oHu2WzRrs85DQ==", + "integrity": "sha512-7OSU2n89XYa+4JDk8WnsVit3z2gSPvxr5QxX+pWlTiV2y5ApWh2pXElleGcVODzlOU/QDJi5bbcZsTpSemobog==", "dependencies": { "@babel/core": "7.22.17", "@jsdevtools/coverage-istanbul-loader": "3.0.5", @@ -1055,7 +1055,7 @@ "node_modules/@rush-temp/sandbox-context-zone": { "version": "0.0.0", "resolved": "file:projects/sandbox-context-zone.tgz", - "integrity": "sha512-OmL/kkbFlzq4EB3D/x0KzFnPTEG7IZNffW/UBa6l8Pj+j9W9QVTjVYhgdRrvdOOCoK4WLDgTJVMpK6YgdkGWMg==", + "integrity": "sha512-Rm8vw6pgkaZF1O8nQBPNNKIYaHAprzSNKwGZDV4nq9fnEIdw/M3hzSO6HHky+3xkyyq4uZik0WqW0/FVKlqJ1g==", "dependencies": { "@babel/core": "7.22.20", "@types/jquery": "^3.5.14", @@ -1454,7 +1454,7 @@ "node_modules/@rush-temp/sandbox-core": { "version": "0.0.0", "resolved": "file:projects/sandbox-core.tgz", - "integrity": "sha512-cHfmOQbEVNfQbozwag5PRTWOFjEajArPSItZOZDKaCTNme7rTg5tYSOG6Gtmzobs+/OxERIJEmlMd3653vrDlA==", + "integrity": "sha512-/VA2hDQOPm75sHbK0ynNY5fJEA3txZjrcZdCSJU4pRMWL37T+q7zKDXxNbAYviXS8TuXc54yhoOmJc+J98W4Tw==", "dependencies": { "@types/jquery": "^3.5.14", "@types/mocha": "^10.0.0", @@ -1502,7 +1502,7 @@ "node_modules/@rush-temp/sandbox-exporter-logs-otlp-http": { "version": "0.0.0", "resolved": "file:projects/sandbox-exporter-logs-otlp-http.tgz", - "integrity": "sha512-vldmJQMJY52zLJGUFtuz6iDIagZmUr2QVUzTZlZIqSmWtOW5b7vJi60fEOuczsegV5fu68AqM+Hfm1Lowz9y+Q==", + "integrity": "sha512-J6Ui3iJdy+HIq7I7SOBzY29DO/lJh/7lX2FIGnyhk9fnImHc+3NrwrsfKnuHyr3fpFBVdR2ffFE7fPwfogSfFQ==", "dependencies": { "@babel/core": "7.22.20", "@types/jquery": "^3.5.14", @@ -1708,7 +1708,7 @@ "node_modules/@rush-temp/sandbox-exporter-logs-otlp-proto": { "version": "0.0.0", "resolved": "file:projects/sandbox-exporter-logs-otlp-proto.tgz", - "integrity": "sha512-Nh9VMJSlt8LZm61F+3Ihcx+ocfAWcFJxqFBrfE1NTgLS+iqnfrMmfq3OzVhWgyRH2YPwBy5zN2xixKg2oEd8lw==", + "integrity": "sha512-5KiHhinNVo90tQBTBNc9MFuhngJxrCrg559gR4s4CnovbYokS9QFHvQ57Tf91X89RYnFqLtM2Lcy1a0bUEvZBw==", "dependencies": { "@babel/core": "7.22.20", "@types/jquery": "^3.5.14", @@ -1914,7 +1914,7 @@ "node_modules/@rush-temp/sandbox-exporter-metrics-otlp-http": { "version": "0.0.0", "resolved": "file:projects/sandbox-exporter-metrics-otlp-http.tgz", - "integrity": "sha512-yv2qfSvRNaeosp4XG8qF10s05V2n3THedgEJZ7oWAAfUGa0mWKf8vqX/BUGlzrRctga9gwdtEE38f79tmMYS8g==", + "integrity": "sha512-cuV8Ni7Ecv0hNp0UrmmtBLqS4OSa68b5INgUD5pWDpHkCrQ/H2HTXJfLwRzMZ/C6fUw2vwkJXR+y5tZyxVI1sA==", "dependencies": { "@babel/core": "7.22.20", "@types/jquery": "^3.5.14", @@ -2120,7 +2120,7 @@ "node_modules/@rush-temp/sandbox-exporter-trace-otlp-http": { "version": "0.0.0", "resolved": "file:projects/sandbox-exporter-trace-otlp-http.tgz", - "integrity": "sha512-oF13KWJNyz4BZhGTVhUn8XbR0FsbncIonlIrirGhTXNeOiiazXZ7hMbMJXGUeoTR+qUXEwxP6Ce+tRDQ0uvfTA==", + "integrity": "sha512-gtdSf+yiFwTPhwxgXpUt9RSfBmO7e9Rx0dDB+dh02MBIuq3CmH8RhFLlCrDuLAfQfwnvwB40Bk5gfEGyLrPEdg==", "dependencies": { "@babel/core": "7.22.20", "@types/jquery": "^3.5.14", @@ -2326,7 +2326,7 @@ "node_modules/@rush-temp/sandbox-exporter-trace-otlp-proto": { "version": "0.0.0", "resolved": "file:projects/sandbox-exporter-trace-otlp-proto.tgz", - "integrity": "sha512-AJcnc0LKik5lg38IC0bOO03XVqf63mJ4EZlUc1JArm5hzvwLsGXox62Y9gcgZOYug3xNqKNIVY2j0Xzl52LIlw==", + "integrity": "sha512-1ILzk059IpkJ0qifa/ATumjLuPmOhh+i228ZHpMeXDOv3ZX2NEduOmMMWdHY1TlguafPrZ4fHxHK7FlYEDi4Hw==", "dependencies": { "@babel/core": "7.22.20", "@types/jquery": "^3.5.14", @@ -2532,7 +2532,7 @@ "node_modules/@rush-temp/sandbox-exporter-zipkin": { "version": "0.0.0", "resolved": "file:projects/sandbox-exporter-zipkin.tgz", - "integrity": "sha512-0m0/32jL9zdwT8PZOyxjpeAhdXcbpUrUfiNYq1WWxqazD5B7jgEJNUKW/S2wYVarEEZGRgPnO/R1UwOPNwBFLw==", + "integrity": "sha512-v5FkNSPPK/ohwYoWkxFkauGfQQy3G5tvUhN1ZCm3iOtCAC0oGsBl2nOhYLJ9/iKtNDPtz2+7eQJImbLaI9xjqw==", "dependencies": { "@babel/core": "7.22.20", "@types/jquery": "^3.5.14", @@ -2738,7 +2738,7 @@ "node_modules/@rush-temp/sandbox-instrumentation": { "version": "0.0.0", "resolved": "file:projects/sandbox-instrumentation.tgz", - "integrity": "sha512-AWiWZ9j66XuOXpWB9/Zf7WwIYY28yWjhG/Y2Cc91MP6J+PQDMe7ZuBI1mQ0kVai/Ft1UmGQz2VGODem81pbo0g==", + "integrity": "sha512-x5auQwttl9ptjzDYW+Ymt/4I6KGFsUvor5ZKU5t0MVU2IjZxi+rzdaKs0p7d7UwvY1M6bguCHFZT0JHmpOxNZw==", "dependencies": { "@babel/core": "7.22.20", "@types/jquery": "^3.5.14", @@ -2796,7 +2796,7 @@ "node_modules/@rush-temp/sandbox-instrumentation-document-load": { "version": "0.0.0", "resolved": "file:projects/sandbox-instrumentation-document-load.tgz", - "integrity": "sha512-2AqdJN76CgmDfdg9ZbFnd+1osIzVDXKUJxQCDF/xSGXCW854sYkRFDKPMc4AYNJkeR0aKhM5e6eqtu274shkIw==", + "integrity": "sha512-oZNGMiTB2h8TZtLlLINOEiBdKHu67HbA9xlVyvF7YgUOuDBleuur8Kom0/4Dnmtx3L5ZUhvWhWHgZO87iu6MuQ==", "dependencies": { "@babel/core": "7.22.17", "@jsdevtools/coverage-istanbul-loader": "3.0.5", @@ -2924,7 +2924,7 @@ "node_modules/@rush-temp/sandbox-instrumentation-fetch": { "version": "0.0.0", "resolved": "file:projects/sandbox-instrumentation-fetch.tgz", - "integrity": "sha512-Tn0ifgJH/OoOunVIoA88bMOTloMtJl7T/VfJBcAhB2/xCyY5Y8TeN2reOIAMuH9zSDNXMqVy9CFYH8Q7LiJD4g==", + "integrity": "sha512-PuwKjxKvbE0kqaOK1ND5fbPpJ0Bf6qke+1fu+Jd7TLCG44hOY1EGjYDoL5CO23jhVONw03A8eEfVPfPQEQREVw==", "dependencies": { "@babel/core": "7.22.20", "@types/jquery": "^3.5.14", @@ -3129,7 +3129,7 @@ "node_modules/@rush-temp/sandbox-instrumentation-long-task": { "version": "0.0.0", "resolved": "file:projects/sandbox-instrumentation-long-task.tgz", - "integrity": "sha512-ZWUKs2EnMrSkf7ltKSoQiXCEbBVtYKXNCO4NyH7XK9jRegrpTSV0ETUlmtDEcrnZzJhV4kwgks9YCCa+hQu94Q==", + "integrity": "sha512-P2xAvGLr/GDKViGT+VUMaDHWVm4PIGNKTPFMpjANpwYasPOdrRuiK2yVSB8GnrK7+E0Vx9YA4bu/w19Gk3bGFQ==", "dependencies": { "@babel/core": "7.22.17", "@jsdevtools/coverage-istanbul-loader": "3.0.5", @@ -3259,7 +3259,7 @@ "node_modules/@rush-temp/sandbox-instrumentation-user-interaction": { "version": "0.0.0", "resolved": "file:projects/sandbox-instrumentation-user-interaction.tgz", - "integrity": "sha512-P/c5IV7wsAULhw1AWHHtqKNnTmziSqyI0OZX5nWPLd7o4xEYktOM+yJqCAQiQfnrl17JB1SuShSBgqH0IC99hA==", + "integrity": "sha512-xoIENhsZ4JXG5Ui925E6CVR+SGXUCaES62C3wDVFZQJFtaJjIblgYN1vVx04ZXHIub4fVuE4YY4B9M10KJPwXw==", "dependencies": { "@babel/core": "7.22.17", "@jsdevtools/coverage-istanbul-loader": "3.0.5", @@ -3389,7 +3389,7 @@ "node_modules/@rush-temp/sandbox-instrumentation-xml-http-request": { "version": "0.0.0", "resolved": "file:projects/sandbox-instrumentation-xml-http-request.tgz", - "integrity": "sha512-9wEAEC8W5h2TQ32ukWG6QQBNT7bwP/17zeaP/xTLewQ/OlJnKQtRBhPgGeol5Q3Ec++PuaKmMtCI6z2crLAViw==", + "integrity": "sha512-8yLFUWMp2gUogRMlUj1mQPBecO8on3a9yoQ7Hec8jbEczZ7THHdnC4eLuNTYBYF2jbmEUXdrdre6SASYWssKDQ==", "dependencies": { "@babel/core": "7.22.20", "@types/jquery": "^3.5.14", @@ -3748,7 +3748,7 @@ "node_modules/@rush-temp/sandbox-opentelemetry-browser-detector": { "version": "0.0.0", "resolved": "file:projects/sandbox-opentelemetry-browser-detector.tgz", - "integrity": "sha512-8L0rkWs+EPNOM00Pkn6uAUZRkAFrONiYdP4cvVYDlAKqSN4q7yM7nsgzrvAfQNADqsY4MGQDdoOgkWbibjmoVQ==", + "integrity": "sha512-9iy238/jPyAtA9iXc+noLYwf/XqcY/DtlJpe6oqs6qMiWEin5exrscVwRM/7xEe7zppXI/v54KJuHU7jPeB5xw==", "dependencies": { "@babel/core": "7.22.20", "@types/jquery": "^3.5.14", @@ -3953,7 +3953,7 @@ "node_modules/@rush-temp/sandbox-otlp-exporter-base": { "version": "0.0.0", "resolved": "file:projects/sandbox-otlp-exporter-base.tgz", - "integrity": "sha512-kIqfiXd1svA23GfWq8MQ98fulgl7DGuGnJtEVdeR0JYCKH4AgoKnoXxmN4Is2VRs+td/jhJE9dJrk1TIT5gRmQ==", + "integrity": "sha512-wGuoyasIJ+qY7sNS3BmN2wnHuSwcpWCPzUREYlTqyJdyvgpnQYacfO5x+8xHOu28ZFVTxEAQI0c00GKj5Bx+/w==", "dependencies": { "@babel/core": "7.22.20", "@types/jquery": "^3.5.14", @@ -4158,7 +4158,7 @@ "node_modules/@rush-temp/sandbox-otlp-proto-exporter-base": { "version": "0.0.0", "resolved": "file:projects/sandbox-otlp-proto-exporter-base.tgz", - "integrity": "sha512-cnFQR8WXphreNTVuGPELKyzRUSWjcmHmfAoQZStYxd6wFWkqST4AXq2TE7fu9QgNDGAXlAIwE0xGkYbHoy/Gew==", + "integrity": "sha512-CSP+2ZloCD0tQhy3o6DSvhdslfKL0j00l7A7wQ3LbyslnVjWlRXODD8bQZgKUPu1c2SVWOrs1jZ+DreUGDU51A==", "dependencies": { "@babel/core": "7.22.20", "@types/jquery": "^3.5.14", @@ -4245,7 +4245,7 @@ "node_modules/@rush-temp/sandbox-otlp-transformer": { "version": "0.0.0", "resolved": "file:projects/sandbox-otlp-transformer.tgz", - "integrity": "sha512-5gbzwLrsFRaAGZT/n9Jl5vn1aJn7DM/DDUNtYpuQiCQEcWxWjUJCWt6sNWkq08y2ph4c0mICNPzNaQioYK5Nkg==", + "integrity": "sha512-sPAOCZVqHI8sKakLNgmn24IjHUGL7H4rbR3kblb6/X1zqchNkJ4X9Bohf5dWLXYfs8TOMeqpeQRhO5ZKWXUQEg==", "dependencies": { "@types/jquery": "^3.5.14", "@types/mocha": "^10.0.0", @@ -4293,7 +4293,7 @@ "node_modules/@rush-temp/sandbox-propagator-b3": { "version": "0.0.0", "resolved": "file:projects/sandbox-propagator-b3.tgz", - "integrity": "sha512-pnkpzBcKabgsnYcwSplaBZCOGvv0TaMZu64q1a8rO6im7U/KPufaCL1WhgQyjN8QqKfzIUIsTHoiqrVx9JRCIA==", + "integrity": "sha512-A7X0z87PE+FQiN1L7+KLfiOzMs6kJJKfse14EyfKtr6/8hsAkAOp+XRfHP/Rofluk55xqRERg5WTa2m/ySoKdA==", "dependencies": { "@types/jquery": "^3.5.14", "@types/mocha": "^10.0.0", @@ -4340,7 +4340,7 @@ "node_modules/@rush-temp/sandbox-resources": { "version": "0.0.0", "resolved": "file:projects/sandbox-resources.tgz", - "integrity": "sha512-DEETzHGqvoEOF48dDXWImGeWLV1EWicP2bzyGRl9PkqfGHpWkQV21X3fRNbnFQuZjJ9+hbDChQ7K5rDEQiKepg==", + "integrity": "sha512-39WZfFl4f+cpXmjcpA56e4/WmfxW+ljNFnA9Qni2Pqpv3E3lcADXVVFP45OvAd2bj/oGpx1DaRkTMtM7vVz+Jg==", "dependencies": { "@opentelemetry/resources": "npm:@opentelemetry/resources@1.9.0", "@types/jquery": "^3.5.14", @@ -4509,7 +4509,7 @@ "node_modules/@rush-temp/sandbox-sdk-logs": { "version": "0.0.0", "resolved": "file:projects/sandbox-sdk-logs.tgz", - "integrity": "sha512-h4zAVrcTEWXAlEOVGUMLUbH5bT6gZNWSymOF2HLN+375tOx1Vw7UlK3sloTCy1Zkfqawh8thFvH7xu3XiS5VoA==", + "integrity": "sha512-6lYeoz43nMpzcMP0AeqVKIi7wMpFfoM6GHdCKKO3XaywyfeVWMgap8RhtLKysh5VgPQf7039ydETUFbb4h/sKg==", "dependencies": { "@babel/core": "7.22.20", "@types/jquery": "^3.5.14", @@ -4714,7 +4714,7 @@ "node_modules/@rush-temp/sandbox-sdk-metrics": { "version": "0.0.0", "resolved": "file:projects/sandbox-sdk-metrics.tgz", - "integrity": "sha512-iEGibegs047twfjm3ZuN0OpRSVueHNZQFW6kCPKuNx6f5aOFSRI5YYhQM0VpvuUXZ6yeUwMeXcalgjj61KA9BQ==", + "integrity": "sha512-H8uqvkOiXGLlT6l9V6qJ5B+/n/cLcUllPoMZUnIHmjvMWmoI/sNVZ8aqZYrvQbp0932AfRl+cdydKI1ElfxYsQ==", "dependencies": { "@babel/core": "7.22.20", "@types/jquery": "^3.5.14", @@ -4921,7 +4921,7 @@ "node_modules/@rush-temp/sandbox-sdk-trace-base": { "version": "0.0.0", "resolved": "file:projects/sandbox-sdk-trace-base.tgz", - "integrity": "sha512-ZvYJrmyfNCFx0xIdrsEcn3AMHqOQ1lv+iyhAIPxpju1yhIE1eORSfDpP8p0bKqlXSGVQsk/ZvfInUlgOuMo55Q==", + "integrity": "sha512-IBQ1GMy7zsoYp49t6NH7L9g7VQimy67Oy4z108jeFaJjMGgTq6Iy9UrlF0EVhid5m7MhuF9G7Qwm99kEacimng==", "dependencies": { "@opentelemetry/resources": "npm:@opentelemetry/resources@1.9.0", "@types/jquery": "^3.5.14", @@ -4970,7 +4970,7 @@ "node_modules/@rush-temp/sandbox-sdk-trace-web": { "version": "0.0.0", "resolved": "file:projects/sandbox-sdk-trace-web.tgz", - "integrity": "sha512-pii6jmNR5cZkn6XbXI9v/tUfHDSlJBpufYZR5M6Mkao4BOXQth3H8A0A9ubMk5HcS03yBOzYghrAUQASrEFHgw==", + "integrity": "sha512-25rrCPVICKzDBXUqs8ZXIBzX1C820+7J03CUZPvVJ+z4RqiTYQ56fspUU1U0GFjPB/wrN8IQvKO5cUH/4RB7Qg==", "dependencies": { "@babel/core": "7.22.20", "@types/jquery": "^3.5.14", @@ -5224,7 +5224,7 @@ "node_modules/@rush-temp/web-opentelemetry-example": { "version": "0.0.0", "resolved": "file:projects/web-opentelemetry-example.tgz", - "integrity": "sha512-/I+105EGnC1cdq9BJg+k41BakHuhelxr30ymY1yBQk1tVLcNCPBq3rBQZuSjIfW7yvClaHBOGTMRdrU+v+79yw==", + "integrity": "sha512-xaGk0e1D02X2Ui7PjSJH9eF/VFkeOcq4ePGyzcPYLwypC8bdqC/3M+v3EjlAOJ+bVMJF6u9zqBTx9LNLWrVIGw==", "dependencies": { "@babel/core": "^7.6.0", "@types/jquery": "^3.5.14", @@ -5508,9 +5508,9 @@ } }, "node_modules/@types/express": { - "version": "4.17.18", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.18.tgz", - "integrity": "sha512-Sxv8BSLLgsBYmcnGdGjjEjqET2U+AKAdCRODmMiq02FgjwuV75Ut85DRpvFjyw/Mk0vgUOliGRU0UUmuuZHByQ==", + "version": "4.17.19", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.19.tgz", + "integrity": "sha512-UtOfBtzN9OvpZPPbnnYunfjM7XCI4jyk1NvnFhTVz5krYAnW4o5DCoIekvms+8ApqhB4+9wSge1kBijdfTSmfg==", "dependencies": { "@types/body-parser": "*", "@types/express-serve-static-core": "^4.17.33", @@ -5548,9 +5548,9 @@ } }, "node_modules/@types/jquery": { - "version": "3.5.20", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.20.tgz", - "integrity": "sha512-UI+EGhgYD4LdSZ8gaiziFqXYIIB38VQSDsnAs8jL/div7FGrzrShx4HKCykVzk3tPfiIlusdNP9Wi3G60LCF2Q==", + "version": "3.5.22", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.22.tgz", + "integrity": "sha512-ISQFeUK5GwRftLK4PVvKTWEVCxZ2BpaqBz0TWkIq5w4vGojxZP9+XkqgcPjxoqmPeew+HLyWthCBvK7GdF5NYA==", "dependencies": { "@types/sizzle": "*" } @@ -5616,9 +5616,9 @@ "integrity": "sha512-NaHL0+0lLNhX6d9rs+NSt97WH/gIlRHmszXbQ/8/MV/eVcFNdeJ/GYhrFuUc8K7WuPhRhTSdMkCp8VMzhUq85w==" }, "node_modules/@types/node": { - "version": "18.18.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.1.tgz", - "integrity": "sha512-3G42sxmm0fF2+Vtb9TJQpnjmP+uKlWvFa8KoEGquh4gqRmoUG/N0ufuhikw6HEsdG2G2oIKhog1GCTfz9v5NdQ==" + "version": "18.18.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.5.tgz", + "integrity": "sha512-4slmbtwV59ZxitY4ixUZdy1uRLf9eSIvBWPQxNjhHYWEtn0FryfKpyS2cvADYXTayWdKEIsJengncrVvkI4I6A==" }, "node_modules/@types/qs": { "version": "6.9.8", @@ -5681,9 +5681,9 @@ "integrity": "sha512-F/IjUGnV6pIN7R4ZV4npHJVoNtaLZWvb+2/9gctxjb99wkpI7Ozg8VPogwDiTRyjLwZXAYxjvdg1KS8LTHKdDA==" }, "node_modules/@types/sinon": { - "version": "10.0.17", - "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.17.tgz", - "integrity": "sha512-+6ILpcixQ0Ma3dHMTLv4rSycbDXkDljgKL+E0nI2RUxxhYTFyPSjt6RVMxh7jUshvyVcBvicb0Ktj+lAJcjgeA==", + "version": "10.0.19", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.19.tgz", + "integrity": "sha512-MWZNGPSchIdDfb5FL+VFi4zHsHbNOTQEgjqFQk7HazXSXwUU9PAX3z9XBqb3AJGYr9YwrtCtaSMsT3brYsN/jQ==", "dependencies": { "@types/sinonjs__fake-timers": "*" } @@ -5761,9 +5761,9 @@ } }, "node_modules/@types/ws": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.6.tgz", - "integrity": "sha512-8B5EO9jLVCy+B58PLHvLDuOD8DRVMgQzq8d55SjLCOn9kqGyqOvy27exVaTio1q1nX5zLu8/6N0n2ThSxOM6tg==", + "version": "8.5.7", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.7.tgz", + "integrity": "sha512-6UrLjiDUvn40CMrAubXuIVtj2PEfKDffJS7ychvnPU44j+KVeXmdHHTgqcM/dxLUTHxlXHiFM8Skmb8ozGdTnQ==", "dependencies": { "@types/node": "*" } @@ -8024,9 +8024,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001541", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001541.tgz", - "integrity": "sha512-bLOsqxDgTqUBkzxbNlSBt8annkDpQB9NdzdTbO2ooJ+eC/IQcvDspDc058g84ejCelF7vHUx57KIOjEecOHXaw==", + "version": "1.0.30001549", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001549.tgz", + "integrity": "sha512-qRp48dPYSCYaP+KurZLhDYdVE+yEyht/3NlmcJgVQ2VMGt6JL36ndQ/7rgspdZsJuxDPFIo/OzBT2+GmIJ53BA==", "funding": [ { "type": "opencollective", @@ -8942,9 +8942,9 @@ } }, "node_modules/define-data-property": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz", - "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", + "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", "dependencies": { "get-intrinsic": "^1.2.1", "gopd": "^1.0.1", @@ -9279,9 +9279,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.537", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.537.tgz", - "integrity": "sha512-W1+g9qs9hviII0HAwOdehGYkr+zt7KKdmCcJcjH0mYg6oL8+ioT3Skjmt7BLoAQqXhjf40AXd+HlR4oAWMlXjA==" + "version": "1.4.554", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.554.tgz", + "integrity": "sha512-Q0umzPJjfBrrj8unkONTgbKQXzXRrH7sVV7D9ea2yBV3Oaogz991yhbpfvo2LMNkJItmruXTEzVpP9cp7vaIiQ==" }, "node_modules/elliptic": { "version": "6.5.4", @@ -9332,9 +9332,9 @@ } }, "node_modules/engine.io": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.2.tgz", - "integrity": "sha512-IXsMcGpw/xRfjra46sVZVHiSWo/nJ/3g1337q9KNXtS6YRzbW5yIzTCb9DjhrBe7r3GZQR0I4+nq+4ODk5g/cA==", + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.3.tgz", + "integrity": "sha512-IML/R4eG/pUS5w7OfcDE0jKrljWS9nwnEfsxWCIJF5eO6AHo6+Hlv+lQbdlAYsiJPHzUthLm1RUjnBzWOs45cw==", "dependencies": { "@types/cookie": "^0.4.1", "@types/cors": "^2.8.12", @@ -10008,9 +10008,9 @@ } }, "node_modules/eslint/node_modules/globals": { - "version": "13.22.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.22.0.tgz", - "integrity": "sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw==", + "version": "13.23.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", + "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", "dependencies": { "type-fest": "^0.20.2" }, @@ -10832,11 +10832,11 @@ } }, "node_modules/flat-cache": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.0.tgz", - "integrity": "sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz", + "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==", "dependencies": { - "flatted": "^3.2.7", + "flatted": "^3.2.9", "keyv": "^4.5.3", "rimraf": "^3.0.2" }, @@ -11089,9 +11089,12 @@ } }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/function.prototype.name": { "version": "1.1.6", @@ -11386,12 +11389,9 @@ "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==" }, "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dependencies": { - "function-bind": "^1.1.1" - }, + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz", + "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==", "engines": { "node": ">= 0.4.0" } @@ -13381,9 +13381,9 @@ } }, "node_modules/keyv": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz", - "integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==", + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", "dependencies": { "json-buffer": "3.0.1" } @@ -13405,12 +13405,12 @@ } }, "node_modules/launch-editor": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz", - "integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.1.tgz", + "integrity": "sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==", "dependencies": { "picocolors": "^1.0.0", - "shell-quote": "^1.7.3" + "shell-quote": "^1.8.1" } }, "node_modules/levn": { @@ -14855,9 +14855,9 @@ } }, "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.0.tgz", + "integrity": "sha512-HQ4J+ic8hKrgIt3mqk6cVOVrW2ozL4KdvHlqpBv9vDYWx9ysAgENAdvy4FoGF+KFdhR7nQTNm5J0ctAeOwn+3g==", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -16594,9 +16594,9 @@ } }, "node_modules/resolve": { - "version": "1.22.6", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz", - "integrity": "sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw==", + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", "dependencies": { "is-core-module": "^2.13.0", "path-parse": "^1.0.7", @@ -17120,9 +17120,9 @@ } }, "node_modules/shiki": { - "version": "0.14.4", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.14.4.tgz", - "integrity": "sha512-IXCRip2IQzKwxArNNq1S+On4KPML3Yyn8Zzs/xRgcgOWIr8ntIK3IKzjFPfjy/7kt9ZMjc+FItfqHRBg8b6tNQ==", + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.14.5.tgz", + "integrity": "sha512-1gCAYOcmCFONmErGTrS1fjzJLA7MGZmKzrBNX7apqSwhyITJg2O102uFzXUeBxNnEkDA9vHIKLyeKq0V083vIw==", "dependencies": { "ansi-sequence-parser": "^1.1.0", "jsonc-parser": "^3.2.0", diff --git a/examples/web/js/package.json b/examples/web/js/package.json index 87fe30ef2..7bb3a2779 100644 --- a/examples/web/js/package.json +++ b/examples/web/js/package.json @@ -1,7 +1,7 @@ { "name": "web-opentelemetry-example", "private": true, - "version": "0.43.0", + "version": "0.44.0", "description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser", "main": "index.js", "scripts": { @@ -92,20 +92,20 @@ }, "dependencies": { "@opentelemetry/sandbox-api": "1.6.0", - "@opentelemetry/sandbox-context-zone": "1.17.0", - "@opentelemetry/sandbox-core": "1.17.0", - "@opentelemetry/sandbox-exporter-metrics-otlp-http": "0.43.0", - "@opentelemetry/sandbox-exporter-trace-otlp-http": "0.43.0", - "@opentelemetry/sandbox-exporter-trace-otlp-proto": "0.43.0", - "@opentelemetry/sandbox-exporter-zipkin": "1.17.0", - "@opentelemetry/sandbox-instrumentation": "0.43.0", - "@opentelemetry/sandbox-instrumentation-fetch": "0.43.0", - "@opentelemetry/sandbox-instrumentation-xml-http-request": "0.43.0", - "@opentelemetry/sandbox-propagator-b3": "1.17.0", - "@opentelemetry/sandbox-sdk-metrics": "1.17.0", - "@opentelemetry/sandbox-sdk-trace-base": "1.17.0", - "@opentelemetry/sandbox-sdk-trace-web": "1.17.0", - "@opentelemetry/sandbox-semantic-conventions": "1.17.0" + "@opentelemetry/sandbox-context-zone": "1.17.1", + "@opentelemetry/sandbox-core": "1.17.1", + "@opentelemetry/sandbox-exporter-metrics-otlp-http": "0.44.0", + "@opentelemetry/sandbox-exporter-trace-otlp-http": "0.44.0", + "@opentelemetry/sandbox-exporter-trace-otlp-proto": "0.44.0", + "@opentelemetry/sandbox-exporter-zipkin": "1.17.1", + "@opentelemetry/sandbox-instrumentation": "0.44.0", + "@opentelemetry/sandbox-instrumentation-fetch": "0.44.0", + "@opentelemetry/sandbox-instrumentation-xml-http-request": "0.44.0", + "@opentelemetry/sandbox-propagator-b3": "1.17.1", + "@opentelemetry/sandbox-sdk-metrics": "1.17.1", + "@opentelemetry/sandbox-sdk-trace-base": "1.17.1", + "@opentelemetry/sandbox-sdk-trace-web": "1.17.1", + "@opentelemetry/sandbox-semantic-conventions": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web" } \ No newline at end of file diff --git a/pkgs/api-events/package.json b/pkgs/api-events/package.json index 1df4d0d76..d3213194b 100644 --- a/pkgs/api-events/package.json +++ b/pkgs/api-events/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-api-events", - "version": "0.43.0", + "version": "0.44.0", "description": "Public events API for OpenTelemetry", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/pkgs/api-logs/package.json b/pkgs/api-logs/package.json index 1048e7282..f12e5cad8 100644 --- a/pkgs/api-logs/package.json +++ b/pkgs/api-logs/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-api-logs", - "version": "0.43.0", + "version": "0.44.0", "description": "Public logs API for OpenTelemetry", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/pkgs/api/CHANGELOG.md b/pkgs/api/CHANGELOG.md index cba48a414..4738e1449 100644 --- a/pkgs/api/CHANGELOG.md +++ b/pkgs/api/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. ## Unreleased +### :rocket: (Enhancement) + +* feat(metrics): prototype experimental advice support [#3876](https://github.com/open-telemetry/opentelemetry-js/pull/3876) @legendecas + ## 1.6.0 ### :bug: (Bug Fix) diff --git a/pkgs/api/src/index.ts b/pkgs/api/src/index.ts index 699200587..c5dbe1685 100644 --- a/pkgs/api/src/index.ts +++ b/pkgs/api/src/index.ts @@ -51,6 +51,7 @@ export { ObservableUpDownCounter, UpDownCounter, BatchObservableCallback, + MetricAdvice, MetricAttributes, MetricAttributeValue, ObservableCallback, diff --git a/pkgs/api/src/metrics/Metric.ts b/pkgs/api/src/metrics/Metric.ts index 533aa264b..e8abca3b1 100644 --- a/pkgs/api/src/metrics/Metric.ts +++ b/pkgs/api/src/metrics/Metric.ts @@ -18,6 +18,18 @@ import { Attributes, AttributeValue } from '../common/Attributes'; import { Context } from '../context/types'; import { BatchObservableResult, ObservableResult } from './ObservableResult'; +/** + * Advisory options influencing aggregation configuration parameters. + * @experimental + */ +export interface MetricAdvice { + /** + * Hint the explicit bucket boundaries for SDK if the metric is been + * aggregated with a HistogramAggregator. + */ + explicitBucketBoundaries?: number[]; +} + /** * Options needed for metric creation */ @@ -39,6 +51,12 @@ export interface MetricOptions { * @default {@link ValueType.DOUBLE} */ valueType?: ValueType; + + /** + * The advice influencing aggregation configuration parameters. + * @experimental + */ + advice?: MetricAdvice; } /** The Type of value. It describes how the data is reported. */ diff --git a/pkgs/context/zone-peer-dep/package.json b/pkgs/context/zone-peer-dep/package.json index 89bd8366f..e01fad055 100644 --- a/pkgs/context/zone-peer-dep/package.json +++ b/pkgs/context/zone-peer-dep/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-context-zone-peer-dep", - "version": "1.17.0", + "version": "1.17.1", "description": "OpenTelemetry Context Zone with peer dependency for zone.js", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/pkgs/context/zone/package.json b/pkgs/context/zone/package.json index bed4d8e73..047b0da4b 100644 --- a/pkgs/context/zone/package.json +++ b/pkgs/context/zone/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-context-zone", - "version": "1.17.0", + "version": "1.17.1", "description": "OpenTelemetry Context Zone", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -102,7 +102,7 @@ "webpack-merge": "5.9.0" }, "dependencies": { - "@opentelemetry/sandbox-context-zone-peer-dep": "1.17.0", + "@opentelemetry/sandbox-context-zone-peer-dep": "1.17.1", "zone.js": "^0.11.4" }, "sideEffects": true, diff --git a/pkgs/core/package.json b/pkgs/core/package.json index 12ecab38f..3b86bad0f 100644 --- a/pkgs/core/package.json +++ b/pkgs/core/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-core", - "version": "1.17.0", + "version": "1.17.1", "description": "OpenTelemetry Core provides constants and utilities shared by all OpenTelemetry SDK packages.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -116,7 +116,7 @@ "@opentelemetry/sandbox-api": "1.6.0" }, "dependencies": { - "@opentelemetry/sandbox-semantic-conventions": "1.17.0" + "@opentelemetry/sandbox-semantic-conventions": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-core", "sideEffects": false diff --git a/pkgs/detectors/browser/package.json b/pkgs/detectors/browser/package.json index f7c1ed000..419a76b56 100644 --- a/pkgs/detectors/browser/package.json +++ b/pkgs/detectors/browser/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-opentelemetry-browser-detector", - "version": "0.43.0", + "version": "0.44.0", "description": "OpenTelemetry Resource Detector for Browser", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -108,8 +108,8 @@ "@opentelemetry/sandbox-api": "1.6.0" }, "dependencies": { - "@opentelemetry/sandbox-resources": "1.17.0", - "@opentelemetry/sandbox-semantic-conventions": "1.17.0" + "@opentelemetry/sandbox-resources": "1.17.1", + "@opentelemetry/sandbox-semantic-conventions": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/browser-detector" } \ No newline at end of file diff --git a/pkgs/exporters/otlp/base/package.json b/pkgs/exporters/otlp/base/package.json index acd41631d..495cb6f0c 100644 --- a/pkgs/exporters/otlp/base/package.json +++ b/pkgs/exporters/otlp/base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-otlp-exporter-base", - "version": "0.43.0", + "version": "0.44.0", "description": "OpenTelemetry OTLP Exporter base (for internal use only)", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -66,7 +66,7 @@ "access": "public" }, "dependencies": { - "@opentelemetry/sandbox-core": "1.17.0" + "@opentelemetry/sandbox-core": "1.17.1" }, "devDependencies": { "@babel/core": "7.22.20", diff --git a/pkgs/exporters/otlp/logs/http/package.json b/pkgs/exporters/otlp/logs/http/package.json index 219d6d999..2d1e95949 100644 --- a/pkgs/exporters/otlp/logs/http/package.json +++ b/pkgs/exporters/otlp/logs/http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-exporter-logs-otlp-http", - "version": "0.43.0", + "version": "0.44.0", "publishConfig": { "access": "public" }, @@ -78,7 +78,7 @@ "devDependencies": { "@babel/core": "7.22.20", "@opentelemetry/sandbox-api": "1.6.0", - "@opentelemetry/sandbox-resources": "1.17.0", + "@opentelemetry/sandbox-resources": "1.17.1", "@types/jquery": "^3.5.14", "@types/mocha": "^10.0.0", "@types/node": "^18.14.2", @@ -128,10 +128,10 @@ "@opentelemetry/sandbox-api": "1.6.0" }, "dependencies": { - "@opentelemetry/sandbox-api-logs": "0.43.0", - "@opentelemetry/sandbox-core": "1.17.0", - "@opentelemetry/sandbox-otlp-exporter-base": "0.43.0", - "@opentelemetry/sandbox-otlp-transformer": "0.43.0", - "@opentelemetry/sandbox-sdk-logs": "0.43.0" + "@opentelemetry/sandbox-api-logs": "0.44.0", + "@opentelemetry/sandbox-core": "1.17.1", + "@opentelemetry/sandbox-otlp-exporter-base": "0.44.0", + "@opentelemetry/sandbox-otlp-transformer": "0.44.0", + "@opentelemetry/sandbox-sdk-logs": "0.44.0" } } \ No newline at end of file diff --git a/pkgs/exporters/otlp/logs/proto/package.json b/pkgs/exporters/otlp/logs/proto/package.json index 41c33326d..6769a4acf 100644 --- a/pkgs/exporters/otlp/logs/proto/package.json +++ b/pkgs/exporters/otlp/logs/proto/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-exporter-logs-otlp-proto", - "version": "0.43.0", + "version": "0.44.0", "description": "An OTLP exporter to send logs using protobuf over HTTP", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -119,14 +119,14 @@ "@opentelemetry/sandbox-api": "1.6.0" }, "dependencies": { - "@opentelemetry/sandbox-api-logs": "0.43.0", - "@opentelemetry/sandbox-core": "1.17.0", - "@opentelemetry/sandbox-otlp-exporter-base": "0.43.0", - "@opentelemetry/sandbox-otlp-proto-exporter-base": "0.43.0", - "@opentelemetry/sandbox-otlp-transformer": "0.43.0", - "@opentelemetry/sandbox-resources": "1.17.0", - "@opentelemetry/sandbox-sdk-logs": "0.43.0", - "@opentelemetry/sandbox-sdk-trace-base": "1.17.0" + "@opentelemetry/sandbox-api-logs": "0.44.0", + "@opentelemetry/sandbox-core": "1.17.1", + "@opentelemetry/sandbox-otlp-exporter-base": "0.44.0", + "@opentelemetry/sandbox-otlp-proto-exporter-base": "0.44.0", + "@opentelemetry/sandbox-otlp-transformer": "0.44.0", + "@opentelemetry/sandbox-resources": "1.17.1", + "@opentelemetry/sandbox-sdk-logs": "0.44.0", + "@opentelemetry/sandbox-sdk-trace-base": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-proto", "sideEffects": false diff --git a/pkgs/exporters/otlp/metrics/http/package.json b/pkgs/exporters/otlp/metrics/http/package.json index a15b20c56..5373dee04 100644 --- a/pkgs/exporters/otlp/metrics/http/package.json +++ b/pkgs/exporters/otlp/metrics/http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-exporter-metrics-otlp-http", - "version": "0.43.0", + "version": "0.44.0", "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -119,11 +119,11 @@ "@opentelemetry/sandbox-api": "1.6.0" }, "dependencies": { - "@opentelemetry/sandbox-core": "1.17.0", - "@opentelemetry/sandbox-otlp-exporter-base": "0.43.0", - "@opentelemetry/sandbox-otlp-transformer": "0.43.0", - "@opentelemetry/sandbox-resources": "1.17.0", - "@opentelemetry/sandbox-sdk-metrics": "1.17.0" + "@opentelemetry/sandbox-core": "1.17.1", + "@opentelemetry/sandbox-otlp-exporter-base": "0.44.0", + "@opentelemetry/sandbox-otlp-transformer": "0.44.0", + "@opentelemetry/sandbox-resources": "1.17.1", + "@opentelemetry/sandbox-sdk-metrics": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-http", "sideEffects": false diff --git a/pkgs/exporters/otlp/proto-base/package.json b/pkgs/exporters/otlp/proto-base/package.json index 985ac34a9..567eedbaf 100644 --- a/pkgs/exporters/otlp/proto-base/package.json +++ b/pkgs/exporters/otlp/proto-base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-otlp-proto-exporter-base", - "version": "0.43.0", + "version": "0.44.0", "description": "OpenTelemetry OTLP-HTTP-protobuf Exporter base (for internal use only)", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -115,8 +115,8 @@ "@opentelemetry/sandbox-api": "1.6.0" }, "dependencies": { - "@opentelemetry/sandbox-core": "1.17.0", - "@opentelemetry/sandbox-otlp-exporter-base": "0.43.0", + "@opentelemetry/sandbox-core": "1.17.1", + "@opentelemetry/sandbox-otlp-exporter-base": "0.44.0", "protobufjs": "^7.2.3" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-proto-exporter-base", diff --git a/pkgs/exporters/otlp/trace/http/package.json b/pkgs/exporters/otlp/trace/http/package.json index 11a3834f4..de6b1fb7b 100644 --- a/pkgs/exporters/otlp/trace/http/package.json +++ b/pkgs/exporters/otlp/trace/http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-exporter-trace-otlp-http", - "version": "0.43.0", + "version": "0.44.0", "description": "OpenTelemetry Collector Trace Exporter allows user to send collected traces to the OpenTelemetry Collector", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -119,11 +119,11 @@ "@opentelemetry/sandbox-api": "1.6.0" }, "dependencies": { - "@opentelemetry/sandbox-core": "1.17.0", - "@opentelemetry/sandbox-otlp-exporter-base": "0.43.0", - "@opentelemetry/sandbox-otlp-transformer": "0.43.0", - "@opentelemetry/sandbox-resources": "1.17.0", - "@opentelemetry/sandbox-sdk-trace-base": "1.17.0" + "@opentelemetry/sandbox-core": "1.17.1", + "@opentelemetry/sandbox-otlp-exporter-base": "0.44.0", + "@opentelemetry/sandbox-otlp-transformer": "0.44.0", + "@opentelemetry/sandbox-resources": "1.17.1", + "@opentelemetry/sandbox-sdk-trace-base": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-http", "sideEffects": false diff --git a/pkgs/exporters/otlp/trace/proto/package.json b/pkgs/exporters/otlp/trace/proto/package.json index 2b332b18d..1b2a85f6b 100644 --- a/pkgs/exporters/otlp/trace/proto/package.json +++ b/pkgs/exporters/otlp/trace/proto/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-exporter-trace-otlp-proto", - "version": "0.43.0", + "version": "0.44.0", "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector using protobuf over HTTP", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -118,12 +118,12 @@ "@opentelemetry/sandbox-api": "1.6.0" }, "dependencies": { - "@opentelemetry/sandbox-core": "1.17.0", - "@opentelemetry/sandbox-otlp-exporter-base": "0.43.0", - "@opentelemetry/sandbox-otlp-proto-exporter-base": "0.43.0", - "@opentelemetry/sandbox-otlp-transformer": "0.43.0", - "@opentelemetry/sandbox-resources": "1.17.0", - "@opentelemetry/sandbox-sdk-trace-base": "1.17.0" + "@opentelemetry/sandbox-core": "1.17.1", + "@opentelemetry/sandbox-otlp-exporter-base": "0.44.0", + "@opentelemetry/sandbox-otlp-proto-exporter-base": "0.44.0", + "@opentelemetry/sandbox-otlp-transformer": "0.44.0", + "@opentelemetry/sandbox-resources": "1.17.1", + "@opentelemetry/sandbox-sdk-trace-base": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-proto", "sideEffects": false diff --git a/pkgs/exporters/otlp/transformer/package.json b/pkgs/exporters/otlp/transformer/package.json index 73ad4dd89..41a26bb4b 100644 --- a/pkgs/exporters/otlp/transformer/package.json +++ b/pkgs/exporters/otlp/transformer/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "0.43.0", + "version": "0.44.0", "description": "Transform OpenTelemetry SDK data into OTLP", "module": "build/esm/index.js", "esnext": "build/esnext/index.js", @@ -107,12 +107,12 @@ "webpack": "^4.46.0" }, "dependencies": { - "@opentelemetry/sandbox-api-logs": "0.43.0", - "@opentelemetry/sandbox-core": "1.17.0", - "@opentelemetry/sandbox-resources": "1.17.0", - "@opentelemetry/sandbox-sdk-logs": "0.43.0", - "@opentelemetry/sandbox-sdk-metrics": "1.17.0", - "@opentelemetry/sandbox-sdk-trace-base": "1.17.0" + "@opentelemetry/sandbox-api-logs": "0.44.0", + "@opentelemetry/sandbox-core": "1.17.1", + "@opentelemetry/sandbox-resources": "1.17.1", + "@opentelemetry/sandbox-sdk-logs": "0.44.0", + "@opentelemetry/sandbox-sdk-metrics": "1.17.1", + "@opentelemetry/sandbox-sdk-trace-base": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-transformer", "sideEffects": false diff --git a/pkgs/exporters/zipkin/package.json b/pkgs/exporters/zipkin/package.json index 2d82edf17..18fea4e81 100644 --- a/pkgs/exporters/zipkin/package.json +++ b/pkgs/exporters/zipkin/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-exporter-zipkin", - "version": "1.17.0", + "version": "1.17.1", "description": "OpenTelemetry Zipkin Exporter allows the user to send collected traces to Zipkin.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -116,10 +116,10 @@ "@opentelemetry/sandbox-api": "1.6.0" }, "dependencies": { - "@opentelemetry/sandbox-core": "1.17.0", - "@opentelemetry/sandbox-resources": "1.17.0", - "@opentelemetry/sandbox-sdk-trace-base": "1.17.0", - "@opentelemetry/sandbox-semantic-conventions": "1.17.0" + "@opentelemetry/sandbox-core": "1.17.1", + "@opentelemetry/sandbox-resources": "1.17.1", + "@opentelemetry/sandbox-sdk-trace-base": "1.17.1", + "@opentelemetry/sandbox-semantic-conventions": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-zipkin", "sideEffects": false diff --git a/pkgs/instrumentations/instrumentation/package.json b/pkgs/instrumentations/instrumentation/package.json index abaaa85dd..3be04e43d 100644 --- a/pkgs/instrumentations/instrumentation/package.json +++ b/pkgs/instrumentations/instrumentation/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-instrumentation", - "version": "0.43.0", + "version": "0.44.0", "description": "Base class for node which OpenTelemetry instrumentation modules extend", "author": "OpenTelemetry Authors", "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation", @@ -88,7 +88,7 @@ "devDependencies": { "@babel/core": "7.22.20", "@opentelemetry/sandbox-api": "1.6.0", - "@opentelemetry/sandbox-sdk-metrics": "1.17.0", + "@opentelemetry/sandbox-sdk-metrics": "1.17.1", "@types/jquery": "^3.5.14", "@types/mocha": "^10.0.0", "@types/node": "^18.14.2", diff --git a/pkgs/instrumentations/web/auto/CHANGELOG.md b/pkgs/instrumentations/web/auto/CHANGELOG.md index ee8fe5033..3efbeec6e 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.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-web-v0.33.1...auto-instrumentations-web-v0.33.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/instrumentation-document-load bumped from ^0.33.1 to ^0.33.2 + * @opentelemetry/instrumentation-user-interaction bumped from ^0.33.1 to ^0.33.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) diff --git a/pkgs/instrumentations/web/auto/package.json b/pkgs/instrumentations/web/auto/package.json index 76326d97e..364fabe55 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.1", + "version": "0.33.2", "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", @@ -85,10 +85,10 @@ "webpack-merge": "5.8.0" }, "dependencies": { - "@opentelemetry/sandbox-instrumentation": "0.43.0", - "@opentelemetry/sandbox-instrumentation-document-load": "0.33.1", - "@opentelemetry/sandbox-instrumentation-fetch": "0.43.0", - "@opentelemetry/sandbox-instrumentation-user-interaction": "0.33.1", - "@opentelemetry/sandbox-instrumentation-xml-http-request": "0.43.0" + "@opentelemetry/sandbox-instrumentation": "0.44.0", + "@opentelemetry/sandbox-instrumentation-document-load": "0.33.2", + "@opentelemetry/sandbox-instrumentation-fetch": "0.44.0", + "@opentelemetry/sandbox-instrumentation-user-interaction": "0.33.2", + "@opentelemetry/sandbox-instrumentation-xml-http-request": "0.44.0" } } \ 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 9472175d2..286b85348 100644 --- a/pkgs/instrumentations/web/document-load/CHANGELOG.md +++ b/pkgs/instrumentations/web/document-load/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [0.33.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-document-load-v0.33.1...instrumentation-document-load-v0.33.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [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) diff --git a/pkgs/instrumentations/web/document-load/package.json b/pkgs/instrumentations/web/document-load/package.json index 3e5af5056..c01a2b93f 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.1", + "version": "0.33.2", "description": "OpenTelemetry document-load automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -102,11 +102,11 @@ "webpack-merge": "5.8.0" }, "dependencies": { - "@opentelemetry/sandbox-core": "1.17.0", - "@opentelemetry/sandbox-instrumentation": "0.43.0", - "@opentelemetry/sandbox-sdk-trace-base": "1.17.0", - "@opentelemetry/sandbox-sdk-trace-web": "1.17.0", - "@opentelemetry/sandbox-semantic-conventions": "1.17.0" + "@opentelemetry/sandbox-core": "1.17.1", + "@opentelemetry/sandbox-instrumentation": "0.44.0", + "@opentelemetry/sandbox-sdk-trace-base": "1.17.1", + "@opentelemetry/sandbox-sdk-trace-web": "1.17.1", + "@opentelemetry/sandbox-semantic-conventions": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-instrumentation-document-load#readme" } \ No newline at end of file diff --git a/pkgs/instrumentations/web/fetch/package.json b/pkgs/instrumentations/web/fetch/package.json index f9c0ff8ed..8628b632b 100644 --- a/pkgs/instrumentations/web/fetch/package.json +++ b/pkgs/instrumentations/web/fetch/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-instrumentation-fetch", - "version": "0.43.0", + "version": "0.44.0", "description": "OpenTelemetry fetch automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -62,9 +62,9 @@ "devDependencies": { "@babel/core": "7.22.20", "@opentelemetry/sandbox-api": "1.6.0", - "@opentelemetry/sandbox-context-zone": "1.17.0", - "@opentelemetry/sandbox-propagator-b3": "1.17.0", - "@opentelemetry/sandbox-sdk-trace-base": "1.17.0", + "@opentelemetry/sandbox-context-zone": "1.17.1", + "@opentelemetry/sandbox-propagator-b3": "1.17.1", + "@opentelemetry/sandbox-sdk-trace-base": "1.17.1", "@types/jquery": "^3.5.14", "@types/mocha": "^10.0.0", "@types/node": "^18.14.2", @@ -113,10 +113,10 @@ "@opentelemetry/sandbox-api": "1.6.0" }, "dependencies": { - "@opentelemetry/sandbox-core": "1.17.0", - "@opentelemetry/sandbox-instrumentation": "0.43.0", - "@opentelemetry/sandbox-sdk-trace-web": "1.17.0", - "@opentelemetry/sandbox-semantic-conventions": "1.17.0" + "@opentelemetry/sandbox-core": "1.17.1", + "@opentelemetry/sandbox-instrumentation": "0.44.0", + "@opentelemetry/sandbox-sdk-trace-web": "1.17.1", + "@opentelemetry/sandbox-semantic-conventions": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-fetch", "sideEffects": false diff --git a/pkgs/instrumentations/web/long-task/CHANGELOG.md b/pkgs/instrumentations/web/long-task/CHANGELOG.md index 1b29a525c..c2a7bc1d5 100644 --- a/pkgs/instrumentations/web/long-task/CHANGELOG.md +++ b/pkgs/instrumentations/web/long-task/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [0.33.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-long-task-v0.33.1...instrumentation-long-task-v0.33.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update all patch versions ([#1687](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1687)) ([47301c0](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/47301c038e4dc7d24797cb0b8426033ecc0374e6)) +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [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) diff --git a/pkgs/instrumentations/web/long-task/package.json b/pkgs/instrumentations/web/long-task/package.json index 59a12f508..bdb4deae5 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.1", + "version": "0.33.2", "description": "OpenTelemetry long task API automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -57,7 +57,7 @@ "@babel/core": "7.22.17", "@jsdevtools/coverage-istanbul-loader": "3.0.5", "@opentelemetry/sandbox-api": "1.6.0", - "@opentelemetry/sandbox-sdk-trace-base": "1.17.0", + "@opentelemetry/sandbox-sdk-trace-base": "1.17.1", "@types/jquery": "^3.5.14", "@types/mocha": "^10.0.0", "@types/node": "^18.14.2", @@ -102,9 +102,9 @@ "zone.js": "^0.11.4" }, "dependencies": { - "@opentelemetry/sandbox-core": "1.17.0", - "@opentelemetry/sandbox-instrumentation": "0.43.0", - "@opentelemetry/sandbox-sdk-trace-web": "1.17.0" + "@opentelemetry/sandbox-core": "1.17.1", + "@opentelemetry/sandbox-instrumentation": "0.44.0", + "@opentelemetry/sandbox-sdk-trace-web": "1.17.1" }, "peerDependencies": { "@opentelemetry/sandbox-api": "1.6.0" diff --git a/pkgs/instrumentations/web/user-interaction/CHANGELOG.md b/pkgs/instrumentations/web/user-interaction/CHANGELOG.md index c7630f0f8..a02aa1012 100644 --- a/pkgs/instrumentations/web/user-interaction/CHANGELOG.md +++ b/pkgs/instrumentations/web/user-interaction/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [0.33.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-user-interaction-v0.33.1...instrumentation-user-interaction-v0.33.2) (2023-10-10) + + +### Bug Fixes + +* **deps:** update all patch versions ([#1687](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1687)) ([47301c0](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/47301c038e4dc7d24797cb0b8426033ecc0374e6)) +* **deps:** update otel core experimental to v0.43.0 ([#1676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1676)) ([deb9aa4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/deb9aa441dc7d2b0fd5ec11b41c934a1e93134fd)) +* **deps:** update otel core experimental to v0.44.0 ([#1725](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1725)) ([540a0d1](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/540a0d1ff5641522abba560d59a298084f786630)) + ## [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) diff --git a/pkgs/instrumentations/web/user-interaction/package.json b/pkgs/instrumentations/web/user-interaction/package.json index a0502faa5..a659b1aba 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.1", + "version": "0.33.2", "description": "OpenTelemetry UserInteraction automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -57,9 +57,9 @@ "@babel/core": "7.22.17", "@jsdevtools/coverage-istanbul-loader": "3.0.5", "@opentelemetry/sandbox-api": "1.6.0", - "@opentelemetry/sandbox-context-zone-peer-dep": "1.17.0", - "@opentelemetry/sandbox-instrumentation-xml-http-request": "0.43.0", - "@opentelemetry/sandbox-sdk-trace-base": "1.17.0", + "@opentelemetry/sandbox-context-zone-peer-dep": "1.17.1", + "@opentelemetry/sandbox-instrumentation-xml-http-request": "0.44.0", + "@opentelemetry/sandbox-sdk-trace-base": "1.17.1", "@types/jquery": "^3.5.14", "@types/mocha": "^10.0.0", "@types/node": "^18.14.2", @@ -104,9 +104,9 @@ "zone.js": "^0.11.4" }, "dependencies": { - "@opentelemetry/sandbox-core": "1.17.0", - "@opentelemetry/sandbox-instrumentation": "0.43.0", - "@opentelemetry/sandbox-sdk-trace-web": "1.17.0" + "@opentelemetry/sandbox-core": "1.17.1", + "@opentelemetry/sandbox-instrumentation": "0.44.0", + "@opentelemetry/sandbox-sdk-trace-web": "1.17.1" }, "peerDependencies": { "@opentelemetry/sandbox-api": "1.6.0", diff --git a/pkgs/instrumentations/web/xhr/package.json b/pkgs/instrumentations/web/xhr/package.json index 2e7becaf7..f7f698af6 100644 --- a/pkgs/instrumentations/web/xhr/package.json +++ b/pkgs/instrumentations/web/xhr/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-instrumentation-xml-http-request", - "version": "0.43.0", + "version": "0.44.0", "description": "OpenTelemetry XMLHttpRequest automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -62,9 +62,9 @@ "devDependencies": { "@babel/core": "7.22.20", "@opentelemetry/sandbox-api": "1.6.0", - "@opentelemetry/sandbox-context-zone": "1.17.0", - "@opentelemetry/sandbox-propagator-b3": "1.17.0", - "@opentelemetry/sandbox-sdk-trace-base": "1.17.0", + "@opentelemetry/sandbox-context-zone": "1.17.1", + "@opentelemetry/sandbox-propagator-b3": "1.17.1", + "@opentelemetry/sandbox-sdk-trace-base": "1.17.1", "@types/jquery": "^3.5.14", "@types/mocha": "^10.0.0", "@types/node": "^18.14.2", @@ -113,10 +113,10 @@ "@opentelemetry/sandbox-api": "1.6.0" }, "dependencies": { - "@opentelemetry/sandbox-core": "1.17.0", - "@opentelemetry/sandbox-instrumentation": "0.43.0", - "@opentelemetry/sandbox-sdk-trace-web": "1.17.0", - "@opentelemetry/sandbox-semantic-conventions": "1.17.0" + "@opentelemetry/sandbox-core": "1.17.1", + "@opentelemetry/sandbox-instrumentation": "0.44.0", + "@opentelemetry/sandbox-sdk-trace-web": "1.17.1", + "@opentelemetry/sandbox-semantic-conventions": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-xml-http-request", "sideEffects": false diff --git a/pkgs/propagators/b3/package.json b/pkgs/propagators/b3/package.json index 39ae9b159..39e92cbd5 100644 --- a/pkgs/propagators/b3/package.json +++ b/pkgs/propagators/b3/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-propagator-b3", - "version": "1.17.0", + "version": "1.17.1", "description": "OpenTelemetry B3 propagator provides context propagation for systems that are using the B3 header format", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -57,7 +57,7 @@ "access": "public" }, "dependencies": { - "@opentelemetry/sandbox-core": "1.17.0" + "@opentelemetry/sandbox-core": "1.17.1" }, "peerDependencies": { "@opentelemetry/sandbox-api": "1.6.0" diff --git a/pkgs/resources/package.json b/pkgs/resources/package.json index 84065a322..fb4e44494 100644 --- a/pkgs/resources/package.json +++ b/pkgs/resources/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-resources", - "version": "1.17.0", + "version": "1.17.1", "description": "OpenTelemetry SDK resources", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -117,8 +117,8 @@ "@opentelemetry/sandbox-api": "1.6.0" }, "dependencies": { - "@opentelemetry/sandbox-core": "1.17.0", - "@opentelemetry/sandbox-semantic-conventions": "1.17.0" + "@opentelemetry/sandbox-core": "1.17.1", + "@opentelemetry/sandbox-semantic-conventions": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-resources", "sideEffects": false diff --git a/pkgs/sdk/logs/package.json b/pkgs/sdk/logs/package.json index 625ab0f20..2a066e4a2 100644 --- a/pkgs/sdk/logs/package.json +++ b/pkgs/sdk/logs/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-sdk-logs", - "version": "0.43.0", + "version": "0.44.0", "publishConfig": { "access": "public" }, @@ -74,12 +74,12 @@ "sideEffects": false, "peerDependencies": { "@opentelemetry/sandbox-api": "1.6.0", - "@opentelemetry/sandbox-api-logs": "0.43.0" + "@opentelemetry/sandbox-api-logs": "0.44.0" }, "devDependencies": { "@babel/core": "7.22.20", "@opentelemetry/sandbox-api": "1.6.0", - "@opentelemetry/sandbox-api-logs": "0.43.0", + "@opentelemetry/sandbox-api-logs": "0.44.0", "@types/jquery": "^3.5.14", "@types/mocha": "^10.0.0", "@types/node": "^18.14.2", @@ -125,7 +125,7 @@ "webpack-merge": "5.9.0" }, "dependencies": { - "@opentelemetry/sandbox-core": "1.17.0", - "@opentelemetry/sandbox-resources": "1.17.0" + "@opentelemetry/sandbox-core": "1.17.1", + "@opentelemetry/sandbox-resources": "1.17.1" } } \ No newline at end of file diff --git a/pkgs/sdk/metrics/package.json b/pkgs/sdk/metrics/package.json index c42ccd73e..3e6e9dd4d 100644 --- a/pkgs/sdk/metrics/package.json +++ b/pkgs/sdk/metrics/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-sdk-metrics", - "version": "1.17.0", + "version": "1.17.1", "description": "OpenTelemetry metrics SDK", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -110,8 +110,8 @@ "@opentelemetry/sandbox-api": "1.6.0" }, "dependencies": { - "@opentelemetry/sandbox-core": "1.17.0", - "@opentelemetry/sandbox-resources": "1.17.0", + "@opentelemetry/sandbox-core": "1.17.1", + "@opentelemetry/sandbox-resources": "1.17.1", "lodash.merge": "^4.6.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/sdk-metrics", diff --git a/pkgs/sdk/metrics/src/InstrumentDescriptor.ts b/pkgs/sdk/metrics/src/InstrumentDescriptor.ts index 792a07a6e..3741f5220 100644 --- a/pkgs/sdk/metrics/src/InstrumentDescriptor.ts +++ b/pkgs/sdk/metrics/src/InstrumentDescriptor.ts @@ -14,7 +14,12 @@ * limitations under the License. */ -import { MetricOptions, ValueType, diag } from '@opentelemetry/sandbox-api'; +import { + MetricAdvice, + MetricOptions, + ValueType, + diag, +} from '@opentelemetry/sandbox-api'; import { View } from './view/View'; import { equalsCaseInsensitive } from './utils'; @@ -31,7 +36,10 @@ export enum InstrumentType { } /** - * An interface describing the instrument. + * An internal interface describing the instrument. + * + * This is intentionally distinguished from the public MetricDescriptor (a.k.a. InstrumentDescriptor) + * which may not contains internal fields like metric advice. */ export interface InstrumentDescriptor { readonly name: string; @@ -39,6 +47,10 @@ export interface InstrumentDescriptor { readonly unit: string; readonly type: InstrumentType; readonly valueType: ValueType; + /** + * @experimental + */ + readonly advice: MetricAdvice; } export function createInstrumentDescriptor( @@ -57,6 +69,7 @@ export function createInstrumentDescriptor( description: options?.description ?? '', unit: options?.unit ?? '', valueType: options?.valueType ?? ValueType.DOUBLE, + advice: options?.advice ?? {}, }; } @@ -70,6 +83,7 @@ export function createInstrumentDescriptorWithView( type: instrument.type, unit: instrument.unit, valueType: instrument.valueType, + advice: instrument.advice, }; } diff --git a/pkgs/sdk/metrics/src/ObservableResult.ts b/pkgs/sdk/metrics/src/ObservableResult.ts index fb8f72dfb..223e83a94 100644 --- a/pkgs/sdk/metrics/src/ObservableResult.ts +++ b/pkgs/sdk/metrics/src/ObservableResult.ts @@ -24,7 +24,6 @@ import { } from '@opentelemetry/sandbox-api'; import { AttributeHashMap } from './state/HashMap'; import { isObservableInstrument, ObservableInstrument } from './Instruments'; -import { InstrumentDescriptor } from '.'; /** * The class implements {@link ObservableResult} interface. @@ -35,7 +34,10 @@ export class ObservableResultImpl implements ObservableResult { */ _buffer = new AttributeHashMap(); - constructor(private _descriptor: InstrumentDescriptor) {} + constructor( + private _instrumentName: string, + private _valueType: ValueType + ) {} /** * Observe a measurement of the value associated with the given attributes. @@ -43,16 +45,13 @@ export class ObservableResultImpl implements ObservableResult { observe(value: number, attributes: MetricAttributes = {}): void { if (typeof value !== 'number') { diag.warn( - `non-number value provided to metric ${this._descriptor.name}: ${value}` + `non-number value provided to metric ${this._instrumentName}: ${value}` ); return; } - if ( - this._descriptor.valueType === ValueType.INT && - !Number.isInteger(value) - ) { + if (this._valueType === ValueType.INT && !Number.isInteger(value)) { diag.warn( - `INT value type cannot accept a floating-point value for ${this._descriptor.name}, ignoring the fractional digits.` + `INT value type cannot accept a floating-point value for ${this._instrumentName}, ignoring the fractional digits.` ); value = Math.trunc(value); // ignore non-finite values. diff --git a/pkgs/sdk/metrics/src/aggregator/Drop.ts b/pkgs/sdk/metrics/src/aggregator/Drop.ts index e20572cd5..aa55f3476 100644 --- a/pkgs/sdk/metrics/src/aggregator/Drop.ts +++ b/pkgs/sdk/metrics/src/aggregator/Drop.ts @@ -16,8 +16,7 @@ import { HrTime } from '@opentelemetry/sandbox-api'; import { AggregationTemporality } from '../export/AggregationTemporality'; -import { MetricData } from '../export/MetricData'; -import { InstrumentDescriptor } from '../InstrumentDescriptor'; +import { MetricData, MetricDescriptor } from '../export/MetricData'; import { Maybe } from '../utils'; import { AggregatorKind, Aggregator, AccumulationRecord } from './types'; @@ -38,7 +37,7 @@ export class DropAggregator implements Aggregator { } toMetricData( - _descriptor: InstrumentDescriptor, + _descriptor: MetricDescriptor, _aggregationTemporality: AggregationTemporality, _accumulationByAttributes: AccumulationRecord[], _endTime: HrTime diff --git a/pkgs/sdk/metrics/src/aggregator/ExponentialHistogram.ts b/pkgs/sdk/metrics/src/aggregator/ExponentialHistogram.ts index bf4c69b42..537dec455 100644 --- a/pkgs/sdk/metrics/src/aggregator/ExponentialHistogram.ts +++ b/pkgs/sdk/metrics/src/aggregator/ExponentialHistogram.ts @@ -24,9 +24,10 @@ import { import { DataPointType, ExponentialHistogramMetricData, + MetricDescriptor, } from '../export/MetricData'; import { diag, HrTime } from '@opentelemetry/sandbox-api'; -import { InstrumentDescriptor, InstrumentType } from '../InstrumentDescriptor'; +import { InstrumentType } from '../InstrumentDescriptor'; import { Maybe } from '../utils'; import { AggregationTemporality } from '../export/AggregationTemporality'; import { Buckets } from './exponential-histogram/Buckets'; @@ -555,7 +556,7 @@ export class ExponentialHistogramAggregator } toMetricData( - descriptor: InstrumentDescriptor, + descriptor: MetricDescriptor, aggregationTemporality: AggregationTemporality, accumulationByAttributes: AccumulationRecord[], endTime: HrTime diff --git a/pkgs/sdk/metrics/src/aggregator/Histogram.ts b/pkgs/sdk/metrics/src/aggregator/Histogram.ts index 1a07547c6..e8d5b08c1 100644 --- a/pkgs/sdk/metrics/src/aggregator/Histogram.ts +++ b/pkgs/sdk/metrics/src/aggregator/Histogram.ts @@ -20,9 +20,13 @@ import { Aggregator, AggregatorKind, } from './types'; -import { DataPointType, HistogramMetricData } from '../export/MetricData'; +import { + DataPointType, + HistogramMetricData, + MetricDescriptor, +} from '../export/MetricData'; import { HrTime } from '@opentelemetry/sandbox-api'; -import { InstrumentDescriptor, InstrumentType } from '../InstrumentDescriptor'; +import { InstrumentType } from '../InstrumentDescriptor'; import { binarySearchLB, Maybe } from '../utils'; import { AggregationTemporality } from '../export/AggregationTemporality'; @@ -207,7 +211,7 @@ export class HistogramAggregator implements Aggregator { } toMetricData( - descriptor: InstrumentDescriptor, + descriptor: MetricDescriptor, aggregationTemporality: AggregationTemporality, accumulationByAttributes: AccumulationRecord[], endTime: HrTime diff --git a/pkgs/sdk/metrics/src/aggregator/LastValue.ts b/pkgs/sdk/metrics/src/aggregator/LastValue.ts index 94b21692f..ea9ec7d31 100644 --- a/pkgs/sdk/metrics/src/aggregator/LastValue.ts +++ b/pkgs/sdk/metrics/src/aggregator/LastValue.ts @@ -23,8 +23,11 @@ import { } from './types'; import { HrTime } from '@opentelemetry/sandbox-api'; import { millisToHrTime, hrTimeToMicroseconds } from '@opentelemetry/sandbox-core'; -import { DataPointType, GaugeMetricData } from '../export/MetricData'; -import { InstrumentDescriptor } from '../InstrumentDescriptor'; +import { + DataPointType, + GaugeMetricData, + MetricDescriptor, +} from '../export/MetricData'; import { Maybe } from '../utils'; import { AggregationTemporality } from '../export/AggregationTemporality'; @@ -103,7 +106,7 @@ export class LastValueAggregator implements Aggregator { } toMetricData( - descriptor: InstrumentDescriptor, + descriptor: MetricDescriptor, aggregationTemporality: AggregationTemporality, accumulationByAttributes: AccumulationRecord[], endTime: HrTime diff --git a/pkgs/sdk/metrics/src/aggregator/Sum.ts b/pkgs/sdk/metrics/src/aggregator/Sum.ts index daf4f6637..49e6c5888 100644 --- a/pkgs/sdk/metrics/src/aggregator/Sum.ts +++ b/pkgs/sdk/metrics/src/aggregator/Sum.ts @@ -22,8 +22,11 @@ import { AccumulationRecord, } from './types'; import { HrTime } from '@opentelemetry/sandbox-api'; -import { DataPointType, SumMetricData } from '../export/MetricData'; -import { InstrumentDescriptor } from '../InstrumentDescriptor'; +import { + DataPointType, + MetricDescriptor, + SumMetricData, +} from '../export/MetricData'; import { Maybe } from '../utils'; import { AggregationTemporality } from '../export/AggregationTemporality'; @@ -109,7 +112,7 @@ export class SumAggregator implements Aggregator { } toMetricData( - descriptor: InstrumentDescriptor, + descriptor: MetricDescriptor, aggregationTemporality: AggregationTemporality, accumulationByAttributes: AccumulationRecord[], endTime: HrTime diff --git a/pkgs/sdk/metrics/src/aggregator/types.ts b/pkgs/sdk/metrics/src/aggregator/types.ts index bbef16248..17397b01c 100644 --- a/pkgs/sdk/metrics/src/aggregator/types.ts +++ b/pkgs/sdk/metrics/src/aggregator/types.ts @@ -16,8 +16,7 @@ import { HrTime, MetricAttributes } from '@opentelemetry/sandbox-api'; import { AggregationTemporality } from '../export/AggregationTemporality'; -import { MetricData } from '../export/MetricData'; -import { InstrumentDescriptor } from '../InstrumentDescriptor'; +import { MetricData, MetricDescriptor } from '../export/MetricData'; import { Maybe } from '../utils'; /** The kind of aggregator. */ @@ -128,14 +127,14 @@ export interface Aggregator { /** * Returns the {@link MetricData} that this {@link Aggregator} will produce. * - * @param descriptor the metric instrument descriptor. + * @param descriptor the metric descriptor. * @param aggregationTemporality the temporality of the resulting {@link MetricData} * @param accumulationByAttributes the array of attributes and accumulation pairs. * @param endTime the end time of the metric data. * @return the {@link MetricData} that this {@link Aggregator} will produce. */ toMetricData( - descriptor: InstrumentDescriptor, + descriptor: MetricDescriptor, aggregationTemporality: AggregationTemporality, accumulationByAttributes: AccumulationRecord[], endTime: HrTime diff --git a/pkgs/sdk/metrics/src/export/MetricData.ts b/pkgs/sdk/metrics/src/export/MetricData.ts index 9a1f85966..0ed449e60 100644 --- a/pkgs/sdk/metrics/src/export/MetricData.ts +++ b/pkgs/sdk/metrics/src/export/MetricData.ts @@ -14,18 +14,30 @@ * limitations under the License. */ -import { HrTime, MetricAttributes } from '@opentelemetry/sandbox-api'; +import { HrTime, MetricAttributes, ValueType } from '@opentelemetry/sandbox-api'; import { InstrumentationScope } from '@opentelemetry/sandbox-core'; import { IResource } from '@opentelemetry/sandbox-resources'; -import { InstrumentDescriptor } from '../InstrumentDescriptor'; +import { InstrumentType } from '../InstrumentDescriptor'; import { AggregationTemporality } from './AggregationTemporality'; import { Histogram, ExponentialHistogram } from '../aggregator/types'; +export interface MetricDescriptor { + readonly name: string; + readonly description: string; + readonly unit: string; + /** + * @deprecated exporter should avoid depending on the type of the instrument + * as their resulting aggregator can be re-mapped with views. + */ + readonly type: InstrumentType; + readonly valueType: ValueType; +} + /** * Basic metric data fields. */ interface BaseMetricData { - readonly descriptor: InstrumentDescriptor; + readonly descriptor: MetricDescriptor; readonly aggregationTemporality: AggregationTemporality; /** * DataPointType of the metric instrument. diff --git a/pkgs/sdk/metrics/src/index.ts b/pkgs/sdk/metrics/src/index.ts index c9623707f..414766c09 100644 --- a/pkgs/sdk/metrics/src/index.ts +++ b/pkgs/sdk/metrics/src/index.ts @@ -14,6 +14,8 @@ * limitations under the License. */ +import { MetricDescriptor } from './export/MetricData'; + export { Sum, LastValue, @@ -38,6 +40,7 @@ export { ResourceMetrics, ScopeMetrics, MetricData, + MetricDescriptor, CollectionResult, } from './export/MetricData'; @@ -56,7 +59,11 @@ export { ConsoleMetricExporter } from './export/ConsoleMetricExporter'; export { MetricCollectOptions, MetricProducer } from './export/MetricProducer'; -export { InstrumentDescriptor, InstrumentType } from './InstrumentDescriptor'; +export { InstrumentType } from './InstrumentDescriptor'; +/** + * @deprecated Use {@link MetricDescriptor} instead. + */ +export type InstrumentDescriptor = MetricDescriptor; export { MeterProvider, MeterProviderOptions } from './MeterProvider'; diff --git a/pkgs/sdk/metrics/src/state/AsyncMetricStorage.ts b/pkgs/sdk/metrics/src/state/AsyncMetricStorage.ts index 81e7af95d..95e8ce546 100644 --- a/pkgs/sdk/metrics/src/state/AsyncMetricStorage.ts +++ b/pkgs/sdk/metrics/src/state/AsyncMetricStorage.ts @@ -42,11 +42,15 @@ export class AsyncMetricStorage> constructor( _instrumentDescriptor: InstrumentDescriptor, aggregator: Aggregator, - private _attributesProcessor: AttributesProcessor + private _attributesProcessor: AttributesProcessor, + collectorHandles: MetricCollectorHandle[] ) { super(_instrumentDescriptor); this._deltaMetricStorage = new DeltaMetricProcessor(aggregator); - this._temporalMetricStorage = new TemporalMetricProcessor(aggregator); + this._temporalMetricStorage = new TemporalMetricProcessor( + aggregator, + collectorHandles + ); } record(measurements: AttributeHashMap, observationTime: HrTime) { @@ -66,14 +70,12 @@ export class AsyncMetricStorage> */ collect( collector: MetricCollectorHandle, - collectors: MetricCollectorHandle[], collectionTime: HrTime ): Maybe { const accumulations = this._deltaMetricStorage.collect(); return this._temporalMetricStorage.buildMetrics( collector, - collectors, this._instrumentDescriptor, accumulations, collectionTime diff --git a/pkgs/sdk/metrics/src/state/MeterSharedState.ts b/pkgs/sdk/metrics/src/state/MeterSharedState.ts index 194e7b7bc..e390d8f86 100644 --- a/pkgs/sdk/metrics/src/state/MeterSharedState.ts +++ b/pkgs/sdk/metrics/src/state/MeterSharedState.ts @@ -96,11 +96,7 @@ export class MeterSharedState { const metricDataList = storages .map(metricStorage => { - return metricStorage.collect( - collector, - this._meterProviderSharedState.metricCollectors, - collectionTime - ); + return metricStorage.collect(collector, collectionTime); }) .filter(isNotNullish); @@ -145,7 +141,8 @@ export class MeterSharedState { const viewStorage = new MetricStorageType( viewDescriptor, aggregator, - view.attributesProcessor + view.attributesProcessor, + this._meterProviderSharedState.metricCollectors ) as R; this.metricStorageRegistry.register(viewStorage); return viewStorage; @@ -169,7 +166,8 @@ export class MeterSharedState { const storage = new MetricStorageType( descriptor, aggregator, - AttributesProcessor.Noop() + AttributesProcessor.Noop(), + [collector] ) as R; this.metricStorageRegistry.registerForCollector(collector, storage); return storage; @@ -191,6 +189,7 @@ interface MetricStorageConstructor { new ( instrumentDescriptor: InstrumentDescriptor, aggregator: Aggregator>, - attributesProcessor: AttributesProcessor + attributesProcessor: AttributesProcessor, + collectors: MetricCollectorHandle[] ): MetricStorage; } diff --git a/pkgs/sdk/metrics/src/state/MetricStorage.ts b/pkgs/sdk/metrics/src/state/MetricStorage.ts index 49fd56c69..9241dfb40 100644 --- a/pkgs/sdk/metrics/src/state/MetricStorage.ts +++ b/pkgs/sdk/metrics/src/state/MetricStorage.ts @@ -39,7 +39,6 @@ export abstract class MetricStorage { */ abstract collect( collector: MetricCollectorHandle, - collectors: MetricCollectorHandle[], collectionTime: HrTime ): Maybe; @@ -55,6 +54,7 @@ export abstract class MetricStorage { description: description, valueType: this._instrumentDescriptor.valueType, unit: this._instrumentDescriptor.unit, + advice: this._instrumentDescriptor.advice, } ); } diff --git a/pkgs/sdk/metrics/src/state/ObservableRegistry.ts b/pkgs/sdk/metrics/src/state/ObservableRegistry.ts index 61dd2d4f1..87e03f0c9 100644 --- a/pkgs/sdk/metrics/src/state/ObservableRegistry.ts +++ b/pkgs/sdk/metrics/src/state/ObservableRegistry.ts @@ -144,7 +144,10 @@ export class ObservableRegistry { private _observeCallbacks(observationTime: HrTime, timeoutMillis?: number) { return this._callbacks.map(async ({ callback, instrument }) => { - const observableResult = new ObservableResultImpl(instrument._descriptor); + const observableResult = new ObservableResultImpl( + instrument._descriptor.name, + instrument._descriptor.valueType + ); let callPromise: Promise = Promise.resolve( callback(observableResult) ); diff --git a/pkgs/sdk/metrics/src/state/SyncMetricStorage.ts b/pkgs/sdk/metrics/src/state/SyncMetricStorage.ts index dd7dd6631..e22309b01 100644 --- a/pkgs/sdk/metrics/src/state/SyncMetricStorage.ts +++ b/pkgs/sdk/metrics/src/state/SyncMetricStorage.ts @@ -41,11 +41,15 @@ export class SyncMetricStorage> constructor( instrumentDescriptor: InstrumentDescriptor, aggregator: Aggregator, - private _attributesProcessor: AttributesProcessor + private _attributesProcessor: AttributesProcessor, + collectorHandles: MetricCollectorHandle[] ) { super(instrumentDescriptor); this._deltaMetricStorage = new DeltaMetricProcessor(aggregator); - this._temporalMetricStorage = new TemporalMetricProcessor(aggregator); + this._temporalMetricStorage = new TemporalMetricProcessor( + aggregator, + collectorHandles + ); } record( @@ -66,14 +70,12 @@ export class SyncMetricStorage> */ collect( collector: MetricCollectorHandle, - collectors: MetricCollectorHandle[], collectionTime: HrTime ): Maybe { const accumulations = this._deltaMetricStorage.collect(); return this._temporalMetricStorage.buildMetrics( collector, - collectors, this._instrumentDescriptor, accumulations, collectionTime diff --git a/pkgs/sdk/metrics/src/state/TemporalMetricProcessor.ts b/pkgs/sdk/metrics/src/state/TemporalMetricProcessor.ts index 6f24862fa..02ffc183f 100644 --- a/pkgs/sdk/metrics/src/state/TemporalMetricProcessor.ts +++ b/pkgs/sdk/metrics/src/state/TemporalMetricProcessor.ts @@ -61,7 +61,14 @@ export class TemporalMetricProcessor> { LastReportedHistory >(); - constructor(private _aggregator: Aggregator) {} + constructor( + private _aggregator: Aggregator, + collectorHandles: MetricCollectorHandle[] + ) { + collectorHandles.forEach(handle => { + this._unreportedAccumulations.set(handle, []); + }); + } /** * Builds the {@link MetricData} streams to report against a specific MetricCollector. @@ -74,12 +81,11 @@ export class TemporalMetricProcessor> { */ buildMetrics( collector: MetricCollectorHandle, - collectors: MetricCollectorHandle[], instrumentDescriptor: InstrumentDescriptor, currentAccumulations: AttributeHashMap, collectionTime: HrTime ): Maybe { - this._stashAccumulations(collectors, currentAccumulations); + this._stashAccumulations(currentAccumulations); const unreportedAccumulations = this._getMergedUnreportedAccumulations(collector); @@ -148,18 +154,16 @@ export class TemporalMetricProcessor> { ); } - private _stashAccumulations( - collectors: MetricCollectorHandle[], - currentAccumulation: AttributeHashMap - ) { - collectors.forEach(it => { - let stash = this._unreportedAccumulations.get(it); + private _stashAccumulations(currentAccumulation: AttributeHashMap) { + const registeredCollectors = this._unreportedAccumulations.keys(); + for (const collector of registeredCollectors) { + let stash = this._unreportedAccumulations.get(collector); if (stash === undefined) { stash = []; - this._unreportedAccumulations.set(it, stash); + this._unreportedAccumulations.set(collector, stash); } stash.push(currentAccumulation); - }); + } } private _getMergedUnreportedAccumulations(collector: MetricCollectorHandle) { diff --git a/pkgs/sdk/metrics/src/view/Aggregation.ts b/pkgs/sdk/metrics/src/view/Aggregation.ts index 8357f3465..fa8dfed2a 100644 --- a/pkgs/sdk/metrics/src/view/Aggregation.ts +++ b/pkgs/sdk/metrics/src/view/Aggregation.ts @@ -184,6 +184,11 @@ export class DefaultAggregation extends Aggregation { return LAST_VALUE_AGGREGATION; } case InstrumentType.HISTOGRAM: { + if (instrument.advice.explicitBucketBoundaries) { + return new ExplicitBucketHistogramAggregation( + instrument.advice.explicitBucketBoundaries + ); + } return HISTOGRAM_AGGREGATION; } } diff --git a/pkgs/sdk/metrics/test/InstrumentDescriptor.test.ts b/pkgs/sdk/metrics/test/InstrumentDescriptor.test.ts index 5ac4855e3..fa159fce9 100644 --- a/pkgs/sdk/metrics/test/InstrumentDescriptor.test.ts +++ b/pkgs/sdk/metrics/test/InstrumentDescriptor.test.ts @@ -57,6 +57,7 @@ describe('InstrumentDescriptor', () => { unit: 'kB', type: InstrumentType.COUNTER, valueType: ValueType.DOUBLE, + advice: {}, }, { name: 'foo', @@ -64,6 +65,7 @@ describe('InstrumentDescriptor', () => { unit: 'kB', type: InstrumentType.COUNTER, valueType: ValueType.DOUBLE, + advice: {}, }, ], [ @@ -75,6 +77,7 @@ describe('InstrumentDescriptor', () => { unit: '', type: InstrumentType.COUNTER, valueType: ValueType.DOUBLE, + advice: {}, }, { name: 'FoO', @@ -82,6 +85,53 @@ describe('InstrumentDescriptor', () => { unit: '', type: InstrumentType.COUNTER, valueType: ValueType.DOUBLE, + advice: {}, + }, + ], + [ + 'Compatible with different advice options', + true, + { + name: 'foo', + description: '', + unit: '', + type: InstrumentType.COUNTER, + valueType: ValueType.DOUBLE, + advice: { + explicitBucketBoundaries: [4, 5, 6], + }, + }, + { + name: 'FoO', + description: '', + unit: '', + type: InstrumentType.COUNTER, + valueType: ValueType.DOUBLE, + advice: { + explicitBucketBoundaries: [1, 2, 3], + }, + }, + ], + [ + 'Compatible with empty advice options', + true, + { + name: 'foo', + description: '', + unit: '', + type: InstrumentType.COUNTER, + valueType: ValueType.DOUBLE, + advice: {}, + }, + { + name: 'FoO', + description: '', + unit: '', + type: InstrumentType.COUNTER, + valueType: ValueType.DOUBLE, + advice: { + explicitBucketBoundaries: [1, 2, 3], + }, }, ], [ @@ -93,6 +143,7 @@ describe('InstrumentDescriptor', () => { unit: '', type: InstrumentType.COUNTER, valueType: ValueType.DOUBLE, + advice: {}, }, { name: 'foobar', @@ -100,6 +151,7 @@ describe('InstrumentDescriptor', () => { unit: '', type: InstrumentType.COUNTER, valueType: ValueType.DOUBLE, + advice: {}, }, ], [ @@ -111,6 +163,7 @@ describe('InstrumentDescriptor', () => { unit: 'kB', type: InstrumentType.COUNTER, valueType: ValueType.DOUBLE, + advice: {}, }, { name: 'foo', @@ -118,6 +171,7 @@ describe('InstrumentDescriptor', () => { unit: 'kb', type: InstrumentType.COUNTER, valueType: ValueType.DOUBLE, + advice: {}, }, ], ]; diff --git a/pkgs/sdk/metrics/test/Instruments.test.ts b/pkgs/sdk/metrics/test/Instruments.test.ts index 82bc2de6a..dfaebba2c 100644 --- a/pkgs/sdk/metrics/test/Instruments.test.ts +++ b/pkgs/sdk/metrics/test/Instruments.test.ts @@ -19,13 +19,13 @@ import * as sinon from 'sinon'; import { InstrumentationScope } from '@opentelemetry/sandbox-core'; import { Resource } from '@opentelemetry/sandbox-resources'; import { - InstrumentDescriptor, InstrumentType, MeterProvider, MetricReader, DataPoint, DataPointType, Histogram, + MetricDescriptor, } from '../src'; import { TestDeltaMetricReader, @@ -352,6 +352,60 @@ describe('Instruments', () => { }); }); + it('should recognize metric advice', async () => { + const { meter, deltaReader } = setup(); + const histogram = meter.createHistogram('test', { + valueType: ValueType.INT, + advice: { + // Set explicit boundaries that are different from the default one. + explicitBucketBoundaries: [1, 9, 100], + }, + }); + + histogram.record(10); + histogram.record(0); + histogram.record(100, { foo: 'bar' }); + histogram.record(0, { foo: 'bar' }); + await validateExport(deltaReader, { + descriptor: { + name: 'test', + description: '', + unit: '', + type: InstrumentType.HISTOGRAM, + valueType: ValueType.INT, + }, + dataPointType: DataPointType.HISTOGRAM, + dataPoints: [ + { + attributes: {}, + value: { + buckets: { + boundaries: [1, 9, 100], + counts: [1, 0, 1, 0], + }, + count: 2, + sum: 10, + max: 10, + min: 0, + }, + }, + { + attributes: { foo: 'bar' }, + value: { + buckets: { + boundaries: [1, 9, 100], + counts: [1, 0, 0, 1], + }, + count: 2, + sum: 100, + max: 100, + min: 0, + }, + }, + ], + }); + }); + it('should collect min and max', async () => { const { meter, deltaReader, cumulativeReader } = setup(); const histogram = meter.createHistogram('test', { @@ -721,7 +775,7 @@ function setup() { interface ValidateMetricData { resource?: Resource; instrumentationScope?: InstrumentationScope; - descriptor?: InstrumentDescriptor; + descriptor?: MetricDescriptor; dataPointType?: DataPointType; dataPoints?: Partial>>[]; isMonotonic?: boolean; diff --git a/pkgs/sdk/metrics/test/ObservableResult.test.ts b/pkgs/sdk/metrics/test/ObservableResult.test.ts index dc5698208..5ed3df10c 100644 --- a/pkgs/sdk/metrics/test/ObservableResult.test.ts +++ b/pkgs/sdk/metrics/test/ObservableResult.test.ts @@ -33,7 +33,8 @@ describe('ObservableResultImpl', () => { describe('observe', () => { it('should observe common values', () => { const observableResult = new ObservableResultImpl( - defaultInstrumentDescriptor + 'instrument_name', + ValueType.DOUBLE ); for (const value of commonValues) { for (const attributes of commonAttributes) { @@ -44,7 +45,8 @@ describe('ObservableResultImpl', () => { it('should deduplicate observations', () => { const observableResult = new ObservableResultImpl( - defaultInstrumentDescriptor + 'instrument_name', + ValueType.DOUBLE ); observableResult.observe(1, {}); observableResult.observe(2, {}); @@ -55,13 +57,10 @@ describe('ObservableResultImpl', () => { }); it('should trunc value if ValueType is INT', () => { - const observableResult = new ObservableResultImpl({ - name: 'test', - description: '', - type: InstrumentType.COUNTER, - unit: '', - valueType: ValueType.INT, - }); + const observableResult = new ObservableResultImpl( + 'instrument_name', + ValueType.INT + ); observableResult.observe(1.1, {}); // should ignore non-finite/non-number values. observableResult.observe(Infinity, {}); @@ -72,14 +71,7 @@ describe('ObservableResultImpl', () => { }); it('should ignore non-number values', () => { - const observableResult = new ObservableResultImpl({ - name: 'test', - description: '', - type: InstrumentType.COUNTER, - unit: '', - valueType: ValueType.INT, - }); - + const observableResult = new ObservableResultImpl('test', ValueType.INT); observableResult.observe('1' as any, {}); assert.strictEqual(observableResult._buffer.get({}), undefined); @@ -139,6 +131,7 @@ describe('BatchObservableResultImpl', () => { type: InstrumentType.COUNTER, unit: '', valueType: ValueType.INT, + advice: {}, }, [], new ObservableRegistry() @@ -161,6 +154,7 @@ describe('BatchObservableResultImpl', () => { type: InstrumentType.COUNTER, unit: '', valueType: ValueType.INT, + advice: {}, }, [], new ObservableRegistry() diff --git a/pkgs/sdk/metrics/test/state/AsyncMetricStorage.test.ts b/pkgs/sdk/metrics/test/state/AsyncMetricStorage.test.ts index 2a8cf867d..a13e3eacb 100644 --- a/pkgs/sdk/metrics/test/state/AsyncMetricStorage.test.ts +++ b/pkgs/sdk/metrics/test/state/AsyncMetricStorage.test.ts @@ -43,15 +43,16 @@ const cumulativeCollector: MetricCollectorHandle = { describe('AsyncMetricStorage', () => { describe('collect', () => { describe('Delta Collector', () => { - const collectors = [deltaCollector]; it('should collect and reset memos', async () => { const delegate = new ObservableCallbackDelegate(); const observableRegistry = new ObservableRegistry(); const metricStorage = new AsyncMetricStorage( defaultInstrumentDescriptor, new SumAggregator(true), - new NoopAttributesProcessor() + new NoopAttributesProcessor(), + [deltaCollector] ); + const observable = new ObservableInstrument( defaultInstrumentDescriptor, [metricStorage], @@ -68,11 +69,7 @@ describe('AsyncMetricStorage', () => { { const collectionTime: HrTime = [0, 0]; await observableRegistry.observe(collectionTime); - const metric = metricStorage.collect( - deltaCollector, - collectors, - collectionTime - ); + const metric = metricStorage.collect(deltaCollector, collectionTime); assertMetricData(metric, DataPointType.SUM); assert.strictEqual(metric.dataPoints.length, 3); @@ -104,11 +101,7 @@ describe('AsyncMetricStorage', () => { { const collectionTime: HrTime = [1, 1]; await observableRegistry.observe(collectionTime); - const metric = metricStorage.collect( - deltaCollector, - collectors, - collectionTime - ); + const metric = metricStorage.collect(deltaCollector, collectionTime); assert.equal(metric, undefined); } @@ -121,11 +114,7 @@ describe('AsyncMetricStorage', () => { { const collectionTime: HrTime = [2, 2]; await observableRegistry.observe(collectionTime); - const metric = metricStorage.collect( - deltaCollector, - collectors, - collectionTime - ); + const metric = metricStorage.collect(deltaCollector, collectionTime); assertMetricData(metric, DataPointType.SUM); assert.strictEqual(metric.dataPoints.length, 3); @@ -160,8 +149,10 @@ describe('AsyncMetricStorage', () => { const metricStorage = new AsyncMetricStorage( defaultInstrumentDescriptor, new SumAggregator(true), - new NoopAttributesProcessor() + new NoopAttributesProcessor(), + [deltaCollector] ); + const observable = new ObservableInstrument( defaultInstrumentDescriptor, [metricStorage], @@ -178,11 +169,7 @@ describe('AsyncMetricStorage', () => { { const collectionTime: HrTime = [0, 0]; await observableRegistry.observe(collectionTime); - const metric = metricStorage.collect( - deltaCollector, - collectors, - collectionTime - ); + const metric = metricStorage.collect(deltaCollector, collectionTime); assertMetricData(metric, DataPointType.SUM); assert.strictEqual(metric.dataPoints.length, 1); @@ -204,11 +191,7 @@ describe('AsyncMetricStorage', () => { { const collectionTime: HrTime = [1, 1]; await observableRegistry.observe(collectionTime); - const metric = metricStorage.collect( - deltaCollector, - collectors, - collectionTime - ); + const metric = metricStorage.collect(deltaCollector, collectionTime); assertMetricData(metric, DataPointType.SUM); assert.strictEqual(metric.dataPoints.length, 1); @@ -230,11 +213,7 @@ describe('AsyncMetricStorage', () => { { const collectionTime: HrTime = [2, 2]; await observableRegistry.observe(collectionTime); - const metric = metricStorage.collect( - deltaCollector, - collectors, - collectionTime - ); + const metric = metricStorage.collect(deltaCollector, collectionTime); assertMetricData(metric, DataPointType.SUM); assert.strictEqual(metric.dataPoints.length, 1); @@ -254,8 +233,10 @@ describe('AsyncMetricStorage', () => { const metricStorage = new AsyncMetricStorage( defaultInstrumentDescriptor, new SumAggregator(false), - new NoopAttributesProcessor() + new NoopAttributesProcessor(), + [deltaCollector] ); + const observable = new ObservableInstrument( defaultInstrumentDescriptor, [metricStorage], @@ -272,11 +253,7 @@ describe('AsyncMetricStorage', () => { { const collectionTime: HrTime = [0, 0]; await observableRegistry.observe(collectionTime); - const metric = metricStorage.collect( - deltaCollector, - collectors, - collectionTime - ); + const metric = metricStorage.collect(deltaCollector, collectionTime); assertMetricData(metric, DataPointType.SUM); assert.strictEqual(metric.dataPoints.length, 1); @@ -298,11 +275,7 @@ describe('AsyncMetricStorage', () => { { const collectionTime: HrTime = [0, 0]; await observableRegistry.observe(collectionTime); - const metric = metricStorage.collect( - deltaCollector, - collectors, - collectionTime - ); + const metric = metricStorage.collect(deltaCollector, collectionTime); assertMetricData(metric, DataPointType.SUM); assert.strictEqual(metric.dataPoints.length, 1); @@ -324,11 +297,7 @@ describe('AsyncMetricStorage', () => { { const collectionTime: HrTime = [2, 2]; await observableRegistry.observe(collectionTime); - const metric = metricStorage.collect( - deltaCollector, - collectors, - collectionTime - ); + const metric = metricStorage.collect(deltaCollector, collectionTime); assertMetricData(metric, DataPointType.SUM); assert.strictEqual(metric.dataPoints.length, 1); @@ -344,15 +313,16 @@ describe('AsyncMetricStorage', () => { }); describe('Cumulative Collector', () => { - const collectors = [cumulativeCollector]; it('should collect cumulative metrics', async () => { const delegate = new ObservableCallbackDelegate(); const observableRegistry = new ObservableRegistry(); const metricStorage = new AsyncMetricStorage( defaultInstrumentDescriptor, new SumAggregator(true), - new NoopAttributesProcessor() + new NoopAttributesProcessor(), + [cumulativeCollector] ); + const observable = new ObservableInstrument( defaultInstrumentDescriptor, [metricStorage], @@ -372,7 +342,6 @@ describe('AsyncMetricStorage', () => { await observableRegistry.observe(collectionTime); const metric = metricStorage.collect( cumulativeCollector, - collectors, collectionTime ); @@ -409,7 +378,6 @@ describe('AsyncMetricStorage', () => { await observableRegistry.observe(collectionTime); const metric = metricStorage.collect( cumulativeCollector, - collectors, collectionTime ); @@ -448,7 +416,6 @@ describe('AsyncMetricStorage', () => { await observableRegistry.observe(collectionTime); const metric = metricStorage.collect( cumulativeCollector, - collectors, collectionTime ); @@ -484,8 +451,10 @@ describe('AsyncMetricStorage', () => { const metricStorage = new AsyncMetricStorage( defaultInstrumentDescriptor, new SumAggregator(true), - new NoopAttributesProcessor() + new NoopAttributesProcessor(), + [cumulativeCollector] ); + const observable = new ObservableInstrument( defaultInstrumentDescriptor, [metricStorage], @@ -504,7 +473,6 @@ describe('AsyncMetricStorage', () => { await observableRegistry.observe(collectionTime); const metric = metricStorage.collect( cumulativeCollector, - collectors, collectionTime ); @@ -530,7 +498,6 @@ describe('AsyncMetricStorage', () => { await observableRegistry.observe(collectionTime); const metric = metricStorage.collect( cumulativeCollector, - collectors, collectionTime ); @@ -557,7 +524,6 @@ describe('AsyncMetricStorage', () => { await observableRegistry.observe(collectionTime); const metric = metricStorage.collect( cumulativeCollector, - collectors, collectionTime ); @@ -579,8 +545,10 @@ describe('AsyncMetricStorage', () => { const metricStorage = new AsyncMetricStorage( defaultInstrumentDescriptor, new SumAggregator(false), - new NoopAttributesProcessor() + new NoopAttributesProcessor(), + [cumulativeCollector] ); + const observable = new ObservableInstrument( defaultInstrumentDescriptor, [metricStorage], @@ -599,7 +567,6 @@ describe('AsyncMetricStorage', () => { await observableRegistry.observe(collectionTime); const metric = metricStorage.collect( cumulativeCollector, - collectors, collectionTime ); @@ -625,7 +592,6 @@ describe('AsyncMetricStorage', () => { await observableRegistry.observe(collectionTime); const metric = metricStorage.collect( cumulativeCollector, - collectors, collectionTime ); @@ -651,7 +617,6 @@ describe('AsyncMetricStorage', () => { await observableRegistry.observe(collectionTime); const metric = metricStorage.collect( cumulativeCollector, - collectors, collectionTime ); diff --git a/pkgs/sdk/metrics/test/state/MetricStorageRegistry.test.ts b/pkgs/sdk/metrics/test/state/MetricStorageRegistry.test.ts index 423e38e19..be3bd1688 100644 --- a/pkgs/sdk/metrics/test/state/MetricStorageRegistry.test.ts +++ b/pkgs/sdk/metrics/test/state/MetricStorageRegistry.test.ts @@ -19,7 +19,7 @@ import { diag, ValueType } from '@opentelemetry/sandbox-api'; import { MetricStorage } from '../../src/state/MetricStorage'; import { HrTime } from '@opentelemetry/sandbox-api'; import { MetricCollectorHandle } from '../../src/state/MetricCollector'; -import { MetricData, InstrumentDescriptor, InstrumentType } from '../../src'; +import { MetricData, InstrumentType } from '../../src'; import { Maybe } from '../../src/utils'; import * as assert from 'assert'; import * as sinon from 'sinon'; @@ -29,11 +29,11 @@ import { getUnitConflictResolutionRecipe, getValueTypeConflictResolutionRecipe, } from '../../src/view/RegistrationConflicts'; +import { InstrumentDescriptor } from '../../src/InstrumentDescriptor'; class TestMetricStorage extends MetricStorage { collect( collector: MetricCollectorHandle, - collectors: MetricCollectorHandle[], collectionTime: HrTime ): Maybe { return undefined; @@ -74,6 +74,7 @@ describe('MetricStorageRegistry', () => { description: 'description', unit: '1', valueType: ValueType.DOUBLE, + advice: {}, }); registry.register(storage); @@ -93,6 +94,7 @@ describe('MetricStorageRegistry', () => { description: 'description', unit: '1', valueType: ValueType.DOUBLE, + advice: {}, }); const storage2 = new TestMetricStorage({ name: 'instrument2', @@ -100,6 +102,7 @@ describe('MetricStorageRegistry', () => { description: 'description', unit: '1', valueType: ValueType.DOUBLE, + advice: {}, }); registry.registerForCollector(collectorHandle, storage); @@ -153,6 +156,7 @@ describe('MetricStorageRegistry', () => { description: 'description', unit: '1', valueType: ValueType.DOUBLE, + advice: {}, }; const otherDescriptor = { @@ -161,6 +165,7 @@ describe('MetricStorageRegistry', () => { description: 'description', unit: '1', valueType: ValueType.DOUBLE, + advice: {}, }; testConflictingRegistration( @@ -177,6 +182,7 @@ describe('MetricStorageRegistry', () => { description: 'description', unit: '1', valueType: ValueType.DOUBLE, + advice: {}, }; const otherDescriptor = { @@ -185,6 +191,7 @@ describe('MetricStorageRegistry', () => { description: 'description', unit: '1', valueType: ValueType.INT, + advice: {}, }; testConflictingRegistration( @@ -204,6 +211,7 @@ describe('MetricStorageRegistry', () => { description: 'description', unit: '1', valueType: ValueType.DOUBLE, + advice: {}, }; const otherDescriptor = { @@ -212,6 +220,7 @@ describe('MetricStorageRegistry', () => { description: 'description', unit: 'ms', valueType: ValueType.DOUBLE, + advice: {}, }; testConflictingRegistration( @@ -228,6 +237,7 @@ describe('MetricStorageRegistry', () => { description: 'description', unit: '1', valueType: ValueType.DOUBLE, + advice: {}, }; const otherDescriptor = { @@ -236,6 +246,7 @@ describe('MetricStorageRegistry', () => { description: 'longer description', unit: '1', valueType: ValueType.DOUBLE, + advice: {}, }; const registry = new MetricStorageRegistry(); @@ -276,6 +287,7 @@ describe('MetricStorageRegistry', () => { description: 'description', unit: '1', valueType: ValueType.DOUBLE, + advice: {}, }; const storage = new TestMetricStorage(descriptor); @@ -295,6 +307,7 @@ describe('MetricStorageRegistry', () => { description: 'description', unit: '1', valueType: ValueType.DOUBLE, + advice: {}, }; const storage = new TestMetricStorage(descriptor); @@ -330,6 +343,7 @@ describe('MetricStorageRegistry', () => { description: 'description', unit: '1', valueType: ValueType.DOUBLE, + advice: {}, }; const otherDescriptor = { @@ -338,6 +352,7 @@ describe('MetricStorageRegistry', () => { description: 'description', unit: '1', valueType: ValueType.DOUBLE, + advice: {}, }; const registry = new MetricStorageRegistry(); @@ -376,6 +391,7 @@ describe('MetricStorageRegistry', () => { description: 'description', unit: '1', valueType: ValueType.DOUBLE, + advice: {}, }; const registry = new MetricStorageRegistry(); diff --git a/pkgs/sdk/metrics/test/state/SyncMetricStorage.test.ts b/pkgs/sdk/metrics/test/state/SyncMetricStorage.test.ts index 009eccd04..60730f604 100644 --- a/pkgs/sdk/metrics/test/state/SyncMetricStorage.test.ts +++ b/pkgs/sdk/metrics/test/state/SyncMetricStorage.test.ts @@ -45,7 +45,8 @@ describe('SyncMetricStorage', () => { const metricStorage = new SyncMetricStorage( defaultInstrumentDescriptor, new SumAggregator(true), - new NoopAttributesProcessor() + new NoopAttributesProcessor(), + [] ); for (const value of commonValues) { @@ -58,22 +59,19 @@ describe('SyncMetricStorage', () => { describe('collect', () => { describe('Delta Collector', () => { - const collectors = [deltaCollector]; it('should collect and reset memos', async () => { const metricStorage = new SyncMetricStorage( defaultInstrumentDescriptor, new SumAggregator(true), - new NoopAttributesProcessor() + new NoopAttributesProcessor(), + [deltaCollector] ); + metricStorage.record(1, {}, api.context.active(), [0, 0]); metricStorage.record(2, {}, api.context.active(), [1, 1]); metricStorage.record(3, {}, api.context.active(), [2, 2]); { - const metric = metricStorage.collect( - deltaCollector, - collectors, - [3, 3] - ); + const metric = metricStorage.collect(deltaCollector, [3, 3]); assertMetricData(metric, DataPointType.SUM); assert.strictEqual(metric.dataPoints.length, 1); @@ -82,22 +80,14 @@ describe('SyncMetricStorage', () => { // The attributes should not be memorized. { - const metric = metricStorage.collect( - deltaCollector, - collectors, - [4, 4] - ); + const metric = metricStorage.collect(deltaCollector, [4, 4]); assert.strictEqual(metric, undefined); } metricStorage.record(1, {}, api.context.active(), [5, 5]); { - const metric = metricStorage.collect( - deltaCollector, - [deltaCollector], - [6, 6] - ); + const metric = metricStorage.collect(deltaCollector, [6, 6]); assertMetricData(metric, DataPointType.SUM); assert.strictEqual(metric.dataPoints.length, 1); @@ -107,22 +97,18 @@ describe('SyncMetricStorage', () => { }); describe('Cumulative Collector', () => { - const collectors = [cumulativeCollector]; it('should collect cumulative metrics', async () => { const metricStorage = new SyncMetricStorage( defaultInstrumentDescriptor, new SumAggregator(true), - new NoopAttributesProcessor() + new NoopAttributesProcessor(), + [cumulativeCollector] ); metricStorage.record(1, {}, api.context.active(), [0, 0]); metricStorage.record(2, {}, api.context.active(), [1, 1]); metricStorage.record(3, {}, api.context.active(), [2, 2]); { - const metric = metricStorage.collect( - cumulativeCollector, - collectors, - [3, 3] - ); + const metric = metricStorage.collect(cumulativeCollector, [3, 3]); assertMetricData(metric, DataPointType.SUM); assert.strictEqual(metric.dataPoints.length, 1); @@ -131,11 +117,7 @@ describe('SyncMetricStorage', () => { // The attributes should be memorized. { - const metric = metricStorage.collect( - cumulativeCollector, - collectors, - [4, 4] - ); + const metric = metricStorage.collect(cumulativeCollector, [4, 4]); assertMetricData(metric, DataPointType.SUM); assert.strictEqual(metric.dataPoints.length, 1); @@ -144,11 +126,7 @@ describe('SyncMetricStorage', () => { metricStorage.record(1, {}, api.context.active(), [5, 5]); { - const metric = metricStorage.collect( - cumulativeCollector, - collectors, - [6, 6] - ); + const metric = metricStorage.collect(cumulativeCollector, [6, 6]); assertMetricData(metric, DataPointType.SUM); assert.strictEqual(metric.dataPoints.length, 1); diff --git a/pkgs/sdk/metrics/test/state/TemporalMetricProcessor.test.ts b/pkgs/sdk/metrics/test/state/TemporalMetricProcessor.test.ts index 769e52674..fb8e4bd60 100644 --- a/pkgs/sdk/metrics/test/state/TemporalMetricProcessor.test.ts +++ b/pkgs/sdk/metrics/test/state/TemporalMetricProcessor.test.ts @@ -48,20 +48,18 @@ describe('TemporalMetricProcessor', () => { describe('buildMetrics', () => { describe('single delta collector', () => { - const collectors = [deltaCollector1]; - it('should build delta recording metrics', () => { const spy = sinon.spy(deltaCollector1, 'selectAggregationTemporality'); const aggregator = new SumAggregator(true); const deltaMetricStorage = new DeltaMetricProcessor(aggregator); - const temporalMetricStorage = new TemporalMetricProcessor(aggregator); - + const temporalMetricStorage = new TemporalMetricProcessor(aggregator, [ + deltaCollector1, + ]); deltaMetricStorage.record(1, {}, api.context.active(), [1, 1]); { const metric = temporalMetricStorage.buildMetrics( deltaCollector1, - collectors, defaultInstrumentDescriptor, deltaMetricStorage.collect(), [2, 2] @@ -81,7 +79,6 @@ describe('TemporalMetricProcessor', () => { { const metric = temporalMetricStorage.buildMetrics( deltaCollector1, - collectors, defaultInstrumentDescriptor, deltaMetricStorage.collect(), [4, 4] @@ -101,7 +98,6 @@ describe('TemporalMetricProcessor', () => { { const metric = temporalMetricStorage.buildMetrics( deltaCollector1, - collectors, defaultInstrumentDescriptor, deltaMetricStorage.collect(), [5, 5] @@ -117,18 +113,18 @@ describe('TemporalMetricProcessor', () => { }); describe('two delta collector', () => { - const collectors = [deltaCollector1, deltaCollector2]; - it('should build delta recording metrics', () => { const aggregator = new SumAggregator(true); const deltaMetricStorage = new DeltaMetricProcessor(aggregator); - const temporalMetricStorage = new TemporalMetricProcessor(aggregator); + const temporalMetricStorage = new TemporalMetricProcessor(aggregator, [ + deltaCollector1, + deltaCollector2, + ]); deltaMetricStorage.record(1, {}, api.context.active(), [1, 1]); { const metric = temporalMetricStorage.buildMetrics( deltaCollector1, - collectors, defaultInstrumentDescriptor, deltaMetricStorage.collect(), [2, 2] @@ -147,7 +143,6 @@ describe('TemporalMetricProcessor', () => { { const metric = temporalMetricStorage.buildMetrics( deltaCollector2, - collectors, defaultInstrumentDescriptor, deltaMetricStorage.collect(), [3, 3] @@ -166,7 +161,6 @@ describe('TemporalMetricProcessor', () => { }); describe('single cumulative collector', () => { - const collectors = [cumulativeCollector1]; it('should build delta recording metrics', () => { const spy = sinon.spy( cumulativeCollector1, @@ -175,13 +169,14 @@ describe('TemporalMetricProcessor', () => { const aggregator = new SumAggregator(true); const deltaMetricStorage = new DeltaMetricProcessor(aggregator); - const temporalMetricStorage = new TemporalMetricProcessor(aggregator); + const temporalMetricStorage = new TemporalMetricProcessor(aggregator, [ + cumulativeCollector1, + ]); deltaMetricStorage.record(1, {}, api.context.active(), [1, 1]); { const metric = temporalMetricStorage.buildMetrics( cumulativeCollector1, - collectors, defaultInstrumentDescriptor, deltaMetricStorage.collect(), [2, 2] @@ -201,7 +196,6 @@ describe('TemporalMetricProcessor', () => { { const metric = temporalMetricStorage.buildMetrics( cumulativeCollector1, - collectors, defaultInstrumentDescriptor, deltaMetricStorage.collect(), [4, 4] @@ -223,17 +217,18 @@ describe('TemporalMetricProcessor', () => { }); describe('cumulative collector with delta collector', () => { - const collectors = [deltaCollector1, cumulativeCollector1]; it('should build delta recording metrics', () => { const aggregator = new SumAggregator(true); const deltaMetricStorage = new DeltaMetricProcessor(aggregator); - const temporalMetricStorage = new TemporalMetricProcessor(aggregator); + const temporalMetricStorage = new TemporalMetricProcessor(aggregator, [ + cumulativeCollector1, + deltaCollector1, + ]); deltaMetricStorage.record(1, {}, api.context.active(), [1, 1]); { const metric = temporalMetricStorage.buildMetrics( cumulativeCollector1, - collectors, defaultInstrumentDescriptor, deltaMetricStorage.collect(), [2, 2] @@ -253,7 +248,6 @@ describe('TemporalMetricProcessor', () => { { const metric = temporalMetricStorage.buildMetrics( deltaCollector1, - collectors, defaultInstrumentDescriptor, deltaMetricStorage.collect(), [4, 4] @@ -271,7 +265,6 @@ describe('TemporalMetricProcessor', () => { { const metric = temporalMetricStorage.buildMetrics( cumulativeCollector1, - collectors, defaultInstrumentDescriptor, deltaMetricStorage.collect(), [5, 5] diff --git a/pkgs/sdk/metrics/test/util.ts b/pkgs/sdk/metrics/test/util.ts index cb4bb9167..d707567de 100644 --- a/pkgs/sdk/metrics/test/util.ts +++ b/pkgs/sdk/metrics/test/util.ts @@ -33,6 +33,7 @@ import { DataPoint, DataPointType, ScopeMetrics, + MetricDescriptor, } from '../src/export/MetricData'; import { isNotNullish } from '../src/utils'; import { HrTime } from '@opentelemetry/sandbox-api'; @@ -58,6 +59,7 @@ export const defaultInstrumentDescriptor: InstrumentDescriptor = { type: InstrumentType.COUNTER, unit: '1', valueType: ValueType.DOUBLE, + advice: {}, }; export const defaultInstrumentationScope: InstrumentationScope = { @@ -104,12 +106,12 @@ export function assertScopeMetrics( export function assertMetricData( actual: unknown, dataPointType?: DataPointType, - instrumentDescriptor: Partial | null = defaultInstrumentDescriptor, + metricDescriptor: Partial | null = defaultInstrumentDescriptor, aggregationTemporality?: AggregationTemporality ): asserts actual is MetricData { const it = actual as MetricData; - if (instrumentDescriptor != null) { - assertPartialDeepStrictEqual(it.descriptor, instrumentDescriptor); + if (metricDescriptor != null) { + assertPartialDeepStrictEqual(it.descriptor, metricDescriptor); } if (isNotNullish(dataPointType)) { assert.strictEqual(it.dataPointType, dataPointType); diff --git a/pkgs/sdk/trace/base/package.json b/pkgs/sdk/trace/base/package.json index 0970b15cb..c34263257 100644 --- a/pkgs/sdk/trace/base/package.json +++ b/pkgs/sdk/trace/base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-sdk-trace-base", - "version": "1.17.0", + "version": "1.17.1", "description": "OpenTelemetry Tracing", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -30,7 +30,7 @@ "tdd:browser": "karma start", "tdd:node": "npm run test -- --watch-extensions ts --watch", "test": "npm run test:node && npm run test:browser && npm run test:webworker", - "test:bench": "node test/performance/benchmark/index.js", + "test:bench": "node test/performance/benchmark/index.js | tee .benchmark-results.txt", "test:browser": "nyc karma start ./karma.conf.js --single-run", "test:debug": "nyc karma start ./karma.debug.conf.js --wait", "test:node": "", @@ -117,9 +117,9 @@ "@opentelemetry/sandbox-api": "1.6.0" }, "dependencies": { - "@opentelemetry/sandbox-core": "1.17.0", - "@opentelemetry/sandbox-resources": "1.17.0", - "@opentelemetry/sandbox-semantic-conventions": "1.17.0" + "@opentelemetry/sandbox-core": "1.17.1", + "@opentelemetry/sandbox-resources": "1.17.1", + "@opentelemetry/sandbox-semantic-conventions": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-base", "sideEffects": false diff --git a/pkgs/sdk/trace/base/src/export/BatchSpanProcessorBase.ts b/pkgs/sdk/trace/base/src/export/BatchSpanProcessorBase.ts index 4c6dea1fb..a5cc6e5af 100644 --- a/pkgs/sdk/trace/base/src/export/BatchSpanProcessorBase.ts +++ b/pkgs/sdk/trace/base/src/export/BatchSpanProcessorBase.ts @@ -41,6 +41,7 @@ export abstract class BatchSpanProcessorBase private readonly _scheduledDelayMillis: number; private readonly _exportTimeoutMillis: number; + private _isExporting = false; private _finishedSpans: ReadableSpan[] = []; private _timer: NodeJS.Timeout | undefined; private _shutdownOnce: BindOnceFuture; @@ -216,19 +217,28 @@ export abstract class BatchSpanProcessorBase } private _maybeStartTimer() { - if (this._timer !== undefined) return; - this._timer = setTimeout(() => { + if (this._isExporting) return; + const flush = () => { + this._isExporting = true; this._flushOneBatch() .then(() => { + this._isExporting = false; if (this._finishedSpans.length > 0) { this._clearTimer(); this._maybeStartTimer(); } }) .catch(e => { + this._isExporting = false; globalErrorHandler(e); }); - }, this._scheduledDelayMillis); + }; + // we only wait if the queue doesn't have enough elements yet + if (this._finishedSpans.length >= this._maxExportBatchSize) { + return flush(); + } + if (this._timer !== undefined) return; + this._timer = setTimeout(() => flush(), this._scheduledDelayMillis); unrefTimer(this._timer); } diff --git a/pkgs/sdk/trace/base/test/common/export/BatchSpanProcessorBase.test.ts b/pkgs/sdk/trace/base/test/common/export/BatchSpanProcessorBase.test.ts index b57204a46..518b6c38a 100644 --- a/pkgs/sdk/trace/base/test/common/export/BatchSpanProcessorBase.test.ts +++ b/pkgs/sdk/trace/base/test/common/export/BatchSpanProcessorBase.test.ts @@ -16,6 +16,7 @@ import { diag, ROOT_CONTEXT } from '@opentelemetry/sandbox-api'; import { + ExportResult, ExportResultCode, loggingErrorHandler, setGlobalErrorHandler, @@ -27,7 +28,9 @@ import { BasicTracerProvider, BufferConfig, InMemorySpanExporter, + ReadableSpan, Span, + SpanExporter, } from '../../../src'; import { context } from '@opentelemetry/sandbox-api'; import { TestRecordOnlySampler } from './TestRecordOnlySampler'; @@ -175,43 +178,35 @@ describe('BatchSpanProcessorBase', () => { assert.strictEqual(spy.args.length, 0); }); - it('should export the sampled spans with buffer size reached', done => { - const clock = sinon.useFakeTimers(); + it('should export the sampled spans with buffer size reached', async () => { const processor = new BatchSpanProcessor(exporter, defaultBufferConfig); - for (let i = 0; i < defaultBufferConfig.maxExportBatchSize; i++) { - const span = createSampledSpan(`${name}_${i}`); + const span = createSampledSpan(name); + for (let i = 1; i < defaultBufferConfig.maxExportBatchSize; i++) { processor.onStart(span, ROOT_CONTEXT); assert.strictEqual(exporter.getFinishedSpans().length, 0); processor.onEnd(span); assert.strictEqual(exporter.getFinishedSpans().length, 0); } - const span = createSampledSpan(`${name}_6`); processor.onStart(span, ROOT_CONTEXT); processor.onEnd(span); - - setTimeout(async () => { - assert.strictEqual(exporter.getFinishedSpans().length, 5); - await processor.shutdown(); - assert.strictEqual(exporter.getFinishedSpans().length, 0); - done(); - }, defaultBufferConfig.scheduledDelayMillis + 1000); - clock.tick(defaultBufferConfig.scheduledDelayMillis + 1000); - clock.restore(); + assert.strictEqual(exporter.getFinishedSpans().length, 5); + await processor.shutdown(); + assert.strictEqual(exporter.getFinishedSpans().length, 0); }); it('should force flush when timeout exceeded', done => { const clock = sinon.useFakeTimers(); const processor = new BatchSpanProcessor(exporter, defaultBufferConfig); - for (let i = 0; i < defaultBufferConfig.maxExportBatchSize; i++) { - const span = createSampledSpan(`${name}_${i}`); + const span = createSampledSpan(name); + for (let i = 1; i < defaultBufferConfig.maxExportBatchSize; i++) { processor.onStart(span, ROOT_CONTEXT); processor.onEnd(span); assert.strictEqual(exporter.getFinishedSpans().length, 0); } setTimeout(() => { - assert.strictEqual(exporter.getFinishedSpans().length, 5); + assert.strictEqual(exporter.getFinishedSpans().length, 4); done(); }, defaultBufferConfig.scheduledDelayMillis + 1000); @@ -222,14 +217,14 @@ describe('BatchSpanProcessorBase', () => { it('should force flush on demand', () => { const processor = new BatchSpanProcessor(exporter, defaultBufferConfig); - for (let i = 0; i < defaultBufferConfig.maxExportBatchSize; i++) { - const span = createSampledSpan(`${name}_${i}`); + const span = createSampledSpan(name); + for (let i = 1; i < defaultBufferConfig.maxExportBatchSize; i++) { processor.onStart(span, ROOT_CONTEXT); processor.onEnd(span); } assert.strictEqual(exporter.getFinishedSpans().length, 0); processor.forceFlush(); - assert.strictEqual(exporter.getFinishedSpans().length, 5); + assert.strictEqual(exporter.getFinishedSpans().length, 4); }); it('should not export empty span lists', done => { @@ -466,17 +461,10 @@ describe('BatchSpanProcessorBase', () => { const debugStub = sinon.spy(diag, 'debug'); const warnStub = sinon.spy(diag, 'warn'); const span = createSampledSpan('test'); - for (let i = 0, j = 6; i < j; i++) { + for (let i = 0, j = 12; i < j; i++) { processor.onStart(span, ROOT_CONTEXT); processor.onEnd(span); } - assert.equal(processor['_finishedSpans'].length, 6); - assert.equal(processor['_droppedSpansCount'], 0); - sinon.assert.notCalled(debugStub); - - processor.onStart(span, ROOT_CONTEXT); - processor.onEnd(span); - assert.equal(processor['_finishedSpans'].length, 6); assert.equal(processor['_droppedSpansCount'], 1); sinon.assert.calledOnce(debugStub); @@ -517,4 +505,45 @@ describe('BatchSpanProcessorBase', () => { }); }); }); + + describe('Concurrency', () => { + it('should only send a single batch at a time', async () => { + const callbacks: ((result: ExportResult) => void)[] = []; + const spans: ReadableSpan[] = []; + const exporter: SpanExporter = { + export: async ( + exportedSpans: ReadableSpan[], + resultCallback: (result: ExportResult) => void + ) => { + callbacks.push(resultCallback); + spans.push(...exportedSpans); + }, + shutdown: async () => {}, + }; + const processor = new BatchSpanProcessor(exporter, { + maxExportBatchSize: 5, + maxQueueSize: 6, + }); + const totalSpans = 50; + for (let i = 0; i < totalSpans; i++) { + const span = createSampledSpan(`${name}_${i}`); + processor.onStart(span, ROOT_CONTEXT); + processor.onEnd(span); + } + assert.equal(callbacks.length, 1); + assert.equal(spans.length, 5); + callbacks[0]({ code: ExportResultCode.SUCCESS }); + await new Promise(resolve => setTimeout(resolve, 0)); + // After the first batch completes we will have dropped a number + // of spans and the next batch will be smaller + assert.equal(callbacks.length, 2); + assert.equal(spans.length, 10); + callbacks[1]({ code: ExportResultCode.SUCCESS }); + + // We expect that all the other spans have been dropped + await new Promise(resolve => setTimeout(resolve, 0)); + assert.equal(callbacks.length, 2); + assert.equal(spans.length, 10); + }); + }); }); diff --git a/pkgs/sdk/trace/web/package.json b/pkgs/sdk/trace/web/package.json index 9533d3da2..187e601a7 100644 --- a/pkgs/sdk/trace/web/package.json +++ b/pkgs/sdk/trace/web/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-sdk-trace-web", - "version": "1.17.0", + "version": "1.17.1", "description": "OpenTelemetry Web Tracer", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -62,9 +62,9 @@ "devDependencies": { "@babel/core": "7.22.20", "@opentelemetry/sandbox-api": "1.6.0", - "@opentelemetry/sandbox-context-zone": "1.17.0", - "@opentelemetry/sandbox-propagator-b3": "1.17.0", - "@opentelemetry/sandbox-resources": "1.17.0", + "@opentelemetry/sandbox-context-zone": "1.17.1", + "@opentelemetry/sandbox-propagator-b3": "1.17.1", + "@opentelemetry/sandbox-resources": "1.17.1", "@types/jquery": "^3.5.14", "@types/mocha": "^10.0.0", "@types/node": "^18.14.2", @@ -114,9 +114,9 @@ "@opentelemetry/sandbox-api": "1.6.0" }, "dependencies": { - "@opentelemetry/sandbox-core": "1.17.0", - "@opentelemetry/sandbox-sdk-trace-base": "1.17.0", - "@opentelemetry/sandbox-semantic-conventions": "1.17.0" + "@opentelemetry/sandbox-core": "1.17.1", + "@opentelemetry/sandbox-sdk-trace-base": "1.17.1", + "@opentelemetry/sandbox-semantic-conventions": "1.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-web", "sideEffects": false diff --git a/pkgs/semantic-conventions/package.json b/pkgs/semantic-conventions/package.json index b92f9bac8..c66e614e9 100644 --- a/pkgs/semantic-conventions/package.json +++ b/pkgs/semantic-conventions/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sandbox-semantic-conventions", - "version": "1.17.0", + "version": "1.17.1", "description": "OpenTelemetry semantic conventions", "main": "build/src/index.js", "module": "build/esm/index.js",