Merge branch 'main' into fix/redis-semconv-stable

Author: luke6Lh43

.github/component_owners.yml

@@ -9,8 +9,12 @@ components:
   instrumentation/opentelemetry-instrumentation-asyncio:
     - bourbonkk
 
+  instrumentation/opentelemetry-instrumentation-botocore:
+    - lukeina2z
+    - yiyuan-he
+
   instrumentation/opentelemetry-instrumentation-pymssql:
-     - guillaumep
+    - guillaumep
 
   instrumentation/opentelemetry-instrumentation-urllib:
     - shalevr
@@ -43,4 +47,4 @@ components:
 
   instrumentation-genai/opentelemetry-instrumentation-langchain:
     - zhirafovod
-    - wrisa
+    - wrisa

CHANGELOG.md

@@ -13,14 +13,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- `opentelemetry-instrumentation-botocore`: migrate off the deprecated events API to use the logs API
+  ([#3624](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3624))
+- `opentelemetry-instrumentation-dbapi`: fix crash retrieving libpq version when enabling commenter with psycopg
+  ([#3796](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3796))
+
 ### Added
-- `opentelemetry-instrumentation`: botocore: Add support for AWS Secrets Manager semantic convention attribute
+
+- `opentelemetry-instrumentation-botocore`: Add support for AWS Secrets Manager semantic convention attribute
   ([#3765](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3765))
+- `opentelemetry-instrumentation-dbapi`: Add support for `commenter_options` in `trace_integration` function to control SQLCommenter behavior
+  ([#3743](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3743))
 - 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-instrumentation-redis`: Add support for semantic convention opt-in and stable Redis span attributes ([#3826](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3826))
+- `opentelemetry-instrumentation-redis`: Add support for semantic convention opt-in and stable Redis span attributes 
+  ([#3826](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3826))
+- `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-instrumentation-psycopg`: Add missing parameter `capture_parameters` to instrumentor.
+  ([#3676](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3676))
+- `opentelemetry-instrumentation-dbapi`: Adds sqlcommenter to documentation.
+  ([#3720](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3720))
 
 ## 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

@@ -45,6 +45,7 @@ py-class=
     psycopg.AsyncConnection
     ObjectProxy
     fastapi.applications.FastAPI
+    _contextvars.Token
 
 any=
     ; API
@@ -75,6 +76,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/examples/manual/main.py

@@ -22,8 +22,7 @@
 
 import google.genai
 
-# NOTE: OpenTelemetry Python Logs and Events APIs are in beta
-from opentelemetry import _events as otel_events
+# NOTE: OpenTelemetry Python Logs API is in beta
 from opentelemetry import _logs as otel_logs
 from opentelemetry import metrics as otel_metrics
 from opentelemetry import trace as otel_trace
@@ -40,7 +39,6 @@
     GoogleGenAiSdkInstrumentor,
 )
 from opentelemetry.instrumentation.requests import RequestsInstrumentor
-from opentelemetry.sdk._events import EventLoggerProvider
 from opentelemetry.sdk._logs import LoggerProvider
 from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
 from opentelemetry.sdk.metrics import MeterProvider
@@ -56,12 +54,11 @@ def setup_otel_tracing():
     )
 
 
-def setup_otel_logs_and_events():
+def setup_otel_logs():
     otel_logs.set_logger_provider(LoggerProvider())
     otel_logs.get_logger_provider().add_log_record_processor(
         BatchLogRecordProcessor(OTLPLogExporter())
     )
-    otel_events.set_event_logger_provider(EventLoggerProvider())
 
 
 def setup_otel_metrics():
@@ -77,7 +74,7 @@ def setup_otel_metrics():
 
 def setup_opentelemetry():
     setup_otel_tracing()
-    setup_otel_logs_and_events()
+    setup_otel_logs()
     setup_otel_metrics()
 
 

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",
   "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
@@ -49,13 +49,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,
         )
         self._generate_content_snapshot = instrument_generate_content(

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

@@ -16,7 +16,7 @@
 
 import google.genai
 
-from opentelemetry._events import Event
+from opentelemetry._logs import LogRecord
 from opentelemetry.semconv._incubating.metrics import gen_ai_metrics
 from opentelemetry.semconv.schemas import Schemas
 
@@ -36,9 +36,9 @@
 
 
 class OTelWrapper:
-    def __init__(self, tracer, event_logger, meter):
+    def __init__(self, tracer, logger, 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)
@@ -48,12 +48,12 @@ def __init__(self, tracer, event_logger, meter):
         )
 
     @staticmethod
-    def from_providers(tracer_provider, event_logger_provider, meter_provider):
+    def from_providers(tracer_provider, logger_provider, meter_provider):
         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(
@@ -88,5 +88,7 @@ def log_response_content(self, attributes, body):
         self._log_event(event_name, attributes, body)
 
     def _log_event(self, event_name, attributes, body):
-        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)

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])