comments

Author: JWinermaSplunk

instrumentation/opentelemetry-instrumentation-logging/src/opentelemetry/instrumentation/logging/__init__.py

@@ -61,7 +61,7 @@
 
 import logging  # pylint: disable=import-self
 from os import environ
-from typing import Collection
+from typing import Collection, Optional
 
 from opentelemetry._logs import get_logger_provider
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
@@ -78,7 +78,6 @@
     OTEL_PYTHON_LOG_LEVEL,
 )
 from opentelemetry.instrumentation.logging.handler import (
-    _get_log_level,
     _setup_logging_handler,
 )
 from opentelemetry.instrumentation.logging.package import _instruments
@@ -101,6 +100,20 @@
 _logger = logging.getLogger(__name__)
 
 
+def _get_log_level(level_name: Optional[str]) -> Optional[int]:
+    if level_name is None:
+        return None
+    result = logging.getLevelName(level_name.upper().strip())
+    if not isinstance(result, int):
+        _logger.warning(
+            "Invalid log level %r for %s; defaulting to NOTSET",
+            level_name,
+            OTEL_PYTHON_LOG_HANDLER_LEVEL,
+        )
+        return logging.NOTSET
+    return result
+
+
 class LoggingInstrumentor(BaseInstrumentor):  # pylint: disable=empty-docstring
     __doc__ = f"""An instrumentor for stdlib logging module.
 

instrumentation/opentelemetry-instrumentation-logging/src/opentelemetry/instrumentation/logging/handler.py

@@ -36,13 +36,6 @@
 from opentelemetry.util.types import _ExtendedAttributes
 
 
-def _get_log_level(level_name: str | None) -> int | None:
-    if level_name is None:
-        return None
-    result = logging.getLevelName(level_name.upper().strip())
-    return result if isinstance(result, int) else logging.NOTSET
-
-
 def _setup_logging_handler(
     logger_provider: LoggerProvider,
     log_code_attributes: bool = False,

instrumentation/opentelemetry-instrumentation-logging/tests/test_handler.py

@@ -20,9 +20,9 @@
 from opentelemetry._logs import NoOpLoggerProvider, SeverityNumber
 from opentelemetry._logs import get_logger as APIGetLogger
 from opentelemetry.attributes import BoundedAttributes
+from opentelemetry.instrumentation.logging import _get_log_level
 from opentelemetry.instrumentation.logging.handler import (
     LoggingHandler,
-    _get_log_level,
     _setup_logging_handler,
 )
 from opentelemetry.sdk import trace
@@ -709,7 +709,11 @@ def test_get_log_level_error(self):
         self.assertEqual(_get_log_level(" eRroR"), logging.ERROR)
 
     def test_get_log_level_invalid_falls_back_to_notset(self):
-        self.assertEqual(_get_log_level("foobar"), logging.NOTSET)
+        with self.assertLogs(
+            "opentelemetry.instrumentation.logging", level="WARNING"
+        ) as cm:
+            self.assertEqual(_get_log_level("foobar"), logging.NOTSET)
+        self.assertTrue(any("foobar" in line for line in cm.output))
 
 
 def set_up_test_logging(