upgrade to opentelemetry API/SDK 0.16b1 (#93)

Author: aabmass

dev-constraints.txt

@@ -10,5 +10,5 @@ Sphinx==3.1.2
 # development before GA. After GA, we will build against specific releases.
 # Bump the commit frequently during development whenever you are missing
 # changes from upstream.
-opentelemetry-api~=0.15b0
-opentelemetry-sdk~=0.15b0
+opentelemetry-api~=0.16b1
+opentelemetry-sdk~=0.16b1

opentelemetry-exporter-google-cloud/src/opentelemetry/exporter/cloud_monitoring/__init__.py

@@ -11,7 +11,7 @@
 from google.cloud.monitoring_v3.proto.metric_pb2 import TimeSeries
 from opentelemetry.sdk.metrics import UpDownCounter
 from opentelemetry.sdk.metrics.export import (
-    MetricRecord,
+    ExportRecord,
     MetricsExporter,
     MetricsExportResult,
 )
@@ -135,7 +135,7 @@ def _batch_write(self, series: TimeSeries) -> None:
             write_ind += MAX_BATCH_WRITE
 
     def _get_metric_descriptor(
-        self, record: MetricRecord
+        self, record: ExportRecord
     ) -> Optional[MetricDescriptor]:
         """ We can map Metric to MetricDescriptor using Metric.name or
         MetricDescriptor.type. We create the MetricDescriptor if it doesn't
@@ -273,10 +273,10 @@ def _set_start_end_times(self, point_dict, record, metric_descriptor):
         }
 
     def export(
-        self, metric_records: Sequence[MetricRecord]
+        self, export_records: Sequence[ExportRecord]
     ) -> "MetricsExportResult":
         all_series = []
-        for record in metric_records:
+        for record in export_records:
             instrument = record.instrument
             metric_descriptor = self._get_metric_descriptor(record)
             if not metric_descriptor:

opentelemetry-exporter-google-cloud/tests/test_cloud_monitoring.py

@@ -30,7 +30,7 @@
     CloudMonitoringMetricsExporter,
 )
 from opentelemetry.sdk.metrics import MeterProvider
-from opentelemetry.sdk.metrics.export import MetricRecord
+from opentelemetry.sdk.metrics.export import ExportRecord
 from opentelemetry.sdk.metrics.export.aggregate import (
     HistogramAggregator,
     SumAggregator,
@@ -145,7 +145,7 @@ def test_get_metric_descriptor(self):
 
         self.assertIsNone(
             exporter._get_metric_descriptor(
-                MetricRecord(
+                ExportRecord(
                     MockMetric(),
                     (),
                     UnsupportedAggregator(),
@@ -154,7 +154,7 @@ def test_get_metric_descriptor(self):
             )
         )
 
-        record = MetricRecord(
+        record = ExportRecord(
             MockMetric(),
             (("label1", "value1"),),
             SumAggregator(),
@@ -185,7 +185,7 @@ def test_get_metric_descriptor(self):
 
         # Drop labels with values that aren't string, int or bool
         exporter._get_metric_descriptor(
-            MetricRecord(
+            ExportRecord(
                 MockMetric(name="name2", value_type=float),
                 (
                     ("label1", "value1"),
@@ -222,7 +222,7 @@ def test_get_value_observer_metric_descriptor(self):
             project_id=self.project_id, client=client
         )
         exporter.project_name = self.project_name
-        record = MetricRecord(
+        record = ExportRecord(
             MockMetric(),
             (),
             ValueObserverAggregator(),
@@ -259,7 +259,7 @@ def test_export(self):
 
         exporter.export(
             [
-                MetricRecord(
+                ExportRecord(
                     MockMetric(),
                     (("label1", "value1"),),
                     UnsupportedAggregator(),
@@ -303,13 +303,13 @@ def test_export(self):
         ) * NANOS_PER_SECOND
         exporter.export(
             [
-                MetricRecord(
+                ExportRecord(
                     MockMetric(meter=mock_meter()),
                     (("label1", "value1"), ("label2", 1),),
                     sum_agg_one,
                     resource,
                 ),
-                MetricRecord(
+                ExportRecord(
                     MockMetric(meter=mock_meter()),
                     (("label1", "value2"), ("label2", 2),),
                     sum_agg_one,
@@ -360,13 +360,13 @@ def test_export(self):
         ) * NANOS_PER_SECOND
         exporter.export(
             [
-                MetricRecord(
+                ExportRecord(
                     MockMetric(),
                     (("label1", "value1"), ("label2", 1),),
                     sum_agg_two,
                     Resource.create_empty(),
                 ),
-                MetricRecord(
+                ExportRecord(
                     MockMetric(),
                     (("label1", "value2"), ("label2", 2),),
                     sum_agg_two,
@@ -380,7 +380,7 @@ def test_export(self):
         sum_agg_two.checkpoint = 2
         exporter.export(
             [
-                MetricRecord(
+                ExportRecord(
                     MockMetric(),
                     (("label1", "changed_label"), ("label2", 2),),
                     sum_agg_two,
@@ -439,7 +439,7 @@ def test_export_value_observer(self):
         ) * NANOS_PER_SECOND
         exporter.export(
             [
-                MetricRecord(
+                ExportRecord(
                     MockMetric(meter=mock_meter()),
                     (),
                     aggregator,
@@ -493,7 +493,7 @@ def test_export_histogram(self):
         ) * NANOS_PER_SECOND
         exporter.export(
             [
-                MetricRecord(
+                ExportRecord(
                     MockMetric(meter=mock_meter()),
                     (),
                     aggregator,
@@ -555,7 +555,7 @@ def test_stateless_times(self):
         agg.checkpoint = 1
         agg.last_update_timestamp = (WRITE_INTERVAL + 1) * NANOS_PER_SECOND
 
-        metric_record = MetricRecord(
+        metric_record = ExportRecord(
             MockMetric(stateful=False), (), agg, Resource.create_empty()
         )
 
@@ -578,7 +578,7 @@ def test_stateless_times(self):
 
         agg.last_update_timestamp = (WRITE_INTERVAL * 2 + 2) * NANOS_PER_SECOND
 
-        metric_record = MetricRecord(
+        metric_record = ExportRecord(
             MockMetric(stateful=False), (), agg, Resource.create_empty()
         )
 
@@ -633,7 +633,7 @@ def test_unique_identifier(self):
 
         sum_agg_one = SumAggregator()
         sum_agg_one.update(1)
-        metric_record = MetricRecord(
+        metric_record = ExportRecord(
             MockMetric(), (), sum_agg_one, Resource.create_empty()
         )
         exporter1.export([metric_record])

tox.ini

@@ -83,6 +83,7 @@ whitelist_externals = bash
 ; for development, run `tox -e dev`. To run fixers (black, isort) `tox -e fix`.
 ; Lint is run as part of CI as well, so uses a separate.
 [testenv:{dev,docs,fix,lint,mypy}]
+download = true
 basepython = {[constants]dev_basepython}
 envdir = venv
 
@@ -102,9 +103,10 @@ whitelist_externals =
   bash
 
 [testenv:{docs,lint,mypy}-ci]
+download = true
 basepython = {[constants]dev_basepython}
 deps =
-  {[constants]dev_deps}
+  !docs: {[constants]dev_deps}
   docs: {[constants]docs_deps}
 
 commands =