Skip to content

Commit a4ab037

Browse files
xrmxxrmx
authored
Merge branch 'main' into fix_celery_memory_leak
2 parents e1e723b + 613d33a commit a4ab037

File tree

343 files changed

+14144
-4340
lines changed

Some content is hidden

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

343 files changed

+14144
-4340
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: 27 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,21 @@ 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

‎.github/workflows/core_contrib_test_0.yml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2453,6 +2453,66 @@ jobs:
24532453
- name: Run tests
24542454
run: tox -e py39-test-util-http -- -ra
24552455

2456+
py39-test-exporter-credential-provider-gcp:
2457+
name: exporter-credential-provider-gcp
2458+
runs-on: ubuntu-latest
2459+
timeout-minutes: 30
2460+
steps:
2461+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
2462+
uses: actions/checkout@v4
2463+
with:
2464+
repository: open-telemetry/opentelemetry-python-contrib
2465+
ref: ${{ env.CONTRIB_REPO_SHA }}
2466+
2467+
- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
2468+
uses: actions/checkout@v4
2469+
with:
2470+
repository: open-telemetry/opentelemetry-python
2471+
ref: ${{ env.CORE_REPO_SHA }}
2472+
path: opentelemetry-python
2473+
2474+
- name: Set up Python 3.9
2475+
uses: actions/setup-python@v5
2476+
with:
2477+
python-version: "3.9"
2478+
architecture: "x64"
2479+
2480+
- name: Install tox
2481+
run: pip install tox-uv
2482+
2483+
- name: Run tests
2484+
run: tox -e py39-test-exporter-credential-provider-gcp -- -ra
2485+
2486+
py39-test-util-genai:
2487+
name: util-genai
2488+
runs-on: ubuntu-latest
2489+
timeout-minutes: 30
2490+
steps:
2491+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
2492+
uses: actions/checkout@v4
2493+
with:
2494+
repository: open-telemetry/opentelemetry-python-contrib
2495+
ref: ${{ env.CONTRIB_REPO_SHA }}
2496+
2497+
- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
2498+
uses: actions/checkout@v4
2499+
with:
2500+
repository: open-telemetry/opentelemetry-python
2501+
ref: ${{ env.CORE_REPO_SHA }}
2502+
path: opentelemetry-python
2503+
2504+
- name: Set up Python 3.9
2505+
uses: actions/setup-python@v5
2506+
with:
2507+
python-version: "3.9"
2508+
architecture: "x64"
2509+
2510+
- name: Install tox
2511+
run: pip install tox-uv
2512+
2513+
- name: Run tests
2514+
run: tox -e py39-test-util-genai -- -ra
2515+
24562516
py39-test-propagator-aws-xray-0:
24572517
name: propagator-aws-xray-0
24582518
runs-on: ubuntu-latest

‎.github/workflows/generate_workflows_lib/src/generate_workflows_lib/lint.yml.j2‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
push:
88
branches-ignore:
99
- 'release/*'
10+
- 'otelbot/*'
1011
pull_request:
1112

1213
permissions:

‎.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
push:
88
branches-ignore:
99
- 'release/*'
10+
- 'otelbot/*'
1011
pull_request:
1112

1213
permissions:

‎.github/workflows/generate_workflows_lib/src/generate_workflows_lib/test.yml.j2‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
push:
88
branches-ignore:
99
- 'release/*'
10+
- 'otelbot/*'
1011
pull_request:
1112

1213
permissions:

‎.github/workflows/lint_0.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
push:
88
branches-ignore:
99
- 'release/*'
10+
- 'otelbot/*'
1011
pull_request:
1112

1213
permissions:
@@ -1076,6 +1077,44 @@ jobs:
10761077
- name: Run tests
10771078
run: tox -e lint-util-http
10781079

1080+
lint-exporter-credential-provider-gcp:
1081+
name: exporter-credential-provider-gcp
1082+
runs-on: ubuntu-latest
1083+
timeout-minutes: 30
1084+
steps:
1085+
- name: Checkout repo @ SHA - ${{ github.sha }}
1086+
uses: actions/checkout@v4
1087+
1088+
- name: Set up Python 3.13
1089+
uses: actions/setup-python@v5
1090+
with:
1091+
python-version: "3.13"
1092+
1093+
- name: Install tox
1094+
run: pip install tox-uv
1095+
1096+
- name: Run tests
1097+
run: tox -e lint-exporter-credential-provider-gcp
1098+
1099+
lint-util-genai:
1100+
name: util-genai
1101+
runs-on: ubuntu-latest
1102+
timeout-minutes: 30
1103+
steps:
1104+
- name: Checkout repo @ SHA - ${{ github.sha }}
1105+
uses: actions/checkout@v4
1106+
1107+
- name: Set up Python 3.13
1108+
uses: actions/setup-python@v5
1109+
with:
1110+
python-version: "3.13"
1111+
1112+
- name: Install tox
1113+
run: pip install tox-uv
1114+
1115+
- name: Run tests
1116+
run: tox -e lint-util-genai
1117+
10791118
lint-propagator-aws-xray:
10801119
name: propagator-aws-xray
10811120
runs-on: ubuntu-latest

‎.github/workflows/misc_0.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
push:
88
branches-ignore:
99
- 'release/*'
10+
- 'otelbot/*'
1011
pull_request:
1112

1213
permissions:
@@ -156,8 +157,8 @@ jobs:
156157
- name: Run tests
157158
run: tox -e shellcheck
158159

159-
ruff:
160-
name: ruff
160+
precommit:
161+
name: precommit
161162
runs-on: ubuntu-latest
162163
timeout-minutes: 30
163164
steps:
@@ -173,7 +174,7 @@ jobs:
173174
run: pip install tox-uv
174175

175176
- name: Run tests
176-
run: tox -e ruff
177+
run: tox -e precommit
177178

178179
typecheck:
179180
name: typecheck

‎.github/workflows/package-prepare-patch-release.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
- opentelemetry-instrumentation-openai-v2
1212
- opentelemetry-instrumentation-vertexai
1313
- opentelemetry-instrumentation-google-genai
14+
- opentelemetry-util-genai
1415
description: 'Package to be released'
1516
required: true
1617
permissions:
@@ -48,7 +49,7 @@ jobs:
4849
4950
version=$(./scripts/eachdist.py version --package ${{ inputs.package }})
5051
51-
version_file=$(find $path -type f -path "*version*.py")
52+
version_file=$(find $path -type f -path "**/version.py")
5253
file_count=$(echo "$version_file" | wc -l)
5354
5455
if [ "$file_count" -ne 1 ]; then

0 commit comments

Comments
 (0)