Skip to content

Commit a171842

Browse files
committed
remove backwards compat re-export of ConfigurationError from _loader.py
Import directly from _exceptions.py since this is new code with no existing dependents on the _loader module path. Assisted-by: Claude Sonnet 4.6
1 parent 16b89b1 commit a171842

3 files changed

Lines changed: 5 additions & 10 deletions

File tree

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
'1.0'
2525
"""
2626

27+
from opentelemetry.sdk._configuration._exceptions import ConfigurationError
2728
from opentelemetry.sdk._configuration._propagator import (
2829
configure_propagator,
2930
create_propagator,
@@ -33,10 +34,7 @@
3334
EnvSubstitutionError,
3435
substitute_env_vars,
3536
)
36-
from opentelemetry.sdk._configuration.file._loader import (
37-
ConfigurationError,
38-
load_config_file,
39-
)
37+
from opentelemetry.sdk._configuration.file._loader import load_config_file
4038

4139
__all__ = [
4240
"load_config_file",

opentelemetry-sdk/src/opentelemetry/sdk/_configuration/file/_loader.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@ def _get_schema() -> dict:
6060
_logger = logging.getLogger(__name__)
6161

6262

63-
# Re-export for backwards compatibility
64-
__all__ = ["ConfigurationError", "load_config_file"]
65-
66-
6763
def load_config_file(file_path: str) -> OpenTelemetryConfiguration:
6864
"""Load and parse an OpenTelemetry configuration file.
6965

opentelemetry-sdk/tests/_configuration/test_propagator.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
from opentelemetry.baggage.propagation import W3CBaggagePropagator
2323
from opentelemetry.environment_variables import OTEL_PROPAGATORS
2424
from opentelemetry.propagators.composite import CompositePropagator
25+
from opentelemetry.sdk._configuration._exceptions import ConfigurationError
2526
from opentelemetry.sdk._configuration._propagator import (
2627
configure_propagator,
2728
create_propagator,
2829
)
29-
from opentelemetry.sdk._configuration.file._loader import ConfigurationError
3030
from opentelemetry.sdk._configuration.models import (
3131
Propagator as PropagatorConfig,
3232
)
@@ -273,5 +273,6 @@ def test_otel_propagators_env_var_ignored(self):
273273
propagator = mock_set.call_args[0][0]
274274
self.assertEqual(len(propagator._propagators), 1) # type: ignore[attr-defined]
275275
self.assertIsInstance(
276-
propagator._propagators[0], TraceContextTextMapPropagator # type: ignore[attr-defined]
276+
propagator._propagators[0],
277+
TraceContextTextMapPropagator, # type: ignore[attr-defined]
277278
)

0 commit comments

Comments
 (0)