Skip to content

Align collection start times #2679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ocelotl merged 8 commits into from
May 13, 2022
Merged

Align collection start times #2679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5c91df7
Align collection start times
ocelotl May 11, 2022
9e397f4
Undo unnecessary change
ocelotl May 12, 2022
5abfb79
Use fixed values for more deterministic tests
ocelotl May 12, 2022
e2832be
Align start times
ocelotl May 12, 2022
c9ecd3b
Rename variable
ocelotl May 12, 2022
ff26fd5
Add time align test case
ocelotl May 12, 2022
86fc546
Remove unnecessary views
ocelotl May 12, 2022
66c3c47
Add more test cases
ocelotl May 13, 2022
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
24 changes: 18 additions & 6 deletions opentelemetry-sdk/src/opentelemetry/sdk/_metrics/_internal/_view_instrument_match.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
from opentelemetry.sdk._metrics._internal.measurement import Measurement
from opentelemetry.sdk._metrics._internal.point import DataPointT
from opentelemetry.sdk._metrics._internal.view import View
from opentelemetry.util._time import _time_ns

_logger = getLogger(__name__)

Expand All @@ -39,6 +40,7 @@ def __init__(
instrument: Instrument,
instrument_class_aggregation: Dict[type, Aggregation],
):
self._start_time_unix_nano = _time_ns()
self._view = view
self._instrument = instrument
self._attributes_aggregation: Dict[frozenset, _Aggregation] = {}
Expand All @@ -50,12 +52,12 @@ def __init__(
)
if not isinstance(self._view._aggregation, DefaultAggregation):
self._aggregation = self._view._aggregation._create_aggregation(
self._instrument, None
self._instrument, None, 0
Comment thread
ocelotl marked this conversation as resolved.
Resolved
)
else:
self._aggregation = self._instrument_class_aggregation[
self._instrument.__class__
]._create_aggregation(self._instrument, None)
]._create_aggregation(self._instrument, None, 0)

def conflicts(self, other: "_ViewInstrumentMatch") -> bool:
# pylint: disable=protected-access
Expand Down Expand Up @@ -103,21 +105,31 @@ def consume_measurement(self, measurement: Measurement) -> None:
):
aggregation = (
self._view._aggregation._create_aggregation(
self._instrument, attributes
self._instrument,
attributes,
self._start_time_unix_nano,
)
)
else:
aggregation = self._instrument_class_aggregation[
self._instrument.__class__
]._create_aggregation(self._instrument, attributes)
]._create_aggregation(
self._instrument,
attributes,
self._start_time_unix_nano,
)
self._attributes_aggregation[attributes] = aggregation

self._attributes_aggregation[attributes].aggregate(measurement)

def collect(
self, aggregation_temporality: AggregationTemporality
self,
aggregation_temporality: AggregationTemporality,
collection_start_nanos: int,
) -> Iterable[DataPointT]:

with self._lock:
for aggregation in self._attributes_aggregation.values():
yield aggregation.collect(aggregation_temporality)
yield aggregation.collect(
aggregation_temporality, collection_start_nanos
)
Loading