Skip to content

Commit 97f7109

Browse files
mriamahmriamah
authored
Merge branch 'main' into semconv-celery
2 parents ceba850 + c1a9f1f commit 97f7109

File tree

69 files changed

+2244
-795
lines changed

Some content is hidden

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

69 files changed

+2244
-795
lines changed

‎.github/component_owners.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@ components:
99
instrumentation/opentelemetry-instrumentation-asyncio:
1010
- bourbonkk
1111

12+
instrumentation/opentelemetry-instrumentation-botocore:
13+
- lukeina2z
14+
- yiyuan-he
15+
1216
instrumentation/opentelemetry-instrumentation-pymssql:
13-
- guillaumep
17+
- guillaumep
1418

1519
instrumentation/opentelemetry-instrumentation-urllib:
1620
- shalevr
@@ -43,4 +47,4 @@ components:
4347

4448
instrumentation-genai/opentelemetry-instrumentation-langchain:
4549
- zhirafovod
46-
- wrisa
50+
- wrisa

‎.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: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,6 +1077,25 @@ jobs:
10771077
- name: Run tests
10781078
run: tox -e lint-util-http
10791079

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+
10801099
lint-util-genai:
10811100
name: util-genai
10821101
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: 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

‎.github/workflows/package-prepare-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

@@ -60,7 +61,7 @@ jobs:
6061
6162
version=${version_dev%.dev}
6263
63-
version_file=$(find $path -type f -path "*version*.py")
64+
version_file=$(find $path -type f -path "**/version.py")
6465
file_count=$(echo "$version_file" | wc -l)
6566
6667
if [ "$file_count" -ne 1 ]; then

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

Lines changed: 1 addition & 0 deletions
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:

‎.github/workflows/test_1.yml‎

Lines changed: 95 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -3965,6 +3965,101 @@ jobs:
39653965
- name: Run tests
39663966
run: tox -e pypy3-test-util-http -- -ra
39673967

3968+
py39-test-exporter-credential-provider-gcp_ubuntu-latest:
3969+
name: exporter-credential-provider-gcp 3.9 Ubuntu
3970+
runs-on: ubuntu-latest
3971+
timeout-minutes: 30
3972+
steps:
3973+
- name: Checkout repo @ SHA - ${{ github.sha }}
3974+
uses: actions/checkout@v4
3975+
3976+
- name: Set up Python 3.9
3977+
uses: actions/setup-python@v5
3978+
with:
3979+
python-version: "3.9"
3980+
3981+
- name: Install tox
3982+
run: pip install tox-uv
3983+
3984+
- name: Run tests
3985+
run: tox -e py39-test-exporter-credential-provider-gcp -- -ra
3986+
3987+
py310-test-exporter-credential-provider-gcp_ubuntu-latest:
3988+
name: exporter-credential-provider-gcp 3.10 Ubuntu
3989+
runs-on: ubuntu-latest
3990+
timeout-minutes: 30
3991+
steps:
3992+
- name: Checkout repo @ SHA - ${{ github.sha }}
3993+
uses: actions/checkout@v4
3994+
3995+
- name: Set up Python 3.10
3996+
uses: actions/setup-python@v5
3997+
with:
3998+
python-version: "3.10"
3999+
4000+
- name: Install tox
4001+
run: pip install tox-uv
4002+
4003+
- name: Run tests
4004+
run: tox -e py310-test-exporter-credential-provider-gcp -- -ra
4005+
4006+
py311-test-exporter-credential-provider-gcp_ubuntu-latest:
4007+
name: exporter-credential-provider-gcp 3.11 Ubuntu
4008+
runs-on: ubuntu-latest
4009+
timeout-minutes: 30
4010+
steps:
4011+
- name: Checkout repo @ SHA - ${{ github.sha }}
4012+
uses: actions/checkout@v4
4013+
4014+
- name: Set up Python 3.11
4015+
uses: actions/setup-python@v5
4016+
with:
4017+
python-version: "3.11"
4018+
4019+
- name: Install tox
4020+
run: pip install tox-uv
4021+
4022+
- name: Run tests
4023+
run: tox -e py311-test-exporter-credential-provider-gcp -- -ra
4024+
4025+
py312-test-exporter-credential-provider-gcp_ubuntu-latest:
4026+
name: exporter-credential-provider-gcp 3.12 Ubuntu
4027+
runs-on: ubuntu-latest
4028+
timeout-minutes: 30
4029+
steps:
4030+
- name: Checkout repo @ SHA - ${{ github.sha }}
4031+
uses: actions/checkout@v4
4032+
4033+
- name: Set up Python 3.12
4034+
uses: actions/setup-python@v5
4035+
with:
4036+
python-version: "3.12"
4037+
4038+
- name: Install tox
4039+
run: pip install tox-uv
4040+
4041+
- name: Run tests
4042+
run: tox -e py312-test-exporter-credential-provider-gcp -- -ra
4043+
4044+
py313-test-exporter-credential-provider-gcp_ubuntu-latest:
4045+
name: exporter-credential-provider-gcp 3.13 Ubuntu
4046+
runs-on: ubuntu-latest
4047+
timeout-minutes: 30
4048+
steps:
4049+
- name: Checkout repo @ SHA - ${{ github.sha }}
4050+
uses: actions/checkout@v4
4051+
4052+
- name: Set up Python 3.13
4053+
uses: actions/setup-python@v5
4054+
with:
4055+
python-version: "3.13"
4056+
4057+
- name: Install tox
4058+
run: pip install tox-uv
4059+
4060+
- name: Run tests
4061+
run: tox -e py313-test-exporter-credential-provider-gcp -- -ra
4062+
39684063
py39-test-util-genai_ubuntu-latest:
39694064
name: util-genai 3.9 Ubuntu
39704065
runs-on: ubuntu-latest
@@ -4686,98 +4781,3 @@ jobs:
46864781

46874782
- name: Run tests
46884783
run: tox -e py39-test-instrumentation-aio-pika-1 -- -ra
4689-
4690-
py39-test-instrumentation-aio-pika-2_ubuntu-latest:
4691-
name: instrumentation-aio-pika-2 3.9 Ubuntu
4692-
runs-on: ubuntu-latest
4693-
timeout-minutes: 30
4694-
steps:
4695-
- name: Checkout repo @ SHA - ${{ github.sha }}
4696-
uses: actions/checkout@v4
4697-
4698-
- name: Set up Python 3.9
4699-
uses: actions/setup-python@v5
4700-
with:
4701-
python-version: "3.9"
4702-
4703-
- name: Install tox
4704-
run: pip install tox-uv
4705-
4706-
- name: Run tests
4707-
run: tox -e py39-test-instrumentation-aio-pika-2 -- -ra
4708-
4709-
py39-test-instrumentation-aio-pika-3_ubuntu-latest:
4710-
name: instrumentation-aio-pika-3 3.9 Ubuntu
4711-
runs-on: ubuntu-latest
4712-
timeout-minutes: 30
4713-
steps:
4714-
- name: Checkout repo @ SHA - ${{ github.sha }}
4715-
uses: actions/checkout@v4
4716-
4717-
- name: Set up Python 3.9
4718-
uses: actions/setup-python@v5
4719-
with:
4720-
python-version: "3.9"
4721-
4722-
- name: Install tox
4723-
run: pip install tox-uv
4724-
4725-
- name: Run tests
4726-
run: tox -e py39-test-instrumentation-aio-pika-3 -- -ra
4727-
4728-
py310-test-instrumentation-aio-pika-0_ubuntu-latest:
4729-
name: instrumentation-aio-pika-0 3.10 Ubuntu
4730-
runs-on: ubuntu-latest
4731-
timeout-minutes: 30
4732-
steps:
4733-
- name: Checkout repo @ SHA - ${{ github.sha }}
4734-
uses: actions/checkout@v4
4735-
4736-
- name: Set up Python 3.10
4737-
uses: actions/setup-python@v5
4738-
with:
4739-
python-version: "3.10"
4740-
4741-
- name: Install tox
4742-
run: pip install tox-uv
4743-
4744-
- name: Run tests
4745-
run: tox -e py310-test-instrumentation-aio-pika-0 -- -ra
4746-
4747-
py310-test-instrumentation-aio-pika-1_ubuntu-latest:
4748-
name: instrumentation-aio-pika-1 3.10 Ubuntu
4749-
runs-on: ubuntu-latest
4750-
timeout-minutes: 30
4751-
steps:
4752-
- name: Checkout repo @ SHA - ${{ github.sha }}
4753-
uses: actions/checkout@v4
4754-
4755-
- name: Set up Python 3.10
4756-
uses: actions/setup-python@v5
4757-
with:
4758-
python-version: "3.10"
4759-
4760-
- name: Install tox
4761-
run: pip install tox-uv
4762-
4763-
- name: Run tests
4764-
run: tox -e py310-test-instrumentation-aio-pika-1 -- -ra
4765-
4766-
py310-test-instrumentation-aio-pika-2_ubuntu-latest:
4767-
name: instrumentation-aio-pika-2 3.10 Ubuntu
4768-
runs-on: ubuntu-latest
4769-
timeout-minutes: 30
4770-
steps:
4771-
- name: Checkout repo @ SHA - ${{ github.sha }}
4772-
uses: actions/checkout@v4
4773-
4774-
- name: Set up Python 3.10
4775-
uses: actions/setup-python@v5
4776-
with:
4777-
python-version: "3.10"
4778-
4779-
- name: Install tox
4780-
run: pip install tox-uv
4781-
4782-
- name: Run tests
4783-
run: tox -e py310-test-instrumentation-aio-pika-2 -- -ra

0 commit comments

Comments
 (0)