Merge branch 'main' into xray_traces

Author: liustve

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -18,7 +18,7 @@ body:
         Please describe any aspect of your environment relevant to the problem, including your Python version, [platform](https://docs.python.org/3/library/platform.html), version numbers of installed dependencies, information about your cloud hosting provider, etc. If you're reporting a problem with a specific version of a library in this repo, please check whether the problem has been fixed on main.
       value: |
         OS: (e.g, Ubuntu)
-        Python version: (e.g., Python 3.8.10)
+        Python version: (e.g., Python 3.9.10)
         Package version: (e.g., 0.46.0)
   
   - type: textarea
@@ -64,3 +64,11 @@ body:
       options:
         - "No"
         - "Yes"
+
+  - type: dropdown
+    attributes:
+      label: Tip
+      description: This element is static, used to render a helpful sub-heading for end-users and community members to help prioritize issues. Please leave as is.
+      options:
+        - <sub>[React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
+      default: 0

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -48,3 +48,11 @@ body:
       options:
         - "No"
         - "Yes"
+
+  - type: dropdown
+    attributes:
+      label: Tip
+      description: This element is static, used to render a helpful sub-heading for end-users and community members to help prioritize issues. Please leave as is.
+      options:
+        - <sub>[React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
+      default: 0

.github/component_owners.yml

@@ -1,74 +1,26 @@
 components:
 
-  docs/instrumentation:
-    - nemoshlag
-
-
-  instrumentation/opentelemetry-instrumentation-aio-pika:
-    - ofek1weiss
-
-  instrumentation/opentelemetry-instrumentation-boto3sqs:
-    - oxeye-nikolay
-    - nikosokolik
-  
-  instrumentation/opentelemetry-instrumentation-kafka-python:
-    - nozik
-  
-  instrumentation/opentelemetry-instrumentation-pika:
-    - oxeye-nikolay
-    - nikosokolik
-
-  instrumentation/opentelemetry-instrumentation-redis:
-    - sungwonh
-
-  instrumentation/opentelemetry-instrumentation-remoulade:
-    - ben-natan
-    - machine424
-
-  instrumentation/opentelemetry-instrumentation-confluent-kafka:
-    - oxeye-dorkolog
-    - dorkolog
-
-  propagator/opentelemetry-propagator-aws-xray:
-    - NathanielRN
-
-  sdk-extension/opentelemetry-sdk-extension-aws:
-    - NathanielRN
-    - Kausik-A
-    - srprash
-
-  instrumentation/opentelemetry-instrumentation-tortoiseorm:
-    - tonybaloney
-
-  instrumentation/opentelemetry-instrumentation-tornado:
-    - shalevr
-
-  instrumentation/opentelemetry-instrumentation-urllib:
-    - shalevr
-
-  instrumentation/opentelemetry-instrumentation-urllib3:
-    - shalevr
-
-  instrumentation/opentelemetry-instrumentation-sqlalchemy:
-    - shalevr
+  instrumentation/opentelemetry-instrumentation-aiokafka:
+    - dimastbk
 
-  instrumentation/opentelemetry-instrumentation-cassandra:
-    - mattcontinisio
+  instrumentation/opentelemetry-instrumentation-asyncclick:
+    - jomcgi
 
   instrumentation/opentelemetry-instrumentation-asyncio:
     - bourbonkk
 
-  instrumentation/opentelemetry-instrumentation-psycopg:
-    - federicobond
+  instrumentation/opentelemetry-instrumentation-botocore:
+    - lukeina2z
+    - yiyuan-he
 
   instrumentation/opentelemetry-instrumentation-pymssql:
     - guillaumep
 
-  instrumentation/opentelemetry-instrumentation-aiokafka:
-    - dimastbk
+  instrumentation/opentelemetry-instrumentation-urllib:
+    - shalevr
 
-  processor/opentelemetry-processor-baggage:
-    - codeboten
+  instrumentation/opentelemetry-instrumentation-urllib3:
+    - shalevr
 
   instrumentation-genai/:
     - karthikscale3
@@ -78,3 +30,24 @@ components:
     - nirga
     - alizenhom
     - codefromthecrypt
+
+  processor/opentelemetry-processor-baggage:
+    - codeboten
+
+  propagator/opentelemetry-propagator-aws-xray:
+    - jj22ee
+
+  sdk-extension/opentelemetry-sdk-extension-aws:
+    - srprash
+    - jj22ee
+
+  util/opentelemetry-util-genai:
+    - DylanRussell
+    - keith-decker
+
+  instrumentation-genai/opentelemetry-instrumentation-langchain:
+    - zhirafovod
+    - wrisa
+
+  instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2:
+    - nagkumar91

.github/scripts/use-cla-approved-github-bot.sh

@@ -1,4 +1,4 @@
 #!/bin/bash -e
 
-git config user.name opentelemetrybot
-git config user.email 107717825+opentelemetrybot@users.noreply.github.com
+git config user.name otelbot
+git config user.email 197425009+otelbot@users.noreply.github.com

.github/workflows/backport.yml

@@ -6,8 +6,14 @@ on:
         description: "The pull request # to backport"
         required: true
 
+permissions:
+  contents: read
+
 jobs:
   backport:
+    permissions:
+      contents: write # required for pushing branches
+      pull-requests: write # required for creating pull requests
     runs-on: ubuntu-latest
     steps:
       - run: |
@@ -24,16 +30,22 @@ jobs:
       - name: Use CLA approved github bot
         run: .github/scripts/use-cla-approved-github-bot.sh
 
+      - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+        id: otelbot-token
+        with:
+          app-id: ${{ vars.OTELBOT_APP_ID }}
+          private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
+
       - name: Create pull request
         env:
           NUMBER: ${{ github.event.inputs.number }}
           # not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
-          GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ steps.otelbot-token.outputs.token }}
         run: |
           commit=$(gh pr view $NUMBER --json mergeCommit --jq .mergeCommit.oid)
           title=$(gh pr view $NUMBER --json title --jq .title)
 
-          branch="opentelemetrybot/backport-${NUMBER}-to-${GITHUB_REF_NAME//\//-}"
+          branch="otelbot/backport-${NUMBER}-to-${GITHUB_REF_NAME//\//-}"
 
           git cherry-pick $commit
           git push origin HEAD:$branch

.github/workflows/changelog.yml

@@ -10,12 +10,15 @@ on:
     branches:
       - main
 
+permissions:
+  contents: read
+
 jobs:
   changelog:
     runs-on: ubuntu-latest
     if: |
       !contains(github.event.pull_request.labels.*.name, 'Skip Changelog')
-      && github.actor != 'opentelemetrybot'
+      && github.actor != 'otelbot[bot]'
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/codeql-analysis.yml

@@ -14,8 +14,13 @@ on:
     #        *  * * * *
     - cron: '30 1 * * *'
 
+permissions:
+  contents: read
+
 jobs:
   CodeQL-Build:
+    permissions:
+      security-events: write # for github/codeql-action/analyze to upload SARIF results
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/component-owners.yml

@@ -6,6 +6,9 @@ name: 'Component Owners'
 on:
   pull_request_target:
 
+permissions:
+  contents: read
+
 jobs:
   run_self:
     runs-on: ubuntu-latest