Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-python-contrib into genai-instrumentation-semconv

Author: argaj

CHANGELOG.md

@@ -12,19 +12,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 
 ### Fixed
-
 - `opentelemetry-instrumentation-dbapi`: fix crash retrieving libpq version when enabling commenter with psycopg
   ([#3796](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3796))
-- `opentelemetry-instrumentation-vertexai`: migrate off the deprecated events API to use the logs API
-  ([#3625](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3626))
 
 ### Added
 - `opentelemetry-instrumentation`: botocore: Add support for AWS Secrets Manager semantic convention attribute
   ([#3765](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3765))
 - Add `rstcheck` to pre-commit to stop introducing invalid RST
   ([#3777](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3777))
-- `opentelemetry-exporter-credential-provider-gcp`: create this package which provides support for supplying your machine's Application Default Credentials (https://cloud.google.com/docs/authentication/application-default-credentials) to the OTLP Exporters created automatically by OpenTelemetry Python's auto instrumentation. These credentials authorize OTLP traces to be sent to `telemetry.googleapis.com`. 
-[#3766](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3766).
+- `opentelemetry-exporter-credential-provider-gcp`: create this package which provides support for supplying your machine's Application Default 
+  Credentials (https://cloud.google.com/docs/authentication/application-default-credentials) to the OTLP Exporters created automatically by OpenTelemetry Python's auto instrumentation. These credentials authorize OTLP traces to be sent to `telemetry.googleapis.com`. [#3766](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3766).
 
 ## Version 1.37.0/0.58b0 (2025-09-11)
 

docs/conf.py

@@ -155,7 +155,14 @@ def getlistcfg(strval):
     ]
 
 
-ignore_categories = ["py-class", "py-func", "py-exc", "py-obj", "any"]
+ignore_categories = [
+    "py-class",
+    "py-func",
+    "py-exc",
+    "py-obj",
+    "py-data",
+    "any",
+]
 
 for category in ignore_categories:
     if category in mcfg:

docs/nitpick-exceptions.ini

@@ -75,6 +75,10 @@ py-obj=
     opentelemetry.instrumentation.dbapi.ConnectionT
     opentelemetry.instrumentation.dbapi.CursorT
 
+py-data=
+    typing.Union
+    typing.Optional
+
 py-func=
     poll
     flush

instrumentation-genai/README.md

@@ -3,6 +3,7 @@
 | --------------- | ------------------ | --------------- | -------------- |
 | [opentelemetry-instrumentation-google-genai](./opentelemetry-instrumentation-google-genai) | google-genai >= 1.0.0 | No | development
 | [opentelemetry-instrumentation-langchain](./opentelemetry-instrumentation-langchain) | langchain >= 0.3.21 | No | development
+| [opentelemetry-instrumentation-openai-agents](./opentelemetry-instrumentation-openai-agents) | openai-agents >= 0.3.3 | No | development
 | [opentelemetry-instrumentation-openai-v2](./opentelemetry-instrumentation-openai-v2) | openai >= 1.26.0 | Yes | development
 | [opentelemetry-instrumentation-vertexai](./opentelemetry-instrumentation-vertexai) | google-cloud-aiplatform >= 1.64 | No | development
 | [opentelemetry-instrumentation-weaviate](./opentelemetry-instrumentation-weaviate) | weaviate-client >= 3.0.0,<5.0.0 | No | development

instrumentation-genai/opentelemetry-instrumentation-google-genai/pyproject.toml

@@ -37,7 +37,7 @@ classifiers = [
   "Programming Language :: Python :: 3.12"
 ]
 dependencies = [
-  "opentelemetry-api >=1.31.1, <2",
+  "opentelemetry-api >=1.37, <2",
   "opentelemetry-instrumentation >=0.52b1, <2",
   "opentelemetry-semantic-conventions >=0.52b1, <2"
 ]

instrumentation-genai/opentelemetry-instrumentation-google-genai/src/opentelemetry/instrumentation/google_genai/instrumentor.py

@@ -14,7 +14,7 @@
 
 from typing import Any, Collection, Optional
 
-from opentelemetry._events import get_event_logger_provider
+from opentelemetry._logs import get_logger_provider
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.metrics import get_meter_provider
 from opentelemetry.trace import get_tracer_provider
@@ -50,13 +50,13 @@ def _instrument(self, **kwargs: Any):
         tracer_provider = (
             kwargs.get("tracer_provider") or get_tracer_provider()
         )
-        event_logger_provider = (
-            kwargs.get("event_logger_provider") or get_event_logger_provider()
+        logger_provider = (
+            kwargs.get("logger_provider") or get_logger_provider()
         )
         meter_provider = kwargs.get("meter_provider") or get_meter_provider()
         otel_wrapper = OTelWrapper.from_providers(
             tracer_provider=tracer_provider,
-            event_logger_provider=event_logger_provider,
+            logger_provider=logger_provider,
             meter_provider=meter_provider,
         )
         completion_hook = (

instrumentation-genai/opentelemetry-instrumentation-google-genai/src/opentelemetry/instrumentation/google_genai/otel_wrapper.py

@@ -18,7 +18,7 @@
 
 import google.genai
 
-from opentelemetry._events import Event, EventLogger, EventLoggerProvider
+from opentelemetry._logs import LogRecord, Logger, LoggerProvider
 from opentelemetry.metrics import Meter, MeterProvider
 from opentelemetry.semconv._incubating.metrics import gen_ai_metrics
 from opentelemetry.semconv.schemas import Schemas
@@ -41,10 +41,10 @@
 
 class OTelWrapper:
     def __init__(
-        self, tracer: Tracer, event_logger: EventLogger, meter: Meter
+        self, tracer: Tracer, logger: Logger, meter: Meter
     ):
         self._tracer = tracer
-        self._event_logger = event_logger
+        self._logger = logger
         self._meter = meter
         self._operation_duration_metric = (
             gen_ai_metrics.create_gen_ai_client_operation_duration(meter)
@@ -56,14 +56,14 @@ def __init__(
     @staticmethod
     def from_providers(
         tracer_provider: TracerProvider,
-        event_logger_provider: EventLoggerProvider,
+        logger_provider: LoggerProvider,
         meter_provider: MeterProvider,
     ):
         return OTelWrapper(
             tracer_provider.get_tracer(
                 _SCOPE_NAME, _LIBRARY_VERSION, _SCHEMA_URL, _SCOPE_ATTRIBUTES
             ),
-            event_logger_provider.get_event_logger(
+            logger_provider.get_logger(
                 _SCOPE_NAME, _LIBRARY_VERSION, _SCHEMA_URL, _SCOPE_ATTRIBUTES
             ),
             meter=meter_provider.get_meter(
@@ -106,12 +106,14 @@ def log_response_content(
     def _log_event(
         self, event_name: str, attributes: dict[str, str], body: dict[str, Any]
     ):
-        event = Event(event_name, body=body, attributes=attributes)
-        self._event_logger.emit(event)
+        event = LogRecord(
+            event_name=event_name, body=body, attributes=attributes
+        )
+        self._logger.emit(event)
 
     def log_completion_details(
         self,
-        event: Event,
+        event: LogRecord,
     ) -> None:
         _logger.debug("Recording completion details event.")
-        self._event_logger.emit(event)
+        self._logger.emit(event)

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

@@ -13,17 +13,14 @@
 # limitations under the License.
 
 
-import opentelemetry._events
 import opentelemetry._logs._internal
 import opentelemetry.metrics._internal
 import opentelemetry.trace
-from opentelemetry._events import (
-    get_event_logger_provider,
-    set_event_logger_provider,
+from opentelemetry._logs import (
+    get_logger_provider,
+    set_logger_provider,
 )
-from opentelemetry._logs import get_logger_provider, set_logger_provider
 from opentelemetry.metrics import get_meter_provider, set_meter_provider
-from opentelemetry.sdk._events import EventLoggerProvider
 from opentelemetry.sdk._logs import LoggerProvider
 from opentelemetry.sdk._logs.export import (
     InMemoryLogExporter,
@@ -43,22 +40,19 @@
 def _bypass_otel_once():
     opentelemetry.trace._TRACER_PROVIDER_SET_ONCE = Once()
     opentelemetry._logs._internal._LOGGER_PROVIDER_SET_ONCE = Once()
-    opentelemetry._events._EVENT_LOGGER_PROVIDER_SET_ONCE = Once()
     opentelemetry.metrics._internal._METER_PROVIDER_SET_ONCE = Once()
 
 
 class OTelProviderSnapshot:
     def __init__(self):
         self._tracer_provider = get_tracer_provider()
         self._logger_provider = get_logger_provider()
-        self._event_logger_provider = get_event_logger_provider()
         self._meter_provider = get_meter_provider()
 
     def restore(self):
         _bypass_otel_once()
         set_tracer_provider(self._tracer_provider)
         set_logger_provider(self._logger_provider)
-        set_event_logger_provider(self._event_logger_provider)
         set_meter_provider(self._meter_provider)
 
 
@@ -82,6 +76,10 @@ def attributes(self):
     def body(self):
         return self._log_data.log_record.body
 
+    @property
+    def event_name(self):
+        return self._log_data.log_record.event_name
+
     def __str__(self):
         return self._log_data.log_record.to_json()
 
@@ -175,23 +173,21 @@ def assert_does_not_have_span_named(self, name):
         assert span is None, f"Found unexpected span named {name}"
 
     def get_event_named(self, event_name):
-        for event in self.get_finished_logs():
-            event_name_attr = event.attributes.get("event.name")
-            if event_name_attr is None:
-                continue
-            if event_name_attr == event_name:
-                return event
-        return None
+        return next(
+            (
+                event
+                for event in self.get_finished_logs()
+                if event.event_name == event_name
+            ),
+            None,
+        )
 
     def get_events_named(self, event_name):
-        result = []
-        for event in self.get_finished_logs():
-            event_name_attr = event.attributes.get("event.name")
-            if event_name_attr is None:
-                continue
-            if event_name_attr == event_name:
-                result.append(event)
-        return result
+        return [
+            event
+            for event in self.get_finished_logs()
+            if event.event_name == event_name
+        ]
 
     def assert_has_event_named(self, name):
         event = self.get_event_named(name)
@@ -219,8 +215,6 @@ def _install_logs(self):
         provider = LoggerProvider()
         provider.add_log_record_processor(SimpleLogRecordProcessor(self._logs))
         set_logger_provider(provider)
-        event_provider = EventLoggerProvider(logger_provider=provider)
-        set_event_logger_provider(event_provider)
 
     def _install_metrics(self):
         provider = MeterProvider(metric_readers=[self._metrics])

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/utils/test_tool_call_wrapper.py

@@ -18,7 +18,7 @@
 
 from google.genai import types as genai_types
 
-from opentelemetry._events import get_event_logger_provider
+from opentelemetry._logs import get_logger_provider
 from opentelemetry.instrumentation._semconv import (
     _OpenTelemetrySemanticConventionStability,
     _OpenTelemetryStabilitySignalType,
@@ -41,7 +41,7 @@ def setUp(self):
         self._otel.install()
         self._otel_wrapper = otel_wrapper.OTelWrapper.from_providers(
             get_tracer_provider(),
-            get_event_logger_provider(),
+            get_logger_provider(),
             get_meter_provider(),
         )
 

instrumentation-genai/opentelemetry-instrumentation-openai-agents/.gitignore

@@ -0,0 +1,2 @@
+examples/.env
+examples/openai_agents_multi_agent_travel/.env