Skip to content

Commit e7872c9

Browse files
tammy-baylis-switammy-baylis-swi
authored
Merge branch 'main' into fix/redis-semconv-stable
2 parents e20cea6 + 1eca3e6 commit e7872c9

489 files changed

Lines changed: 61297 additions & 10472 deletions

File tree

Some content is hidden

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

‎.github/component_owners.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
components:
22

3+
instrumentation/opentelemetry-instrumentation-aiohttp-client:
4+
- herin049
5+
36
instrumentation/opentelemetry-instrumentation-aiokafka:
47
- dimastbk
58

@@ -48,3 +51,9 @@ components:
4851
instrumentation-genai/opentelemetry-instrumentation-langchain:
4952
- zhirafovod
5053
- wrisa
54+
55+
instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2:
56+
- nagkumar91
57+
58+
instrumentation-genai/opentelemetry-instrumentation-anthropic:
59+
- vasantteja

‎.github/workflows/core_contrib_test_0.yml‎

Lines changed: 123 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,66 @@ jobs:
203203
- name: Run tests
204204
run: tox -e py39-test-instrumentation-google-genai-latest -- -ra
205205

206+
py39-test-instrumentation-anthropic-oldest:
207+
name: instrumentation-anthropic-oldest
208+
runs-on: ubuntu-latest
209+
timeout-minutes: 30
210+
steps:
211+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
212+
uses: actions/checkout@v4
213+
with:
214+
repository: open-telemetry/opentelemetry-python-contrib
215+
ref: ${{ env.CONTRIB_REPO_SHA }}
216+
217+
- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
218+
uses: actions/checkout@v4
219+
with:
220+
repository: open-telemetry/opentelemetry-python
221+
ref: ${{ env.CORE_REPO_SHA }}
222+
path: opentelemetry-python
223+
224+
- name: Set up Python 3.9
225+
uses: actions/setup-python@v5
226+
with:
227+
python-version: "3.9"
228+
architecture: "x64"
229+
230+
- name: Install tox
231+
run: pip install tox-uv
232+
233+
- name: Run tests
234+
run: tox -e py39-test-instrumentation-anthropic-oldest -- -ra
235+
236+
py39-test-instrumentation-anthropic-latest:
237+
name: instrumentation-anthropic-latest
238+
runs-on: ubuntu-latest
239+
timeout-minutes: 30
240+
steps:
241+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
242+
uses: actions/checkout@v4
243+
with:
244+
repository: open-telemetry/opentelemetry-python-contrib
245+
ref: ${{ env.CONTRIB_REPO_SHA }}
246+
247+
- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
248+
uses: actions/checkout@v4
249+
with:
250+
repository: open-telemetry/opentelemetry-python
251+
ref: ${{ env.CORE_REPO_SHA }}
252+
path: opentelemetry-python
253+
254+
- name: Set up Python 3.9
255+
uses: actions/setup-python@v5
256+
with:
257+
python-version: "3.9"
258+
architecture: "x64"
259+
260+
- name: Install tox
261+
run: pip install tox-uv
262+
263+
- name: Run tests
264+
run: tox -e py39-test-instrumentation-anthropic-latest -- -ra
265+
206266
py39-test-resource-detector-containerid:
207267
name: resource-detector-containerid
208268
runs-on: ubuntu-latest
@@ -1163,6 +1223,36 @@ jobs:
11631223
- name: Run tests
11641224
run: tox -e py39-test-instrumentation-flask-2 -- -ra
11651225

1226+
py39-test-instrumentation-flask-3:
1227+
name: instrumentation-flask-3
1228+
runs-on: ubuntu-latest
1229+
timeout-minutes: 30
1230+
steps:
1231+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
1232+
uses: actions/checkout@v4
1233+
with:
1234+
repository: open-telemetry/opentelemetry-python-contrib
1235+
ref: ${{ env.CONTRIB_REPO_SHA }}
1236+
1237+
- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
1238+
uses: actions/checkout@v4
1239+
with:
1240+
repository: open-telemetry/opentelemetry-python
1241+
ref: ${{ env.CORE_REPO_SHA }}
1242+
path: opentelemetry-python
1243+
1244+
- name: Set up Python 3.9
1245+
uses: actions/setup-python@v5
1246+
with:
1247+
python-version: "3.9"
1248+
architecture: "x64"
1249+
1250+
- name: Install tox
1251+
run: pip install tox-uv
1252+
1253+
- name: Run tests
1254+
run: tox -e py39-test-instrumentation-flask-3 -- -ra
1255+
11661256
py39-test-instrumentation-urllib:
11671257
name: instrumentation-urllib
11681258
runs-on: ubuntu-latest
@@ -2933,8 +3023,38 @@ jobs:
29333023
- name: Run tests
29343024
run: tox -e py39-test-instrumentation-asyncio -- -ra
29353025

2936-
py39-test-instrumentation-cassandra:
2937-
name: instrumentation-cassandra
3026+
py39-test-instrumentation-cassandra-driver:
3027+
name: instrumentation-cassandra-driver
3028+
runs-on: ubuntu-latest
3029+
timeout-minutes: 30
3030+
steps:
3031+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
3032+
uses: actions/checkout@v4
3033+
with:
3034+
repository: open-telemetry/opentelemetry-python-contrib
3035+
ref: ${{ env.CONTRIB_REPO_SHA }}
3036+
3037+
- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
3038+
uses: actions/checkout@v4
3039+
with:
3040+
repository: open-telemetry/opentelemetry-python
3041+
ref: ${{ env.CORE_REPO_SHA }}
3042+
path: opentelemetry-python
3043+
3044+
- name: Set up Python 3.9
3045+
uses: actions/setup-python@v5
3046+
with:
3047+
python-version: "3.9"
3048+
architecture: "x64"
3049+
3050+
- name: Install tox
3051+
run: pip install tox-uv
3052+
3053+
- name: Run tests
3054+
run: tox -e py39-test-instrumentation-cassandra-driver -- -ra
3055+
3056+
py39-test-instrumentation-cassandra-scylla:
3057+
name: instrumentation-cassandra-scylla
29383058
runs-on: ubuntu-latest
29393059
timeout-minutes: 30
29403060
steps:
@@ -2961,7 +3081,7 @@ jobs:
29613081
run: pip install tox-uv
29623082

29633083
- name: Run tests
2964-
run: tox -e py39-test-instrumentation-cassandra -- -ra
3084+
run: tox -e py39-test-instrumentation-cassandra-scylla -- -ra
29653085

29663086
py39-test-processor-baggage:
29673087
name: processor-baggage

‎.github/workflows/generate_workflows_lib/src/generate_workflows_lib/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def get_contrib_job_datas(tox_envs: list) -> list:
143143

144144
contrib_job_datas.append(
145145
{
146-
"ui_name": (f"{groups['name']}" f"{contrib_requirements}"),
146+
"ui_name": (f"{groups['name']}{contrib_requirements}"),
147147
"tox_env": tox_env,
148148
}
149149
)

‎.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
@@ -89,6 +108,25 @@ jobs:
89108
- name: Run tests
90109
run: tox -e lint-instrumentation-google-genai
91110

111+
lint-instrumentation-anthropic:
112+
name: instrumentation-anthropic
113+
runs-on: ubuntu-latest
114+
timeout-minutes: 30
115+
steps:
116+
- name: Checkout repo @ SHA - ${{ github.sha }}
117+
uses: actions/checkout@v4
118+
119+
- name: Set up Python 3.13
120+
uses: actions/setup-python@v5
121+
with:
122+
python-version: "3.13"
123+
124+
- name: Install tox
125+
run: pip install tox-uv
126+
127+
- name: Run tests
128+
run: tox -e lint-instrumentation-anthropic
129+
92130
lint-resource-detector-containerid:
93131
name: resource-detector-containerid
94132
runs-on: ubuntu-latest

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ 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
1415
- opentelemetry-util-genai

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ 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
1415
- opentelemetry-util-genai

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ 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
1415
- opentelemetry-util-genai

0 commit comments

Comments
 (0)