reorder metricrecord

lzchen · lzchen · commit f2e446237f96 · 2020-06-02T01:29:41.000-07:00
diff --git a/ext/opentelemetry-ext-opencensusexporter/tests/test_otcollector_metrics_exporter.py b/ext/opentelemetry-ext-opencensusexporter/tests/test_otcollector_metrics_exporter.py
@@ -92,21 +92,21 @@ def test_get_collector_point(self):
             "testName", "testDescription", "unit", float, Measure
         )
         result = metrics_exporter.get_collector_point(
-            MetricRecord(aggregator, self._key_labels, int_counter)
+            MetricRecord(int_counter, self._key_labels, aggregator)
         )
         self.assertIsInstance(result, metrics_pb2.Point)
         self.assertIsInstance(result.timestamp, Timestamp)
         self.assertEqual(result.int64_value, 0)
         aggregator.update(123.5)
         aggregator.take_checkpoint()
         result = metrics_exporter.get_collector_point(
-            MetricRecord(aggregator, self._key_labels, float_counter)
+            MetricRecord(float_counter, self._key_labels, aggregator)
         )
         self.assertEqual(result.double_value, 123.5)
         self.assertRaises(
             TypeError,
             metrics_exporter.get_collector_point(
-                MetricRecord(aggregator, self._key_labels, measure)
+                MetricRecord(measure, self._key_labels, aggregator)
             ),
         )
 
@@ -122,7 +122,7 @@ def test_export(self):
             "testname", "testdesc", "unit", int, Counter, ["environment"]
         )
         record = MetricRecord(
-            aggregate.CounterAggregator(), self._key_labels, test_metric
+            test_metric, self._key_labels, aggregate.CounterAggregator(),
         )
 
         result = collector_exporter.export([record])
@@ -147,7 +147,7 @@ def test_translate_to_collector(self):
         aggregator = aggregate.CounterAggregator()
         aggregator.update(123)
         aggregator.take_checkpoint()
-        record = MetricRecord(aggregator, self._key_labels, test_metric)
+        record = MetricRecord(test_metric, self._key_labels, aggregator,)
         output_metrics = metrics_exporter.translate_to_collector([record])
         self.assertEqual(len(output_metrics), 1)
         self.assertIsInstance(output_metrics[0], metrics_pb2.Metric)
diff --git a/ext/opentelemetry-ext-prometheus/tests/test_prometheus_exporter.py b/ext/opentelemetry-ext-prometheus/tests/test_prometheus_exporter.py
@@ -67,7 +67,7 @@ def test_shutdown(self):
     def test_export(self):
         with self._registry_register_patch:
             record = MetricRecord(
-                CounterAggregator(), self._labels_key, self._test_metric
+                self._test_metric, self._labels_key, CounterAggregator(),
             )
             exporter = PrometheusMetricsExporter()
             result = exporter.export([record])
@@ -90,7 +90,7 @@ def test_counter_to_prometheus(self):
         aggregator = CounterAggregator()
         aggregator.update(123)
         aggregator.take_checkpoint()
-        record = MetricRecord(aggregator, key_labels, metric)
+        record = MetricRecord(metric, key_labels, aggregator, key_labels)
         collector = CustomCollector("testprefix")
         collector.add_metrics_data([record])
 
@@ -118,7 +118,7 @@ def test_invalid_metric(self):
         )
         labels = {"environment": "staging"}
         key_labels = metrics.get_labels_as_key(labels)
-        record = MetricRecord(None, key_labels, metric)
+        record = MetricRecord(metric, key_labels, None)
         collector = CustomCollector("testprefix")
         collector.add_metrics_data([record])
         collector.collect()
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/metrics/export/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/metrics/export/__init__.py
@@ -27,13 +27,13 @@ class MetricsExportResult(Enum):
 class MetricRecord:
     def __init__(
         self,
-        aggregator: Aggregator,
+        instrument: metrics_api.InstrumentT,
         labels: Tuple[Tuple[str, str]],
-        metric: metrics_api.MetricT,
+        aggregator: Aggregator,
     ):
-        self.aggregator = aggregator
+        self.instrument = instrument
         self.labels = labels
-        self.metric = metric
+        self.aggregator = aggregator
 
 
 class MetricsExporter:
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/metrics/export/batcher.py b/opentelemetry-sdk/src/opentelemetry/sdk/metrics/export/batcher.py
@@ -64,7 +64,7 @@ def checkpoint_set(self) -> Sequence[MetricRecord]:
         """
         metric_records = []
         for (instrument, labels), aggregator in self._batch_map.items():
-            metric_records.append(MetricRecord(aggregator, labels, instrument))
+            metric_records.append(MetricRecord(instrument, labels, aggregator))
         return metric_records
 
     def finished_collection(self):
diff --git a/opentelemetry-sdk/tests/metrics/export/test_export.py b/opentelemetry-sdk/tests/metrics/export/test_export.py
@@ -48,7 +48,7 @@ def test_export(self):
         )
         labels = {"environment": "staging"}
         aggregator = CounterAggregator()
-        record = MetricRecord(aggregator, labels, metric)
+        record = MetricRecord(metric, labels, aggregator)
         result = '{}(data="{}", labels="{}", value={})'.format(
             ConsoleMetricsExporter.__name__,
             metric,

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ def test_export(self):`
`48`	`48`	`)`
`49`	`49`	`labels = {"environment": "staging"}`
`50`	`50`	`aggregator = CounterAggregator()`
`51`		`- record = MetricRecord(aggregator, labels, metric)`
	`51`	`+ record = MetricRecord(metric, labels, aggregator)`
`52`	`52`	`result = '{}(data="{}", labels="{}", value={})'.format(`
`53`	`53`	`ConsoleMetricsExporter.__name__,`
`54`	`54`	`metric,`