Skip to content

Commit 597530f

Browse files
jomcgijomcgi
authored
Merge branch 'main' into feat-3318/asyncclick-autoinstrumentation
2 parents bac1c1b + 81eaea5 commit 597530f

27 files changed

Lines changed: 684 additions & 314 deletions

File tree

‎.github/workflows/core_contrib_test_0.yml‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -899,8 +899,8 @@ jobs:
899899
- name: Run tests
900900
run: tox -e py38-test-instrumentation-requests -- -ra
901901

902-
py38-test-instrumentation-starlette:
903-
name: instrumentation-starlette
902+
py38-test-instrumentation-starlette-oldest:
903+
name: instrumentation-starlette-oldest
904904
runs-on: ubuntu-latest
905905
steps:
906906
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -919,7 +919,29 @@ jobs:
919919
run: pip install tox-uv
920920

921921
- name: Run tests
922-
run: tox -e py38-test-instrumentation-starlette -- -ra
922+
run: tox -e py38-test-instrumentation-starlette-oldest -- -ra
923+
924+
py38-test-instrumentation-starlette-latest:
925+
name: instrumentation-starlette-latest
926+
runs-on: ubuntu-latest
927+
steps:
928+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
929+
uses: actions/checkout@v4
930+
with:
931+
repository: open-telemetry/opentelemetry-python-contrib
932+
ref: ${{ env.CONTRIB_REPO_SHA }}
933+
934+
- name: Set up Python 3.8
935+
uses: actions/setup-python@v5
936+
with:
937+
python-version: "3.8"
938+
architecture: "x64"
939+
940+
- name: Install tox
941+
run: pip install tox-uv
942+
943+
- name: Run tests
944+
run: tox -e py38-test-instrumentation-starlette-latest -- -ra
923945

924946
py38-test-instrumentation-jinja2:
925947
name: instrumentation-jinja2

‎.github/workflows/test_1.yml‎

Lines changed: 147 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,8 @@ jobs:
412412
- name: Run tests
413413
run: tox -e py313-test-instrumentation-requests -- -ra
414414

415-
py38-test-instrumentation-starlette_ubuntu-latest:
416-
name: instrumentation-starlette 3.8 Ubuntu
415+
py38-test-instrumentation-starlette-oldest_ubuntu-latest:
416+
name: instrumentation-starlette-oldest 3.8 Ubuntu
417417
runs-on: ubuntu-latest
418418
steps:
419419
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -428,10 +428,28 @@ jobs:
428428
run: pip install tox-uv
429429

430430
- name: Run tests
431-
run: tox -e py38-test-instrumentation-starlette -- -ra
431+
run: tox -e py38-test-instrumentation-starlette-oldest -- -ra
432432

433-
py39-test-instrumentation-starlette_ubuntu-latest:
434-
name: instrumentation-starlette 3.9 Ubuntu
433+
py38-test-instrumentation-starlette-latest_ubuntu-latest:
434+
name: instrumentation-starlette-latest 3.8 Ubuntu
435+
runs-on: ubuntu-latest
436+
steps:
437+
- name: Checkout repo @ SHA - ${{ github.sha }}
438+
uses: actions/checkout@v4
439+
440+
- name: Set up Python 3.8
441+
uses: actions/setup-python@v5
442+
with:
443+
python-version: "3.8"
444+
445+
- name: Install tox
446+
run: pip install tox-uv
447+
448+
- name: Run tests
449+
run: tox -e py38-test-instrumentation-starlette-latest -- -ra
450+
451+
py39-test-instrumentation-starlette-oldest_ubuntu-latest:
452+
name: instrumentation-starlette-oldest 3.9 Ubuntu
435453
runs-on: ubuntu-latest
436454
steps:
437455
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -446,10 +464,46 @@ jobs:
446464
run: pip install tox-uv
447465

448466
- name: Run tests
449-
run: tox -e py39-test-instrumentation-starlette -- -ra
467+
run: tox -e py39-test-instrumentation-starlette-oldest -- -ra
450468

451-
py310-test-instrumentation-starlette_ubuntu-latest:
452-
name: instrumentation-starlette 3.10 Ubuntu
469+
py39-test-instrumentation-starlette-latest_ubuntu-latest:
470+
name: instrumentation-starlette-latest 3.9 Ubuntu
471+
runs-on: ubuntu-latest
472+
steps:
473+
- name: Checkout repo @ SHA - ${{ github.sha }}
474+
uses: actions/checkout@v4
475+
476+
- name: Set up Python 3.9
477+
uses: actions/setup-python@v5
478+
with:
479+
python-version: "3.9"
480+
481+
- name: Install tox
482+
run: pip install tox-uv
483+
484+
- name: Run tests
485+
run: tox -e py39-test-instrumentation-starlette-latest -- -ra
486+
487+
py310-test-instrumentation-starlette-oldest_ubuntu-latest:
488+
name: instrumentation-starlette-oldest 3.10 Ubuntu
489+
runs-on: ubuntu-latest
490+
steps:
491+
- name: Checkout repo @ SHA - ${{ github.sha }}
492+
uses: actions/checkout@v4
493+
494+
- name: Set up Python 3.10
495+
uses: actions/setup-python@v5
496+
with:
497+
python-version: "3.10"
498+
499+
- name: Install tox
500+
run: pip install tox-uv
501+
502+
- name: Run tests
503+
run: tox -e py310-test-instrumentation-starlette-oldest -- -ra
504+
505+
py310-test-instrumentation-starlette-latest_ubuntu-latest:
506+
name: instrumentation-starlette-latest 3.10 Ubuntu
453507
runs-on: ubuntu-latest
454508
steps:
455509
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -464,10 +518,10 @@ jobs:
464518
run: pip install tox-uv
465519

466520
- name: Run tests
467-
run: tox -e py310-test-instrumentation-starlette -- -ra
521+
run: tox -e py310-test-instrumentation-starlette-latest -- -ra
468522

469-
py311-test-instrumentation-starlette_ubuntu-latest:
470-
name: instrumentation-starlette 3.11 Ubuntu
523+
py311-test-instrumentation-starlette-oldest_ubuntu-latest:
524+
name: instrumentation-starlette-oldest 3.11 Ubuntu
471525
runs-on: ubuntu-latest
472526
steps:
473527
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -482,10 +536,46 @@ jobs:
482536
run: pip install tox-uv
483537

484538
- name: Run tests
485-
run: tox -e py311-test-instrumentation-starlette -- -ra
539+
run: tox -e py311-test-instrumentation-starlette-oldest -- -ra
486540

487-
py312-test-instrumentation-starlette_ubuntu-latest:
488-
name: instrumentation-starlette 3.12 Ubuntu
541+
py311-test-instrumentation-starlette-latest_ubuntu-latest:
542+
name: instrumentation-starlette-latest 3.11 Ubuntu
543+
runs-on: ubuntu-latest
544+
steps:
545+
- name: Checkout repo @ SHA - ${{ github.sha }}
546+
uses: actions/checkout@v4
547+
548+
- name: Set up Python 3.11
549+
uses: actions/setup-python@v5
550+
with:
551+
python-version: "3.11"
552+
553+
- name: Install tox
554+
run: pip install tox-uv
555+
556+
- name: Run tests
557+
run: tox -e py311-test-instrumentation-starlette-latest -- -ra
558+
559+
py312-test-instrumentation-starlette-oldest_ubuntu-latest:
560+
name: instrumentation-starlette-oldest 3.12 Ubuntu
561+
runs-on: ubuntu-latest
562+
steps:
563+
- name: Checkout repo @ SHA - ${{ github.sha }}
564+
uses: actions/checkout@v4
565+
566+
- name: Set up Python 3.12
567+
uses: actions/setup-python@v5
568+
with:
569+
python-version: "3.12"
570+
571+
- name: Install tox
572+
run: pip install tox-uv
573+
574+
- name: Run tests
575+
run: tox -e py312-test-instrumentation-starlette-oldest -- -ra
576+
577+
py312-test-instrumentation-starlette-latest_ubuntu-latest:
578+
name: instrumentation-starlette-latest 3.12 Ubuntu
489579
runs-on: ubuntu-latest
490580
steps:
491581
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -500,10 +590,28 @@ jobs:
500590
run: pip install tox-uv
501591

502592
- name: Run tests
503-
run: tox -e py312-test-instrumentation-starlette -- -ra
593+
run: tox -e py312-test-instrumentation-starlette-latest -- -ra
594+
595+
py313-test-instrumentation-starlette-oldest_ubuntu-latest:
596+
name: instrumentation-starlette-oldest 3.13 Ubuntu
597+
runs-on: ubuntu-latest
598+
steps:
599+
- name: Checkout repo @ SHA - ${{ github.sha }}
600+
uses: actions/checkout@v4
601+
602+
- name: Set up Python 3.13
603+
uses: actions/setup-python@v5
604+
with:
605+
python-version: "3.13"
606+
607+
- name: Install tox
608+
run: pip install tox-uv
609+
610+
- name: Run tests
611+
run: tox -e py313-test-instrumentation-starlette-oldest -- -ra
504612

505-
py313-test-instrumentation-starlette_ubuntu-latest:
506-
name: instrumentation-starlette 3.13 Ubuntu
613+
py313-test-instrumentation-starlette-latest_ubuntu-latest:
614+
name: instrumentation-starlette-latest 3.13 Ubuntu
507615
runs-on: ubuntu-latest
508616
steps:
509617
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -518,10 +626,28 @@ jobs:
518626
run: pip install tox-uv
519627

520628
- name: Run tests
521-
run: tox -e py313-test-instrumentation-starlette -- -ra
629+
run: tox -e py313-test-instrumentation-starlette-latest -- -ra
630+
631+
pypy3-test-instrumentation-starlette-oldest_ubuntu-latest:
632+
name: instrumentation-starlette-oldest pypy-3.8 Ubuntu
633+
runs-on: ubuntu-latest
634+
steps:
635+
- name: Checkout repo @ SHA - ${{ github.sha }}
636+
uses: actions/checkout@v4
637+
638+
- name: Set up Python pypy-3.8
639+
uses: actions/setup-python@v5
640+
with:
641+
python-version: "pypy-3.8"
642+
643+
- name: Install tox
644+
run: pip install tox-uv
645+
646+
- name: Run tests
647+
run: tox -e pypy3-test-instrumentation-starlette-oldest -- -ra
522648

523-
pypy3-test-instrumentation-starlette_ubuntu-latest:
524-
name: instrumentation-starlette pypy-3.8 Ubuntu
649+
pypy3-test-instrumentation-starlette-latest_ubuntu-latest:
650+
name: instrumentation-starlette-latest pypy-3.8 Ubuntu
525651
runs-on: ubuntu-latest
526652
steps:
527653
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -536,7 +662,7 @@ jobs:
536662
run: pip install tox-uv
537663

538664
- name: Run tests
539-
run: tox -e pypy3-test-instrumentation-starlette -- -ra
665+
run: tox -e pypy3-test-instrumentation-starlette-latest -- -ra
540666

541667
py38-test-instrumentation-jinja2_ubuntu-latest:
542668
name: instrumentation-jinja2 3.8 Ubuntu

‎CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2929
([#3273](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3273))
3030
- Add `opentelemetry-instrumentation-vertexai>=2.0b0` to `opentelemetry-bootstrap`
3131
([#3307](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3307))
32+
- Loosen `opentelemetry-instrumentation-starlette[instruments]` specifier
33+
([#3304](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3304))
3234
- `opentelemetry-instrumentation-asyncclick`: new instrumentation to trace asyncclick commands
3335
([#3318](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3318))
3436

35-
3637
### Fixed
3738

3839
- `opentelemetry-instrumentation-redis` Add missing entry in doc string for `def _instrument`

‎instrumentation-genai/opentelemetry-instrumentation-google-genai/CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## Unreleased
99

10+
- Add support for async and streaming.
11+
([#3298](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3298))
12+
1013
Create an initial version of Open Telemetry instrumentation for github.com/googleapis/python-genai.
1114
([#3256](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3256))

‎instrumentation-genai/opentelemetry-instrumentation-google-genai/TODOS.md‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,17 @@
44

55
Here are some TODO items required to achieve stability for this package:
66

7-
1. Add support for streaming interfaces
8-
2. Add support for async interfaces
9-
3. Add more span-level attributes for request configuration
10-
4. Add more span-level attributes for response information
11-
5. Verify and correct formatting of events:
12-
- Including the 'role' field for message events
13-
- Including tool invocation information
14-
6. Emit events for safety ratings when they block responses
15-
7. Additional cleanup/improvement tasks such as:
16-
- Adoption of 'wrapt' instead of 'functools.wraps'
17-
- Bolstering test coverage
18-
8. Migrate tests to use VCR.py
7+
- Add more span-level attributes for request configuration
8+
- Add more span-level attributes for response information
9+
- Verify and correct formatting of events:
10+
- Including the 'role' field for message events
11+
- Including tool invocation information
12+
- Emit events for safety ratings when they block responses
13+
- Additional cleanup/improvement tasks such as:
14+
- Adoption of 'wrapt' instead of 'functools.wraps'
15+
- Bolstering test coverage
16+
- Migrate tests to use VCR.py
17+
1918
## Future
2019

2120
Beyond the above TODOs, it would also be desirable to extend the

0 commit comments

Comments
 (0)