Skip to content

Commit fba4dd4

Browse files
authored
Merge branch 'main' into xray-sampler-pr1
2 parents 3c10d97 + 34db73e commit fba4dd4

File tree

329 files changed

+15643
-2549
lines changed

Some content is hidden

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

329 files changed

+15643
-2549
lines changed

.github/component_owners.yml

Lines changed: 30 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +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-
- jj22ee
37-
38-
sdk-extension/opentelemetry-sdk-extension-aws:
39-
- srprash
40-
- jj22ee
41-
42-
instrumentation/opentelemetry-instrumentation-tortoiseorm:
43-
- tonybaloney
44-
45-
instrumentation/opentelemetry-instrumentation-tornado:
46-
- shalevr
47-
48-
instrumentation/opentelemetry-instrumentation-urllib:
49-
- shalevr
50-
51-
instrumentation/opentelemetry-instrumentation-urllib3:
52-
- shalevr
53-
54-
instrumentation/opentelemetry-instrumentation-sqlalchemy:
55-
- shalevr
56-
57-
instrumentation/opentelemetry-instrumentation-cassandra:
58-
- mattcontinisio
59-
609
instrumentation/opentelemetry-instrumentation-asyncio:
6110
- bourbonkk
6211

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

6616
instrumentation/opentelemetry-instrumentation-pymssql:
6717
- guillaumep
6818

69-
instrumentation/opentelemetry-instrumentation-aiokafka:
70-
- dimastbk
19+
instrumentation/opentelemetry-instrumentation-urllib:
20+
- shalevr
7121

72-
processor/opentelemetry-processor-baggage:
73-
- codeboten
22+
instrumentation/opentelemetry-instrumentation-urllib3:
23+
- shalevr
7424

7525
instrumentation-genai/:
7626
- karthikscale3
@@ -80,3 +30,24 @@ components:
8030
- nirga
8131
- alizenhom
8232
- 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

.github/workflows/core_contrib_test_0.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2453,6 +2453,36 @@ 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+
24562486
py39-test-util-genai:
24572487
name: util-genai
24582488
runs-on: ubuntu-latest

.github/workflows/lint_0.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,25 @@ jobs:
5151
- name: Run tests
5252
run: tox -e lint-instrumentation-openai-v2
5353

54+
lint-instrumentation-openai_agents-v2:
55+
name: instrumentation-openai_agents-v2
56+
runs-on: ubuntu-latest
57+
timeout-minutes: 30
58+
steps:
59+
- name: Checkout repo @ SHA - ${{ github.sha }}
60+
uses: actions/checkout@v4
61+
62+
- name: Set up Python 3.13
63+
uses: actions/setup-python@v5
64+
with:
65+
python-version: "3.13"
66+
67+
- name: Install tox
68+
run: pip install tox-uv
69+
70+
- name: Run tests
71+
run: tox -e lint-instrumentation-openai_agents-v2
72+
5473
lint-instrumentation-vertexai:
5574
name: instrumentation-vertexai
5675
runs-on: ubuntu-latest
@@ -1077,6 +1096,25 @@ jobs:
10771096
- name: Run tests
10781097
run: tox -e lint-util-http
10791098

1099+
lint-exporter-credential-provider-gcp:
1100+
name: exporter-credential-provider-gcp
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-exporter-credential-provider-gcp
1117+
10801118
lint-util-genai:
10811119
name: util-genai
10821120
runs-on: ubuntu-latest

.github/workflows/misc_0.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ jobs:
157157
- name: Run tests
158158
run: tox -e shellcheck
159159

160-
ruff:
161-
name: ruff
160+
precommit:
161+
name: precommit
162162
runs-on: ubuntu-latest
163163
timeout-minutes: 30
164164
steps:
@@ -174,7 +174,7 @@ jobs:
174174
run: pip install tox-uv
175175

176176
- name: Run tests
177-
run: tox -e ruff
177+
run: tox -e precommit
178178

179179
typecheck:
180180
name: typecheck

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ on:
99
- opentelemetry-resource-detector-azure
1010
- opentelemetry-sdk-extension-aws
1111
- opentelemetry-instrumentation-openai-v2
12+
- opentelemetry-instrumentation-openai-agents-v2
1213
- opentelemetry-instrumentation-vertexai
1314
- opentelemetry-instrumentation-google-genai
15+
- opentelemetry-util-genai
1416
description: 'Package to be released'
1517
required: true
1618
permissions:
@@ -48,7 +50,7 @@ jobs:
4850
4951
version=$(./scripts/eachdist.py version --package ${{ inputs.package }})
5052
51-
version_file=$(find $path -type f -path "*version*.py")
53+
version_file=$(find $path -type f -path "**/version.py")
5254
file_count=$(echo "$version_file" | wc -l)
5355
5456
if [ "$file_count" -ne 1 ]; then

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ on:
99
- opentelemetry-resource-detector-azure
1010
- opentelemetry-sdk-extension-aws
1111
- opentelemetry-instrumentation-openai-v2
12+
- opentelemetry-instrumentation-openai-agents-v2
1213
- opentelemetry-instrumentation-vertexai
1314
- opentelemetry-instrumentation-google-genai
15+
- opentelemetry-util-genai
1416
description: 'Package to be released'
1517
required: true
1618

@@ -60,7 +62,7 @@ jobs:
6062
6163
version=${version_dev%.dev}
6264
63-
version_file=$(find $path -type f -path "*version*.py")
65+
version_file=$(find $path -type f -path "**/version.py")
6466
file_count=$(echo "$version_file" | wc -l)
6567
6668
if [ "$file_count" -ne 1 ]; then

.github/workflows/package-release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ on:
99
- opentelemetry-resource-detector-azure
1010
- opentelemetry-sdk-extension-aws
1111
- opentelemetry-instrumentation-openai-v2
12+
- opentelemetry-instrumentation-openai-agents-v2
1213
- opentelemetry-instrumentation-vertexai
1314
- opentelemetry-instrumentation-google-genai
15+
- opentelemetry-util-genai
1416
description: 'Package to be released'
1517
required: true
1618
permissions:

0 commit comments

Comments
 (0)