Skip to content

Add support for async and streaming responses in the Google GenAI instrumentation#3298

Merged
aabmass merged 87 commits intoopen-telemetry:mainfrom
michaelsafyan:async_and_streaming
Mar 3, 2025
Merged

Add support for async and streaming responses in the Google GenAI instrumentation#3298
aabmass merged 87 commits intoopen-telemetry:mainfrom
michaelsafyan:async_and_streaming

Conversation

@michaelsafyan
Copy link
Copy Markdown
Contributor

@michaelsafyan michaelsafyan commented Feb 25, 2025 •
edited
Loading

Description

This builds on #3256 to add support for async and streaming variants of the GenerateContent operation.

Change Summary:

  • generate_content.py:
    • Fix minor issues in implementation of streaming async (align to underlying library's data model of the result)
    • Removal of guards to short-circuit patching of async, streaming cases
  • tests:
    • Extend existing utilities to enable mocking streaming responses
    • Add testing coverage for streaming, async cases that validate the instrumentation
  • docs:
    • Remove async, streaming support from list of TODOS given that this PR checks that off the list

Type of change

  • New feature (non-breaking change which adds functionality)

How Has This Been Tested?

Added unit test coverage.

Does This PR Require a Core Repo Change?

  • No.

michaelsafyan and others added 30 commits February 7, 2025 17:02
@michaelsafyan
Begin instrumentation of GenAI SDK.
b72b4cd
@michaelsafyan
Merge branch 'open-telemetry:main' into genaisdk_instrumentation
74a648a
@michaelsafyan
Snapshot current state.
a850642
@michaelsafyan
Created minimal tests and got first test to pass.
257da64
@michaelsafyan
Added test for span attributes.
3244258
@michaelsafyan
Ensure that token counts work.
431fdf5
@michaelsafyan
Add more tests.
b6068e2
@michaelsafyan
Make it easy to turn off instrumentation for streaming and async to a…
5ac2108 
…llow for rapid iteration.
@michaelsafyan
Merge branch 'open-telemetry:main' into genaisdk_instrumentation
f503787
@michaelsafyan
Add licenses and fill out main README.rst.
7fcbd8c
@michaelsafyan
Add a changelog file.
6ecd69c
@michaelsafyan
Fill out 'requirements.txt' and 'README.rst' for the manual instrumen…
5bcb73a 
…tation example.
@michaelsafyan
Add missing exporter dependency for the manual instrumentation example.
65241b0
@michaelsafyan
Fill out rest of the zero-code example.
44f5081
@michaelsafyan
Add minimal tests for async, streaming cases.
5e5f226
@michaelsafyan
Update sync test to use indirection on top of 'client.models.generate…
7b3805c 
…_content' to simplify test reuse.
@michaelsafyan
Fix ruff check issues.
3ee8dd1
@michaelsafyan
Add subproject to top-level project build mechanism.
6b66fe4
@michaelsafyan
Simplify invocation of pylint.
06ab153
@michaelsafyan
Fix 'make test' command and lint issues.
9f73c64
@michaelsafyan
Add '.dev' suffix to version per feedback on pull request open-teleme…
319f0a5 
…try#3256
@michaelsafyan
Fix README.rst files for the examples.
493689e
@michaelsafyan
Add specific versions for the examples.
368a3cc
@michaelsafyan
Merge branch 'main' into genaisdk_instrumentation
4682521
@michaelsafyan
Merge branch 'open-telemetry:main' into genaisdk_instrumentation
e2afc4e
@michaelsafyan
Revamp 'make test' to not require local 'tox.ini' configuration.
a157e2e
@michaelsafyan @xrmx
Extend separators per review comment.
dd606c2 
Co-authored-by: Riccardo Magliocchetti <[email protected]>
@michaelsafyan
Fix version conflict caused by non-hermetic requirements.
a2ec3fb
@michaelsafyan
Fix typo on the comment line.
1304fed
@michaelsafyan
Merge branch 'open-telemetry:main' into genaisdk_instrumentation
07cbf2f
xrmx
xrmx reviewed Feb 28, 2025
View reviewed changes
Comment thread instrumentation-genai/opentelemetry-instrumentation-google-genai/TODOS.md Outdated
aabmass
aabmass reviewed Feb 28, 2025
View reviewed changes
Comment thread instrumentation-genai/opentelemetry-instrumentation-google-genai/CHANGELOG.md Outdated
Comment thread ...trumentation-google-genai/src/opentelemetry/instrumentation/google_genai/generate_content.py Outdated
Comment thread ...rumentation-genai/opentelemetry-instrumentation-google-genai/tests/common/requests_mocker.py
@michaelsafyan michaelsafyan requested review from aabmass and xrmx March 3, 2025 16:29
aabmass
aabmass approved these changes Mar 3, 2025
View reviewed changes
Comment thread ...rumentation-genai/opentelemetry-instrumentation-google-genai/tests/common/requests_mocker.py
Comment thread ...trumentation-google-genai/src/opentelemetry/instrumentation/google_genai/generate_content.py Outdated
@aabmass aabmass enabled auto-merge (squash) March 3, 2025 22:29
@aabmass aabmass merged commit 81eaea5 into open-telemetry:main Mar 3, 2025
@michaelsafyan michaelsafyan mentioned this pull request Mar 18, 2025
Closed
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@aabmass aabmass aabmass approved these changes

@alizenhom alizenhom Awaiting requested review from alizenhom

@codefromthecrypt codefromthecrypt Awaiting requested review from codefromthecrypt

@gyliu513 gyliu513 Awaiting requested review from gyliu513

@karthikscale3 karthikscale3 Awaiting requested review from karthikscale3

@lmolkova lmolkova Awaiting requested review from lmolkova

@lzchen lzchen Awaiting requested review from lzchen

@nirga nirga Awaiting requested review from nirga

@xrmx xrmx Awaiting requested review from xrmx

Assignees

@codefromthecrypt codefromthecrypt

@lmolkova lmolkova

@nirga nirga

@gyliu513 gyliu513

@lzchen lzchen

@karthikscale3 karthikscale3

@alizenhom alizenhom

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@michaelsafyan @xrmx @aabmass @codefromthecrypt @lmolkova @nirga @gyliu513 @lzchen @karthikscale3 @alizenhom