Skip to content

Commit 9d5b390

Browse files
committed
Remove bespoke request mocker. Replace with direct mocking of the underlying API.
1 parent 9e4de00 commit 9d5b390

File tree

6 files changed

+209
-290
lines changed

6 files changed

+209
-290
lines changed

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/common/base.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
from .instrumentation_context import InstrumentationContext
2121
from .otel_mocker import OTelMocker
22-
from .requests_mocker import RequestsMocker
2322

2423

2524
class _FakeCredentials(google.auth.credentials.AnonymousCredentials):
@@ -31,8 +30,6 @@ class TestCase(unittest.TestCase):
3130
def setUp(self):
3231
self._otel = OTelMocker()
3332
self._otel.install()
34-
self._requests = RequestsMocker()
35-
self._requests.install()
3633
self._instrumentation_context = None
3734
self._api_key = "test-api-key"
3835
self._project = "test-project"
@@ -51,17 +48,22 @@ def client(self):
5148
self._client = self._create_client()
5249
return self._client
5350

54-
@property
55-
def requests(self):
56-
return self._requests
57-
5851
@property
5952
def otel(self):
6053
return self._otel
6154

6255
def set_use_vertex(self, use_vertex):
6356
self._uses_vertex = use_vertex
6457

58+
def reset_client(self):
59+
self._client = None
60+
61+
def reset_instrumentation(self):
62+
if self._instrumentation_context is None:
63+
return
64+
self._instrumentation_context.uninstall()
65+
self._instrumentation_context = None
66+
6567
def _create_client(self):
6668
self._lazy_init()
6769
if self._uses_vertex:
@@ -77,5 +79,4 @@ def _create_client(self):
7779
def tearDown(self):
7880
if self._instrumentation_context is not None:
7981
self._instrumentation_context.uninstall()
80-
self._requests.uninstall()
8182
self._otel.uninstall()

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/common/requests_mocker.py

Lines changed: 0 additions & 238 deletions
This file was deleted.

0 commit comments

Comments
 (0)