Merge branch 'main' into main

Author: pichlermarc

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,7 +7,7 @@ Before creating a pull request, please make sure:
 - You have read the guide for contributing
   - See https://github.com/open-telemetry/opentelemetry-js/blob/main/CONTRIBUTING.md
 - You signed all your commits (otherwise we won't be able to merge the PR)
-  - See https://github.com/open-telemetry/community/blob/main/CONTRIBUTING.md#sign-the-cla
+  - See https://github.com/open-telemetry/community/blob/main/guides/contributor#sign-the-cla
 - You added unit tests for the new functionality
 - You mention in the PR description which issue it is addressing, e.g. "Fixes #xxx". This will auto-close
   the issue that your PR fixes (if such)

.github/component_owners.yml

@@ -74,6 +74,7 @@ components:
   plugins/node/opentelemetry-instrumentation-aws-sdk:
     - blumamir
     - jj22ee
+    - trivikr
   plugins/node/opentelemetry-instrumentation-bunyan:
     - seemk
     - trentm

.github/workflows/unit-test.yml

@@ -182,7 +182,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ["16"]
+        node: ["22"]
     runs-on: ubuntu-latest
     env:
       NPM_CONFIG_UNSAFE_PERM: true
@@ -195,9 +195,6 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
-      - name: Update npm to a version that supports workspaces (v7 or later)
-        if: ${{ matrix.node < 16 }}
-        run: npm install -g npm@9 # npm@9 supports node >=14.17.0
       - name: Install
         run: npm ci
       - name: Download Build Artifacts

.github/workflows/update-otel-deps.yaml

@@ -0,0 +1,48 @@
+name: Create or Update OpenTelemetry Update PR
+
+on:
+  workflow_dispatch:
+
+jobs:
+  create-or-update-deps-pr:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Fork
+        run: gh repo fork open-telemetry/opentelemetry-js-contrib
+        env:
+          GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          repository: opentelemetrybot/opentelemetry-js-contrib
+          ref: main
+          token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
+      - name: Sync with upstream
+        run: |
+          git remote show origin
+          git remote add upstream https://github.com/open-telemetry/opentelemetry-js-contrib.git
+          git fetch upstream
+          git reset --hard upstream/main
+          git push origin main --force
+
+      - uses: actions/setup-node@v4
+        with:
+          cache: 'npm'
+          cache-dependency-path: package-lock.json
+          node-version: 22
+
+      - run: npm install -g npm@latest
+
+      - run: npm ci
+
+      - name: Create/Update Release PR
+        run: |
+          git config user.name opentelemetrybot
+          git config user.email [email protected]
+          git checkout -b feat/update-otel-deps
+          node ./scripts/update-otel-deps.js
+          git commit -am "feat(deps): update deps matching '@opentelemetry/*'"
+          git push --set-upstream origin feat/update-otel-deps --force
+          gh pr create --repo open-telemetry/opentelemetry-js-contrib --title 'chore: prepare next release' --body 'Updates all `@opentelemetry/*` dependencies to latest'
+        env:
+          GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}

.release-please-manifest.json

@@ -1,63 +1,63 @@
 {
-  "detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.5",
-  "detectors/node/opentelemetry-resource-detector-aws": "1.8.0",
-  "detectors/node/opentelemetry-resource-detector-azure": "0.3.0",
-  "detectors/node/opentelemetry-resource-detector-container": "0.5.1",
-  "detectors/node/opentelemetry-resource-detector-gcp": "0.30.0",
+  "detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.6",
+  "detectors/node/opentelemetry-resource-detector-aws": "1.9.0",
+  "detectors/node/opentelemetry-resource-detector-azure": "0.4.0",
+  "detectors/node/opentelemetry-resource-detector-container": "0.5.2",
+  "detectors/node/opentelemetry-resource-detector-gcp": "0.31.0",
   "detectors/node/opentelemetry-resource-detector-github": "0.29.0",
-  "detectors/node/opentelemetry-resource-detector-instana": "0.15.0",
+  "detectors/node/opentelemetry-resource-detector-instana": "0.16.0",
   "metapackages/auto-configuration-propagators": "0.3.1",
-  "metapackages/auto-instrumentations-node": "0.53.0",
-  "metapackages/auto-instrumentations-web": "0.43.0",
+  "metapackages/auto-instrumentations-node": "0.54.0",
+  "metapackages/auto-instrumentations-web": "0.44.0",
   "packages/baggage-span-processor": "0.3.1",
   "packages/opentelemetry-host-metrics": "0.35.4",
   "packages/opentelemetry-id-generator-aws-xray": "1.2.2",
-  "packages/opentelemetry-propagation-utils": "0.30.13",
+  "packages/opentelemetry-propagation-utils": "0.30.14",
   "packages/opentelemetry-redis-common": "0.36.2",
   "packages/opentelemetry-sql-common": "0.40.1",
-  "packages/opentelemetry-test-utils": "0.43.0",
-  "packages/winston-transport": "0.8.0",
-  "plugins/node/instrumentation-amqplib": "0.44.0",
-  "plugins/node/instrumentation-cucumber": "0.11.0",
-  "plugins/node/instrumentation-dataloader": "0.14.0",
-  "plugins/node/instrumentation-fs": "0.17.0",
-  "plugins/node/instrumentation-kafkajs": "0.5.0",
-  "plugins/node/instrumentation-lru-memoizer": "0.42.0",
-  "plugins/node/instrumentation-mongoose": "0.44.0",
-  "plugins/node/instrumentation-runtime-node": "0.10.0",
-  "plugins/node/instrumentation-socket.io": "0.44.0",
-  "plugins/node/instrumentation-tedious": "0.16.0",
-  "plugins/node/instrumentation-undici": "0.8.0",
-  "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.48.0",
-  "plugins/node/opentelemetry-instrumentation-aws-sdk": "0.47.0",
-  "plugins/node/opentelemetry-instrumentation-bunyan": "0.43.0",
-  "plugins/node/opentelemetry-instrumentation-cassandra": "0.43.0",
-  "plugins/node/opentelemetry-instrumentation-connect": "0.41.0",
-  "plugins/node/opentelemetry-instrumentation-dns": "0.41.0",
-  "plugins/node/opentelemetry-instrumentation-express": "0.45.0",
-  "plugins/node/opentelemetry-instrumentation-fastify": "0.42.0",
-  "plugins/node/opentelemetry-instrumentation-generic-pool": "0.41.0",
-  "plugins/node/opentelemetry-instrumentation-graphql": "0.45.0",
-  "plugins/node/opentelemetry-instrumentation-hapi": "0.43.0",
-  "plugins/node/opentelemetry-instrumentation-ioredis": "0.45.0",
-  "plugins/node/opentelemetry-instrumentation-knex": "0.42.0",
-  "plugins/node/opentelemetry-instrumentation-koa": "0.45.0",
-  "plugins/node/opentelemetry-instrumentation-memcached": "0.41.0",
-  "plugins/node/opentelemetry-instrumentation-mongodb": "0.49.0",
-  "plugins/node/opentelemetry-instrumentation-mysql": "0.43.0",
-  "plugins/node/opentelemetry-instrumentation-mysql2": "0.43.0",
-  "plugins/node/opentelemetry-instrumentation-nestjs-core": "0.42.0",
-  "plugins/node/opentelemetry-instrumentation-net": "0.41.0",
-  "plugins/node/opentelemetry-instrumentation-pg": "0.48.0",
-  "plugins/node/opentelemetry-instrumentation-pino": "0.44.0",
-  "plugins/node/opentelemetry-instrumentation-redis": "0.44.0",
-  "plugins/node/opentelemetry-instrumentation-redis-4": "0.44.0",
-  "plugins/node/opentelemetry-instrumentation-restify": "0.43.0",
-  "plugins/node/opentelemetry-instrumentation-router": "0.42.0",
-  "plugins/node/opentelemetry-instrumentation-winston": "0.42.0",
-  "plugins/web/opentelemetry-instrumentation-document-load": "0.42.0",
-  "plugins/web/opentelemetry-instrumentation-long-task": "0.42.0",
-  "plugins/web/opentelemetry-instrumentation-user-interaction": "0.42.0",
+  "packages/opentelemetry-test-utils": "0.44.0",
+  "packages/winston-transport": "0.9.0",
+  "plugins/node/instrumentation-amqplib": "0.45.0",
+  "plugins/node/instrumentation-cucumber": "0.12.0",
+  "plugins/node/instrumentation-dataloader": "0.15.0",
+  "plugins/node/instrumentation-fs": "0.18.0",
+  "plugins/node/instrumentation-kafkajs": "0.6.0",
+  "plugins/node/instrumentation-lru-memoizer": "0.43.0",
+  "plugins/node/instrumentation-mongoose": "0.45.0",
+  "plugins/node/instrumentation-runtime-node": "0.11.0",
+  "plugins/node/instrumentation-socket.io": "0.45.0",
+  "plugins/node/instrumentation-tedious": "0.17.0",
+  "plugins/node/instrumentation-undici": "0.9.0",
+  "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.49.0",
+  "plugins/node/opentelemetry-instrumentation-aws-sdk": "0.48.0",
+  "plugins/node/opentelemetry-instrumentation-bunyan": "0.44.0",
+  "plugins/node/opentelemetry-instrumentation-cassandra": "0.44.0",
+  "plugins/node/opentelemetry-instrumentation-connect": "0.42.0",
+  "plugins/node/opentelemetry-instrumentation-dns": "0.42.0",
+  "plugins/node/opentelemetry-instrumentation-express": "0.46.0",
+  "plugins/node/opentelemetry-instrumentation-fastify": "0.43.0",
+  "plugins/node/opentelemetry-instrumentation-generic-pool": "0.42.0",
+  "plugins/node/opentelemetry-instrumentation-graphql": "0.46.0",
+  "plugins/node/opentelemetry-instrumentation-hapi": "0.44.0",
+  "plugins/node/opentelemetry-instrumentation-ioredis": "0.46.0",
+  "plugins/node/opentelemetry-instrumentation-knex": "0.43.0",
+  "plugins/node/opentelemetry-instrumentation-koa": "0.46.0",
+  "plugins/node/opentelemetry-instrumentation-memcached": "0.42.0",
+  "plugins/node/opentelemetry-instrumentation-mongodb": "0.50.0",
+  "plugins/node/opentelemetry-instrumentation-mysql": "0.44.0",
+  "plugins/node/opentelemetry-instrumentation-mysql2": "0.44.0",
+  "plugins/node/opentelemetry-instrumentation-nestjs-core": "0.43.0",
+  "plugins/node/opentelemetry-instrumentation-net": "0.42.0",
+  "plugins/node/opentelemetry-instrumentation-pg": "0.49.0",
+  "plugins/node/opentelemetry-instrumentation-pino": "0.45.0",
+  "plugins/node/opentelemetry-instrumentation-redis": "0.45.0",
+  "plugins/node/opentelemetry-instrumentation-redis-4": "0.45.0",
+  "plugins/node/opentelemetry-instrumentation-restify": "0.44.0",
+  "plugins/node/opentelemetry-instrumentation-router": "0.43.0",
+  "plugins/node/opentelemetry-instrumentation-winston": "0.43.0",
+  "plugins/web/opentelemetry-instrumentation-document-load": "0.43.0",
+  "plugins/web/opentelemetry-instrumentation-long-task": "0.43.0",
+  "plugins/web/opentelemetry-instrumentation-user-interaction": "0.43.0",
   "plugins/web/opentelemetry-plugin-react-load": "0.31.0",
   "propagators/opentelemetry-propagator-instana": "0.3.2",
   "propagators/opentelemetry-propagator-ot-trace": "0.27.2",

CONTRIBUTING.md

@@ -56,7 +56,7 @@ Reporting bugs is an important contribution. Please make sure to include:
 ### Before you start
 
 Please read project contribution
-[guide](https://github.com/open-telemetry/community/blob/main/CONTRIBUTING.md)
+[guide](https://github.com/open-telemetry/community/blob/main/guides/contributor)
 for general practices for OpenTelemetry project.
 
 #### Conventional commit
@@ -88,7 +88,7 @@ git merge upstream/main
 
 Remember to always work in a branch of your local copy, as you might otherwise have to contend with conflicts in main.
 
-Please also see [GitHub workflow](https://github.com/open-telemetry/community/blob/main/CONTRIBUTING.md#github-workflow) section of general project contributing guide.
+Please also see [GitHub workflow](https://github.com/open-telemetry/community/blob/main/guides/contributor/processes.md#github-workflow) section of general project contributing guide.
 
 ## Development
 
@@ -149,6 +149,9 @@ Maintainers may override the decisions of component owners, but should only do s
 
 ### Becoming a Component Owner
 
+To become a component owner, contributors MUST be a member of the OpenTelemetry GitHub organization.
+To become a member, follow the steps in the [community guidelines for membership requirements](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#requirements).
+
 To become a component owner, contributors SHOULD demonstrate prior knowledge of the instrumented package or the concepts therein.
 
 Ways do to so may be by providing proof of:
@@ -177,6 +180,7 @@ If all these conditions are met, aspiring component owners are encouraged to sel
 information provided on the issue - either approve or deny the ownership request. If the ownership request has been
 approved, the new component owner opens a PR to add themselves to the list of owners ([.github/component_owners.yml](.github/component_owners.yml))
 for that package.
+@open-telemetry/javascript-maintainers will add the component owner to @open-telemetry/javascript-contrib-triagers.
 
 ## Component Lifecycle
 
@@ -306,6 +310,7 @@ When instrumentation cannot be included in a target package and there is good re
 Note that new instrumentation needs at least two contributors assigned to it as code-owners.  It is the responsibility
 of the requesting party to reach out and find code-owners for the proposed instrumentation. The instrumentation request
 needs to be accepted before any pull requests for the instrumentation can be considered for merging.
+Review the guidelines for [Becoming a Component Owner](#becoming-a-component-owner).
 
 Regardless of where instrumentation is hosted, it needs to be discoverable.
 The [OpenTelemetry registry](https://opentelemetry.io/registry/) exists to ensure that instrumentation is discoverable.

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

@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.29.6](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.5...resource-detector-alibaba-cloud-v0.29.6) (2024-12-04)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.43.0 to ^0.44.0
+
 ## [0.29.5](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.4...resource-detector-alibaba-cloud-v0.29.5) (2024-11-18)
 
 

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

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-alibaba-cloud",
-  "version": "0.29.5",
+  "version": "0.29.6",
   "description": "OpenTelemetry resource detector for Alibaba Cloud",
   "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.43.0",
+    "@opentelemetry/contrib-test-utils": "^0.44.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.18.14",
     "@types/sinon": "10.0.20",

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

@@ -1,5 +1,20 @@
 # Changelog
 
+## [1.9.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.8.0...resource-detector-aws-v1.9.0) (2024-12-04)
+
+
+### Features
+
+* **deps:** update deps matching '@opentelemetry/*' ([#2582](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2582)) ([5df02cb](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/5df02cbb35681d2b5cce359dda7b023d7bf339f2))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.43.0 to ^0.44.0
+    * @opentelemetry/instrumentation-fs bumped from ^0.17.0 to ^0.18.0
+
 ## [1.8.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.7.0...resource-detector-aws-v1.8.0) (2024-11-18)
 
 

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

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-aws",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "OpenTelemetry SDK resource detector for AWS",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -38,9 +38,9 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.43.0",
-    "@opentelemetry/instrumentation-fs": "^0.17.0",
-    "@opentelemetry/instrumentation-http": "^0.55.0",
+    "@opentelemetry/contrib-test-utils": "^0.44.0",
+    "@opentelemetry/instrumentation-fs": "^0.18.0",
+    "@opentelemetry/instrumentation-http": "^0.56.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.18.14",
     "@types/sinon": "10.0.20",