diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 1f050ba6ca..f72672f84f 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -7,7 +7,7 @@ "detectors/node/opentelemetry-resource-detector-github": "0.29.0", "detectors/node/opentelemetry-resource-detector-instana": "0.14.0", "metapackages/auto-configuration-propagators": "0.3.1", - "metapackages/auto-instrumentations-node": "0.52.0", + "metapackages/auto-instrumentations-node": "0.52.1", "metapackages/auto-instrumentations-web": "0.42.0", "packages/baggage-span-processor": "0.3.1", "packages/opentelemetry-host-metrics": "0.35.4", @@ -24,12 +24,12 @@ "plugins/node/instrumentation-kafkajs": "0.4.0", "plugins/node/instrumentation-lru-memoizer": "0.41.0", "plugins/node/instrumentation-mongoose": "0.43.0", - "plugins/node/instrumentation-runtime-node": "0.8.0", + "plugins/node/instrumentation-runtime-node": "0.9.0", "plugins/node/instrumentation-socket.io": "0.43.0", "plugins/node/instrumentation-tedious": "0.15.0", - "plugins/node/instrumentation-undici": "0.7.0", - "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.46.0", - "plugins/node/opentelemetry-instrumentation-aws-sdk": "0.45.0", + "plugins/node/instrumentation-undici": "0.7.1", + "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.47.0", + "plugins/node/opentelemetry-instrumentation-aws-sdk": "0.46.0", "plugins/node/opentelemetry-instrumentation-bunyan": "0.42.0", "plugins/node/opentelemetry-instrumentation-cassandra": "0.42.0", "plugins/node/opentelemetry-instrumentation-connect": "0.40.0", @@ -45,10 +45,10 @@ "plugins/node/opentelemetry-instrumentation-memcached": "0.40.0", "plugins/node/opentelemetry-instrumentation-mongodb": "0.48.0", "plugins/node/opentelemetry-instrumentation-mysql": "0.42.0", - "plugins/node/opentelemetry-instrumentation-mysql2": "0.42.0", + "plugins/node/opentelemetry-instrumentation-mysql2": "0.42.1", "plugins/node/opentelemetry-instrumentation-nestjs-core": "0.41.0", "plugins/node/opentelemetry-instrumentation-net": "0.40.0", - "plugins/node/opentelemetry-instrumentation-pg": "0.47.0", + "plugins/node/opentelemetry-instrumentation-pg": "0.47.1", "plugins/node/opentelemetry-instrumentation-pino": "0.43.0", "plugins/node/opentelemetry-instrumentation-redis": "0.43.0", "plugins/node/opentelemetry-instrumentation-redis-4": "0.43.0", diff --git a/metapackages/auto-instrumentations-node/CHANGELOG.md b/metapackages/auto-instrumentations-node/CHANGELOG.md index b86221545d..1beb3cbd8c 100644 --- a/metapackages/auto-instrumentations-node/CHANGELOG.md +++ b/metapackages/auto-instrumentations-node/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.52.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.52.0...auto-instrumentations-node-v0.52.1) (2024-11-07) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/instrumentation-aws-lambda bumped from ^0.46.0 to ^0.47.0 + * @opentelemetry/instrumentation-aws-sdk bumped from ^0.45.0 to ^0.46.0 + * @opentelemetry/instrumentation-mysql2 bumped from ^0.42.0 to ^0.42.1 + * @opentelemetry/instrumentation-pg bumped from ^0.47.0 to ^0.47.1 + * @opentelemetry/instrumentation-undici bumped from ^0.7.0 to ^0.7.1 + ## [0.52.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.51.0...auto-instrumentations-node-v0.52.0) (2024-10-25) diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index 5764d9c104..cccfd0a84b 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/auto-instrumentations-node", - "version": "0.52.0", + "version": "0.52.1", "description": "Metapackage which bundles opentelemetry node core and contrib instrumentations", "author": "OpenTelemetry Authors", "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/metapackages/auto-instrumentations-node#readme", @@ -48,8 +48,8 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.54.0", "@opentelemetry/instrumentation-amqplib": "^0.43.0", - "@opentelemetry/instrumentation-aws-lambda": "^0.46.0", - "@opentelemetry/instrumentation-aws-sdk": "^0.45.0", + "@opentelemetry/instrumentation-aws-lambda": "^0.47.0", + "@opentelemetry/instrumentation-aws-sdk": "^0.46.0", "@opentelemetry/instrumentation-bunyan": "^0.42.0", "@opentelemetry/instrumentation-cassandra-driver": "^0.42.0", "@opentelemetry/instrumentation-connect": "^0.40.0", @@ -73,10 +73,10 @@ "@opentelemetry/instrumentation-mongodb": "^0.48.0", "@opentelemetry/instrumentation-mongoose": "^0.43.0", "@opentelemetry/instrumentation-mysql": "^0.42.0", - "@opentelemetry/instrumentation-mysql2": "^0.42.0", + "@opentelemetry/instrumentation-mysql2": "^0.42.1", "@opentelemetry/instrumentation-nestjs-core": "^0.41.0", "@opentelemetry/instrumentation-net": "^0.40.0", - "@opentelemetry/instrumentation-pg": "^0.47.0", + "@opentelemetry/instrumentation-pg": "^0.47.1", "@opentelemetry/instrumentation-pino": "^0.43.0", "@opentelemetry/instrumentation-redis": "^0.43.0", "@opentelemetry/instrumentation-redis-4": "^0.43.0", @@ -84,7 +84,7 @@ "@opentelemetry/instrumentation-router": "^0.41.0", "@opentelemetry/instrumentation-socket.io": "^0.43.0", "@opentelemetry/instrumentation-tedious": "^0.15.0", - "@opentelemetry/instrumentation-undici": "^0.7.0", + "@opentelemetry/instrumentation-undici": "^0.7.1", "@opentelemetry/instrumentation-winston": "^0.41.0", "@opentelemetry/resource-detector-alibaba-cloud": "^0.29.4", "@opentelemetry/resource-detector-aws": "^1.7.0", diff --git a/package-lock.json b/package-lock.json index c782be3c9d..038ab3078a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -381,13 +381,13 @@ }, "metapackages/auto-instrumentations-node": { "name": "@opentelemetry/auto-instrumentations-node", - "version": "0.52.0", + "version": "0.52.1", "license": "Apache-2.0", "dependencies": { "@opentelemetry/instrumentation": "^0.54.0", "@opentelemetry/instrumentation-amqplib": "^0.43.0", - "@opentelemetry/instrumentation-aws-lambda": "^0.46.0", - "@opentelemetry/instrumentation-aws-sdk": "^0.45.0", + "@opentelemetry/instrumentation-aws-lambda": "^0.47.0", + "@opentelemetry/instrumentation-aws-sdk": "^0.46.0", "@opentelemetry/instrumentation-bunyan": "^0.42.0", "@opentelemetry/instrumentation-cassandra-driver": "^0.42.0", "@opentelemetry/instrumentation-connect": "^0.40.0", @@ -411,10 +411,10 @@ "@opentelemetry/instrumentation-mongodb": "^0.48.0", "@opentelemetry/instrumentation-mongoose": "^0.43.0", "@opentelemetry/instrumentation-mysql": "^0.42.0", - "@opentelemetry/instrumentation-mysql2": "^0.42.0", + "@opentelemetry/instrumentation-mysql2": "^0.42.1", "@opentelemetry/instrumentation-nestjs-core": "^0.41.0", "@opentelemetry/instrumentation-net": "^0.40.0", - "@opentelemetry/instrumentation-pg": "^0.47.0", + "@opentelemetry/instrumentation-pg": "^0.47.1", "@opentelemetry/instrumentation-pino": "^0.43.0", "@opentelemetry/instrumentation-redis": "^0.43.0", "@opentelemetry/instrumentation-redis-4": "^0.43.0", @@ -422,7 +422,7 @@ "@opentelemetry/instrumentation-router": "^0.41.0", "@opentelemetry/instrumentation-socket.io": "^0.43.0", "@opentelemetry/instrumentation-tedious": "^0.15.0", - "@opentelemetry/instrumentation-undici": "^0.7.0", + "@opentelemetry/instrumentation-undici": "^0.7.1", "@opentelemetry/instrumentation-winston": "^0.41.0", "@opentelemetry/resource-detector-alibaba-cloud": "^0.29.4", "@opentelemetry/resource-detector-aws": "^1.7.0", @@ -35921,7 +35921,7 @@ }, "plugins/node/instrumentation-runtime-node": { "name": "@opentelemetry/instrumentation-runtime-node", - "version": "0.8.0", + "version": "0.9.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/instrumentation": "^0.54.0" @@ -36870,7 +36870,7 @@ }, "plugins/node/instrumentation-undici": { "name": "@opentelemetry/instrumentation-undici", - "version": "0.7.0", + "version": "0.7.1", "license": "Apache-2.0", "dependencies": { "@opentelemetry/core": "^1.8.0", @@ -36908,7 +36908,7 @@ }, "plugins/node/opentelemetry-instrumentation-aws-lambda": { "name": "@opentelemetry/instrumentation-aws-lambda", - "version": "0.46.0", + "version": "0.47.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/instrumentation": "^0.54.0", @@ -36947,7 +36947,7 @@ }, "plugins/node/opentelemetry-instrumentation-aws-sdk": { "name": "@opentelemetry/instrumentation-aws-sdk", - "version": "0.45.0", + "version": "0.46.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/core": "^1.8.0", @@ -37809,7 +37809,7 @@ }, "plugins/node/opentelemetry-instrumentation-mysql2": { "name": "@opentelemetry/instrumentation-mysql2", - "version": "0.42.0", + "version": "0.42.1", "license": "Apache-2.0", "dependencies": { "@opentelemetry/instrumentation": "^0.54.0", @@ -37930,7 +37930,7 @@ }, "plugins/node/opentelemetry-instrumentation-pg": { "name": "@opentelemetry/instrumentation-pg", - "version": "0.47.0", + "version": "0.47.1", "license": "Apache-2.0", "dependencies": { "@opentelemetry/core": "^1.26.0", @@ -46800,8 +46800,8 @@ "@opentelemetry/api": "^1.4.1", "@opentelemetry/instrumentation": "^0.54.0", "@opentelemetry/instrumentation-amqplib": "^0.43.0", - "@opentelemetry/instrumentation-aws-lambda": "^0.46.0", - "@opentelemetry/instrumentation-aws-sdk": "^0.45.0", + "@opentelemetry/instrumentation-aws-lambda": "^0.47.0", + "@opentelemetry/instrumentation-aws-sdk": "^0.46.0", "@opentelemetry/instrumentation-bunyan": "^0.42.0", "@opentelemetry/instrumentation-cassandra-driver": "^0.42.0", "@opentelemetry/instrumentation-connect": "^0.40.0", @@ -46825,10 +46825,10 @@ "@opentelemetry/instrumentation-mongodb": "^0.48.0", "@opentelemetry/instrumentation-mongoose": "^0.43.0", "@opentelemetry/instrumentation-mysql": "^0.42.0", - "@opentelemetry/instrumentation-mysql2": "^0.42.0", + "@opentelemetry/instrumentation-mysql2": "^0.42.1", "@opentelemetry/instrumentation-nestjs-core": "^0.41.0", "@opentelemetry/instrumentation-net": "^0.40.0", - "@opentelemetry/instrumentation-pg": "^0.47.0", + "@opentelemetry/instrumentation-pg": "^0.47.1", "@opentelemetry/instrumentation-pino": "^0.43.0", "@opentelemetry/instrumentation-redis": "^0.43.0", "@opentelemetry/instrumentation-redis-4": "^0.43.0", @@ -46836,7 +46836,7 @@ "@opentelemetry/instrumentation-router": "^0.41.0", "@opentelemetry/instrumentation-socket.io": "^0.43.0", "@opentelemetry/instrumentation-tedious": "^0.15.0", - "@opentelemetry/instrumentation-undici": "^0.7.0", + "@opentelemetry/instrumentation-undici": "^0.7.1", "@opentelemetry/instrumentation-winston": "^0.41.0", "@opentelemetry/resource-detector-alibaba-cloud": "^0.29.4", "@opentelemetry/resource-detector-aws": "^1.7.0", diff --git a/plugins/node/instrumentation-runtime-node/CHANGELOG.md b/plugins/node/instrumentation-runtime-node/CHANGELOG.md index bad2aad9f1..1166ab5e97 100644 --- a/plugins/node/instrumentation-runtime-node/CHANGELOG.md +++ b/plugins/node/instrumentation-runtime-node/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [0.9.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-runtime-node-v0.8.0...instrumentation-runtime-node-v0.9.0) (2024-11-07) + + +### ⚠ BREAKING CHANGES + +* **instrumentation-runtime-node:** add prom-client-metrics ([#2136](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2136)) + +### Features + +* **instrumentation-runtime-node:** add prom-client-metrics ([#2136](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2136)) ([80d0c74](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/80d0c74f8cafdfce681ef39e6cea103dca4e4ccd)) + ## [0.8.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-runtime-node-v0.7.0...instrumentation-runtime-node-v0.8.0) (2024-10-25) diff --git a/plugins/node/instrumentation-runtime-node/package.json b/plugins/node/instrumentation-runtime-node/package.json index 20f2d465d0..24f95f3af3 100644 --- a/plugins/node/instrumentation-runtime-node/package.json +++ b/plugins/node/instrumentation-runtime-node/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-runtime-node", - "version": "0.8.0", + "version": "0.9.0", "description": "OpenTelemetry instrumentation for Node.js Performance measurement API", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/instrumentation-undici/CHANGELOG.md b/plugins/node/instrumentation-undici/CHANGELOG.md index bab6c51bd1..c3a5f30d1f 100644 --- a/plugins/node/instrumentation-undici/CHANGELOG.md +++ b/plugins/node/instrumentation-undici/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [0.7.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-undici-v0.7.0...instrumentation-undici-v0.7.1) (2024-11-07) + + +### Bug Fixes + +* **instrumentation-undici:** fix a possible crash if the request path is a full URL ([#2518](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2518)) ([28e209a](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/28e209a9da36bc4e1f8c2b0db7360170ed46cb80)), closes [#2471](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2471) +* **instrumentation-undici:** Fix RequestType ([#2503](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2503)) ([9a20e15](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/9a20e15547669450987b2bb7cab193f17e04ebb7)) + ## [0.7.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-undici-v0.6.0...instrumentation-undici-v0.7.0) (2024-10-25) diff --git a/plugins/node/instrumentation-undici/package.json b/plugins/node/instrumentation-undici/package.json index e590b4e13b..3bea1dc564 100644 --- a/plugins/node/instrumentation-undici/package.json +++ b/plugins/node/instrumentation-undici/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-undici", - "version": "0.7.0", + "version": "0.7.1", "description": "OpenTelemetry instrumentation for `undici` http client and Node.js fetch()", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-aws-lambda/CHANGELOG.md index c8e86170b7..6218d5a0a3 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.47.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-lambda-v0.46.0...instrumentation-aws-lambda-v0.47.0) (2024-11-07) + + +### ⚠ BREAKING CHANGES + +* **aws-lambda:** Remove explicit x-ray context in favor of global propagator ([#2369](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2369)) + +### Features + +* **aws-lambda:** Remove explicit x-ray context in favor of global propagator ([#2369](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2369)) ([a926f53](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/a926f536733a2add23464bd26988cf253bdda305)) +* **instrumentation-aws-lambda:** take care of ESM based (`.mjs`) handlers ([#2508](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2508)) ([0309cae](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/0309caeafc44ac9cb13a3345b790b01b76d0497d)) + ## [0.46.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-lambda-v0.45.0...instrumentation-aws-lambda-v0.46.0) (2024-10-25) diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index 6df797e2dd..7a7877d21b 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-aws-lambda", - "version": "0.46.0", + "version": "0.47.0", "description": "OpenTelemetry instrumentation for AWS Lambda function invocations", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md index dc1d33404e..4abb5d21e7 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.46.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-sdk-v0.45.0...instrumentation-aws-sdk-v0.46.0) (2024-11-07) + + +### Features + +* **aws-sdk:** add s3 and kinesis service extensions for aws-sdk instrumentation ([#2361](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2361)) ([a5b5614](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/a5b5614b18d0b77ce5772df9f286492879323c88)) + ## [0.45.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-sdk-v0.44.0...instrumentation-aws-sdk-v0.45.0) (2024-10-25) diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index 1a855f04cd..fc1c425011 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-aws-sdk", - "version": "0.45.0", + "version": "0.46.0", "description": "OpenTelemetry instrumentation for `aws-sdk` and `@aws-sdk/client-*` clients for various AWS services", "keywords": [ "aws", diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-mysql2/CHANGELOG.md index 40e8ddd186..8dbd9f6dd9 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-mysql2/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.42.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mysql2-v0.42.0...instrumentation-mysql2-v0.42.1) (2024-11-07) + + +### Bug Fixes + +* **instrumentation-mysql:** fix test for mysql2 v3 ([#2168](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2168)) ([#2451](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2451)) ([ad8c581](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/ad8c581c24f47e1ed413598b78f866977af56124)) + ## [0.42.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mysql2-v0.41.0...instrumentation-mysql2-v0.42.0) (2024-10-25) diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json index fd36e4b1bc..5b0ac2c370 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-mysql2", - "version": "0.42.0", + "version": "0.42.1", "description": "OpenTelemetry instrumentation for `mysql2` database client for MySQL", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-pg/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-pg/CHANGELOG.md index a386767f53..2cba7bbfc6 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-pg/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.47.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-pg-v0.47.0...instrumentation-pg-v0.47.1) (2024-11-07) + + +### Bug Fixes + +* **pg:** Do not add SQLCommenter comments to prepared statements ([#2456](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2456)) ([8070c7f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/8070c7f9e50110046b72a658e7fbd8d2f06b73e9)) + ## [0.47.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-pg-v0.46.0...instrumentation-pg-v0.47.0) (2024-10-25) diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index eee4775537..53b2312e7a 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-pg", - "version": "0.47.0", + "version": "0.47.1", "description": "OpenTelemetry instrumentation for `pg` and `pg-pool` database client for PostgreSQL", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/scripts/update-otel-deps.js b/scripts/update-otel-deps.js index 410d6d592b..ab446a9fc8 100755 --- a/scripts/update-otel-deps.js +++ b/scripts/update-otel-deps.js @@ -143,9 +143,12 @@ function updateNpmWorkspacesDeps({patterns, allowRangeBumpFor0x, dryRun}) { return; } // We use 'npm outdated -j ...' as a quick way to get the current - // installed version and latest published version of deps. The '-j' - // output shows a limited/random subset of data such that its `wanted` - // value cannot be used (see "npm outdated" perils above). + // installed version and latest published version of deps. + // Note: The '-j' output with npm@9 shows a limited/random subset of + // data such that its `wanted` value cannot be used (see "npm outdated" + // perils above). This has changed with npm@10 such that we might be + // able to use the `wanted` values now. + debug(` $ cd ${wsDir} && npm outdated --json ${depNames.join(' ')}`); const p = spawnSync('npm', ['outdated', '--json'].concat(depNames), { cwd: wsDir, encoding: 'utf8', @@ -156,13 +159,17 @@ function updateNpmWorkspacesDeps({patterns, allowRangeBumpFor0x, dryRun}) { } const npmInstallArgs = []; + let npmInstallingALocalDep = false; for (let depName of depNames) { if (!(depName in outdated)) { continue; } + const anOutdatedEntry = Array.isArray(outdated[depName]) + ? outdated[depName][0] + : outdated[depName]; const summaryNote = localPkgNames.has(depName) ? ' (local)' : ''; - const currVer = outdated[depName].current; - const latestVer = outdated[depName].latest; + const currVer = anOutdatedEntry.current; + const latestVer = anOutdatedEntry.latest; if (semver.satisfies(latestVer, info.deps[depName])) { // `npm update` should suffice. npmUpdatePkgNames.add(depName); @@ -172,6 +179,9 @@ function updateNpmWorkspacesDeps({patterns, allowRangeBumpFor0x, dryRun}) { } else if (semver.lt(currVer, '1.0.0')) { if (allowRangeBumpFor0x) { npmInstallArgs.push(`${depName}@${latestVer}`); + if (localPkgNames.has(depName)) { + npmInstallingALocalDep = true; + } summaryStrs.add( `${currVer} -> ${latestVer} ${depName} (range-bump)${summaryNote}` ); @@ -192,6 +202,18 @@ function updateNpmWorkspacesDeps({patterns, allowRangeBumpFor0x, dryRun}) { cwd: wsDir, argv: ['npm', 'install'].concat(npmInstallArgs), }); + if (npmInstallingALocalDep) { + // A surprise I've found with 'npm install ...': When the dep + // being updated (e.g. '@otel/foo@0.1.0' to '@otel/foo@0.2.0') + // is a *local* dep (i.e. it is another workspace in the same + // repo) then updating successfully sometimes requires running the + // 'npm install ...' **twice**. + npmInstallTasks.push({ + cwd: wsDir, + argv: ['npm', 'install'].concat(npmInstallArgs), + comment: 'second time because "npm install"ing a *local* dep can take two tries' + }); + } } }); @@ -203,7 +225,7 @@ function updateNpmWorkspacesDeps({patterns, allowRangeBumpFor0x, dryRun}) { debug('npmInstallTasks: ', npmInstallTasks); debug('npmUpdatePkgNames: ', npmUpdatePkgNames); for (let task of npmInstallTasks) { - console.log(` $ cd ${task.cwd} && ${task.argv.join(' ')}`); + console.log(` $ cd ${task.cwd} && ${task.argv.join(' ')} ${task.comment ? `# ${task.comment}` : ''}`); if (!dryRun) { const p = spawnSync(task.argv[0], task.argv.slice(1), { cwd: task.cwd,