Upgraded black and isort (#1777)

Author: owais

dev-requirements.txt

@@ -1,7 +1,7 @@
 pylint==2.6.0
 flake8~=3.7
-isort~=5.6
-black>=19.3b0,==19.*
+isort~=5.8
+black~=20.8b1
 httpretty~=1.0
 mypy==0.812
 sphinx~=2.1

docs/conf.py

@@ -101,12 +101,27 @@
     # Even if wrapt is added to intersphinx_mapping, sphinx keeps failing
     # with "class reference target not found: ObjectProxy".
     ("py:class", "ObjectProxy"),
-    ("py:class", "opentelemetry.trace._LinkBase",),
+    (
+        "py:class",
+        "opentelemetry.trace._LinkBase",
+    ),
     # TODO: Understand why sphinx is not able to find this local class
-    ("py:class", "opentelemetry.propagators.textmap.TextMapPropagator",),
-    ("py:class", "opentelemetry.propagators.textmap.DefaultGetter",),
-    ("any", "opentelemetry.propagators.textmap.TextMapPropagator.extract",),
-    ("any", "opentelemetry.propagators.textmap.TextMapPropagator.inject",),
+    (
+        "py:class",
+        "opentelemetry.propagators.textmap.TextMapPropagator",
+    ),
+    (
+        "py:class",
+        "opentelemetry.propagators.textmap.DefaultGetter",
+    ),
+    (
+        "any",
+        "opentelemetry.propagators.textmap.TextMapPropagator.extract",
+    ),
+    (
+        "any",
+        "opentelemetry.propagators.textmap.TextMapPropagator.inject",
+    ),
 ]
 
 # Add any paths that contain templates here, relative to this directory.

docs/examples/opentracing/main.py

@@ -13,7 +13,10 @@
 tracer_provider = trace.get_tracer_provider()
 
 # Configure the tracer to export traces to Jaeger
-jaeger_exporter = JaegerExporter(agent_host_name="localhost", agent_port=6831,)
+jaeger_exporter = JaegerExporter(
+    agent_host_name="localhost",
+    agent_port=6831,
+)
 span_processor = SimpleSpanProcessor(jaeger_exporter)
 tracer_provider.add_span_processor(span_processor)
 

docs/getting_started/jaeger_example.py

@@ -25,7 +25,10 @@
     )
 )
 
-jaeger_exporter = JaegerExporter(agent_host_name="localhost", agent_port=6831,)
+jaeger_exporter = JaegerExporter(
+    agent_host_name="localhost",
+    agent_port=6831,
+)
 
 trace.get_tracer_provider().add_span_processor(
     BatchSpanProcessor(jaeger_exporter)

docs/getting_started/tests/test_flask.py

@@ -27,7 +27,8 @@ def test_flask(self):
         dirpath = os.path.dirname(os.path.realpath(__file__))
         server_script = "{}/../flask_example.py".format(dirpath)
         server = subprocess.Popen(
-            [sys.executable, server_script], stdout=subprocess.PIPE,
+            [sys.executable, server_script],
+            stdout=subprocess.PIPE,
         )
         retry_strategy = Retry(total=10, backoff_factor=1)
         adapter = HTTPAdapter(max_retries=retry_strategy)

exporter/opentelemetry-exporter-jaeger-proto-grpc/examples/jaeger_exporter_example.py

@@ -15,7 +15,8 @@
 # `EXPORTER_JAEGER_CERTIFICATE` with file containing creds.
 
 jaeger_exporter = grpc.JaegerExporter(
-    collector_endpoint="localhost:14250", insecure=True,
+    collector_endpoint="localhost:14250",
+    insecure=True,
 )
 
 # create a BatchSpanProcessor and add the exporter to it

exporter/opentelemetry-exporter-jaeger-proto-grpc/src/opentelemetry/exporter/jaeger/proto/grpc/translate/__init__.py

@@ -195,7 +195,8 @@ def _duration_from_two_time_stamps(
     See https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#duration
     """
     duration = Duration(
-        seconds=end.seconds - start.seconds, nanos=end.nanos - start.nanos,
+        seconds=end.seconds - start.seconds,
+        nanos=end.nanos - start.nanos,
     )
     # pylint: disable=chained-comparison
     if duration.seconds < 0 and duration.nanos > 0:
@@ -350,7 +351,10 @@ def _extract_logs(
                     fields.append(tag)
 
             fields.append(
-                _get_string_key_value(key="message", value=event.name,)
+                _get_string_key_value(
+                    key="message",
+                    value=event.name,
+                )
             )
             event_ts = _proto_timestamp_from_epoch_nanos(event.timestamp)
             logs.append(model_pb2.Log(timestamp=event_ts, fields=fields))

exporter/opentelemetry-exporter-jaeger-proto-grpc/tests/test_jaeger_exporter_protobuf.py

@@ -126,8 +126,8 @@ def test_translate_to_jaeger(self):
 
         event_timestamp = base_time + 50 * 10 ** 6
         # pylint:disable=protected-access
-        event_timestamp_proto = pb_translator._proto_timestamp_from_epoch_nanos(
-            event_timestamp
+        event_timestamp_proto = (
+            pb_translator._proto_timestamp_from_epoch_nanos(event_timestamp)
         )
 
         event = trace.Event(
@@ -339,7 +339,9 @@ def test_translate_to_jaeger(self):
                 duration=span2_duration,
                 flags=0,
                 tags=default_tags,
-                process=model_pb2.Process(service_name="svc",),
+                process=model_pb2.Process(
+                    service_name="svc",
+                ),
             ),
             model_pb2.Span(
                 operation_name=span_names[2],
@@ -370,15 +372,18 @@ def test_translate_to_jaeger(self):
                         v_str="version",
                     ),
                 ],
-                process=model_pb2.Process(service_name="svc",),
+                process=model_pb2.Process(
+                    service_name="svc",
+                ),
             ),
         ]
 
         # events are complicated to compare because order of fields
         # (attributes) in otel is not important but in jeager it is
         # pylint: disable=no-member
         self.assertCountEqual(
-            spans[0].logs[0].fields, expected_spans[0].logs[0].fields,
+            spans[0].logs[0].fields,
+            expected_spans[0].logs[0].fields,
         )
 
         self.assertEqual(spans, expected_spans)

exporter/opentelemetry-exporter-jaeger-thrift/tests/test_jaeger_exporter_thrift.py

@@ -258,7 +258,9 @@ def test_translate_to_jaeger(self):
 
         default_tags = [
             jaeger.Tag(
-                key="span.kind", vType=jaeger.TagType.STRING, vStr="internal",
+                key="span.kind",
+                vType=jaeger.TagType.STRING,
+                vStr="internal",
             ),
         ]
 
@@ -522,7 +524,8 @@ def test_agent_client(self):
         spans = translate._translate(ThriftTranslator())
 
         batch = jaeger.Batch(
-            spans=spans, process=jaeger.Process(serviceName="xxx"),
+            spans=spans,
+            process=jaeger.Process(serviceName="xxx"),
         )
 
         agent_client.emit(batch)

exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/trace_exporter/__init__.py

@@ -46,7 +46,10 @@ class OpenCensusSpanExporter(SpanExporter):
     """
 
     def __init__(
-        self, endpoint=DEFAULT_ENDPOINT, host_name=None, client=None,
+        self,
+        endpoint=DEFAULT_ENDPOINT,
+        host_name=None,
+        client=None,
     ):
         tracer_provider = trace.get_tracer_provider()
         service_name = (