Merge branch 'open-telemetry:main' into fix/1477

Author: aryabharat

CHANGELOG.md

@@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Fixed
+
+- `opentelemetry-instrumentation` Fix client address is set to server address in new semconv
+  ([#3354](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3354))
+
 ## Version 1.31.0/0.52b0 (2025-03-12)
 
 ### Added
@@ -36,7 +41,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Loosen `opentelemetry-instrumentation-starlette[instruments]` specifier
   ([#3304](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3304))
 
-
 ### Fixed
 
 - `opentelemetry-instrumentation-dbapi`, `opentelemetry-instrumentation-django`,
@@ -115,7 +119,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Breaking changes
 
 - `opentelemetry-exporter-prometheus-remote-write` updated protobuf required version from 4.21 to 5.26 and regenerated protobufs
- ([#3219](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3219))
+  ([#3219](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3219))
 - `opentelemetry-instrumentation-sqlalchemy` including sqlcomment in `db.statement` span attribute value is now opt-in
   ([#3112](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3112))
 - `opentelemetry-instrumentation-dbapi` including sqlcomment in `db.statement` span attribute value is now opt-in

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

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- Restructure tests to keep in line with repository conventions ([#3344](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3344))
+
 ## Version 0.1b0 (2025-03-05)
 
 - Add support for async and streaming.

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

@@ -13,7 +13,6 @@ Here are some TODO items required to achieve stability for this package:
  - Additional cleanup/improvement tasks such as:
    - Adoption of 'wrapt' instead of 'functools.wraps'
    - Bolstering test coverage
- - Migrate tests to use VCR.py
 
 ## Future
 

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

@@ -0,0 +1,20 @@
+# Copyright The OpenTelemetry Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import google.auth.credentials
+
+
+class FakeCredentials(google.auth.credentials.AnonymousCredentials):
+    def refresh(self, request):
+        pass

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

@@ -17,29 +17,22 @@
 
 import google.genai
 
+from .auth import FakeCredentials
 from .instrumentation_context import InstrumentationContext
 from .otel_mocker import OTelMocker
-from .requests_mocker import RequestsMocker
-
-
-class _FakeCredentials(google.auth.credentials.AnonymousCredentials):
-    def refresh(self, request):
-        pass
 
 
 class TestCase(unittest.TestCase):
     def setUp(self):
         self._otel = OTelMocker()
         self._otel.install()
-        self._requests = RequestsMocker()
-        self._requests.install()
         self._instrumentation_context = None
         self._api_key = "test-api-key"
         self._project = "test-project"
         self._location = "test-location"
         self._client = None
         self._uses_vertex = False
-        self._credentials = _FakeCredentials()
+        self._credentials = FakeCredentials()
 
     def _lazy_init(self):
         self._instrumentation_context = InstrumentationContext()
@@ -51,17 +44,22 @@ def client(self):
             self._client = self._create_client()
         return self._client
 
-    @property
-    def requests(self):
-        return self._requests
-
     @property
     def otel(self):
         return self._otel
 
     def set_use_vertex(self, use_vertex):
         self._uses_vertex = use_vertex
 
+    def reset_client(self):
+        self._client = None
+
+    def reset_instrumentation(self):
+        if self._instrumentation_context is None:
+            return
+        self._instrumentation_context.uninstall()
+        self._instrumentation_context = None
+
     def _create_client(self):
         self._lazy_init()
         if self._uses_vertex:
@@ -72,10 +70,9 @@ def _create_client(self):
                 location=self._location,
                 credentials=self._credentials,
             )
-        return google.genai.Client(api_key=self._api_key)
+        return google.genai.Client(vertexai=False, api_key=self._api_key)
 
     def tearDown(self):
         if self._instrumentation_context is not None:
             self._instrumentation_context.uninstall()
-        self._requests.uninstall()
         self._otel.uninstall()