OTEL_PYTHON_LOG_LEVEL

Author: jeremydvoss

opentelemetry-sdk/src/opentelemetry/sdk/_configuration/__init__.py

@@ -54,7 +54,7 @@
     OTEL_EXPORTER_OTLP_TRACES_PROTOCOL,
     OTEL_PYTHON_TRACER_CONFIGURATOR,
     OTEL_PYTHON_LOG_FORMAT,
-    OTEL_PYTHON_LOG_HANDLER_LEVEL,
+    OTEL_PYTHON_LOG_LEVEL,
     OTEL_TRACES_SAMPLER,
     OTEL_TRACES_SAMPLER_ARG,
     OTEL_PYTHON_LOG_LEVEL,
@@ -105,7 +105,7 @@
 
 _OTEL_SAMPLER_ENTRY_POINT_GROUP = "opentelemetry_traces_sampler"
 
-_OTEL_PYTHON_LOG_HANDLER_LEVEL_BY_NAME = {
+_OTEL_PYTHON_LOG_LEVEL_BY_NAME = {
     "notset": logging.NOTSET,
     "debug": logging.DEBUG,
     "info": logging.INFO,
@@ -180,8 +180,8 @@ def _get_id_generator() -> str:
     return environ.get(OTEL_PYTHON_ID_GENERATOR, _DEFAULT_ID_GENERATOR)
 
 def _get_log_level() -> int:
-    return _OTEL_PYTHON_LOG_HANDLER_LEVEL_BY_NAME.get(
-        environ.get(OTEL_PYTHON_LOG_HANDLER_LEVEL, "notset").lower().strip(),
+    return _OTEL_PYTHON_LOG_LEVEL_BY_NAME.get(
+        environ.get(OTEL_PYTHON_LOG_LEVEL, "notset").lower().strip(),
         logging.NOTSET,
     )
 
@@ -350,7 +350,7 @@ def _init_logging(
             level=logging.NOTSET, logger_provider=provider
         )
         # Log level
-        if OTEL_PYTHON_LOG_HANDLER_LEVEL in environ:
+        if OTEL_PYTHON_LOG_LEVEL in environ:
             handler.setLevel(_get_log_level())
         # Log format
         if OTEL_PYTHON_LOG_FORMAT in environ:

opentelemetry-sdk/src/opentelemetry/sdk/environment_variables/__init__.py

@@ -62,11 +62,11 @@
 Default: "logging.BASIC_FORMAT"
 """
 
-OTEL_PYTHON_LOG_HANDLER_LEVEL = "OTEL_PYTHON_LOG_HANDLER_LEVEL"
+OTEL_PYTHON_LOG_LEVEL = "OTEL_PYTHON_LOG_LEVEL"
 """
-.. envvar:: OTEL_PYTHON_LOG_HANDLER_LEVEL
+.. envvar:: OTEL_PYTHON_LOG_LEVEL
 
-The :envvar:`OTEL_PYTHON_LOG_HANDLER_LEVEL` environment variable sets the log level for the OpenTelemetry LoggingHandler
+The :envvar:`OTEL_PYTHON_LOG_LEVEL` environment variable sets the log level for the OpenTelemetry LoggingHandler
 Default: "logging.NOTSET"
 """
 

opentelemetry-sdk/tests/test_configurator.py

@@ -871,7 +871,7 @@ def test_logging_init_exporter_level_under(self, log_level_mock):
         environ,
         {
             "OTEL_RESOURCE_ATTRIBUTES": "service.name=otlp-service",
-            "OTEL_PYTHON_LOG_HANDLER_LEVEL": "CUSTOM_LOG_LEVEL",
+            "OTEL_PYTHON_LOG_LEVEL": "CUSTOM_LOG_LEVEL",
         },
         clear=True,
     )
@@ -908,6 +908,7 @@ def test_logging_init_exporter_level_under(self, log_level_mock):
         environ,
         {
             "OTEL_RESOURCE_ATTRIBUTES": "service.name=otlp-service",
+            "OTEL_PYTHON_LOG_LEVEL": "CUSTOM_LOG_LEVEL",
             "OTEL_PYTHON_LOG_HANDLER_LEVEL": "CUSTOM_LOG_LEVEL",
             "OTEL_PYTHON_LOG_FORMAT": CUSTOM_LOG_FORMAT,
         },
@@ -983,45 +984,31 @@ def test_logging_init_exporter_without_handler_setup(self):
     def test_otel_log_level_by_name_default(self):
         self.assertEqual(_get_log_level(), NOTSET)
 
-    @patch.dict(
-        environ, {"OTEL_PYTHON_LOG_HANDLER_LEVEL": "NOTSET "}, clear=True
-    )
+    @patch.dict(environ, {"OTEL_PYTHON_LOG_LEVEL": "NOTSET "}, clear=True)
     def test_otel_log_level_by_name_notset(self):
         self.assertEqual(_get_log_level(), NOTSET)
 
-    @patch.dict(
-        environ, {"OTEL_PYTHON_LOG_HANDLER_LEVEL": " DeBug "}, clear=True
-    )
+    @patch.dict(environ, {"OTEL_PYTHON_LOG_LEVEL": " DeBug "}, clear=True)
     def test_otel_log_level_by_name_debug(self):
         self.assertEqual(_get_log_level(), DEBUG)
 
-    @patch.dict(
-        environ, {"OTEL_PYTHON_LOG_HANDLER_LEVEL": " info "}, clear=True
-    )
+    @patch.dict(environ, {"OTEL_PYTHON_LOG_LEVEL": " info "}, clear=True)
     def test_otel_log_level_by_name_info(self):
         self.assertEqual(_get_log_level(), INFO)
 
-    @patch.dict(
-        environ, {"OTEL_PYTHON_LOG_HANDLER_LEVEL": " warn"}, clear=True
-    )
+    @patch.dict(environ, {"OTEL_PYTHON_LOG_LEVEL": " warn"}, clear=True)
     def test_otel_log_level_by_name_warn(self):
         self.assertEqual(_get_log_level(), WARNING)
 
-    @patch.dict(
-        environ, {"OTEL_PYTHON_LOG_HANDLER_LEVEL": " warnING "}, clear=True
-    )
+    @patch.dict(environ, {"OTEL_PYTHON_LOG_LEVEL": " warnING "}, clear=True)
     def test_otel_log_level_by_name_warning(self):
         self.assertEqual(_get_log_level(), WARNING)
 
-    @patch.dict(
-        environ, {"OTEL_PYTHON_LOG_HANDLER_LEVEL": " eRroR"}, clear=True
-    )
+    @patch.dict(environ, {"OTEL_PYTHON_LOG_LEVEL": " eRroR"}, clear=True)
     def test_otel_log_level_by_name_error(self):
         self.assertEqual(_get_log_level(), ERROR)
 
-    @patch.dict(
-        environ, {"OTEL_PYTHON_LOG_HANDLER_LEVEL": "foobar"}, clear=True
-    )
+    @patch.dict(environ, {"OTEL_PYTHON_LOG_LEVEL": "foobar"}, clear=True)
     def test_otel_log_level_by_name_invalid(self):
         self.assertEqual(_get_log_level(), NOTSET)