Merge branch 'main' into bedrock-invoke-model-stream

Author: yuliia-fryshko

.github/workflows/test-all-versions.yml

@@ -163,8 +163,6 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
-      - name: Set MySQL variables
-        run: mysql --user=root --password=${MYSQL_ROOT_PASSWORD} --host=${MYSQL_HOST} --port=${MYSQL_PORT} -e "SET GLOBAL log_output='TABLE'; SET GLOBAL general_log = 1;" mysql
       - name: Install
         run: npm ci
       - name: Download Build Artifacts

.github/workflows/unit-test.yml

@@ -176,8 +176,6 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
-      - name: Set MySQL variables
-        run: mysql --user=root --password=${MYSQL_ROOT_PASSWORD} --host=${MYSQL_HOST} --port=${MYSQL_PORT} -e "SET GLOBAL log_output='TABLE'; SET GLOBAL general_log = 1;" mysql
       - name: Install
         run: npm ci
       - name: Download Build Artifacts

.release-please-manifest.json

@@ -1,67 +1,67 @@
 {
-  "detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.31.1",
-  "detectors/node/opentelemetry-resource-detector-aws": "2.1.0",
-  "detectors/node/opentelemetry-resource-detector-azure": "0.8.0",
-  "detectors/node/opentelemetry-resource-detector-container": "0.7.1",
-  "detectors/node/opentelemetry-resource-detector-gcp": "0.35.0",
+  "detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.31.2",
+  "detectors/node/opentelemetry-resource-detector-aws": "2.2.0",
+  "detectors/node/opentelemetry-resource-detector-azure": "0.9.0",
+  "detectors/node/opentelemetry-resource-detector-container": "0.7.2",
+  "detectors/node/opentelemetry-resource-detector-gcp": "0.36.0",
   "detectors/node/opentelemetry-resource-detector-github": "0.31.0",
-  "detectors/node/opentelemetry-resource-detector-instana": "0.20.0",
+  "detectors/node/opentelemetry-resource-detector-instana": "0.21.0",
   "metapackages/auto-configuration-propagators": "0.4.1",
-  "metapackages/auto-instrumentations-node": "0.59.0",
-  "metapackages/auto-instrumentations-web": "0.47.0",
+  "metapackages/auto-instrumentations-node": "0.60.1",
+  "metapackages/auto-instrumentations-web": "0.48.0",
   "packages/baggage-span-processor": "0.4.0",
-  "packages/baggage-log-record-processor": "0.2.0",
+  "packages/baggage-log-record-processor": "0.3.0",
   "packages/opentelemetry-host-metrics": "0.36.0",
   "packages/opentelemetry-id-generator-aws-xray": "2.0.0",
-  "packages/opentelemetry-propagation-utils": "0.31.1",
+  "packages/opentelemetry-propagation-utils": "0.31.2",
   "packages/opentelemetry-redis-common": "0.37.0",
   "packages/opentelemetry-sql-common": "0.41.0",
-  "packages/opentelemetry-test-utils": "0.47.0",
-  "packages/winston-transport": "0.12.0",
-  "plugins/node/instrumentation-amqplib": "0.48.0",
-  "plugins/node/instrumentation-cucumber": "0.16.0",
-  "plugins/node/instrumentation-dataloader": "0.18.0",
-  "plugins/node/instrumentation-fs": "0.21.0",
-  "plugins/node/instrumentation-kafkajs": "0.10.0",
-  "plugins/node/instrumentation-lru-memoizer": "0.46.0",
-  "plugins/node/instrumentation-mongoose": "0.48.0",
-  "plugins/node/instrumentation-runtime-node": "0.15.0",
-  "plugins/node/instrumentation-socket.io": "0.48.0",
-  "plugins/node/instrumentation-tedious": "0.20.0",
-  "plugins/node/instrumentation-typeorm": "0.2.0",
-  "plugins/node/instrumentation-undici": "0.12.0",
-  "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.52.0",
-  "plugins/node/opentelemetry-instrumentation-aws-sdk": "0.53.0",
-  "plugins/node/opentelemetry-instrumentation-bunyan": "0.47.0",
-  "plugins/node/opentelemetry-instrumentation-cassandra": "0.47.0",
-  "plugins/node/opentelemetry-instrumentation-connect": "0.45.0",
-  "plugins/node/opentelemetry-instrumentation-dns": "0.45.0",
-  "plugins/node/opentelemetry-instrumentation-express": "0.50.0",
-  "plugins/node/opentelemetry-instrumentation-fastify": "0.46.0",
-  "plugins/node/opentelemetry-instrumentation-generic-pool": "0.45.0",
-  "plugins/node/opentelemetry-instrumentation-graphql": "0.49.0",
-  "plugins/node/opentelemetry-instrumentation-hapi": "0.47.0",
-  "plugins/node/opentelemetry-instrumentation-ioredis": "0.49.0",
-  "plugins/node/opentelemetry-instrumentation-knex": "0.46.0",
-  "plugins/node/opentelemetry-instrumentation-koa": "0.49.0",
-  "plugins/node/opentelemetry-instrumentation-memcached": "0.45.0",
-  "plugins/node/opentelemetry-instrumentation-mongodb": "0.54.0",
-  "plugins/node/opentelemetry-instrumentation-mysql": "0.47.0",
-  "plugins/node/opentelemetry-instrumentation-mysql2": "0.47.0",
-  "plugins/node/opentelemetry-instrumentation-nestjs-core": "0.47.0",
-  "plugins/node/opentelemetry-instrumentation-net": "0.45.0",
-  "plugins/node/opentelemetry-instrumentation-oracledb": "0.27.0",
-  "plugins/node/opentelemetry-instrumentation-pg": "0.53.0",
-  "plugins/node/opentelemetry-instrumentation-pino": "0.48.0",
-  "plugins/node/opentelemetry-instrumentation-redis": "0.48.0",
-  "plugins/node/opentelemetry-instrumentation-redis-4": "0.48.0",
-  "plugins/node/opentelemetry-instrumentation-restify": "0.47.0",
-  "plugins/node/opentelemetry-instrumentation-router": "0.46.0",
-  "plugins/node/opentelemetry-instrumentation-winston": "0.46.0",
-  "plugins/web/opentelemetry-instrumentation-document-load": "0.46.0",
-  "plugins/web/opentelemetry-instrumentation-long-task": "0.46.0",
-  "plugins/web/opentelemetry-instrumentation-user-interaction": "0.46.0",
-  "plugins/web/opentelemetry-plugin-react-load": "0.33.0",
+  "packages/opentelemetry-test-utils": "0.48.0",
+  "packages/winston-transport": "0.13.0",
+  "plugins/node/instrumentation-amqplib": "0.49.0",
+  "plugins/node/instrumentation-cucumber": "0.17.0",
+  "plugins/node/instrumentation-dataloader": "0.19.0",
+  "plugins/node/instrumentation-fs": "0.22.0",
+  "plugins/node/instrumentation-kafkajs": "0.11.0",
+  "plugins/node/instrumentation-lru-memoizer": "0.47.0",
+  "plugins/node/instrumentation-mongoose": "0.49.0",
+  "plugins/node/instrumentation-runtime-node": "0.16.0",
+  "plugins/node/instrumentation-socket.io": "0.49.0",
+  "plugins/node/instrumentation-tedious": "0.21.0",
+  "plugins/node/instrumentation-typeorm": "0.3.0",
+  "plugins/node/instrumentation-undici": "0.13.1",
+  "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.53.0",
+  "plugins/node/opentelemetry-instrumentation-aws-sdk": "0.54.0",
+  "plugins/node/opentelemetry-instrumentation-bunyan": "0.48.0",
+  "plugins/node/opentelemetry-instrumentation-cassandra": "0.48.0",
+  "plugins/node/opentelemetry-instrumentation-connect": "0.46.0",
+  "plugins/node/opentelemetry-instrumentation-dns": "0.46.0",
+  "plugins/node/opentelemetry-instrumentation-express": "0.51.0",
+  "plugins/node/opentelemetry-instrumentation-fastify": "0.47.0",
+  "plugins/node/opentelemetry-instrumentation-generic-pool": "0.46.0",
+  "plugins/node/opentelemetry-instrumentation-graphql": "0.50.0",
+  "plugins/node/opentelemetry-instrumentation-hapi": "0.49.0",
+  "plugins/node/opentelemetry-instrumentation-ioredis": "0.50.0",
+  "plugins/node/opentelemetry-instrumentation-knex": "0.47.0",
+  "plugins/node/opentelemetry-instrumentation-koa": "0.50.1",
+  "plugins/node/opentelemetry-instrumentation-memcached": "0.46.0",
+  "plugins/node/opentelemetry-instrumentation-mongodb": "0.55.1",
+  "plugins/node/opentelemetry-instrumentation-mysql": "0.48.0",
+  "plugins/node/opentelemetry-instrumentation-mysql2": "0.48.0",
+  "plugins/node/opentelemetry-instrumentation-nestjs-core": "0.48.0",
+  "plugins/node/opentelemetry-instrumentation-net": "0.46.1",
+  "plugins/node/opentelemetry-instrumentation-oracledb": "0.28.0",
+  "plugins/node/opentelemetry-instrumentation-pg": "0.54.0",
+  "plugins/node/opentelemetry-instrumentation-pino": "0.49.0",
+  "plugins/node/opentelemetry-instrumentation-redis": "0.49.1",
+  "plugins/node/opentelemetry-instrumentation-redis-4": "0.49.0",
+  "plugins/node/opentelemetry-instrumentation-restify": "0.48.1",
+  "plugins/node/opentelemetry-instrumentation-router": "0.47.0",
+  "plugins/node/opentelemetry-instrumentation-winston": "0.47.0",
+  "plugins/web/opentelemetry-instrumentation-document-load": "0.47.0",
+  "plugins/web/opentelemetry-instrumentation-long-task": "0.47.0",
+  "plugins/web/opentelemetry-instrumentation-user-interaction": "0.47.0",
+  "plugins/web/opentelemetry-plugin-react-load": "0.34.0",
   "propagators/opentelemetry-propagator-instana": "0.4.0",
   "propagators/opentelemetry-propagator-ot-trace": "0.28.0",
   "propagators/propagator-aws-xray": "2.1.0",

CONTRIBUTING.md

@@ -135,6 +135,34 @@ The conventional commit type (in PR title) is very important to automatically bu
 
 There is no need to update the CHANGELOG in a PR because it will be updated as part of the release process (see [RELEASING.md](RELEASING.md) for more details).
 
+### Testing
+
+Most unit tests case be run via:
+
+```sh
+npm test
+```
+
+However, some instrumentations require test-services to be running (e.g. the `instrumentation-mongodb` package requires a MongoDB server). Use the `test-services`-related npm scripts to start all required services in Docker and then run the tests with the appropriate configuration to use those services:
+
+```sh
+npm run test-services:start       # starts services in Docker
+npm run test:with-services-config # runs 'npm test' with envvars from test/test-services.env
+npm run test-services:stop        # stops services in Docker
+```
+
+If you only want to test a single package (e.g. the `instrumentation-mongodb`) you can `cd` into it and run the tests after you started the services.
+
+```sh
+npm run test-services:start                           # starts services in Docker
+cd plugins/node/opentelemetry-instrumentation-mongodb # get into the instrumenation folder
+RUN_MONGODB_TESTS=1 npm test                          # run the test with the proper config (check each package)
+cd ../../..                                           # go back to root folder
+npm run test-services:stop                            # stops services in Docker
+```
+
+NOTE: scripts for each package will be added to avoid extra consumption of resources and improve the development experience.
+
 ### Benchmarks
 
 When two or more approaches must be compared, please write a benchmark in the benchmark/index.js module so that we can keep track of the most efficient algorithm.

detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.31.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.31.1...resource-detector-alibaba-cloud-v0.31.2) (2025-06-02)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.47.0 to ^0.48.0
+
 ## [0.31.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.31.0...resource-detector-alibaba-cloud-v0.31.1) (2025-05-15)
 
 

detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-alibaba-cloud",
-  "version": "0.31.1",
+  "version": "0.31.2",
   "description": "OpenTelemetry resource detector for Alibaba Cloud",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
@@ -43,7 +43,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.47.0",
+    "@opentelemetry/contrib-test-utils": "^0.48.0",
     "@opentelemetry/sdk-trace-base": "^2.0.0",
     "@types/mocha": "10.0.10",
     "@types/node": "18.18.14",

detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [2.2.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v2.1.0...resource-detector-aws-v2.2.0) (2025-06-02)
+
+
+### Features
+
+* **deps:** update deps matching '@opentelemetry/*' ([#2871](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2871)) ([d33c6f2](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/d33c6f232a3c5673e618fa62692d2d3bbfe4c0fc))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.47.0 to ^0.48.0
+    * @opentelemetry/instrumentation-fs bumped from ^0.21.0 to ^0.22.0
+
 ## [2.1.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v2.0.0...resource-detector-aws-v2.1.0) (2025-05-15)
 
 

detectors/node/opentelemetry-resource-detector-aws/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-aws",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "OpenTelemetry SDK resource detector for AWS",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
@@ -42,9 +42,9 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.47.0",
-    "@opentelemetry/instrumentation-fs": "^0.21.0",
-    "@opentelemetry/instrumentation-http": "^0.201.0",
+    "@opentelemetry/contrib-test-utils": "^0.48.0",
+    "@opentelemetry/instrumentation-fs": "^0.22.0",
+    "@opentelemetry/instrumentation-http": "^0.202.0",
     "@opentelemetry/sdk-trace-base": "^2.0.0",
     "@types/mocha": "10.0.10",
     "@types/node": "18.18.14",

detectors/node/opentelemetry-resource-detector-azure/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.9.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.8.0...resource-detector-azure-v0.9.0) (2025-06-02)
+
+
+### Features
+
+* **deps:** update deps matching '@opentelemetry/*' ([#2871](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2871)) ([d33c6f2](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/d33c6f232a3c5673e618fa62692d2d3bbfe4c0fc))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.47.0 to ^0.48.0
+
 ## [0.8.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.7.0...resource-detector-azure-v0.8.0) (2025-05-15)
 
 

detectors/node/opentelemetry-resource-detector-azure/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-azure",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "OpenTelemetry SDK resource detector for Azure",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
@@ -35,8 +35,8 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.47.0",
-    "@opentelemetry/instrumentation-http": "^0.201.0",
+    "@opentelemetry/contrib-test-utils": "^0.48.0",
+    "@opentelemetry/instrumentation-http": "^0.202.0",
     "@opentelemetry/sdk-trace-base": "^2.0.0",
     "@types/mocha": "10.0.10",
     "@types/node": "18.18.14",