Skip to content

test(google-genai): skip the vcrpy aiohttp workaround on fixed vcrpy #276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pylaterreur wants to merge 1 commit into
base: main
Choose a base branch
from
Open

test(google-genai): skip the vcrpy aiohttp workaround on fixed vcrpy #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions instrumentation-genai/opentelemetry-instrumentation-google-genai/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

- Skip the `test_e2e.py` workaround for [kevin1024/vcrpy#927](https://github.com/kevin1024/vcrpy/issues/927) on vcrpy releases that include [kevin1024/vcrpy#1055](https://github.com/kevin1024/vcrpy/pull/1055), where it breaks replaying ([#276](https://github.com/alibaba/loongsuite-python/pull/276)).

## Version 0.7b0 (2026-02-20)
- Fix bug in how tokens are counted when using the streaming `generateContent` method. ([#4152](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4152)).
- Add `gen_ai.tool.definitions` attribute to `gen_ai.client.inference.operation.details` log event ([#4142](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4142)).
Expand Down
8 changes: 8 additions & 0 deletions ...ation-genai/opentelemetry-instrumentation-google-genai/tests/generate_content/test_e2e.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,11 @@

try:
# These modules are only supported in python >= 3.10
from aiohttp import StreamReader
from aiohttp.client_exceptions import ClientConnectionError
from vcr.stubs import aiohttp_stubs
except ImportError:
StreamReader = None
ClientConnectionError = None
aiohttp_stubs = None

Expand Down Expand Up @@ -334,6 +336,12 @@ def fixture_patch_vcr_aiohttp_stream():
# https://github.com/kevin1024/vcrpy/issues/927
if ClientConnectionError is None or aiohttp_stubs is None:
return
# vcrpy releases that include https://github.com/kevin1024/vcrpy/pull/1055
# fix this themselves: a replayed response keeps a single aiohttp
# StreamReader as its content. The patch below is not needed there, and
# would break replaying.
if issubclass(aiohttp_stubs.MockStream, StreamReader):
return

class _ReplayMockStream(aiohttp_stubs.MockStream):
# Keep vcrpy's stream behavior, but ignore aiohttp's
Expand Down
Loading