Fix some lint problems

open-telemetry · Jun 10, 2021 · a710f3b · a710f3b
1 parent 9fedfdd
commit a710f3b
Show file tree

Hide file tree

Showing 12 changed files with 140 additions and 104 deletions.
diff --git a/docs/examples/basic_meter/calling_conventions.py b/docs/examples/basic_meter/calling_conventions.py
@@ -35,7 +35,10 @@
 )
 
 clicks_counter = meter.create_counter(
-    name="clicks", description="number of clicks", unit="1", value_type=int,
+    name="clicks",
+    description="number of clicks",
+    unit="1",
+    value_type=int,
 )
 
 labels = {"environment": "staging"}

diff --git a/docs/examples/metrics/grocery/grocery.py b/docs/examples/metrics/grocery/grocery.py
@@ -12,11 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from math import inf
-
-from opentelemetry.sdk.metrics.export import ConsoleExporter
 from opentelemetry.metrics import get_meter_provider
-
+from opentelemetry.sdk.metrics.export import ConsoleExporter
 
 exporter = ConsoleExporter()
 
@@ -55,25 +52,15 @@
 
 
 class GroceryStore:
-
     def __init__(self, name):
         self._name = name
 
     def process_order(self, customer_name, potatoes=0, tomatoes=0):
-        order_counter.add(
-            1,
-            {
-                "store": self._name,
-                "customer": customer_name
-            }
-        )
+        order_counter.add(1, {"store": self._name, "customer": customer_name})
 
         amount_counter.add(
             (potatoes * 1) + (tomatoes * 3),
-            {
-                "store": self._name,
-                "customer": customer_name
-            }
+            {"store": self._name, "customer": customer_name},
         )
 
         sold_items_counter.add(
@@ -82,7 +69,7 @@ def process_order(self, customer_name, potatoes=0, tomatoes=0):
                 "store": self._name,
                 "customer": customer_name,
                 "item": "potato",
-            }
+            },
         )
 
         sold_items_counter.add(
@@ -91,25 +78,17 @@ def process_order(self, customer_name, potatoes=0, tomatoes=0):
                 "store": self._name,
                 "customer": customer_name,
                 "item": "tomato",
-            }
+            },
         )
 
     def enter_customer(self, customer_name, account_type):
 
         customers_in_store.add(
-            1,
-            {
-                "store": self._name,
-                "account_type": account_type
-            }
+            1, {"store": self._name, "account_type": account_type}
         )
 
     def exit_customer(self, customer_name, account_type):
 
         customers_in_store.add(
-            -1,
-            {
-                "store": self._name,
-                "account_type": account_type
-            }
+            -1, {"store": self._name, "account_type": account_type}
         )
diff --git a/docs/getting_started/otlpcollector_example.py b/docs/getting_started/otlpcollector_example.py
@@ -15,10 +15,13 @@
 # otcollector.py
 import time
 
-from opentelemetry import trace
+from opentelemetry import metrics, trace
+from opentelemetry.exporter.otlp.metrics_exporter import OTLPMetricsExporter
 from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import (
     OTLPSpanExporter,
 )
+from opentelemetry.sdk.metrics import MeterProvider
+from opentelemetry.sdk.metrics.export import PushController
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
 

diff --git a/exporter/opentelemetry-exporter-opencensus/tests/test_otcollector_metrics_exporter.py b/exporter/opentelemetry-exporter-opencensus/tests/test_otcollector_metrics_exporter.py
@@ -91,13 +91,22 @@ def test_get_collector_metric_type(self):
     def test_get_collector_point(self):
         aggregator = aggregate.SumAggregator()
         int_counter = self._meter.create_counter(
-            "testNameIntCounter", "testDescription", "unit", int,
+            "testNameIntCounter",
+            "testDescription",
+            "unit",
+            int,
         )
         float_counter = self._meter.create_counter(
-            "testNameFloatCounter", "testDescription", "unit", float,
+            "testNameFloatCounter",
+            "testDescription",
+            "unit",
+            float,
         )
         valuerecorder = self._meter.create_valuerecorder(
-            "testNameValueRecorder", "testDescription", "unit", float,
+            "testNameValueRecorder",
+            "testDescription",
+            "unit",
+            float,
         )
         result = metrics_exporter.get_collector_point(
             ExportRecord(
@@ -142,7 +151,10 @@ def test_export(self):
             client=mock_client, host_name=host_name
         )
         test_metric = self._meter.create_counter(
-            "testname", "testdesc", "unit", int,
+            "testname",
+            "testdesc",
+            "unit",
+            int,
         )
         record = ExportRecord(
             test_metric,
@@ -168,7 +180,10 @@ def test_export(self):
 
     def test_translate_to_collector(self):
         test_metric = self._meter.create_counter(
-            "testcollector", "testdesc", "unit", int,
+            "testcollector",
+            "testdesc",
+            "unit",
+            int,
         )
         aggregator = aggregate.SumAggregator()
         aggregator.update(123)
@@ -181,7 +196,8 @@ def test_translate_to_collector(self):
         )
         start_timestamp = Timestamp()
         output_metrics = metrics_exporter.translate_to_collector(
-            [record], start_timestamp,
+            [record],
+            start_timestamp,
         )
         self.assertEqual(len(output_metrics), 1)
         self.assertIsInstance(output_metrics[0], metrics_pb2.Metric)
@@ -204,26 +220,30 @@ def test_translate_to_collector(self):
             "environment",
         )
         self.assertEqual(
-            output_metrics[0].metric_descriptor.label_keys[1].key, "number",
+            output_metrics[0].metric_descriptor.label_keys[1].key,
+            "number",
         )
 
         self.assertIsNotNone(output_metrics[0].resource)
         self.assertEqual(
-            output_metrics[0].resource.type, "",
+            output_metrics[0].resource.type,
+            "",
         )
         self.assertEqual(
             output_metrics[0].resource.labels["key_with_str_value"],
             self._resource_labels["key_with_str_value"],
         )
         self.assertIsInstance(
-            output_metrics[0].resource.labels["key_with_int_val"], str,
+            output_metrics[0].resource.labels["key_with_int_val"],
+            str,
         )
         self.assertEqual(
             output_metrics[0].resource.labels["key_with_int_val"],
             str(self._resource_labels["key_with_int_val"]),
         )
         self.assertIsInstance(
-            output_metrics[0].resource.labels["key_with_true"], str,
+            output_metrics[0].resource.labels["key_with_true"],
+            str,
         )
         self.assertEqual(
             output_metrics[0].resource.labels["key_with_true"],

diff --git a/.../opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/metrics_exporter/__init__.py b/.../opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/metrics_exporter/__init__.py
@@ -315,9 +315,11 @@ def _translate_data(
                 )
                 argument = type_class[value_type]["gauge"]["argument"]
 
-            instrumentation_library_metrics = sdk_resource_instrumentation_library_metrics[
-                export_record.resource
-            ]
+            instrumentation_library_metrics = (
+                sdk_resource_instrumentation_library_metrics[
+                    export_record.resource
+                ]
+            )
 
             instrumentation_library_metrics.metrics.append(
                 OTLPMetric(

diff --git a/exporter/opentelemetry-exporter-otlp/tests/test_otlp_metric_exporter.py b/exporter/opentelemetry-exporter-otlp/tests/test_otlp_metric_exporter.py
@@ -64,9 +64,9 @@ class TestOTLPMetricExporter(TestCase):
     def setUp(self):  # pylint: disable=arguments-differ
         self.exporter = OTLPMetricsExporter(insecure=True)
         self.resource = SDKResource(OrderedDict([("a", 1), ("b", False)]))
-        self.meter = MeterProvider(resource=self.resource,).get_meter(
-            "name", "version"
-        )
+        self.meter = MeterProvider(
+            resource=self.resource,
+        ).get_meter("name", "version")
 
     @patch.dict(
         "os.environ",
@@ -114,14 +114,16 @@ def test_otlp_headers_from_env(self, mock_ssl_channel, mock_secure):
         exporter = OTLPMetricsExporter()
         # pylint: disable=protected-access
         self.assertEqual(
-            exporter._headers, (("key1", "value1"), ("key2", "value2")),
+            exporter._headers,
+            (("key1", "value1"), ("key2", "value2")),
         )
         exporter = OTLPMetricsExporter(
             headers=(("key3", "value3"), ("key4", "value4"))
         )
         # pylint: disable=protected-access
         self.assertEqual(
-            exporter._headers, (("key3", "value3"), ("key4", "value4")),
+            exporter._headers,
+            (("key3", "value3"), ("key4", "value4")),
         )
 
     @patch("opentelemetry.exporter.otlp.exporter.ssl_channel_credentials")
@@ -137,7 +139,14 @@ def test_translate_counter_export_record(self, mock_time_ns):
         mock_time_ns.configure_mock(**{"return_value": 1})
 
         counter_export_record = ExportRecord(
-            Counter("c", "d", "e", int, self.meter, ("f",),),
+            Counter(
+                "c",
+                "d",
+                "e",
+                int,
+                self.meter,
+                ("f",),
+            ),
             [("g", "h")],
             SumAggregator(),
             self.resource,
@@ -161,7 +170,8 @@ def test_translate_counter_export_record(self, mock_time_ns):
                     instrumentation_library_metrics=[
                         InstrumentationLibraryMetrics(
                             instrumentation_library=InstrumentationLibrary(
-                                name="name", version="version",
+                                name="name",
+                                version="version",
                             ),
                             metrics=[
                                 OTLPMetric(
@@ -203,7 +213,15 @@ def test_translate_counter_export_record(self, mock_time_ns):
     def test_translate_sum_observer_export_record(self, mock_time_ns):
         mock_time_ns.configure_mock(**{"return_value": 1})
         counter_export_record = ExportRecord(
-            SumObserver(Mock(), "c", "d", "e", int, self.meter, ("f",),),
+            SumObserver(
+                Mock(),
+                "c",
+                "d",
+                "e",
+                int,
+                self.meter,
+                ("f",),
+            ),
             [("g", "h")],
             SumAggregator(),
             self.resource,
@@ -227,7 +245,8 @@ def test_translate_sum_observer_export_record(self, mock_time_ns):
                     instrumentation_library_metrics=[
                         InstrumentationLibraryMetrics(
                             instrumentation_library=InstrumentationLibrary(
-                                name="name", version="version",
+                                name="name",
+                                version="version",
                             ),
                             metrics=[
                                 OTLPMetric(
@@ -294,7 +313,8 @@ def test_translate_updowncounter_export_record(self, mock_time_ns):
                     instrumentation_library_metrics=[
                         InstrumentationLibraryMetrics(
                             instrumentation_library=InstrumentationLibrary(
-                                name="name", version="version",
+                                name="name",
+                                version="version",
                             ),
                             metrics=[
                                 OTLPMetric(
@@ -335,7 +355,15 @@ def test_translate_updowncounter_export_record(self, mock_time_ns):
     def test_translate_updownsum_observer_export_record(self, mock_time_ns):
         mock_time_ns.configure_mock(**{"return_value": 1})
         counter_export_record = ExportRecord(
-            UpDownSumObserver(Mock(), "c", "d", "e", int, self.meter, ("f",),),
+            UpDownSumObserver(
+                Mock(),
+                "c",
+                "d",
+                "e",
+                int,
+                self.meter,
+                ("f",),
+            ),
             [("g", "h")],
             SumAggregator(),
             self.resource,
@@ -359,7 +387,8 @@ def test_translate_updownsum_observer_export_record(self, mock_time_ns):
                     instrumentation_library_metrics=[
                         InstrumentationLibraryMetrics(
                             instrumentation_library=InstrumentationLibrary(
-                                name="name", version="version",
+                                name="name",
+                                version="version",
                             ),
                             metrics=[
                                 OTLPMetric(

diff --git a/exporter/opentelemetry-exporter-prometheus/tests/test_prometheus_exporter.py b/exporter/opentelemetry-exporter-prometheus/tests/test_prometheus_exporter.py
@@ -37,7 +37,10 @@ def setUp(self):
         set_meter_provider(metrics.MeterProvider())
         self._meter = get_meter_provider().get_meter(__name__)
         self._test_metric = self._meter.create_counter(
-            "testname", "testdesc", "unit", int,
+            "testname",
+            "testdesc",
+            "unit",
+            int,
         )
         labels = {"environment": "staging"}
         self._labels_key = get_dict_as_key(labels)
@@ -101,7 +104,12 @@ def test_min_max_sum_aggregator_to_prometheus(self):
 
     def test_counter_to_prometheus(self):
         meter = get_meter_provider().get_meter(__name__)
-        metric = meter.create_counter("test@name", "testdesc", "unit", int,)
+        metric = meter.create_counter(
+            "test@name",
+            "testdesc",
+            "unit",
+            int,
+        )
         labels = {"environment@": "staging", "os": "Windows"}
         key_labels = get_dict_as_key(labels)
         aggregator = SumAggregator()
@@ -165,5 +173,10 @@ def __init__(
         enabled: bool = True,
     ):
         super().__init__(
-            name, description, unit, value_type, meter, enabled=enabled,
+            name,
+            description,
+            unit,
+            value_type,
+            meter,
+            enabled=enabled,
         )