Skip to content

Commit 00405b6

Browse files
comments
1 parent 23eb26c commit 00405b6

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,7 @@ def record_factory(*args, **kwargs):
249249
)
250250
handler_level = kwargs.get(
251251
"log_handler_level",
252-
_get_log_level(environ[OTEL_PYTHON_LOG_HANDLER_LEVEL])
253-
if OTEL_PYTHON_LOG_HANDLER_LEVEL in environ
254-
else None,
252+
_get_log_level(environ.get(OTEL_PYTHON_LOG_HANDLER_LEVEL)),
255253
)
256254
logger_provider = get_logger_provider()
257255
handler = _setup_logging_handler(

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
from opentelemetry.util.types import _ExtendedAttributes
3737

3838

39-
def _get_log_level(level_name: str) -> int:
39+
def _get_log_level(level_name: str | None) -> int | None:
40+
if level_name is None:
41+
return None
4042
result = logging.getLevelName(level_name.upper().strip())
4143
return result if isinstance(result, int) else logging.NOTSET
4244

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -687,6 +687,9 @@ def test_setup_logging_handler_default_level_is_notset(self):
687687

688688

689689
class GetLogLevelTestCase(unittest.TestCase):
690+
def test_get_log_level_none_returns_none(self):
691+
self.assertIsNone(_get_log_level(None))
692+
690693
def test_get_log_level_notset(self):
691694
self.assertEqual(_get_log_level("notset"), logging.NOTSET)
692695

0 commit comments

Comments
 (0)