Metrics tests passing

Author: ocelotl

exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/metrics_exporter/__init__.py

@@ -145,21 +145,21 @@ def _translate_data(
 
             type_class = {
                 int: {
-                    "sum_class": IntSum,
-                    "gauge_class": IntGauge,
+                    "sum": {"class": IntSum, "argument": "int_sum"},
+                    "gauge": {"class": IntGauge, "argument": "int_gauge"},
                     "data_point_class": IntDataPoint,
                 },
                 float: {
-                    "sum_class": DoubleSum,
-                    "gauge_class": DoubleGauge,
+                    "sum": {"class": DoubleSum, "argument": "double_sum"},
+                    "gauge": {"class": DoubleGauge, "argument": "double_gauge"},
                     "data_point_class": DoubleDataPoint,
                 },
             }
 
             value_type = sdk_metric.instrument.value_type
 
-            sum_class = type_class[value_type]["sum_class"]
-            gauge_class = type_class[value_type]["gauge_class"]
+            sum_class = type_class[value_type]["sum"]["class"]
+            gauge_class = type_class[value_type]["gauge"]["class"]
             data_point_class = type_class[value_type]["data_point_class"]
 
             if isinstance(sdk_metric.instrument, Counter):
@@ -171,6 +171,7 @@ def _translate_data(
                     ),
                     is_monotonic=True,
                 )
+                argument = type_class[value_type]["sum"]["argument"]
 
             elif isinstance(sdk_metric.instrument, UpDownCounter):
                 otlp_metric_data = sum_class(
@@ -181,6 +182,7 @@ def _translate_data(
                     ),
                     is_monotonic=False,
                 )
+                argument = type_class[value_type]["sum"]["argument"]
 
             elif isinstance(sdk_metric.instrument, (ValueRecorder)):
                 logger.warning(
@@ -197,6 +199,7 @@ def _translate_data(
                     ),
                     is_monotonic=True,
                 )
+                argument = type_class[value_type]["sum"]["argument"]
 
             elif isinstance(sdk_metric.instrument, UpDownSumObserver):
                 otlp_metric_data = sum_class(
@@ -207,20 +210,24 @@ def _translate_data(
                     ),
                     is_monotonic=False,
                 )
+                argument = type_class[value_type]["sum"]["argument"]
 
             elif isinstance(sdk_metric.instrument, (ValueObserver)):
                 otlp_metric_data = gauge_class(
                     data_points=_get_data_points(sdk_metric, data_point_class)
                 )
+                argument = type_class[value_type]["gauge"]["argument"]
 
             sdk_resource_instrumentation_library_metrics[
                 sdk_metric.instrument.meter.resource
             ].metrics.append(
                 OTLPMetric(
-                    name=sdk_metric.instrument.name,
-                    description=sdk_metric.instrument.description,
-                    unit=sdk_metric.instrument.unit,
-                    data=otlp_metric_data
+                    **{
+                        "name": sdk_metric.instrument.name,
+                        "description": sdk_metric.instrument.description,
+                        "unit": sdk_metric.instrument.unit,
+                        argument: otlp_metric_data
+                    }
                 )
             )
 

exporter/opentelemetry-exporter-otlp/tests/test_otlp_metric_exporter.py

@@ -87,7 +87,7 @@ def test_translate_metrics(self):
                                     name="a",
                                     description="b",
                                     unit="c",
-                                    data=IntSum(
+                                    int_sum=IntSum(
                                         data_points=[
                                             IntDataPoint(
                                                 labels=[
@@ -100,9 +100,9 @@ def test_translate_metrics(self):
                                         ],
                                         aggregation_temporality=(
                                             AggregationTemporality.
-                                            AGGREGATION_TEMPORALITY_CUMULATIVE
+                                            AGGREGATION_TEMPORALITY_DELTA
                                         ),
-                                        is_monotonic=False,
+                                        is_monotonic=True,
                                     )
                                 )
                             ]