Update usage for Meter.create_counter in tests and examples, clean up unused imports (open-telemetry#1463)

Wanqi Lyu · web-flow · commit d8c3c24c3479 · 2020-12-16T07:40:44.000-08:00
diff --git a/docs/examples/opencensus-exporter-metrics/collector.py b/docs/examples/opencensus-exporter-metrics/collector.py
@@ -20,7 +20,7 @@
 from opentelemetry.exporter.opencensus.metrics_exporter import (
     OpenCensusMetricsExporter,
 )
-from opentelemetry.sdk.metrics import Counter, MeterProvider
+from opentelemetry.sdk.metrics import MeterProvider
 
 exporter = OpenCensusMetricsExporter(
     service_name="basic-service", endpoint="localhost:55678"
@@ -35,7 +35,6 @@
     description="number of requests",
     unit="1",
     value_type=int,
-    label_keys=("environment",),
 )
 
 staging_labels = {"environment": "staging"}
diff --git a/docs/getting_started/otlpcollector_example.py b/docs/getting_started/otlpcollector_example.py
@@ -59,7 +59,6 @@
     description="number of requests",
     unit="1",
     value_type=int,
-    label_keys=("environment",),
 )
 # Labels are used to identify key-values that are associated with a specific
 # metric that you want to record. These are useful for pre-aggregation and can
diff --git a/docs/getting_started/prometheus_example.py b/docs/getting_started/prometheus_example.py
@@ -21,7 +21,6 @@
 from opentelemetry import metrics
 from opentelemetry.exporter.prometheus import PrometheusMetricsExporter
 from opentelemetry.sdk.metrics import MeterProvider
-from opentelemetry.sdk.metrics.export import ConsoleMetricsExporter
 from opentelemetry.sdk.metrics.export.controller import PushController
 
 # Start Prometheus client
@@ -40,7 +39,6 @@
     description="number of requests",
     unit="1",
     value_type=int,
-    label_keys=("environment",),
 )
 
 requests_counter.add(25, staging_labels)
diff --git a/exporter/opentelemetry-exporter-opencensus/tests/test_otcollector_metrics_exporter.py b/exporter/opentelemetry-exporter-opencensus/tests/test_otcollector_metrics_exporter.py
@@ -142,7 +142,7 @@ def test_export(self):
             client=mock_client, host_name=host_name
         )
         test_metric = self._meter.create_counter(
-            "testname", "testdesc", "unit", int, self._labels.keys(),
+            "testname", "testdesc", "unit", int,
         )
         record = ExportRecord(
             test_metric,
@@ -168,7 +168,7 @@ def test_export(self):
 
     def test_translate_to_collector(self):
         test_metric = self._meter.create_counter(
-            "testcollector", "testdesc", "unit", int, self._labels.keys()
+            "testcollector", "testdesc", "unit", int,
         )
         aggregator = aggregate.SumAggregator()
         aggregator.update(123)
diff --git a/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/__init__.py b/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/__init__.py
@@ -28,7 +28,7 @@
 
     from opentelemetry import metrics
     from opentelemetry.exporter.prometheus import PrometheusMetricsExporter
-    from opentelemetry.sdk.metrics import Counter, Meter
+    from opentelemetry.sdk.metrics import Meter
     from prometheus_client import start_http_server
 
     # Start Prometheus client
@@ -48,7 +48,6 @@
         "number of requests",
         "requests",
         int,
-        ("environment",),
     )
 
     # Labels are used to identify key-values that are associated with a specific

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`from opentelemetry.exporter.opencensus.metrics_exporter import (`
`21`	`21`	`OpenCensusMetricsExporter,`
`22`	`22`	`)`
`23`		`-from opentelemetry.sdk.metrics import Counter, MeterProvider`
	`23`	`+from opentelemetry.sdk.metrics import MeterProvider`
`24`	`24`
`25`	`25`	`exporter = OpenCensusMetricsExporter(`
`26`	`26`	`service_name="basic-service", endpoint="localhost:55678"`
`@@ -35,7 +35,6 @@`
`35`	`35`	`description="number of requests",`
`36`	`36`	`unit="1",`
`37`	`37`	`value_type=int,`
`38`		`- label_keys=("environment",),`
`39`	`38`	`)`
`40`	`39`
`41`	`40`	`staging_labels = {"environment": "staging"}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,6 @@`
`59`	`59`	`description="number of requests",`
`60`	`60`	`unit="1",`
`61`	`61`	`value_type=int,`
`62`		`- label_keys=("environment",),`
`63`	`62`	`)`
`64`	`63`	`# Labels are used to identify key-values that are associated with a specific`
`65`	`64`	`# metric that you want to record. These are useful for pre-aggregation and can`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ def test_export(self):`
`142`	`142`	`client=mock_client, host_name=host_name`
`143`	`143`	`)`
`144`	`144`	`test_metric = self._meter.create_counter(`
`145`		`- "testname", "testdesc", "unit", int, self._labels.keys(),`
	`145`	`+ "testname", "testdesc", "unit", int,`
`146`	`146`	`)`
`147`	`147`	`record = ExportRecord(`
`148`	`148`	`test_metric,`
`@@ -168,7 +168,7 @@ def test_export(self):`
`168`	`168`
`169`	`169`	`def test_translate_to_collector(self):`
`170`	`170`	`test_metric = self._meter.create_counter(`
`171`		`- "testcollector", "testdesc", "unit", int, self._labels.keys()`
	`171`	`+ "testcollector", "testdesc", "unit", int,`
`172`	`172`	`)`
`173`	`173`	`aggregator = aggregate.SumAggregator()`
`174`	`174`	`aggregator.update(123)`