Merge base changes.

Author: michaelsafyan

CHANGELOG.md

@@ -23,8 +23,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3266](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3266))
 - `opentelemetry-instrumentation-botocore` Add support for GenAI choice events
   ([#3275](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3275))
+- `opentelemetry-instrumentation-botocore` Add support for GenAI tool events
+  ([#3302](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3302))
 - `opentelemetry-instrumentation` make it simpler to initialize auto-instrumentation programmatically
   ([#3273](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3273))
+- Add `opentelemetry-instrumentation-vertexai>=2.0b0` to `opentelemetry-bootstrap`
+  ([#3307](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3307))
+
 
 ### Fixed
 

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

@@ -5,12 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## 0.0.2
-
-Add support for aync and streaming.
-([#3298](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3298))
-
 ## Unreleased
 
+- Add support for async and streaming.
+  ([#3298](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3298))
+
 Create an initial version of Open Telemetry instrumentation for github.com/googleapis/python-genai.
 ([#3256](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3256)) 

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

@@ -4,16 +4,16 @@
 
 Here are some TODO items required to achieve stability for this package:
 
-  1. Add more span-level attributes for request configuration
-  2. Add more span-level attributes for response information
-  3. Verify and correct formatting of events:
-     - Including the 'role' field for message events
-     - Including tool invocation information
-  4. Emit events for safety ratings when they block responses
-  5. Additional cleanup/improvement tasks such as:
-     - Adoption of 'wrapt' instead of 'functools.wraps'
-     - Bolstering test coverage
-  6. Migrate tests to use VCR.py
+ - Add more span-level attributes for request configuration
+ - Add more span-level attributes for response information
+ - Verify and correct formatting of events:
+   - Including the 'role' field for message events
+   - Including tool invocation information
+ - Emit events for safety ratings when they block responses
+ - 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/src/opentelemetry/instrumentation/google_genai/generate_content.py

@@ -220,7 +220,9 @@ def __init__(
         self._response_index = 0
         self._candidate_index = 0
 
-    def start_span_as_current_span(self, model_name, function_name):
+    def start_span_as_current_span(
+        self, model_name, function_name, end_on_exit=True
+    ):
         return self._otel_wrapper.start_as_current_span(
             f"{_GENERATE_CONTENT_OP_NAME} {model_name}",
             start_time=self._start_time,
@@ -230,6 +232,7 @@ def start_span_as_current_span(self, model_name, function_name):
                 gen_ai_attributes.GEN_AI_REQUEST_MODEL: self._genai_request_model,
                 gen_ai_attributes.GEN_AI_OPERATION_NAME: _GENERATE_CONTENT_OP_NAME,
             },
+            end_on_exit=end_on_exit,
         )
 
     def process_request(
@@ -600,7 +603,7 @@ def instrumented_generate_content(
                     self,
                     model=model,
                     contents=contents,
-                    config=config,
+                    config=_wrapped_config(otel_wrapper, config),
                     **kwargs,
                 )
                 helper.process_response(response)
@@ -640,7 +643,7 @@ def instrumented_generate_content_stream(
                     self,
                     model=model,
                     contents=contents,
-                    config=config,
+                    config=_wrapped_config(otel_wrapper, config),
                     **kwargs,
                 ):
                     helper.process_response(response)
@@ -680,7 +683,7 @@ async def instrumented_generate_content(
                     self,
                     model=model,
                     contents=contents,
-                    config=config,
+                    config=_wrapped_config(otel_wrapper, config),
                     **kwargs,
                 )
                 helper.process_response(response)
@@ -712,22 +715,32 @@ async def instrumented_generate_content_stream(
         helper = _GenerateContentInstrumentationHelper(
             self, otel_wrapper, model
         )
+        with helper.start_span_as_current_span(
+            model,
+            "google.genai.AsyncModels.generate_content_stream",
+            end_on_exit=False,
+        ) as span:
+            helper.process_request(contents, config)
+        try:
+            response_async_generator = await wrapped_func(
+                self,
+                model=model,
+                contents=contents,
+                config=_wrapped_config(otel_wrapper, config),
+                **kwargs,
+            )
+        except Exception as error:
+            helper.process_error(error)
+            helper.finalize_processing()
+            with trace.use_span(span, end_on_exit=True):
+                raise
 
-        async def _internal_generator():
-            with helper.start_span_as_current_span(
-                model, "google.genai.AsyncModels.generate_content_stream"
-            ):
-                helper.process_request(contents, config)
+        async def _response_async_generator_wrapper():
+            with trace.use_span(span, end_on_exit=True):
                 try:
-                    async for response in await wrapped_func(
-                        self,
-                        model=model,
-                        contents=contents,
-                        config=config,
-                        **kwargs,
-                    ):  # pyright: ignore
+                    async for response in response_async_generator:
                         helper.process_response(response)
-                        yield response  # pyright: ignore
+                        yield response
                 except Exception as error:
                     helper.process_error(error)
                     raise
@@ -736,7 +749,7 @@ async def _internal_generator():
 
         class _GeneratorProvider:
             def __aiter__(self):
-                return _internal_generator()
+                return _response_async_generator_wrapper()
 
         return _GeneratorProvider()
 

instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py

@@ -22,24 +22,29 @@
 
 .. code:: python
 
+    import asyncio
     import aiohttp
     from opentelemetry.instrumentation.aiohttp_client import create_trace_config
     import yarl
 
     def strip_query_params(url: yarl.URL) -> str:
         return str(url.with_query(None))
 
-    async with aiohttp.ClientSession(trace_configs=[create_trace_config(
+    async def get(url):
+        async with aiohttp.ClientSession(trace_configs=[create_trace_config(
             # Remove all query params from the URL attribute on the span.
             url_filter=strip_query_params,
-    )]) as session:
-        async with session.get(url) as response:
-            await response.text()
+        )]) as session:
+            async with session.get(url) as response:
+                await response.text()
+
+    asyncio.run(get("https://example.com"))
 
 Instrumenting all client sessions:
 
 .. code:: python
 
+    import asyncio
     import aiohttp
     from opentelemetry.instrumentation.aiohttp_client import (
         AioHttpClientInstrumentor
@@ -49,9 +54,12 @@ def strip_query_params(url: yarl.URL) -> str:
     AioHttpClientInstrumentor().instrument()
 
     # Create a session and make an HTTP get request
-    async with aiohttp.ClientSession() as session:
-        async with session.get(url) as response:
-            await response.text()
+    async def get(url):
+        async with aiohttp.ClientSession() as session:
+            async with session.get(url) as response:
+                await response.text()
+
+    asyncio.run(get("https://example.com"))
 
 Configuration
 -------------

instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/extensions/bedrock.py

@@ -248,7 +248,8 @@ def before_service_call(
         messages = self._get_request_messages()
         for message in messages:
             event_logger = instrumentor_context.event_logger
-            event_logger.emit(message_to_event(message, capture_content))
+            for event in message_to_event(message, capture_content):
+                event_logger.emit(event)
 
         if not span.is_recording():
             return