refactor to avoid duplication

Author: loomis-relativity

exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/_internal/metrics_encoder/__init__.py

@@ -169,13 +169,25 @@ def _get_aggregation(
 
         return instrument_class_aggregation
 
+
 def truncate_trailing_zeros(lst: Sequence[int]) -> Sequence[int]:
     if lst:
         for i, value in enumerate(reversed(lst)):
             if value != 0:
                 return lst[0:len(lst)-i]
     return []
 
+
+def create_exponential_histogram_buckets(offset, bucket_counts):
+    buckets = None
+    if truncated_bucket_counts := truncate_trailing_zeros(bucket_counts):
+        buckets = pb2.ExponentialHistogramDataPoint.Buckets(
+                                offset=offset,
+                                bucket_counts=truncated_bucket_counts,
+                            )
+    return buckets
+
+
 class EncodingException(Exception):
     """
     Raised by encode_metrics() when an exception is caught during encoding. Contains the problematic metric so
@@ -313,21 +325,8 @@ def _encode_metric(metric, pb2_metric):
     elif isinstance(metric.data, ExponentialHistogramType):
         for data_point in metric.data.data_points:
 
-            if positive_buckets := truncate_trailing_zeros(data_point.positive.bucket_counts):
-                positive = pb2.ExponentialHistogramDataPoint.Buckets(
-                    offset=data_point.positive.offset,
-                    bucket_counts=positive_buckets,
-                )
-            else:
-                positive = None
-
-            if negative_buckets := truncate_trailing_zeros(data_point.negative.bucket_counts):
-                negative = pb2.ExponentialHistogramDataPoint.Buckets(
-                    offset=data_point.negative.offset,
-                    bucket_counts=negative_buckets,
-                )
-            else:
-                negative = None
+            positive = create_exponential_histogram_buckets(data_point.positive.offset, data_point.positive.bucket_counts)
+            negative = create_exponential_histogram_buckets(data_point.negative.offset, data_point.negative.bucket_counts)
 
             pt = pb2.ExponentialHistogramDataPoint(
                 attributes=_encode_attributes(data_point.attributes),

exporter/opentelemetry-exporter-otlp-proto-common/tests/test_metrics_encoder.py

@@ -18,6 +18,7 @@
 from opentelemetry.exporter.otlp.proto.common._internal.metrics_encoder import (
     EncodingException,
     truncate_trailing_zeros,
+    create_exponential_histogram_buckets,
 )
 from opentelemetry.exporter.otlp.proto.common.metrics_encoder import (
     encode_metrics,
@@ -862,6 +863,10 @@ def test_truncate_trailing_zeros(self):
         self.assertEqual([0, 1], truncate_trailing_zeros([0, 1, 0]))
         self.assertEqual([1, -1], truncate_trailing_zeros([1, -1, 0, 0]))
 
+    def test_create_histogram_buckets(self):
+        self.assertIsNone([], create_exponential_histogram_buckets(0, [0, 0, 0, 0]))
+        self.assertIsNotNone([], create_exponential_histogram_buckets(0, [1]))
+
     def test_encode_exponential_histogram(self):
         exponential_histogram = Metric(
             name="exponential_histogram",