Skip to content

Commit 83e17bd

Browse files
committed
Merge branch 'mike/config-recursive-dict-conversion' into mike/config-orchestrator
2 parents fd6c20a + b6e4702 commit 83e17bd

2 files changed

Lines changed: 9 additions & 12 deletions

File tree

.codespellrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[codespell]
22
# skipping auto generated folders
33
skip = ./.tox,./.mypy_cache,./docs/_build,./target,*/LICENSE,./venv,.git,./opentelemetry-semantic-conventions,*-requirements*.txt
4-
ignore-words-list = ans,ue,ot,hist,ro
4+
ignore-words-list = ans,ue,ot,hist,ro,astroid

opentelemetry-sdk/tests/_configuration/test_conversion.py

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
import unittest
88
from dataclasses import dataclass
9-
from enum import Enum
109
from typing import Any, ClassVar
1110

1211
from opentelemetry.sdk._configuration._common import _additional_properties
1312
from opentelemetry.sdk._configuration._conversion import _dict_to_dataclass
13+
from opentelemetry.sdk._configuration.models import ExemplarFilter
1414

1515

1616
@dataclass
@@ -37,14 +37,9 @@ class _WithExtras:
3737
additional_properties: ClassVar[dict[str, Any]]
3838

3939

40-
class _Level(Enum):
41-
info = "info"
42-
warn = "warn"
43-
44-
4540
@dataclass
4641
class _WithEnum:
47-
level: _Level | None = None
42+
filter: ExemplarFilter | None = None
4843

4944

5045
class TestDictToDataclass(unittest.TestCase):
@@ -105,9 +100,11 @@ def test_empty_list_converted(self):
105100
self.assertEqual(result.middle.items, [])
106101

107102
def test_enum_value_coerced_from_string(self):
108-
result = _dict_to_dataclass({"level": "info"}, _WithEnum)
109-
self.assertIs(result.level, _Level.info)
103+
result = _dict_to_dataclass({"filter": "always_on"}, _WithEnum)
104+
self.assertIs(result.filter, ExemplarFilter.always_on)
110105

111106
def test_enum_value_already_enum_passes_through(self):
112-
result = _dict_to_dataclass({"level": _Level.warn}, _WithEnum)
113-
self.assertIs(result.level, _Level.warn)
107+
result = _dict_to_dataclass(
108+
{"filter": ExemplarFilter.trace_based}, _WithEnum
109+
)
110+
self.assertIs(result.filter, ExemplarFilter.trace_based)

0 commit comments

Comments
 (0)