Add another test for histograms

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

@@ -140,6 +140,7 @@ def collect(
         Atomically return a point for the current value of the metric and
         reset the aggregation value.
         """
+
         if self._instrument_temporality is AggregationTemporality.DELTA:
 
             with self._lock:
@@ -289,6 +290,7 @@ def collect(
         Atomically return a point for the current value of the metric.
         """
         with self._lock:
+
             if not any(self._bucket_counts):
                 return None
 

opentelemetry-sdk/tests/metrics/integration_test/test_histogram_export.py

@@ -0,0 +1,85 @@
+# Copyright The OpenTelemetry Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from unittest import TestCase
+
+from opentelemetry.metrics import set_meter_provider
+from opentelemetry.sdk.metrics import MeterProvider
+from opentelemetry.sdk.metrics.export import InMemoryMetricReader
+from opentelemetry.sdk.resources import SERVICE_NAME, Resource
+
+in_memory_metric_reader = InMemoryMetricReader()
+
+provider = MeterProvider(
+    resource=Resource.create({SERVICE_NAME: "otel-test"}),
+    metric_readers=[in_memory_metric_reader],
+)
+set_meter_provider(provider)
+
+meter = provider.get_meter("my-meter")
+
+histogram = meter.create_histogram("my_histogram")
+counter = meter.create_counter("my_counter")
+
+
+class TestHistogramExport(TestCase):
+    def test_histogram_counter_collection(self):
+
+        histogram.record(5, {"attribute": "value"})
+        counter.add(1, {"attribute": "value_counter"})
+
+        metric_data = in_memory_metric_reader.get_metrics_data()
+
+        self.assertEqual(
+            len(metric_data.resource_metrics[0].scope_metrics[0].metrics), 2
+        )
+
+        self.assertEqual(
+            (
+                metric_data.resource_metrics[0]
+                .scope_metrics[0]
+                .metrics[0]
+                .data.data_points[0]
+                .bucket_counts
+            ),
+            (0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+        )
+        self.assertEqual(
+            (
+                metric_data.resource_metrics[0]
+                .scope_metrics[0]
+                .metrics[1]
+                .data.data_points[0]
+                .value
+            ),
+            1,
+        )
+
+        metric_data = in_memory_metric_reader.get_metrics_data()
+
+        # FIXME ExplicitBucketHistogramAggregation is resetting counts to zero
+        # even if aggregation temporality is cumulative.
+        self.assertEqual(
+            len(metric_data.resource_metrics[0].scope_metrics[0].metrics), 1
+        )
+        self.assertEqual(
+            (
+                metric_data.resource_metrics[0]
+                .scope_metrics[0]
+                .metrics[0]
+                .data.data_points[0]
+                .value
+            ),
+            1,
+        )