Skip to content

Commit dd30bfc

Browse files
committed
Avoid using current_point attributes
1 parent a31411e commit dd30bfc

File tree

1 file changed

+16
-16
lines changed
  • opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal

1 file changed

+16
-16
lines changed

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

+16-16
Original file line numberDiff line numberDiff line change
@@ -656,51 +656,51 @@ def collect(
656656
if aggregation_temporality is AggregationTemporality.CUMULATIVE:
657657

658658
start_time_unix_nano = self._previous_start_time_unix_nano
659-
sum_ = current_point.sum + self._previous_sum
659+
sum_ = current_sum + self._previous_sum
660660
# Only update min/max on delta -> cumulative
661-
max_ = max(current_point.max, self._previous_max)
662-
min_ = min(current_point.min, self._previous_min)
661+
max_ = max(current_max, self._previous_max)
662+
min_ = min(current_min, self._previous_min)
663663

664664
self._merge(
665665
self._previous_positive,
666-
current_point.positive,
667-
current_point.scale,
666+
current_positive,
667+
current_scale,
668668
min_scale,
669669
aggregation_temporality,
670670
)
671671
self._merge(
672672
self._previous_negative,
673-
current_point.negative,
674-
current_point.scale,
673+
current_negative,
674+
current_scale,
675675
min_scale,
676676
aggregation_temporality,
677677
)
678678

679679
else:
680680
start_time_unix_nano = self._previous_start_time_unix_nano
681-
sum_ = current_point.sum - self._previous_sum
682-
max_ = current_point.max
683-
min_ = current_point.min
681+
sum_ = current_sum - self._previous_sum
682+
max_ = current_max
683+
min_ = current_min
684684

685685
self._merge(
686686
self._previous_positive,
687-
current_point.positive,
688-
current_point.scale,
687+
current_positive,
688+
current_scale,
689689
min_scale,
690690
aggregation_temporality,
691691
)
692692
self._merge(
693693
self._previous_negative,
694-
current_point.negative,
695-
current_point.scale,
694+
current_negative,
695+
current_scale,
696696
min_scale,
697697
aggregation_temporality,
698698
)
699699

700700
current_point = ExponentialHistogramDataPoint(
701701
attributes=self._attributes,
702702
start_time_unix_nano=start_time_unix_nano,
703-
time_unix_nano=current_point.time_unix_nano,
703+
time_unix_nano=collection_start_nano,
704704
count=current_count,
705705
sum=sum_,
706706
scale=current_scale,
@@ -804,7 +804,7 @@ def _merge(
804804
current_change = current_scale - min_scale
805805

806806
for current_bucket_index, current_bucket in enumerate(
807-
current_buckets.bucket_counts
807+
current_buckets.counts
808808
):
809809

810810
if current_bucket == 0:

0 commit comments

Comments
 (0)