Switch to OTEL_LOG_LEVEL

Author: xrmx

docs/reference/edot-python/configuration.md

@@ -94,19 +94,22 @@ EDOT Python uses different defaults than OpenTelemetry Python for the following
 | `OTEL_METRICS_EXEMPLAR_FILTER` | `always_off` | `trace_based` |
 | `OTEL_TRACES_SAMPLER` | `parentbased_traceidratio` | `parentbased_always_on` |
 | `OTEL_TRACES_SAMPLER_ARG` | `1.0` | |
+| `OTEL_LOG_LEVEL` | `warn` | Not handled |
 
 :::{note}
 `OTEL_EXPERIMENTAL_RESOURCE_DETECTORS` cloud resource detectors are dynamically set. When running in a Kubernetes Pod it will be set to `process_runtime,os,otel,telemetry_distro,service_instance,_gcp,aws_eks`.
 :::
 
+:::{note}
+`OTEL_LOG_LEVEL` accepts the following levels: `trace`, `debug`, `info`, `warn`, `error`, `fatal`, `off`.
+:::
 
 ### Configuration options only available in EDOT Python
 
 `ELASTIC_OTEL_` options are specific to Elastic and will always live in EDOT Python include the following.
 
 | Option(s) | Default | Description |
 |---|---|---|
-| `ELASTIC_OTEL_LOG_LEVEL` | `warn` | Configure EDOT SDK logging level to one of `trace`, `debug`, `info`, `warn`, `error`, `fatal`, `off` |
 | `ELASTIC_OTEL_SYSTEM_METRICS_ENABLED` | `false` | When set to `true`, sends *system namespace* metrics. |
 
 ## LLM settings

src/elasticotel/distro/config.py

@@ -20,13 +20,12 @@
 import os
 from dataclasses import dataclass
 
-from elasticotel.distro.environment_variables import ELASTIC_OTEL_LOG_LEVEL
 from opentelemetry import trace
 from opentelemetry._opamp import messages
 from opentelemetry._opamp.agent import OpAMPAgent
 from opentelemetry._opamp.client import OpAMPClient
 from opentelemetry._opamp.proto import opamp_pb2 as opamp_pb2
-from opentelemetry.sdk.environment_variables import OTEL_TRACES_SAMPLER_ARG
+from opentelemetry.sdk.environment_variables import OTEL_LOG_LEVEL, OTEL_TRACES_SAMPLER_ARG
 from opentelemetry.sdk.trace.sampling import ParentBasedTraceIdRatio
 
 
@@ -82,9 +81,8 @@ class ConfigUpdate:
 @dataclass
 class Config:
  sampling_rate = ConfigItem(default=str(DEFAULT_SAMPLING_RATE), from_env_var=OTEL_TRACES_SAMPLER_ARG)
- # currently the sdk does not handle OTEL_LOG_LEVEL, so we use ELASTIC_OTEL_LOG_LEVEL
- # with the same values and behavior of the logging_level we get from Central Configuration.
- logging_level = ConfigItem(default=DEFAULT_LOGGING_LEVEL, from_env_var=ELASTIC_OTEL_LOG_LEVEL)
+ # currently the sdk does not handle OTEL_LOG_LEVEL, so we use handle it on our own
+ logging_level = ConfigItem(default=DEFAULT_LOGGING_LEVEL, from_env_var=OTEL_LOG_LEVEL)
 
  def to_dict(self):
  return {LOGGING_LEVEL_CONFIG_KEY: self.logging_level.value, SAMPLING_RATE_CONFIG_KEY: self.sampling_rate.value}

src/elasticotel/distro/environment_variables.py

@@ -31,12 +31,3 @@
 
 **Default value:** ``not set``
 """
-
-ELASTIC_OTEL_LOG_LEVEL = "ELASTIC_OTEL_LOG_LEVEL"
-"""
-.. envvar:: ELASTIC_OTEL_LOG_LEVEL
-
-EDOT and OpenTelemetry SDK logging level.
-
-**Default value:** ``not set``
-"""

tests/distro/test_distro.py

@@ -235,7 +235,7 @@ def test_configurator_ignores_opamp_without_endpoint(self, client_mock, agent_mo
  client_mock.assert_not_called()
  agent_mock.assert_not_called()
 
- @mock.patch.dict("os.environ", {"ELASTIC_OTEL_LOG_LEVEL": "debug"}, clear=True)
+ @mock.patch.dict("os.environ", {"OTEL_LOG_LEVEL": "debug"}, clear=True)
  @mock.patch("elasticotel.distro.config.logger")
  def test_configurator_applies_elastic_otel_log_level(self, logger_mock):
  ElasticOpenTelemetryConfigurator()._configure()
@@ -255,7 +255,7 @@ def test_configurator_handles_elastic_otel_log_level_not_set(self, logger_mock):
  self.assertEqual(logging.getLogger("opentelemetry").getEffectiveLevel(), logging.WARNING)
  self.assertEqual(logging.getLogger("elasticotel").getEffectiveLevel(), logging.WARNING)
 
- @mock.patch.dict("os.environ", {"ELASTIC_OTEL_LOG_LEVEL": "invalid"}, clear=True)
+ @mock.patch.dict("os.environ", {"OTEL_LOG_LEVEL": "invalid"}, clear=True)
  def test_configurator_handles_invalid_elastic_otel_log_level(self):
  with self.assertLogs("elasticotel", level="ERROR") as cm:
  ElasticOpenTelemetryConfigurator()._configure()