Merge branch 'main' into add_redis_client_only_instrumentation

Author: OlegZv

CHANGELOG.md

@@ -25,8 +25,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-vertexai/CHANGELOG.md

@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-## Version 2.0b0 (2025-02-21)
+## Version 2.0b0 (2025-02-24)
 
 - Added Vertex AI spans for request parameters
  ([#3192](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3192))

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