From 7e72778795cb4e722375eddc949c41b31ea8d47e Mon Sep 17 00:00:00 2001 From: "marc.pichler" Date: Wed, 16 Mar 2022 09:38:08 +0100 Subject: [PATCH 1/3] fix(delta-histogram): reset delta histogram sum on collection. --- .../src/opentelemetry/sdk/_metrics/aggregation.py | 4 +++- opentelemetry-sdk/tests/metrics/test_aggregation.py | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/_metrics/aggregation.py b/opentelemetry-sdk/src/opentelemetry/sdk/_metrics/aggregation.py index e0020fa27d8..23596112fd4 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/_metrics/aggregation.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/_metrics/aggregation.py @@ -191,9 +191,11 @@ def collect(self) -> Histogram: with self._lock: value = self._bucket_counts start_time_unix_nano = self._start_time_unix_nano + histogram_sum = self._sum self._bucket_counts = self._get_empty_bucket_counts() self._start_time_unix_nano = now + 1 + self._sum = 0 return Histogram( start_time_unix_nano=start_time_unix_nano, @@ -201,7 +203,7 @@ def collect(self) -> Histogram: bucket_counts=tuple(value), explicit_bounds=self._boundaries, aggregation_temporality=AggregationTemporality.DELTA, - sum=self._sum, + sum=histogram_sum, ) diff --git a/opentelemetry-sdk/tests/metrics/test_aggregation.py b/opentelemetry-sdk/tests/metrics/test_aggregation.py index ec6ae8dcd42..414939e30cd 100644 --- a/opentelemetry-sdk/tests/metrics/test_aggregation.py +++ b/opentelemetry-sdk/tests/metrics/test_aggregation.py @@ -286,6 +286,7 @@ def test_collect(self): first_histogram = explicit_bucket_histogram_aggregation.collect() self.assertEqual(first_histogram.bucket_counts, (0, 1, 0, 0)) + self.assertEqual(first_histogram.sum, 1) # CI fails the last assertion without this sleep(0.1) @@ -294,6 +295,7 @@ def test_collect(self): second_histogram = explicit_bucket_histogram_aggregation.collect() self.assertEqual(second_histogram.bucket_counts, (0, 1, 0, 0)) + self.assertEqual(second_histogram.sum, 1) self.assertGreater( second_histogram.time_unix_nano, first_histogram.time_unix_nano From cc11d995f0ea6cd199d78c7a9104e95775cd463c Mon Sep 17 00:00:00 2001 From: "marc.pichler" Date: Wed, 16 Mar 2022 09:58:36 +0100 Subject: [PATCH 2/3] fix(delta-histogram): update changelog. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fbd4575bae2..cd525ad1b0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#2525](https://github.com/open-telemetry/opentelemetry-python/pull/2525)) - Change OTLPHandler to LoggingHandler ([#2528](https://github.com/open-telemetry/opentelemetry-python/pull/2528)) +- Fix delta histogram sum not being reset on collection + ([#2533](https://github.com/open-telemetry/opentelemetry-python/pull/2533)) ## [1.10.0-0.29b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.10.0-0.29b0) - 2022-03-10 From cd7b12e99fd052faa7f0697c1f49b4b0573608af Mon Sep 17 00:00:00 2001 From: "marc.pichler" Date: Wed, 16 Mar 2022 09:59:44 +0100 Subject: [PATCH 3/3] fix(delta-histogram): remove trailing space in changelog. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd525ad1b0a..0a10cc35438 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Change OTLPHandler to LoggingHandler ([#2528](https://github.com/open-telemetry/opentelemetry-python/pull/2528)) - Fix delta histogram sum not being reset on collection - ([#2533](https://github.com/open-telemetry/opentelemetry-python/pull/2533)) + ([#2533](https://github.com/open-telemetry/opentelemetry-python/pull/2533)) ## [1.10.0-0.29b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.10.0-0.29b0) - 2022-03-10