Skip to content

Commit cee2016

Browse files
committed
update dataclass definitions
1 parent 01f0dbc commit cee2016

File tree

2 files changed

+12
-10
lines changed
  • opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal
  • tests/opentelemetry-test-utils/src/opentelemetry/test

2 files changed

+12
-10
lines changed

opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/point.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@ def no_recorded_value(self) -> bool:
5656
return bool(self & self.NO_RECORDED_VALUE)
5757

5858

59-
DEFAULT_DATA_POINT_FLAGS = DataPointFlags.get_default()
60-
61-
6259
@dataclass(frozen=True)
6360
class NumberDataPoint:
6461
"""Single data point in a timeseries that describes the time-varying scalar
@@ -70,7 +67,7 @@ class NumberDataPoint:
7067
time_unix_nano: int
7168
value: Union[int, float]
7269
exemplars: Sequence[Exemplar] = field(default_factory=list)
73-
flags: DataPointFlags = DEFAULT_DATA_POINT_FLAGS
70+
flags: DataPointFlags = DataPointFlags.get_default()
7471

7572
def to_json(self, indent: Optional[int] = 4) -> str:
7673
return dumps(asdict(self), indent=indent)
@@ -92,7 +89,7 @@ class HistogramDataPoint:
9289
min: float
9390
max: float
9491
exemplars: Sequence[Exemplar] = field(default_factory=list)
95-
flags: DataPointFlags = DEFAULT_DATA_POINT_FLAGS
92+
flags: DataPointFlags = DataPointFlags.get_default()
9693

9794
def to_json(self, indent: Optional[int] = 4) -> str:
9895
return dumps(asdict(self), indent=indent)
@@ -123,7 +120,7 @@ class ExponentialHistogramDataPoint:
123120
min: float
124121
max: float
125122
exemplars: Sequence[Exemplar] = field(default_factory=list)
126-
flags: DataPointFlags = DEFAULT_DATA_POINT_FLAGS
123+
flags: DataPointFlags = DataPointFlags.get_default()
127124

128125
def to_json(self, indent: Optional[int] = 4) -> str:
129126
return dumps(asdict(self), indent=indent)

tests/opentelemetry-test-utils/src/opentelemetry/test/metrictestutil.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
from typing import Optional
1717

1818
from opentelemetry.attributes import BoundedAttributes
19-
from opentelemetry.sdk.metrics._internal.point import DEFAULT_DATA_POINT_FLAGS
2019
from opentelemetry.sdk.metrics.export import (
2120
AggregationTemporality,
2221
DataPointFlags,
@@ -52,10 +51,12 @@ def _generate_sum(
5251
description=None,
5352
unit=None,
5453
is_monotonic=True,
55-
flags=DEFAULT_DATA_POINT_FLAGS,
54+
flags=None,
5655
) -> Metric:
5756
if attributes is None:
5857
attributes = BoundedAttributes(attributes={"a": 1, "b": True})
58+
if flags is None:
59+
flags = DataPointFlags.get_default()
5960
return _generate_metric(
6061
name,
6162
Sum(
@@ -82,10 +83,12 @@ def _generate_gauge(
8283
attributes=None,
8384
description=None,
8485
unit=None,
85-
flags=DEFAULT_DATA_POINT_FLAGS,
86+
flags=None,
8687
) -> Metric:
8788
if attributes is None:
8889
attributes = BoundedAttributes(attributes={"a": 1, "b": True})
90+
if flags is None:
91+
flags = DataPointFlags.get_default()
8992
return _generate_metric(
9093
name,
9194
Gauge(
@@ -120,10 +123,12 @@ def _generate_histogram(
120123
attributes: Attributes = None,
121124
description: Optional[str] = None,
122125
unit: Optional[str] = None,
123-
flags: DataPointFlags = DEFAULT_DATA_POINT_FLAGS,
126+
flags: Optional[DataPointFlags] = None,
124127
) -> Metric:
125128
if attributes is None:
126129
attributes = BoundedAttributes(attributes={"a": 1, "b": True})
130+
if flags is None:
131+
flags = DataPointFlags.get_default()
127132
return _generate_metric(
128133
name,
129134
Histogram(

0 commit comments

Comments
 (0)