More WIP

Author: ocelotl

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

@@ -26,17 +26,18 @@
 )
 from opentelemetry.proto.metrics.v1.metrics_pb2 import (
     InstrumentationLibraryMetrics,
-    Int64DataPoint,
+    IntDataPoint,
 )
 from opentelemetry.proto.metrics.v1.metrics_pb2 import (
-    Metric as CollectorMetric,
+    Metric as OTLPMetric,
 )
 from opentelemetry.proto.metrics.v1.metrics_pb2 import (
-    MetricDescriptor,
     ResourceMetrics,
+    IntSum,
+    AggregationTemporality,
 )
 from opentelemetry.proto.resource.v1.resource_pb2 import (
-    Resource as CollectorResource,
+    Resource as OTLPResource,
 )
 from opentelemetry.sdk.metrics import Counter, MeterProvider
 from opentelemetry.sdk.metrics.export import MetricRecord
@@ -71,7 +72,7 @@ def test_translate_metrics(self):
         expected = ExportMetricsServiceRequest(
             resource_metrics=[
                 ResourceMetrics(
-                    resource=CollectorResource(
+                    resource=OTLPResource(
                         attributes=[
                             KeyValue(key="a", value=AnyValue(int_value=1)),
                             KeyValue(
@@ -82,26 +83,27 @@ def test_translate_metrics(self):
                     instrumentation_library_metrics=[
                         InstrumentationLibraryMetrics(
                             metrics=[
-                                CollectorMetric(
-                                    metric_descriptor=MetricDescriptor(
-                                        name="a",
-                                        description="b",
-                                        unit="c",
-                                        type=MetricDescriptor.Type.INT64,
-                                        temporality=(
-                                            MetricDescriptor.Temporality.DELTA
+                                OTLPMetric(
+                                    name="a",
+                                    description="b",
+                                    unit="c",
+                                    data=IntSum(
+                                        data_points=[
+                                            IntDataPoint(
+                                                labels=[
+                                                    StringKeyValue(
+                                                        key="a", value="b"
+                                                    )
+                                                ],
+                                                value=1,
+                                            )
+                                        ],
+                                        aggregation_temporality=(
+                                            AggregationTemporality.
+                                            AGGREGATION_TEMPORALITY_CUMULATIVE
                                         ),
-                                    ),
-                                    int64_data_points=[
-                                        Int64DataPoint(
-                                            labels=[
-                                                StringKeyValue(
-                                                    key="a", value="b"
-                                                )
-                                            ],
-                                            value=1,
-                                        )
-                                    ],
+                                        is_monotonic=False,
+                                    )
                                 )
                             ]
                         )