Skip to content

Commit 2350366

Browse files
authored
Merge branch 'main' into hectorhdzg/renameinmem
2 parents eca9ee2 + 8297dde commit 2350366

File tree

515 files changed

+49472
-6416
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

515 files changed

+49472
-6416
lines changed

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,11 @@ body:
6464
options:
6565
- "No"
6666
- "Yes"
67+
68+
- type: dropdown
69+
attributes:
70+
label: Tip
71+
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.
72+
options:
73+
- <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>
74+
default: 0

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,11 @@ body:
4848
options:
4949
- "No"
5050
- "Yes"
51+
52+
- type: dropdown
53+
attributes:
54+
label: Tip
55+
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.
56+
options:
57+
- <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>
58+
default: 0

.github/component_owners.yml

Lines changed: 30 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,26 @@
11
components:
22

3-
docs/instrumentation:
4-
- nemoshlag
5-
6-
7-
instrumentation/opentelemetry-instrumentation-aio-pika:
8-
- ofek1weiss
3+
instrumentation/opentelemetry-instrumentation-aiokafka:
4+
- dimastbk
95

10-
instrumentation/opentelemetry-instrumentation-boto3sqs:
11-
- oxeye-nikolay
12-
- nikosokolik
13-
146
instrumentation/opentelemetry-instrumentation-asyncclick:
157
- jomcgi
168

17-
instrumentation/opentelemetry-instrumentation-kafka-python:
18-
- nozik
19-
20-
instrumentation/opentelemetry-instrumentation-pika:
21-
- oxeye-nikolay
22-
- nikosokolik
23-
24-
instrumentation/opentelemetry-instrumentation-redis:
25-
- sungwonh
26-
27-
instrumentation/opentelemetry-instrumentation-remoulade:
28-
- ben-natan
29-
- machine424
30-
31-
instrumentation/opentelemetry-instrumentation-confluent-kafka:
32-
- oxeye-dorkolog
33-
- dorkolog
34-
35-
propagator/opentelemetry-propagator-aws-xray:
36-
- NathanielRN
37-
38-
sdk-extension/opentelemetry-sdk-extension-aws:
39-
- NathanielRN
40-
- Kausik-A
41-
- srprash
42-
43-
instrumentation/opentelemetry-instrumentation-tortoiseorm:
44-
- tonybaloney
45-
46-
instrumentation/opentelemetry-instrumentation-tornado:
47-
- shalevr
48-
49-
instrumentation/opentelemetry-instrumentation-urllib:
50-
- shalevr
51-
52-
instrumentation/opentelemetry-instrumentation-urllib3:
53-
- shalevr
54-
55-
instrumentation/opentelemetry-instrumentation-sqlalchemy:
56-
- shalevr
57-
58-
instrumentation/opentelemetry-instrumentation-cassandra:
59-
- mattcontinisio
60-
619
instrumentation/opentelemetry-instrumentation-asyncio:
6210
- bourbonkk
6311

64-
instrumentation/opentelemetry-instrumentation-psycopg:
65-
- federicobond
12+
instrumentation/opentelemetry-instrumentation-botocore:
13+
- lukeina2z
14+
- yiyuan-he
6615

6716
instrumentation/opentelemetry-instrumentation-pymssql:
6817
- guillaumep
6918

70-
instrumentation/opentelemetry-instrumentation-aiokafka:
71-
- dimastbk
19+
instrumentation/opentelemetry-instrumentation-urllib:
20+
- shalevr
7221

73-
processor/opentelemetry-processor-baggage:
74-
- codeboten
22+
instrumentation/opentelemetry-instrumentation-urllib3:
23+
- shalevr
7524

7625
instrumentation-genai/:
7726
- karthikscale3
@@ -81,3 +30,24 @@ components:
8130
- nirga
8231
- alizenhom
8332
- codefromthecrypt
33+
34+
processor/opentelemetry-processor-baggage:
35+
- codeboten
36+
37+
propagator/opentelemetry-propagator-aws-xray:
38+
- jj22ee
39+
40+
sdk-extension/opentelemetry-sdk-extension-aws:
41+
- srprash
42+
- jj22ee
43+
44+
util/opentelemetry-util-genai:
45+
- DylanRussell
46+
- keith-decker
47+
48+
instrumentation-genai/opentelemetry-instrumentation-langchain:
49+
- zhirafovod
50+
- wrisa
51+
52+
instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2:
53+
- nagkumar91
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash -e
22

3-
git config user.name opentelemetrybot
4-
git config user.email 107717825+opentelemetrybot@users.noreply.github.com
3+
git config user.name otelbot
4+
git config user.email 197425009+otelbot@users.noreply.github.com

.github/workflows/backport.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@ on:
66
description: "The pull request # to backport"
77
required: true
88

9+
permissions:
10+
contents: read
11+
912
jobs:
1013
backport:
14+
permissions:
15+
contents: write # required for pushing branches
16+
pull-requests: write # required for creating pull requests
1117
runs-on: ubuntu-latest
1218
steps:
1319
- run: |
@@ -24,16 +30,22 @@ jobs:
2430
- name: Use CLA approved github bot
2531
run: .github/scripts/use-cla-approved-github-bot.sh
2632

33+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
34+
id: otelbot-token
35+
with:
36+
app-id: ${{ vars.OTELBOT_APP_ID }}
37+
private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
38+
2739
- name: Create pull request
2840
env:
2941
NUMBER: ${{ github.event.inputs.number }}
3042
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
31-
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
43+
GITHUB_TOKEN: ${{ steps.otelbot-token.outputs.token }}
3244
run: |
3345
commit=$(gh pr view $NUMBER --json mergeCommit --jq .mergeCommit.oid)
3446
title=$(gh pr view $NUMBER --json title --jq .title)
3547
36-
branch="opentelemetrybot/backport-${NUMBER}-to-${GITHUB_REF_NAME//\//-}"
48+
branch="otelbot/backport-${NUMBER}-to-${GITHUB_REF_NAME//\//-}"
3749
3850
git cherry-pick $commit
3951
git push origin HEAD:$branch

.github/workflows/changelog.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,15 @@ on:
1010
branches:
1111
- main
1212

13+
permissions:
14+
contents: read
15+
1316
jobs:
1417
changelog:
1518
runs-on: ubuntu-latest
1619
if: |
1720
!contains(github.event.pull_request.labels.*.name, 'Skip Changelog')
18-
&& github.actor != 'opentelemetrybot'
21+
&& github.actor != 'otelbot[bot]'
1922
2023
steps:
2124
- uses: actions/checkout@v4

.github/workflows/codeql-analysis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,13 @@ on:
1414
# * * * * *
1515
- cron: '30 1 * * *'
1616

17+
permissions:
18+
contents: read
19+
1720
jobs:
1821
CodeQL-Build:
22+
permissions:
23+
security-events: write # for github/codeql-action/analyze to upload SARIF results
1924
runs-on: ubuntu-latest
2025

2126
steps:

.github/workflows/component-owners.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ name: 'Component Owners'
66
on:
77
pull_request_target:
88

9+
permissions:
10+
contents: read
11+
912
jobs:
1013
run_self:
1114
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)