fix(logging): fix logging duplicating

Author: kossman

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.15.1] - 2025-10-06
+### Fixed
+- Logging duplication on CloudWatch side
+
+
 ## [1.15.0] - 2025-09-04
 ### Security
 - Upgraded internal dependency `urllib3` to version `2.5.0`

src/corva/configuration.py

@@ -3,6 +3,12 @@
 import pydantic
 
 
+def parse_truthy(v):
+    if isinstance(v, bool):
+        return v
+    return str(v or "").strip().lower() in {"1", "true", "t", "yes", "y", "on"}
+
+
 class Settings(pydantic.BaseSettings):
     # api
     API_ROOT_URL: pydantic.AnyHttpUrl
@@ -32,5 +38,11 @@ class Settings(pydantic.BaseSettings):
     MAX_RETRY_COUNT: int = 3  # If `0` then retries will be disabled
     BACKOFF_FACTOR: float = 1.0
 
+    OTEL_LOG_SENDING_DISABLED: bool = False
+
+    _validate_otel_log_sending_disabled = pydantic.validator(
+        "OTEL_LOG_SENDING_DISABLED", pre=True, allow_reuse=True
+    )(parse_truthy)
+
 
 SETTINGS = Settings()

src/corva/logger.py

@@ -1,8 +1,8 @@
 import contextlib
 import logging
-import os
 import sys
 import time
+from contextlib import suppress
 from typing import Optional
 
 from corva.configuration import SETTINGS
@@ -22,14 +22,6 @@
 CORVA_LOGGER.propagate = False
 
 
-def _is_truthy(value: Optional[str]) -> bool:
-    return str(value).strip().lower() in {"1", "true", "t", "yes", "y", "on"}
-
-
-# Cache at import time: env rarely changes at runtime
-_OTEL_X_LOG_SENDING_DISABLED = _is_truthy(os.getenv("OTEL_X_LOG_SENDING_DISABLED"))
-
-
 def _is_otel_handler(handler: logging.Handler) -> bool:
     """Best-effort detection of OTel log sending handlers.
 
@@ -263,14 +255,12 @@ def __enter__(self):
         # If OTel log sending is enabled and an OTel handler exists on root,
         # attach it to CORVA_LOGGER as well so propagation can remain disabled
         # (avoids AWS root duplication) while still exporting logs via OTel.
-        if not _OTEL_X_LOG_SENDING_DISABLED:
-            try:
-                for h in _gather_otel_handlers_from_root():
-                    if h not in handlers:
-                        handlers.append(h)
-            except Exception:
-                # Fail-safe: never break logging if detection fails
-                pass
+
+        if not SETTINGS.OTEL_LOG_SENDING_DISABLED:
+            with suppress(Exception):  # Fail-safe: never break logging if detection fails
+                for handler in _gather_otel_handlers_from_root():
+                    if handler not in handlers:
+                        handlers.append(handler)
 
         self.logger.handlers = handlers
 

src/version.py

@@ -1 +1 @@
-VERSION = "1.15.0"
+VERSION = "1.15.1"

tests/unit/test_logging.py

@@ -1,5 +1,6 @@
 import datetime
 import logging
+from unittest.mock import MagicMock
 
 import freezegun
 import pytest
@@ -8,6 +9,7 @@
 from corva import Logger
 from corva.configuration import SETTINGS
 from corva.handlers import scheduled, stream, task
+from corva.logger import LoggingContext
 from corva.models.context import CorvaContext
 from corva.models.scheduled.raw import RawScheduledDataTimeEvent, RawScheduledEvent
 from corva.models.scheduled.scheduler_type import SchedulerType
@@ -326,3 +328,27 @@ def app(event, api):
 
     assert 'The app failed to execute.' in captured.out
     assert 'The app failed to execute.' in captured.err
+
+
+@pytest.mark.parametrize("handler_cls_name", ("opentelemetry", "otel"))
+def test__otel_handler_passed_to_logging_context__success(monkeypatch, handler_cls_name):
+
+    otel_handler = MagicMock()
+    otel_handler.__class__.__name__ = handler_cls_name
+
+    # Attach to the root logger
+    logging.getLogger().addHandler(otel_handler)
+
+    monkeypatch.setenv("OTEL_SDK_DISABLED", "false")
+
+    with LoggingContext(
+            aws_request_id=MagicMock(),
+            asset_id=MagicMock(),
+            app_connection_id=MagicMock(),
+            handler=MagicMock(),
+            user_handler=MagicMock(),
+            logger=MagicMock(),
+    ) as context:
+        assert otel_handler in context.logger.handlers
+
+    logging.getLogger().removeHandler(otel_handler)