Skip to content

Commit 60046ed

Browse files
committed
Merge branch 'main' into feat/arangodb-instrumentor
2 parents d96b04b + 1d97282 commit 60046ed

File tree

329 files changed

+37179
-5081
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

+37179
-5081
lines changed

.github/component_owners.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,6 @@ components:
4848
instrumentation-genai/opentelemetry-instrumentation-langchain:
4949
- zhirafovod
5050
- wrisa
51+
52+
instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2:
53+
- nagkumar91

.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: 19 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

.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

.github/workflows/test_0.yml

Lines changed: 228 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,158 @@ jobs:
260260
- name: Run tests
261261
run: tox -e pypy3-test-instrumentation-openai-v2-latest -- -ra
262262

263+
py310-test-instrumentation-openai_agents-v2-oldest_ubuntu-latest:
264+
name: instrumentation-openai_agents-v2-oldest 3.10 Ubuntu
265+
runs-on: ubuntu-latest
266+
timeout-minutes: 30
267+
steps:
268+
- name: Checkout repo @ SHA - ${{ github.sha }}
269+
uses: actions/checkout@v4
270+
271+
- name: Set up Python 3.10
272+
uses: actions/setup-python@v5
273+
with:
274+
python-version: "3.10"
275+
276+
- name: Install tox
277+
run: pip install tox-uv
278+
279+
- name: Run tests
280+
run: tox -e py310-test-instrumentation-openai_agents-v2-oldest -- -ra
281+
282+
py310-test-instrumentation-openai_agents-v2-latest_ubuntu-latest:
283+
name: instrumentation-openai_agents-v2-latest 3.10 Ubuntu
284+
runs-on: ubuntu-latest
285+
timeout-minutes: 30
286+
steps:
287+
- name: Checkout repo @ SHA - ${{ github.sha }}
288+
uses: actions/checkout@v4
289+
290+
- name: Set up Python 3.10
291+
uses: actions/setup-python@v5
292+
with:
293+
python-version: "3.10"
294+
295+
- name: Install tox
296+
run: pip install tox-uv
297+
298+
- name: Run tests
299+
run: tox -e py310-test-instrumentation-openai_agents-v2-latest -- -ra
300+
301+
py311-test-instrumentation-openai_agents-v2-oldest_ubuntu-latest:
302+
name: instrumentation-openai_agents-v2-oldest 3.11 Ubuntu
303+
runs-on: ubuntu-latest
304+
timeout-minutes: 30
305+
steps:
306+
- name: Checkout repo @ SHA - ${{ github.sha }}
307+
uses: actions/checkout@v4
308+
309+
- name: Set up Python 3.11
310+
uses: actions/setup-python@v5
311+
with:
312+
python-version: "3.11"
313+
314+
- name: Install tox
315+
run: pip install tox-uv
316+
317+
- name: Run tests
318+
run: tox -e py311-test-instrumentation-openai_agents-v2-oldest -- -ra
319+
320+
py311-test-instrumentation-openai_agents-v2-latest_ubuntu-latest:
321+
name: instrumentation-openai_agents-v2-latest 3.11 Ubuntu
322+
runs-on: ubuntu-latest
323+
timeout-minutes: 30
324+
steps:
325+
- name: Checkout repo @ SHA - ${{ github.sha }}
326+
uses: actions/checkout@v4
327+
328+
- name: Set up Python 3.11
329+
uses: actions/setup-python@v5
330+
with:
331+
python-version: "3.11"
332+
333+
- name: Install tox
334+
run: pip install tox-uv
335+
336+
- name: Run tests
337+
run: tox -e py311-test-instrumentation-openai_agents-v2-latest -- -ra
338+
339+
py312-test-instrumentation-openai_agents-v2-oldest_ubuntu-latest:
340+
name: instrumentation-openai_agents-v2-oldest 3.12 Ubuntu
341+
runs-on: ubuntu-latest
342+
timeout-minutes: 30
343+
steps:
344+
- name: Checkout repo @ SHA - ${{ github.sha }}
345+
uses: actions/checkout@v4
346+
347+
- name: Set up Python 3.12
348+
uses: actions/setup-python@v5
349+
with:
350+
python-version: "3.12"
351+
352+
- name: Install tox
353+
run: pip install tox-uv
354+
355+
- name: Run tests
356+
run: tox -e py312-test-instrumentation-openai_agents-v2-oldest -- -ra
357+
358+
py312-test-instrumentation-openai_agents-v2-latest_ubuntu-latest:
359+
name: instrumentation-openai_agents-v2-latest 3.12 Ubuntu
360+
runs-on: ubuntu-latest
361+
timeout-minutes: 30
362+
steps:
363+
- name: Checkout repo @ SHA - ${{ github.sha }}
364+
uses: actions/checkout@v4
365+
366+
- name: Set up Python 3.12
367+
uses: actions/setup-python@v5
368+
with:
369+
python-version: "3.12"
370+
371+
- name: Install tox
372+
run: pip install tox-uv
373+
374+
- name: Run tests
375+
run: tox -e py312-test-instrumentation-openai_agents-v2-latest -- -ra
376+
377+
py313-test-instrumentation-openai_agents-v2-oldest_ubuntu-latest:
378+
name: instrumentation-openai_agents-v2-oldest 3.13 Ubuntu
379+
runs-on: ubuntu-latest
380+
timeout-minutes: 30
381+
steps:
382+
- name: Checkout repo @ SHA - ${{ github.sha }}
383+
uses: actions/checkout@v4
384+
385+
- name: Set up Python 3.13
386+
uses: actions/setup-python@v5
387+
with:
388+
python-version: "3.13"
389+
390+
- name: Install tox
391+
run: pip install tox-uv
392+
393+
- name: Run tests
394+
run: tox -e py313-test-instrumentation-openai_agents-v2-oldest -- -ra
395+
396+
py313-test-instrumentation-openai_agents-v2-latest_ubuntu-latest:
397+
name: instrumentation-openai_agents-v2-latest 3.13 Ubuntu
398+
runs-on: ubuntu-latest
399+
timeout-minutes: 30
400+
steps:
401+
- name: Checkout repo @ SHA - ${{ github.sha }}
402+
uses: actions/checkout@v4
403+
404+
- name: Set up Python 3.13
405+
uses: actions/setup-python@v5
406+
with:
407+
python-version: "3.13"
408+
409+
- name: Install tox
410+
run: pip install tox-uv
411+
412+
- name: Run tests
413+
run: tox -e py313-test-instrumentation-openai_agents-v2-latest -- -ra
414+
263415
py39-test-instrumentation-vertexai-oldest_ubuntu-latest:
264416
name: instrumentation-vertexai-oldest 3.9 Ubuntu
265417
runs-on: ubuntu-latest
@@ -4781,3 +4933,79 @@ jobs:
47814933

47824934
- name: Run tests
47834935
run: tox -e py311-test-instrumentation-starlette-latest -- -ra
4936+
4937+
py312-test-instrumentation-starlette-oldest_ubuntu-latest:
4938+
name: instrumentation-starlette-oldest 3.12 Ubuntu
4939+
runs-on: ubuntu-latest
4940+
timeout-minutes: 30
4941+
steps:
4942+
- name: Checkout repo @ SHA - ${{ github.sha }}
4943+
uses: actions/checkout@v4
4944+
4945+
- name: Set up Python 3.12
4946+
uses: actions/setup-python@v5
4947+
with:
4948+
python-version: "3.12"
4949+
4950+
- name: Install tox
4951+
run: pip install tox-uv
4952+
4953+
- name: Run tests
4954+
run: tox -e py312-test-instrumentation-starlette-oldest -- -ra
4955+
4956+
py312-test-instrumentation-starlette-latest_ubuntu-latest:
4957+
name: instrumentation-starlette-latest 3.12 Ubuntu
4958+
runs-on: ubuntu-latest
4959+
timeout-minutes: 30
4960+
steps:
4961+
- name: Checkout repo @ SHA - ${{ github.sha }}
4962+
uses: actions/checkout@v4
4963+
4964+
- name: Set up Python 3.12
4965+
uses: actions/setup-python@v5
4966+
with:
4967+
python-version: "3.12"
4968+
4969+
- name: Install tox
4970+
run: pip install tox-uv
4971+
4972+
- name: Run tests
4973+
run: tox -e py312-test-instrumentation-starlette-latest -- -ra
4974+
4975+
py313-test-instrumentation-starlette-oldest_ubuntu-latest:
4976+
name: instrumentation-starlette-oldest 3.13 Ubuntu
4977+
runs-on: ubuntu-latest
4978+
timeout-minutes: 30
4979+
steps:
4980+
- name: Checkout repo @ SHA - ${{ github.sha }}
4981+
uses: actions/checkout@v4
4982+
4983+
- name: Set up Python 3.13
4984+
uses: actions/setup-python@v5
4985+
with:
4986+
python-version: "3.13"
4987+
4988+
- name: Install tox
4989+
run: pip install tox-uv
4990+
4991+
- name: Run tests
4992+
run: tox -e py313-test-instrumentation-starlette-oldest -- -ra
4993+
4994+
py313-test-instrumentation-starlette-latest_ubuntu-latest:
4995+
name: instrumentation-starlette-latest 3.13 Ubuntu
4996+
runs-on: ubuntu-latest
4997+
timeout-minutes: 30
4998+
steps:
4999+
- name: Checkout repo @ SHA - ${{ github.sha }}
5000+
uses: actions/checkout@v4
5001+
5002+
- name: Set up Python 3.13
5003+
uses: actions/setup-python@v5
5004+
with:
5005+
python-version: "3.13"
5006+
5007+
- name: Install tox
5008+
run: pip install tox-uv
5009+
5010+
- name: Run tests
5011+
run: tox -e py313-test-instrumentation-starlette-latest -- -ra

0 commit comments

Comments
 (0)