Merge branch 'main' into codeboten/test-async

Alex Boten · web-flow · commit 76d895070eec · 2022-03-08T14:45:26.000-08:00
diff --git a/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/__init__.py b/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/__init__.py
@@ -65,6 +65,7 @@
 import collections
 import logging
 import re
+from itertools import chain
 from typing import Iterable, Optional, Sequence, Tuple
 
 from prometheus_client import core
@@ -78,14 +79,13 @@
 def _convert_buckets(metric: Metric) -> Sequence[Tuple[str, int]]:
     buckets = []
     total_count = 0
-    for index, value in enumerate(metric.point.bucket_counts):
-        total_count += value
-        buckets.append(
-            (
-                f"{metric.point.explicit_bounds[index]}",
-                total_count,
-            )
-        )
+    for upper_bound, count in zip(
+        chain(metric.point.explicit_bounds, ["+Inf"]),
+        metric.point.bucket_counts,
+    ):
+        total_count += count
+        buckets.append((f"{upper_bound}", total_count))
+
     return buckets
 
 
diff --git a/exporter/opentelemetry-exporter-prometheus/tests/test_prometheus_exporter.py b/exporter/opentelemetry-exporter-prometheus/tests/test_prometheus_exporter.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import unittest
+from textwrap import dedent
 from unittest import mock
 
 from prometheus_client import generate_latest
@@ -61,10 +62,10 @@ def test_histogram_to_prometheus(self):
             Histogram(
                 time_unix_nano=1641946016139533244,
                 start_time_unix_nano=1641946016139533244,
-                bucket_counts=[1, 1],
+                bucket_counts=[1, 3, 2],
                 sum=579.0,
                 explicit_bounds=[123.0, 456.0],
-                aggregation_temporality=AggregationTemporality.DELTA,
+                aggregation_temporality=AggregationTemporality.CUMULATIVE,
             ),
             attributes={"histo": 1},
         )
@@ -73,8 +74,20 @@ def test_histogram_to_prometheus(self):
         collector.add_metrics_data([record])
         result_bytes = generate_latest(collector)
         result = result_bytes.decode("utf-8")
-        self.assertIn('testprefix_test_name_s_sum{histo="1"} 579.0', result)
-        self.assertIn('testprefix_test_name_s_count{histo="1"} 2.0', result)
+        self.assertEqual(
+            result,
+            dedent(
+                """\
+                # HELP testprefix_test_name_s foo
+                # TYPE testprefix_test_name_s histogram
+                testprefix_test_name_s_bucket{histo="1",le="123.0"} 1.0
+                testprefix_test_name_s_bucket{histo="1",le="456.0"} 4.0
+                testprefix_test_name_s_bucket{histo="1",le="+Inf"} 6.0
+                testprefix_test_name_s_count{histo="1"} 6.0
+                testprefix_test_name_s_sum{histo="1"} 579.0
+                """
+            ),
+        )
 
     def test_sum_to_prometheus(self):
         labels = {"environment@": "staging", "os": "Windows"}
