From 123932cc21b26ddc6b6ce1232258d6e6e87c4aa9 Mon Sep 17 00:00:00 2001 From: jerevoss Date: Thu, 26 Sep 2024 16:22:32 -0700 Subject: [PATCH] Clean up. Still has todos --- .../opentelemetry/sdk/_configuration/__init__.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/_configuration/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/_configuration/__init__.py index 94a01ebfdf..7aec9a7037 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/_configuration/__init__.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/_configuration/__init__.py @@ -43,6 +43,7 @@ OTEL_EXPORTER_OTLP_TRACES_PROTOCOL, OTEL_TRACES_SAMPLER, OTEL_TRACES_SAMPLER_ARG, + # TODO which env vars OTEL_LOG_LEVEL, OTEL_PYTHON_LOG_LEVEL, OTEL_PYTHON_LOG_FORMAT, @@ -241,16 +242,14 @@ def _init_logging( exporters: Dict[str, Type[LogExporter]], resource: Resource = None, ): - print("_init_logging") log_format = environ.get(OTEL_PYTHON_LOG_FORMAT, logging.BASIC_FORMAT) - LEVELS = { + levels = { "debug": logging.DEBUG, "info": logging.INFO, "warning": logging.WARNING, "error": logging.ERROR, } - # log_level = LEVELS.get(environ.get(OTEL_PYTHON_LOG_LEVEL, "info"), logging.INFO) - log_level = LEVELS.get(environ.get(OTEL_PYTHON_LOG_LEVEL), logging.INFO) + log_level = levels.get(environ.get(OTEL_PYTHON_LOG_LEVEL, "info").lower(), logging.INFO) provider = LoggerProvider(resource=resource) set_logger_provider(provider) @@ -263,12 +262,6 @@ def _init_logging( handler = LoggingHandler(level=logging.NOTSET, logger_provider=provider) - # fmt = Formatter(fs, dfs, style) - # handler.setFormatter(fmt) - # logging.getLogger().addHandler(handler) - # logging.getLogger().setLevel(log_level) - # logging.getLogger().addHandler(handler) - logging.basicConfig( format=log_format, level=log_level,