Upgrade black (#802)

dev-requirements.txt

@@ -1,7 +1,7 @@
 pylint<2.10
 flake8~=3.7
 isort~=5.6
-black>=19.3b0,==19.*
+black>=21.10b0
 httpretty~=1.0
 mypy==0.790
 sphinx

docs/conf.py

@@ -129,12 +129,22 @@ def getlistcfg(strval):
 if "class_references" in mcfg:
     class_references = getlistcfg(mcfg["class_references"])
     for class_reference in class_references:
-        nitpick_ignore.append(("py:class", class_reference,))
+        nitpick_ignore.append(
+            (
+                "py:class",
+                class_reference,
+            )
+        )
 
 if "anys" in mcfg:
     anys = getlistcfg(mcfg["anys"])
     for _any in anys:
-        nitpick_ignore.append(("any", _any,))
+        nitpick_ignore.append(
+            (
+                "any",
+                _any,
+            )
+        )
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ["_templates"]

exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/propagator.py

@@ -96,7 +96,9 @@ def inject(
             return
         sampled = (trace.TraceFlags.SAMPLED & span.context.trace_flags) != 0
         setter.set(
-            carrier, self.TRACE_ID_KEY, format_trace_id(span.context.trace_id),
+            carrier,
+            self.TRACE_ID_KEY,
+            format_trace_id(span.context.trace_id),
         )
         setter.set(
             carrier, self.PARENT_ID_KEY, format_span_id(span.context.span_id)

exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py

@@ -78,7 +78,8 @@ def test_constructor_explicit(self):
         """Test the constructor passing all the options."""
         agent_url = "http://localhost:8126"
         exporter = datadog.DatadogSpanExporter(
-            agent_url=agent_url, service="explicit",
+            agent_url=agent_url,
+            service="explicit",
         )
 
         self.assertEqual(exporter.agent_url, agent_url)
@@ -472,7 +473,8 @@ def test_span_processor_dropped_spans(self):
         tracer_provider.shutdown()
 
     @mark.skipif(
-        sys.platform == "win32", reason="unreliable test on windows",
+        sys.platform == "win32",
+        reason="unreliable test on windows",
     )
     def test_span_processor_scheduled_delay(self):
         """Test that spans are exported each schedule_delay_millis"""

exporter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/__init__.py

@@ -132,7 +132,8 @@ class RichConsoleSpanExporter(SpanExporter):
     """
 
     def __init__(
-        self, service_name: Optional[str] = None,
+        self,
+        service_name: Optional[str] = None,
     ):
         self.service_name = service_name
         self.console = Console()

instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py

@@ -201,7 +201,8 @@ async def on_request_start(
         request_span_name = f"HTTP {http_method}"
 
         trace_config_ctx.span = trace_config_ctx.tracer.start_span(
-            request_span_name, kind=SpanKind.CLIENT,
+            request_span_name,
+            kind=SpanKind.CLIENT,
         )
 
         if callable(request_hook):

instrumentation/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py

@@ -116,7 +116,10 @@ def test_status_codes(self):
             (HTTPStatus.OK, StatusCode.UNSET),
             (HTTPStatus.TEMPORARY_REDIRECT, StatusCode.UNSET),
             (HTTPStatus.SERVICE_UNAVAILABLE, StatusCode.ERROR),
-            (HTTPStatus.GATEWAY_TIMEOUT, StatusCode.ERROR,),
+            (
+                HTTPStatus.GATEWAY_TIMEOUT,
+                StatusCode.ERROR,
+            ),
         ):
             with self.subTest(status_code=status_code):
                 host, port = self._http_request(
@@ -178,7 +181,8 @@ def response_hook(
 
         host, port = self._http_request(
             trace_config=aiohttp_client.create_trace_config(
-                request_hook=request_hook, response_hook=response_hook,
+                request_hook=request_hook,
+                response_hook=response_hook,
             ),
             method=method,
             url=path,

instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/__init__.py

@@ -91,7 +91,7 @@ def _instrument(self, **kwargs):
 
     # pylint:disable=no-self-use
     def _uninstrument(self, **kwargs):
-        """"Disable aiopg instrumentation"""
+        """ "Disable aiopg instrumentation"""
         wrappers.unwrap_connect()
         wrappers.unwrap_create_pool()
 

instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py

@@ -299,7 +299,8 @@ async def __call__(self, scope, receive, send):
 
         try:
             with self.tracer.start_as_current_span(
-                span_name, kind=trace.SpanKind.SERVER,
+                span_name,
+                kind=trace.SpanKind.SERVER,
             ) as span:
                 if span.is_recording():
                     attributes = collect_request_attributes(scope)

instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py

@@ -130,15 +130,15 @@ def _determine_parent_context(
 ) -> Context:
     """Determine the parent context for the current Lambda invocation.
 
-        See more:
-        https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/instrumentation/aws-lambda.md#determining-the-parent-of-a-span
+    See more:
+    https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/instrumentation/aws-lambda.md#determining-the-parent-of-a-span
 
-        Args:
-            lambda_event: user-defined, so it could be anything, but this
-                method counts it being a map with a 'headers' key
-        Returns:
-            A Context with configuration found in the carrier.
-        """
+    Args:
+        lambda_event: user-defined, so it could be anything, but this
+            method counts it being a map with a 'headers' key
+    Returns:
+        A Context with configuration found in the carrier.
+    """
     parent_context = None
 
     xray_env_var = os.environ.get(_X_AMZN_TRACE_ID)
@@ -194,7 +194,9 @@ def _instrumented_lambda_handler_call(
         tracer = get_tracer(__name__, __version__, tracer_provider)
 
         with tracer.start_as_current_span(
-            name=orig_handler_name, context=parent_context, kind=span_kind,
+            name=orig_handler_name,
+            context=parent_context,
+            kind=span_kind,
         ) as span:
             if span.is_recording():
                 lambda_context = args[1]

instrumentation/opentelemetry-instrumentation-aws-lambda/tests/test_aws_lambda_instrumentation_manual.py

@@ -93,7 +93,8 @@ class TestAwsLambdaInstrumentor(TestBase):
     def setUp(self):
         super().setUp()
         self.common_env_patch = mock.patch.dict(
-            "os.environ", {_HANDLER: "mocks.lambda_function.handler"},
+            "os.environ",
+            {_HANDLER: "mocks.lambda_function.handler"},
         )
         self.common_env_patch.start()
 

instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/__init__.py

@@ -123,7 +123,8 @@ def _common_request(  # pylint: disable=too-many-locals
         endpoint_name = getattr(instance, "host").split(".")[0]
 
         with self._tracer.start_as_current_span(
-            f"{endpoint_name}.command", kind=SpanKind.CONSUMER,
+            f"{endpoint_name}.command",
+            kind=SpanKind.CONSUMER,
         ) as span:
             span.set_attribute("endpoint", endpoint_name)
             if args:
@@ -135,7 +136,11 @@ def _common_request(  # pylint: disable=too-many-locals
 
             if span.is_recording():
                 add_span_arg_tags(
-                    span, endpoint_name, args, args_name, traced_args,
+                    span,
+                    endpoint_name,
+                    args,
+                    args_name,
+                    traced_args,
                 )
 
                 # Obtaining region name

instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_instrumentation.py

@@ -99,7 +99,11 @@ def assert_only_span(self):
         return spans[0]
 
     def assert_span(
-        self, service: str, operation: str, request_id=None, attributes=None,
+        self,
+        service: str,
+        operation: str,
+        request_id=None,
+        attributes=None,
     ):
         span = self.assert_only_span()
         expected = self._default_span_attributes(service, operation)

instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/__init__.py

@@ -131,7 +131,9 @@ def _instrument(self, **kwargs):
 
         tracer_provider = kwargs.get("tracer_provider")
         tracer = get_tracer(
-            __name__, __version__, tracer_provider=tracer_provider,
+            __name__,
+            __version__,
+            tracer_provider=tracer_provider,
         )
 
         _DjangoMiddleware._tracer = tracer

instrumentation/opentelemetry-instrumentation-django/tests/test_middleware.py

@@ -356,19 +356,23 @@ async def test_trace_parent(self):
         traceparent_value = f"00-{trace_id}-{span_id}-01"
 
         Client().get(
-            "/span_name/1234/", traceparent=traceparent_value,
+            "/span_name/1234/",
+            traceparent=traceparent_value,
         )
         span = self.memory_exporter.get_finished_spans()[0]
 
         self.assertEqual(
-            trace_id, format_trace_id(span.get_span_context().trace_id),
+            trace_id,
+            format_trace_id(span.get_span_context().trace_id),
         )
         self.assertIsNotNone(span.parent)
         self.assertEqual(
-            trace_id, format_trace_id(span.parent.trace_id),
+            trace_id,
+            format_trace_id(span.parent.trace_id),
         )
         self.assertEqual(
-            span_id, format_span_id(span.parent.span_id),
+            span_id,
+            format_span_id(span.parent.span_id),
         )
         self.memory_exporter.clear()
 
@@ -382,7 +386,8 @@ def test_trace_response_headers(self):
 
         response = Client().get("/span_name/1234/")
         self.assertTraceResponseHeaderMatchesSpan(
-            response, self.memory_exporter.get_finished_spans()[0],
+            response,
+            self.memory_exporter.get_finished_spans()[0],
         )
         self.memory_exporter.clear()
 

instrumentation/opentelemetry-instrumentation-django/tests/test_middleware_asgi.py

@@ -330,19 +330,23 @@ async def test_trace_parent(self):
         traceparent_value = f"00-{trace_id}-{span_id}-01"
 
         await self.async_client.get(
-            "/span_name/1234/", traceparent=traceparent_value,
+            "/span_name/1234/",
+            traceparent=traceparent_value,
         )
         span = self.memory_exporter.get_finished_spans()[0]
 
         self.assertEqual(
-            trace_id, format_trace_id(span.get_span_context().trace_id),
+            trace_id,
+            format_trace_id(span.get_span_context().trace_id),
         )
         self.assertIsNotNone(span.parent)
         self.assertEqual(
-            trace_id, format_trace_id(span.parent.trace_id),
+            trace_id,
+            format_trace_id(span.parent.trace_id),
         )
         self.assertEqual(
-            span_id, format_span_id(span.parent.span_id),
+            span_id,
+            format_span_id(span.parent.span_id),
         )
         self.memory_exporter.clear()
 
@@ -359,7 +363,8 @@ async def test_trace_response_headers(self):
 
         self.assertTrue(response.has_header("traceresponse"))
         self.assertEqual(
-            response["Access-Control-Expose-Headers"], "traceresponse",
+            response["Access-Control-Expose-Headers"],
+            "traceresponse",
         )
         self.assertEqual(
             response["traceresponse"],

instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py

@@ -119,7 +119,8 @@ class ElasticsearchInstrumentor(BaseInstrumentor):
     def __init__(self, span_name_prefix=None):
         if not span_name_prefix:
             span_name_prefix = environ.get(
-                "OTEL_PYTHON_ELASTICSEARCH_NAME_PREFIX", "Elasticsearch",
+                "OTEL_PYTHON_ELASTICSEARCH_NAME_PREFIX",
+                "Elasticsearch",
             )
         self._span_name_prefix = span_name_prefix.strip()
         super().__init__()
@@ -187,7 +188,8 @@ def wrapper(wrapped, _, args, kwargs):
         body = kwargs.get("body", None)
 
         with tracer.start_as_current_span(
-            op_name, kind=SpanKind.CLIENT,
+            op_name,
+            kind=SpanKind.CLIENT,
         ) as span:
 
             if callable(request_hook):
@@ -215,7 +217,8 @@ def wrapper(wrapped, _, args, kwargs):
                 for member in _ATTRIBUTES_FROM_RESULT:
                     if member in rv:
                         span.set_attribute(
-                            f"elasticsearch.{member}", str(rv[member]),
+                            f"elasticsearch.{member}",
+                            str(rv[member]),
                         )
 
             if callable(response_hook):

instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/__init__.py

@@ -222,7 +222,9 @@ def _start_response(status, response_headers, *args, **kwargs):
             return super().__call__(env, _start_response)
         except Exception as exc:
             activation.__exit__(
-                type(exc), exc, getattr(exc, "__traceback__", None),
+                type(exc),
+                exc,
+                getattr(exc, "__traceback__", None),
             )
             context.detach(token)
             raise

instrumentation/opentelemetry-instrumentation-falcon/tests/test_falcon.py

@@ -88,7 +88,8 @@ def _test_method(self, method):
         self.assertEqual(span.name, f"HelloWorldResource.on_{method.lower()}")
         self.assertEqual(span.status.status_code, StatusCode.UNSET)
         self.assertEqual(
-            span.status.description, None,
+            span.status.description,
+            None,
         )
         self.assertSpanHasAttributes(
             span,

instrumentation/opentelemetry-instrumentation-fastapi/tests/test_fastapi_instrumentation.py

@@ -254,7 +254,8 @@ def _create_app_explicit_excluded_urls(self):
         to_exclude = "/user/123,/foobar"
         self._instrumentor.uninstrument()  # Disable previous instrumentation (setUp)
         self._instrumentor.instrument(
-            tracer_provider=tracer_provider, excluded_urls=to_exclude,
+            tracer_provider=tracer_provider,
+            excluded_urls=to_exclude,
         )
         return self._create_fastapi_app()
 

instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py

@@ -326,7 +326,9 @@ def instrument_app(
             tracer = trace.get_tracer(__name__, __version__, tracer_provider)
 
             _before_request = _wrapped_before_request(
-                request_hook, tracer, excluded_urls=excluded_urls,
+                request_hook,
+                tracer,
+                excluded_urls=excluded_urls,
             )
             app._before_request = _before_request
             app.before_request(_before_request)

instrumentation/opentelemetry-instrumentation-flask/tests/test_programmatic.py

@@ -157,7 +157,8 @@ def test_trace_response(self):
         self.assertEqual(len(span_list), 1)
 
         self.assertTraceResponseHeaderMatchesSpan(
-            response.headers, span_list[0],
+            response.headers,
+            span_list[0],
         )
 
         set_global_response_propagator(orig)

instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/__init__.py

@@ -206,7 +206,9 @@ def instrumentation_dependencies(self) -> Collection[str]:
     def _instrument(self, **kwargs):
         for ctype in self._which_channel(kwargs):
             _wrap(
-                "grpc", ctype, self.wrapper_fn,
+                "grpc",
+                ctype,
+                self.wrapper_fn,
             )
 
     def _uninstrument(self, **kwargs):
@@ -217,7 +219,8 @@ def wrapper_fn(self, original_func, instance, args, kwargs):
         channel = original_func(*args, **kwargs)
         tracer_provider = kwargs.get("tracer_provider")
         return intercept_channel(
-            channel, client_interceptor(tracer_provider=tracer_provider),
+            channel,
+            client_interceptor(tracer_provider=tracer_provider),
         )