Merge branch 'main' into tm-semconv-lint-and-changelog-play

Author: trentm

.github/ISSUE_TEMPLATE/instrumentation_request.md

@@ -1,41 +1,36 @@
 ---
 name: Instrumentation request
-about: Create a report to add support for an instrumentation
+about: Create a request to add a new instrumentation
 labels: instrumentation-request
 ---
 
 <!--
-**NB:** Before opening an instrumentation request against this repo, please read [the contributing guidelines for new instrumentation](../../CONTRIBUTING.md#new-instrumentation).
+**NB:** Before opening an instrumentation request against this repo, please read [the contributing guidelines for new instrumentation](../blob/main/CONTRIBUTING.md#new-instrumentation).
 -->
 
-### Is your instrumentation request related to a problem? Please describe
+### Which library do you want to instrument?
 <!--
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+A clear and concise description of why this library should be instrumented. Ex. I'm always frustrated when [...]
 -->
 
-
-### Is it applicable for Node or Browser or both?
-
-
-### Do you expect this instrumentation to be commonly used?
-
-Weekly Downloads:
-
-### What version of instrumentation are you interested in using?
-
-Versions:
-
 ### Code Owners
 
 <!--
-New Instrumentation requests need at least 2 code-owners that will maintain the instrumentation long-term.
+New Instrumentations MUST have at least 2 code-owners that will maintain the instrumentation long-term.
+Any code-owners listed MUST fulfill all criteria laid out in the checklist below.
 -->
 
 - Owner 1
+  - [ ] I am a [member of the OpenTelemetry Organization](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#member)
+  - [ ] I have read [CONTRIBUTING.md](../blob/main/CONTRIBUTING.md) and understand the responsibilities of a component owner
+  - [ ] I agree to follow and uphold the [mission, vision and values](https://github.com/open-telemetry/community/blob/main/mission-vision-values.md) of the OpenTelemetry project
+  - [ ] I understand that the component may be subject to the [OpenTelemetry Semantic Conventions](https://github.com/open-telemetry/semantic-conventions) and agree to follow the rules set out therein
 - Owner 2
+  <!-- instruct any co-owners to complete the checklist above and comment it on this issue -->
+  - [ ] Commented on the issue confirming they have fulfilled all criteria for becoming a component owner
+<!-- continue listing co-owners if you have more than two -->
 
 ### Additional context
 <!--
 Add any other context or screenshots about the instrumentation request here. Is there a reference you could point for the well-defined lifecycle methods?
 -->
-

.github/ISSUE_TEMPLATE/ownership_request.md

@@ -5,7 +5,7 @@ labels: type:ownership-request
 ---
 
 <!--
-**NB:** Before opening a component ownership request against this repo, please read [CONTRIBUTING.md](../../CONTRIBUTING.md#component-ownership) and its subsections first.
+**NB:** Before opening a component ownership request against this repo, please read [CONTRIBUTING.md](../blob/main/CONTRIBUTING.md#component-ownership) and its subsections first.
 -->
 
 ### Which component are you requesting ownership of?
@@ -17,7 +17,7 @@ Put a link to the component here.
 ### Related Work and Qualifications
 
 <!--
-List here why you're qualified to take ownership of the component, see [CONTRIBUTING.md](../../CONTRIBUTING.md#becoming-a-component-owner) for details.
+List here why you're qualified to take ownership of the component, see [CONTRIBUTING.md](../blob/main/CONTRIBUTING.md#becoming-a-component-owner) for details.
 
 Examples:
 - I am working on <related open-source-project> and have deep knowledge of the instrumented package.
@@ -28,7 +28,8 @@ Examples:
 
 ### Checklist
 
-- [ ] I have read [CONTRIBUTING.md](../../CONTRIBUTING.md) and understand the responsibilities of a component owner.
+- [ ] I am a [member of the OpenTelemetry Organization](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#member)
+- [ ] I have read [CONTRIBUTING.md](../blob/main/CONTRIBUTING.md) and understand the responsibilities of a component owner.
 - [ ] I agree to follow and uphold the [mission, vision and values](https://github.com/open-telemetry/community/blob/main/mission-vision-values.md) of the OpenTelemetry project
 - [ ] I understand that the component I'm requesting ownership of may be subject to the [OpenTelemetry Semantic Conventions](https://github.com/open-telemetry/semantic-conventions) and agree to follow the rules set out therein.
 

.github/component-label-map.yml

@@ -304,5 +304,4 @@ pkg-status:unmaintained:
           - plugins/node/opentelemetry-instrumentation-restify/**
           - plugins/node/opentelemetry-instrumentation-router/**
           - propagators/opentelemetry-propagator-ot-trace/**
-          - propagators/propagator-aws-xray/**
           - propagators/propagator-aws-xray-lambda/**

.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 "feat(deps): update deps matching '@opentelemetry/*'" --body 'Updates all `@opentelemetry/*` dependencies to latest'
+        env:
+          GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}

.release-please-manifest.json

@@ -1,66 +1,66 @@
 {
-  "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.7",
+  "detectors/node/opentelemetry-resource-detector-aws": "1.10.0",
+  "detectors/node/opentelemetry-resource-detector-azure": "0.5.0",
+  "detectors/node/opentelemetry-resource-detector-container": "0.5.3",
+  "detectors/node/opentelemetry-resource-detector-gcp": "0.32.0",
   "detectors/node/opentelemetry-resource-detector-github": "0.29.0",
-  "detectors/node/opentelemetry-resource-detector-instana": "0.15.0",
-  "metapackages/auto-configuration-propagators": "0.3.1",
-  "metapackages/auto-instrumentations-node": "0.53.0",
-  "metapackages/auto-instrumentations-web": "0.43.0",
+  "detectors/node/opentelemetry-resource-detector-instana": "0.17.0",
+  "metapackages/auto-configuration-propagators": "0.3.2",
+  "metapackages/auto-instrumentations-node": "0.55.2",
+  "metapackages/auto-instrumentations-web": "0.45.0",
   "packages/baggage-span-processor": "0.3.1",
-  "packages/opentelemetry-host-metrics": "0.35.4",
+  "packages/opentelemetry-host-metrics": "0.35.5",
   "packages/opentelemetry-id-generator-aws-xray": "1.2.2",
-  "packages/opentelemetry-propagation-utils": "0.30.13",
+  "packages/opentelemetry-propagation-utils": "0.30.15",
   "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.45.0",
+  "packages/winston-transport": "0.10.0",
+  "plugins/node/instrumentation-amqplib": "0.46.0",
+  "plugins/node/instrumentation-cucumber": "0.13.0",
+  "plugins/node/instrumentation-dataloader": "0.16.0",
+  "plugins/node/instrumentation-fs": "0.19.0",
+  "plugins/node/instrumentation-kafkajs": "0.7.0",
+  "plugins/node/instrumentation-lru-memoizer": "0.44.0",
+  "plugins/node/instrumentation-mongoose": "0.46.0",
+  "plugins/node/instrumentation-runtime-node": "0.12.1",
+  "plugins/node/instrumentation-socket.io": "0.46.0",
+  "plugins/node/instrumentation-tedious": "0.18.0",
+  "plugins/node/instrumentation-undici": "0.10.0",
+  "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.50.1",
+  "plugins/node/opentelemetry-instrumentation-aws-sdk": "0.49.0",
+  "plugins/node/opentelemetry-instrumentation-bunyan": "0.45.0",
+  "plugins/node/opentelemetry-instrumentation-cassandra": "0.45.0",
+  "plugins/node/opentelemetry-instrumentation-connect": "0.43.0",
+  "plugins/node/opentelemetry-instrumentation-dns": "0.43.0",
+  "plugins/node/opentelemetry-instrumentation-express": "0.47.0",
+  "plugins/node/opentelemetry-instrumentation-fastify": "0.44.0",
+  "plugins/node/opentelemetry-instrumentation-generic-pool": "0.43.0",
+  "plugins/node/opentelemetry-instrumentation-graphql": "0.47.0",
+  "plugins/node/opentelemetry-instrumentation-hapi": "0.45.1",
+  "plugins/node/opentelemetry-instrumentation-ioredis": "0.47.0",
+  "plugins/node/opentelemetry-instrumentation-knex": "0.44.0",
+  "plugins/node/opentelemetry-instrumentation-koa": "0.47.0",
+  "plugins/node/opentelemetry-instrumentation-memcached": "0.43.0",
+  "plugins/node/opentelemetry-instrumentation-mongodb": "0.51.0",
+  "plugins/node/opentelemetry-instrumentation-mysql": "0.45.0",
+  "plugins/node/opentelemetry-instrumentation-mysql2": "0.45.0",
+  "plugins/node/opentelemetry-instrumentation-nestjs-core": "0.44.0",
+  "plugins/node/opentelemetry-instrumentation-net": "0.43.0",
+  "plugins/node/opentelemetry-instrumentation-pg": "0.50.0",
+  "plugins/node/opentelemetry-instrumentation-pino": "0.46.0",
+  "plugins/node/opentelemetry-instrumentation-redis": "0.46.0",
+  "plugins/node/opentelemetry-instrumentation-redis-4": "0.46.0",
+  "plugins/node/opentelemetry-instrumentation-restify": "0.45.0",
+  "plugins/node/opentelemetry-instrumentation-router": "0.44.0",
+  "plugins/node/opentelemetry-instrumentation-winston": "0.44.0",
+  "plugins/web/opentelemetry-instrumentation-document-load": "0.44.0",
+  "plugins/web/opentelemetry-instrumentation-long-task": "0.44.0",
+  "plugins/web/opentelemetry-instrumentation-user-interaction": "0.44.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",
-  "propagators/propagator-aws-xray": "1.26.0",
-  "propagators/propagator-aws-xray-lambda": "0.53.0"
+  "propagators/propagator-aws-xray": "1.26.1",
+  "propagators/propagator-aws-xray-lambda": "0.53.1"
 }

CONTRIBUTING.md

@@ -140,15 +140,20 @@ When two or more approaches must be compared, please write a benchmark in the be
 This repository contains many components which are maintained by more than the typical set of JS maintainers and approvers.
 Each component in this repository SHOULD have a component owner who is responsible for maintaining it.
 The README.md for each component SHOULD contain its owner, but the source of truth for component ownership is in [.github/component_owners.yml](.github/component_owners.yml).
+
 Component owners are generally given authority to make decisions relating to implementation and feature requests for their components,
 provided they follow the best practices set out by the maintainers and the [mission, vision and values](https://github.com/open-telemetry/community/blob/main/mission-vision-values.md)
-of the OpenTelemetry Project.
+of the OpenTelemetry Project. To facilitate independent triage of issues pertaining to the owned component, component owners are assigned
+[the Triager role](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#triager).
 
 Component owners MUST do their best to maintain a high level of quality, security, performance, and specification compliance within their components.
 Maintainers may override the decisions of component owners, but should only do so when they feel one or more of these traits is compromised.
 
 ### Becoming a Component Owner
 
+To become a component owner, contributors MUST be a [member](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#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 +182,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
 
@@ -266,6 +272,7 @@ please ping ([@open-telemetry/javascript-approvers](https://github.com/orgs/open
 
 - Approved by
   - at least one component owner if one is defined in [.github/component_owners.yml](.github/component_owners.yml)
+    - upon approval, the component owner SHOULD apply the `has:owner-approval` label to signal to maintainers that the PR is ready to merge.
   - OR one maintainer
   - OR at least one approver who is not the approver merging the pull request
     - A pull request for small (simple typo, URL, update docs, or grammatical fix) changes may be approved and merged by the same approver
@@ -291,8 +298,11 @@ The size of the OpenTelemetry JavaScript developer community is not large enough
 Therefore, to reach our goal, we have the following recommendations for where instrumentation packages should live.
 
 1. Native to the instrumented package
-2. A dedicated public repository
-3. Here in the opentelemetry-js-contrib repository
+2. Close to where maintenance of the instrumented library takes place. For example:
+   1. in a repository that is part of the organization that maintains the instrumented library
+   2. in the same repository as the instrumented library
+3. A dedicated public repository
+4. Here in the opentelemetry-js-contrib repository
 
 If possible, OpenTelemetry instrumentation should be included in the instrumented package.
 This will ensure the instrumentation reaches all package users, and is continuously maintained by developers that understand the package.
@@ -306,6 +316,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,23 @@
 # Changelog
 
+## [0.29.7](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.6...resource-detector-alibaba-cloud-v0.29.7) (2024-12-18)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.44.0 to ^0.45.0
+
+## [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)