Merge branch 'main' into fix/host-metrics-bundling

.github/workflows/release-please.yml

@@ -54,15 +54,11 @@ jobs:
 
       # get main again
       - name: Checkout Repository
-        # only checkout if a release has been created
-        if: ${{ steps.release.outputs.release_created }}
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Rebuild Packages
-        # only rebuild if a release has been created
-        if: ${{ steps.release.outputs.release_created }}
         run: |
           npm ci
           npm run compile
@@ -71,8 +67,6 @@ jobs:
       # need to publish all unpublished versions to npm here
       # See: https://github.com/lerna/lerna/tree/main/commands/publish#bump-from-package
       - name: Publish to npm
-        # only publish if a release has been created
-        if: ${{ steps.release.outputs.release_created }}
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
         run: npx lerna publish from-package --no-push --no-private --no-git-tag-version --no-verify-access --yes

.release-please-manifest.json

@@ -1,62 +1,62 @@
 {
-  "detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.28.8",
-  "detectors/node/opentelemetry-resource-detector-aws": "1.4.1",
-  "detectors/node/opentelemetry-resource-detector-azure": "0.2.6",
-  "detectors/node/opentelemetry-resource-detector-container": "0.3.8",
-  "detectors/node/opentelemetry-resource-detector-gcp": "0.29.8",
-  "detectors/node/opentelemetry-resource-detector-github": "0.28.1",
-  "detectors/node/opentelemetry-resource-detector-instana": "0.8.0",
-  "metapackages/auto-instrumentations-node": "0.44.0",
-  "metapackages/auto-instrumentations-web": "0.38.0",
-  "packages/opentelemetry-host-metrics": "0.35.0",
-  "packages/opentelemetry-id-generator-aws-xray": "1.2.1",
-  "packages/opentelemetry-propagation-utils": "0.30.8",
-  "packages/opentelemetry-redis-common": "0.36.1",
-  "packages/opentelemetry-sql-common": "0.40.0",
-  "packages/opentelemetry-test-utils": "0.38.0",
-  "packages/winston-transport": "0.2.0",
-  "plugins/node/instrumentation-amqplib": "0.36.0",
-  "plugins/node/instrumentation-cucumber": "0.5.0",
-  "plugins/node/instrumentation-dataloader": "0.8.0",
-  "plugins/node/instrumentation-fs": "0.11.0",
-  "plugins/node/instrumentation-lru-memoizer": "0.36.0",
-  "plugins/node/instrumentation-mongoose": "0.37.0",
-  "plugins/node/instrumentation-runtime-node": "0.3.0",
-  "plugins/node/instrumentation-socket.io": "0.38.0",
-  "plugins/node/instrumentation-tedious": "0.9.0",
-  "plugins/node/instrumentation-undici": "0.1.0",
-  "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.40.0",
-  "plugins/node/opentelemetry-instrumentation-aws-sdk": "0.40.0",
-  "plugins/node/opentelemetry-instrumentation-bunyan": "0.37.0",
-  "plugins/node/opentelemetry-instrumentation-cassandra": "0.37.0",
-  "plugins/node/opentelemetry-instrumentation-connect": "0.35.0",
-  "plugins/node/opentelemetry-instrumentation-dns": "0.35.0",
-  "plugins/node/opentelemetry-instrumentation-express": "0.37.0",
-  "plugins/node/opentelemetry-instrumentation-fastify": "0.35.0",
-  "plugins/node/opentelemetry-instrumentation-generic-pool": "0.35.0",
-  "plugins/node/opentelemetry-instrumentation-graphql": "0.39.0",
-  "plugins/node/opentelemetry-instrumentation-hapi": "0.36.0",
-  "plugins/node/opentelemetry-instrumentation-ioredis": "0.39.0",
-  "plugins/node/opentelemetry-instrumentation-knex": "0.35.0",
-  "plugins/node/opentelemetry-instrumentation-koa": "0.39.0",
-  "plugins/node/opentelemetry-instrumentation-memcached": "0.35.0",
-  "plugins/node/opentelemetry-instrumentation-mongodb": "0.42.0",
-  "plugins/node/opentelemetry-instrumentation-mysql": "0.37.0",
-  "plugins/node/opentelemetry-instrumentation-mysql2": "0.37.0",
-  "plugins/node/opentelemetry-instrumentation-nestjs-core": "0.36.0",
-  "plugins/node/opentelemetry-instrumentation-net": "0.35.0",
-  "plugins/node/opentelemetry-instrumentation-pg": "0.40.0",
-  "plugins/node/opentelemetry-instrumentation-pino": "0.37.0",
-  "plugins/node/opentelemetry-instrumentation-redis": "0.38.0",
-  "plugins/node/opentelemetry-instrumentation-redis-4": "0.38.0",
-  "plugins/node/opentelemetry-instrumentation-restify": "0.37.0",
-  "plugins/node/opentelemetry-instrumentation-router": "0.36.0",
-  "plugins/node/opentelemetry-instrumentation-winston": "0.36.0",
-  "plugins/web/opentelemetry-instrumentation-document-load": "0.37.0",
-  "plugins/web/opentelemetry-instrumentation-long-task": "0.37.0",
-  "plugins/web/opentelemetry-instrumentation-user-interaction": "0.37.0",
-  "plugins/web/opentelemetry-plugin-react-load": "0.30.0",
-  "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.9",
+  "detectors/node/opentelemetry-resource-detector-aws": "1.4.2",
+  "detectors/node/opentelemetry-resource-detector-azure": "0.2.7",
+  "detectors/node/opentelemetry-resource-detector-container": "0.3.9",
+  "detectors/node/opentelemetry-resource-detector-gcp": "0.29.9",
+  "detectors/node/opentelemetry-resource-detector-github": "0.28.2",
+  "detectors/node/opentelemetry-resource-detector-instana": "0.9.0",
+  "metapackages/auto-instrumentations-node": "0.45.0",
+  "metapackages/auto-instrumentations-web": "0.39.0",
+  "packages/opentelemetry-host-metrics": "0.35.1",
+  "packages/opentelemetry-id-generator-aws-xray": "1.2.2",
+  "packages/opentelemetry-propagation-utils": "0.30.9",
+  "packages/opentelemetry-redis-common": "0.36.2",
+  "packages/opentelemetry-sql-common": "0.40.1",
+  "packages/opentelemetry-test-utils": "0.39.0",
+  "packages/winston-transport": "0.3.0",
+  "plugins/node/instrumentation-amqplib": "0.37.0",
+  "plugins/node/instrumentation-cucumber": "0.6.0",
+  "plugins/node/instrumentation-dataloader": "0.9.0",
+  "plugins/node/instrumentation-fs": "0.12.0",
+  "plugins/node/instrumentation-lru-memoizer": "0.37.0",
+  "plugins/node/instrumentation-mongoose": "0.38.0",
+  "plugins/node/instrumentation-runtime-node": "0.4.0",
+  "plugins/node/instrumentation-socket.io": "0.39.0",
+  "plugins/node/instrumentation-tedious": "0.10.0",
+  "plugins/node/instrumentation-undici": "0.2.0",
+  "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.41.0",
+  "plugins/node/opentelemetry-instrumentation-aws-sdk": "0.41.0",
+  "plugins/node/opentelemetry-instrumentation-bunyan": "0.38.0",
+  "plugins/node/opentelemetry-instrumentation-cassandra": "0.38.0",
+  "plugins/node/opentelemetry-instrumentation-connect": "0.36.0",
+  "plugins/node/opentelemetry-instrumentation-dns": "0.36.0",
+  "plugins/node/opentelemetry-instrumentation-express": "0.38.0",
+  "plugins/node/opentelemetry-instrumentation-fastify": "0.36.0",
+  "plugins/node/opentelemetry-instrumentation-generic-pool": "0.36.0",
+  "plugins/node/opentelemetry-instrumentation-graphql": "0.40.0",
+  "plugins/node/opentelemetry-instrumentation-hapi": "0.37.0",
+  "plugins/node/opentelemetry-instrumentation-ioredis": "0.40.0",
+  "plugins/node/opentelemetry-instrumentation-knex": "0.36.0",
+  "plugins/node/opentelemetry-instrumentation-koa": "0.40.0",
+  "plugins/node/opentelemetry-instrumentation-memcached": "0.36.0",
+  "plugins/node/opentelemetry-instrumentation-mongodb": "0.43.0",
+  "plugins/node/opentelemetry-instrumentation-mysql": "0.38.0",
+  "plugins/node/opentelemetry-instrumentation-mysql2": "0.38.0",
+  "plugins/node/opentelemetry-instrumentation-nestjs-core": "0.37.0",
+  "plugins/node/opentelemetry-instrumentation-net": "0.36.0",
+  "plugins/node/opentelemetry-instrumentation-pg": "0.41.0",
+  "plugins/node/opentelemetry-instrumentation-pino": "0.38.0",
+  "plugins/node/opentelemetry-instrumentation-redis": "0.39.0",
+  "plugins/node/opentelemetry-instrumentation-redis-4": "0.39.0",
+  "plugins/node/opentelemetry-instrumentation-restify": "0.38.0",
+  "plugins/node/opentelemetry-instrumentation-router": "0.37.0",
+  "plugins/node/opentelemetry-instrumentation-winston": "0.37.0",
+  "plugins/web/opentelemetry-instrumentation-document-load": "0.38.0",
+  "plugins/web/opentelemetry-instrumentation-long-task": "0.38.0",
+  "plugins/web/opentelemetry-instrumentation-user-interaction": "0.38.0",
+  "plugins/web/opentelemetry-plugin-react-load": "0.30.1",
+  "propagators/opentelemetry-propagator-grpc-census-binary": "0.27.2",
+  "propagators/opentelemetry-propagator-instana": "0.3.2",
+  "propagators/opentelemetry-propagator-ot-trace": "0.27.2"
 }

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

@@ -72,6 +72,20 @@
   * devDependencies
     * @opentelemetry/contrib-test-utils bumped from ^0.36.0 to ^0.37.0
 
+## [0.28.9](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.28.8...resource-detector-alibaba-cloud-v0.28.9) (2024-04-25)
+
+
+### Bug Fixes
+
+* revert modifications to Apache license ([#2105](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2105)) ([4590c8d](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4590c8df184bbcb9bd67ce1111df9f25f865ccf2))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.38.0 to ^0.39.0
+
 ## [0.28.8](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.28.7...resource-detector-alibaba-cloud-v0.28.8) (2024-04-03)
 
 

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

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-alibaba-cloud",
-  "version": "0.28.8",
+  "version": "0.28.9",
   "description": "OpenTelemetry resource detector for Alibaba Cloud",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -40,7 +40,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.38.0",
+    "@opentelemetry/contrib-test-utils": "^0.39.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.18",

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

@@ -66,6 +66,20 @@
   * devDependencies
     * @opentelemetry/contrib-test-utils bumped from ^0.35.1 to ^0.36.0
 
+## [1.4.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.4.1...resource-detector-aws-v1.4.2) (2024-04-25)
+
+
+### Bug Fixes
+
+* revert modifications to Apache license ([#2105](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2105)) ([4590c8d](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4590c8df184bbcb9bd67ce1111df9f25f865ccf2))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.38.0 to ^0.39.0
+
 ## [1.4.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.4.0...resource-detector-aws-v1.4.1) (2024-04-03)
 
 

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

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-aws",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "OpenTelemetry SDK resource detector for AWS",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.38.0",
+    "@opentelemetry/contrib-test-utils": "^0.39.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.18",

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

@@ -12,6 +12,20 @@
   * devDependencies
     * @opentelemetry/contrib-test-utils bumped from ^0.36.0 to ^0.37.0
 
+## [0.2.7](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.2.6...resource-detector-azure-v0.2.7) (2024-04-25)
+
+
+### Bug Fixes
+
+* revert modifications to Apache license ([#2105](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2105)) ([4590c8d](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4590c8df184bbcb9bd67ce1111df9f25f865ccf2))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.38.0 to ^0.39.0
+
 ## [0.2.6](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.2.5...resource-detector-azure-v0.2.6) (2024-04-03)
 
 

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

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-azure",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "OpenTelemetry SDK resource detector for Azure",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -32,7 +32,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.38.0",
+    "@opentelemetry/contrib-test-utils": "^0.39.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.18",

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

@@ -60,6 +60,20 @@
   * devDependencies
     * @opentelemetry/contrib-test-utils bumped from ^0.36.0 to ^0.37.0
 
+## [0.3.9](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.3.8...resource-detector-container-v0.3.9) (2024-04-25)
+
+
+### Bug Fixes
+
+* revert modifications to Apache license ([#2105](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2105)) ([4590c8d](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4590c8df184bbcb9bd67ce1111df9f25f865ccf2))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.38.0 to ^0.39.0
+
 ## [0.3.8](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.3.7...resource-detector-container-v0.3.8) (2024-04-03)
 
 

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

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-container",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "description": "Opentelemetry resource detector to get container resource attributes",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.38.0",
+    "@opentelemetry/contrib-test-utils": "^0.39.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.18",

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

@@ -60,6 +60,20 @@
   * devDependencies
     * @opentelemetry/contrib-test-utils bumped from ^0.36.0 to ^0.37.0
 
+## [0.29.9](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-gcp-v0.29.8...resource-detector-gcp-v0.29.9) (2024-04-25)
+
+
+### Bug Fixes
+
+* revert modifications to Apache license ([#2105](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2105)) ([4590c8d](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4590c8df184bbcb9bd67ce1111df9f25f865ccf2))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.38.0 to ^0.39.0
+
 ## [0.29.8](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-gcp-v0.29.7...resource-detector-gcp-v0.29.8) (2024-04-03)
 
 

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

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-gcp",
-  "version": "0.29.8",
+  "version": "0.29.9",
   "description": "OpenTelemetry SDK resource detector for GCP",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.38.0",
+    "@opentelemetry/contrib-test-utils": "^0.39.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.6.5",
     "@types/semver": "7.5.3",

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

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.28.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-github-v0.28.1...resource-detector-github-v0.28.2) (2024-04-25)
+
+
+### Bug Fixes
+
+* revert modifications to Apache license ([#2105](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2105)) ([4590c8d](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4590c8df184bbcb9bd67ce1111df9f25f865ccf2))
+
 ## [0.28.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-github-v0.28.0...resource-detector-github-v0.28.1) (2023-08-14)
 
 

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

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-github",
-  "version": "0.28.1",
+  "version": "0.28.2",
   "description": "OpenTelemetry SDK resource detector for GitHub",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",

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

@@ -6,6 +6,26 @@
   * devDependencies
     * @opentelemetry/contrib-test-utils bumped from ^0.34.3 to ^0.35.0
 
+## [0.9.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-instana-v0.8.0...resource-detector-instana-v0.9.0) (2024-04-25)
+
+
+### Features
+
+* **deps:** update otel-js to 0.51.0 ([80cbee7](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/80cbee73130c65c8ccd78384485a7be8d2a4a84b))
+* remove generic type from instrumentations ([80cbee7](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/80cbee73130c65c8ccd78384485a7be8d2a4a84b))
+
+
+### Bug Fixes
+
+* revert modifications to Apache license ([#2105](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2105)) ([4590c8d](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4590c8df184bbcb9bd67ce1111df9f25f865ccf2))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.38.0 to ^0.39.0
+
 ## [0.8.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-instana-v0.7.0...resource-detector-instana-v0.8.0) (2024-04-03)