Merge branch 'main' into dataloader-custom-methods

Author: onurtemizkan

.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/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-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/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 "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.4",
-  "detectors/node/opentelemetry-resource-detector-aws": "1.7.0",
-  "detectors/node/opentelemetry-resource-detector-azure": "0.2.12",
-  "detectors/node/opentelemetry-resource-detector-container": "0.5.0",
-  "detectors/node/opentelemetry-resource-detector-gcp": "0.29.13",
-  "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.1",
-  "metapackages/auto-instrumentations-web": "0.42.0",
+  "detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.30.0",
+  "detectors/node/opentelemetry-resource-detector-aws": "1.11.0",
+  "detectors/node/opentelemetry-resource-detector-azure": "0.6.0",
+  "detectors/node/opentelemetry-resource-detector-container": "0.6.0",
+  "detectors/node/opentelemetry-resource-detector-gcp": "0.33.0",
+  "detectors/node/opentelemetry-resource-detector-github": "0.30.0",
+  "detectors/node/opentelemetry-resource-detector-instana": "0.18.0",
+  "metapackages/auto-configuration-propagators": "0.3.2",
+  "metapackages/auto-instrumentations-node": "0.55.3",
+  "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.12",
+  "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.42.0",
-  "packages/winston-transport": "0.7.0",
-  "plugins/node/instrumentation-amqplib": "0.43.0",
-  "plugins/node/instrumentation-cucumber": "0.10.0",
-  "plugins/node/instrumentation-dataloader": "0.13.0",
-  "plugins/node/instrumentation-fs": "0.16.0",
-  "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.9.0",
-  "plugins/node/instrumentation-socket.io": "0.43.0",
-  "plugins/node/instrumentation-tedious": "0.15.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",
-  "plugins/node/opentelemetry-instrumentation-dns": "0.40.0",
-  "plugins/node/opentelemetry-instrumentation-express": "0.44.0",
-  "plugins/node/opentelemetry-instrumentation-fastify": "0.41.0",
-  "plugins/node/opentelemetry-instrumentation-generic-pool": "0.40.0",
-  "plugins/node/opentelemetry-instrumentation-graphql": "0.44.0",
-  "plugins/node/opentelemetry-instrumentation-hapi": "0.42.0",
-  "plugins/node/opentelemetry-instrumentation-ioredis": "0.44.0",
-  "plugins/node/opentelemetry-instrumentation-knex": "0.41.0",
-  "plugins/node/opentelemetry-instrumentation-koa": "0.44.0",
-  "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.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.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",
-  "plugins/node/opentelemetry-instrumentation-restify": "0.42.0",
-  "plugins/node/opentelemetry-instrumentation-router": "0.41.0",
-  "plugins/node/opentelemetry-instrumentation-winston": "0.41.0",
-  "plugins/web/opentelemetry-instrumentation-document-load": "0.41.0",
-  "plugins/web/opentelemetry-instrumentation-long-task": "0.41.0",
-  "plugins/web/opentelemetry-instrumentation-user-interaction": "0.41.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.2",
+  "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.1",
+  "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"
 }