Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

- Enable `PIE` (flake8-pie) ruff rule and fix all violations
([#5150](https://github.com/open-telemetry/opentelemetry-python/pull/5150))
- `opentelemetry-sdk`: add `additional_properties` support to generated config models via custom `datamodel-codegen` template, enabling plugin/custom component names to flow through typed dataclasses
([#5131](https://github.com/open-telemetry/opentelemetry-python/pull/5131))
- Fix incorrect code example in `create_tracer()` docstring
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,6 @@ def _exporting(self) -> str:
Returns a string that describes the overall exporter, to be used in
warning messages.
"""
pass

def _set_meter_provider(self, meter_provider: MeterProvider) -> None:
self._metrics = ExporterMetrics(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,7 @@ def setUp(self):
self.span = _Span(
"a",
context=Mock(
**{
"trace_state": {"a": "b", "c": "d"},
"span_id": 10217189687419569865,
"trace_id": 67545097771067222548457157018666467027,
}
trace_state={"a": "b", "c": "d"}, span_id=10217189687419569865, trace_id=67545097771067222548457157018666467027
),
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,27 +84,20 @@ def setUp(self):
self.tracer = tracer_provider.get_tracer(__name__)

event_mock = Mock(
**{
"timestamp": 1591240820506462784,
"attributes": BoundedAttributes(
timestamp=1591240820506462784, attributes=BoundedAttributes(
attributes={"a": 1, "b": False}
),
}
)
)

type(event_mock).name = PropertyMock(return_value="a")
type(event_mock).dropped_attributes = PropertyMock(return_value=0)
self.span = _Span(
"a",
context=Mock(
**{
"trace_state": {"a": "b", "c": "d"},
"span_id": 10217189687419569865,
"trace_id": 67545097771067222548457157018666467027,
}
trace_state={"a": "b", "c": "d"}, span_id=10217189687419569865, trace_id=67545097771067222548457157018666467027
),
resource=SDKResource({"a": 1, "b": False}),
parent=Mock(**{"span_id": 12345}),
parent=Mock(span_id=12345),
attributes=BoundedAttributes(attributes={"a": 1, "b": True}),
events=[event_mock],
links=[
Expand All @@ -128,14 +121,10 @@ def setUp(self):
self.span2 = _Span(
"b",
context=Mock(
**{
"trace_state": {"a": "b", "c": "d"},
"span_id": 10217189687419569865,
"trace_id": 67545097771067222548457157018666467027,
}
trace_state={"a": "b", "c": "d"}, span_id=10217189687419569865, trace_id=67545097771067222548457157018666467027
),
resource=SDKResource({"a": 2, "b": False}),
parent=Mock(**{"span_id": 12345}),
parent=Mock(span_id=12345),
instrumentation_scope=InstrumentationScope(
name="name", version="version"
),
Expand All @@ -144,14 +133,10 @@ def setUp(self):
self.span3 = _Span(
"c",
context=Mock(
**{
"trace_state": {"a": "b", "c": "d"},
"span_id": 10217189687419569865,
"trace_id": 67545097771067222548457157018666467027,
}
trace_state={"a": "b", "c": "d"}, span_id=10217189687419569865, trace_id=67545097771067222548457157018666467027
),
resource=SDKResource({"a": 1, "b": False}),
parent=Mock(**{"span_id": 12345}),
parent=Mock(span_id=12345),
instrumentation_scope=InstrumentationScope(
name="name2", version="version2"
),
Expand Down Expand Up @@ -795,13 +780,9 @@ def _create_span_with_status(status: SDKStatus):
span = _Span(
"a",
context=Mock(
**{
"trace_state": {"a": "b", "c": "d"},
"span_id": 10217189687419569865,
"trace_id": 67545097771067222548457157018666467027,
}
trace_state={"a": "b", "c": "d"}, span_id=10217189687419569865, trace_id=67545097771067222548457157018666467027
),
parent=Mock(**{"span_id": 12345}),
parent=Mock(span_id=12345),
instrumentation_scope=InstrumentationScope(
name="name", version="version"
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,7 @@
BASIC_SPAN = _Span(
"abc",
context=Mock(
**{
"trace_state": {"a": "b", "c": "d"},
"span_id": 10217189687419569865,
"trace_id": 67545097771067222548457157018666467027,
}
trace_state={"a": "b", "c": "d"}, span_id=10217189687419569865, trace_id=67545097771067222548457157018666467027
),
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@ def get_data_for_max_tag_length_test(
span.set_attribute("tuple4", (2,) * 10)
span.set_attribute("tuple5", (True,) * 25)
span.set_attribute("tuple6", (True,) * 10)
span.set_attribute("range1", range(0, 25))
span.set_attribute("range2", range(0, 10))
span.set_attribute("range1", range(25))
span.set_attribute("range2", range(10))
span.set_attribute("empty_list", [])
span.set_attribute("none_list", ["hello", None, "world"])
span.end(end_time=end_time)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@ def get_data_for_max_tag_length_test(
span.set_attribute("tuple4", (2,) * 10)
span.set_attribute("tuple5", (True,) * 25)
span.set_attribute("tuple6", (True,) * 10)
span.set_attribute("range1", range(0, 25))
span.set_attribute("range2", range(0, 10))
span.set_attribute("range1", range(25))
span.set_attribute("range2", range(10))
span.set_attribute("empty_list", [])
span.set_attribute("none_list", ["hello", None, "world"])
span.end(end_time=end_time)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def test_get_event_logger_provider(self):
with patch("opentelemetry._events._load_provider", Mock()):
with patch(
"opentelemetry._events.cast",
Mock(**{"return_value": "test_event_logger_provider"}),
Mock(return_value="test_event_logger_provider"),
):
self.assertEqual(
get_event_logger_provider(),
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-api/tests/logs/test_logger_provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def test_get_logger_provider(self):
with patch("opentelemetry._logs._internal._load_provider", Mock()):
with patch(
"opentelemetry._logs._internal.cast",
Mock(**{"return_value": "test_logger_provider"}),
Mock(return_value="test_logger_provider"),
):
self.assertEqual(
get_logger_provider(), "test_logger_provider"
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-api/tests/metrics/test_meter_provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def test_get_meter_provider(reset_meter_provider):
with patch("opentelemetry.metrics._internal._load_provider", Mock()):
with patch(
"opentelemetry.metrics._internal.cast",
Mock(**{"return_value": "test_meter_provider"}),
Mock(return_value="test_meter_provider"),
):
assert get_meter_provider() == "test_meter_provider"

Expand Down
7 changes: 1 addition & 6 deletions opentelemetry-api/tests/propagators/test__envcarrier.py
Original file line number Diff line number Diff line change
Expand Up @@ -374,12 +374,7 @@ def test_fields(self, mock_get_current_span, mock_invalid_span_context):
return_value=Mock(
**{
"get_span_context.return_value": Mock(
**{
"trace_id": 1,
"span_id": 2,
"trace_flags": 3,
"trace_state": TraceState([("a", "b")]),
}
trace_id=1, span_id=2, trace_flags=3, trace_state=TraceState([("a", "b")])
)
}
)
Expand Down
18 changes: 8 additions & 10 deletions opentelemetry-api/tests/propagators/test_propagators.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def test_propagators(propagators):
)

mock_compositehttppropagator.configure_mock(
**{"side_effect": test_propagators}
side_effect=test_propagators
)

# pylint: disable=import-outside-toplevel
Expand All @@ -62,7 +62,7 @@ def test_propagators(propagators):
)

mock_compositehttppropagator.configure_mock(
**{"side_effect": test_propagators}
side_effect=test_propagators
)

# pylint: disable=import-outside-toplevel
Expand All @@ -85,7 +85,7 @@ def test_propagators(propagators):
)

mock_compositehttppropagator.configure_mock(
**{"side_effect": test_propagators}
side_effect=test_propagators
)

# pylint: disable=import-outside-toplevel
Expand All @@ -100,13 +100,12 @@ def test_non_default_propagators(
self, mock_entry_points, mock_compositehttppropagator
):
mock_entry_points.configure_mock(
**{
"side_effect": [
side_effect=[
[
Mock(
**{
"load.return_value": Mock(
**{"return_value": "a"}
return_value="a"
)
}
),
Expand All @@ -115,7 +114,7 @@ def test_non_default_propagators(
Mock(
**{
"load.return_value": Mock(
**{"return_value": "b"}
return_value="b"
)
}
)
Expand All @@ -124,20 +123,19 @@ def test_non_default_propagators(
Mock(
**{
"load.return_value": Mock(
**{"return_value": "c"}
return_value="c"
)
}
)
],
]
}
)

def test_propagators(propagators):
self.assertEqual(propagators, ["a", "b", "c"])

mock_compositehttppropagator.configure_mock(
**{"side_effect": test_propagators}
side_effect=test_propagators
)

# pylint: disable=import-outside-toplevel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,12 +249,7 @@ def test_fields(self, mock_get_current_span, mock_invalid_span_context):
return_value=Mock(
**{
"get_span_context.return_value": Mock(
**{
"trace_id": 1,
"span_id": 2,
"trace_flags": 3,
"trace_state": TraceState([("a", "b")]),
}
trace_id=1, span_id=2, trace_flags=3, trace_state=TraceState([("a", "b")])
)
}
)
Expand Down
6 changes: 2 additions & 4 deletions opentelemetry-api/tests/util/test__providers.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,17 @@ def test__providers(self, mock_entry_points):
reload(_providers)

mock_entry_points.configure_mock(
**{
"side_effect": [
side_effect=[
[
Mock(
**{
"load.return_value": Mock(
**{"return_value": "a"}
return_value="a"
)
}
),
],
]
}
)

self.assertEqual(
Expand Down
8 changes: 3 additions & 5 deletions opentelemetry-sdk/tests/error_handler/test_error_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,10 @@ class AssertionErrorHandler(ErrorHandler, AssertionError):
)

mock_entry_points.configure_mock(
**{
"return_value": [
return_value=[
mock_entry_point_zero_division_error_handler,
mock_entry_point_assertion_error_handler,
]
}
)

error = ZeroDivisionError()
Expand Down Expand Up @@ -91,7 +89,7 @@ def _handle(self, error: Exception):
)

mock_entry_points.configure_mock(
**{"return_value": [mock_entry_point_error_error_handler]}
return_value=[mock_entry_point_error_error_handler]
)

error = ZeroDivisionError()
Expand All @@ -115,7 +113,7 @@ def __new__(cls):
)

mock_entry_points.configure_mock(
**{"return_value": [mock_entry_point_error_handler]}
return_value=[mock_entry_point_error_handler]
)

error = IndexError()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ def mock_increment(self, bucket_index: int) -> None:
exponential_histogram_aggregation._value_positive.offset,
)

for index in range(0, 256):
for index in range(256):
self.assertLessEqual(
exponential_histogram_aggregation._value_positive[index],
6 * increment,
Expand Down Expand Up @@ -578,7 +578,7 @@ def test_move_into(self):
exponential_histogram_aggregation_1._value_positive.offset,
)

for index in range(0, 256):
for index in range(256):
self.assertLessEqual(
exponential_histogram_aggregation_1._value_positive[index], 6
)
Expand Down
4 changes: 2 additions & 2 deletions opentelemetry-sdk/tests/metrics/test_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ def test_instrument_type(self):

def test_instrument_name(self):
mock_instrument = Mock()
mock_instrument.configure_mock(**{"name": "instrument_name"})
mock_instrument.configure_mock(name="instrument_name")

self.assertTrue(
View(instrument_name="instrument_name")._match(mock_instrument)
)

def test_instrument_unit(self):
mock_instrument = Mock()
mock_instrument.configure_mock(**{"unit": "instrument_unit"})
mock_instrument.configure_mock(unit="instrument_unit")

self.assertTrue(
View(instrument_unit="instrument_unit")._match(mock_instrument)
Expand Down
4 changes: 2 additions & 2 deletions opentelemetry-sdk/tests/test_configurator.py
Original file line number Diff line number Diff line change
Expand Up @@ -1472,7 +1472,7 @@ def mock_entry_points_impl(group, name):
class TestImportConfigComponents(TestCase):
@patch(
"opentelemetry.sdk._configuration.entry_points",
**{"side_effect": KeyError},
side_effect=KeyError,
)
def test__import_config_components_missing_entry_point(
self, mock_entry_points
Expand All @@ -1485,7 +1485,7 @@ def test__import_config_components_missing_entry_point(

@patch(
"opentelemetry.sdk._configuration.entry_points",
**{"side_effect": StopIteration},
side_effect=StopIteration,
)
def test__import_config_components_missing_component(
self, mock_entry_points
Expand Down
Loading