Skip to content

Commit 79adade

Browse files
authored
Merge branch 'main' into fix/issue-3671
2 parents 281ceef + ae4972c commit 79adade

File tree

97 files changed

+7636
-3072
lines changed

Some content is hidden

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

97 files changed

+7636
-3072
lines changed

.github/component_owners.yml

Lines changed: 24 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,23 @@
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
9+
instrumentation/opentelemetry-instrumentation-asyncio:
10+
- bourbonkk
4411

45-
instrumentation/opentelemetry-instrumentation-tornado:
46-
- shalevr
12+
instrumentation/opentelemetry-instrumentation-pymssql:
13+
- guillaumep
4714

4815
instrumentation/opentelemetry-instrumentation-urllib:
4916
- shalevr
5017

5118
instrumentation/opentelemetry-instrumentation-urllib3:
5219
- shalevr
5320

54-
instrumentation/opentelemetry-instrumentation-sqlalchemy:
55-
- shalevr
56-
57-
instrumentation/opentelemetry-instrumentation-cassandra:
58-
- mattcontinisio
59-
60-
instrumentation/opentelemetry-instrumentation-asyncio:
61-
- bourbonkk
62-
63-
instrumentation/opentelemetry-instrumentation-psycopg:
64-
- federicobond
65-
66-
instrumentation/opentelemetry-instrumentation-pymssql:
67-
- guillaumep
68-
69-
instrumentation/opentelemetry-instrumentation-aiokafka:
70-
- dimastbk
71-
72-
processor/opentelemetry-processor-baggage:
73-
- codeboten
74-
7521
instrumentation-genai/:
7622
- karthikscale3
7723
- lmolkova
@@ -80,3 +26,21 @@ components:
8026
- nirga
8127
- alizenhom
8228
- codefromthecrypt
29+
30+
processor/opentelemetry-processor-baggage:
31+
- codeboten
32+
33+
propagator/opentelemetry-propagator-aws-xray:
34+
- jj22ee
35+
36+
sdk-extension/opentelemetry-sdk-extension-aws:
37+
- srprash
38+
- jj22ee
39+
40+
util/opentelemetry-util-genai:
41+
- DylanRussell
42+
- keith-decker
43+
44+
instrumentation-genai/opentelemetry-instrumentation-langchain:
45+
- zhirafovod
46+
- 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:

0 commit comments

Comments
 (0)