Fix formatting

Signed-off-by: Aidan Jensen <aidandj.github@gmail.com>

Author: aidandj

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

@@ -25,6 +25,7 @@
 from typing import Callable, MutableMapping
 
 import grpc
+
 from opentelemetry import trace
 from opentelemetry.instrumentation.grpc import grpcext
 from opentelemetry.instrumentation.grpc._utilities import RpcInfo
@@ -77,11 +78,12 @@ def _safe_invoke(function: Callable, *args):
             "Error when invoking function '%s'", function_name, exc_info=ex
         )
 
+
 class OpenTelemetryClientInterceptor(
     grpcext.UnaryClientInterceptor, grpcext.StreamClientInterceptor
 ):
     def __init__(
-            self, tracer, filter_=None, request_hook=None, response_hook=None
+        self, tracer, filter_=None, request_hook=None, response_hook=None
     ):
         self._tracer = tracer
         self._filter = filter_
@@ -135,10 +137,10 @@ def _intercept(self, request, metadata, client_info, invoker):
         else:
             mutable_metadata = OrderedDict(metadata)
         with self._start_span(
-                client_info.full_method,
-                end_on_exit=False,
-                record_exception=False,
-                set_status_on_exception=False,
+            client_info.full_method,
+            end_on_exit=False,
+            record_exception=False,
+            set_status_on_exception=False,
         ) as span:
             result = None
             try:
@@ -192,16 +194,15 @@ def intercept_unary(self, request, metadata, client_info, invoker):
     # the span across the generated responses and detect any errors, we wrap
     # the result in a new generator that yields the response values.
     def _intercept_server_stream(
-            self, request_or_iterator, metadata, client_info, invoker
+        self, request_or_iterator, metadata, client_info, invoker
     ):
         if not metadata:
             mutable_metadata = OrderedDict()
         else:
             mutable_metadata = OrderedDict(metadata)
 
         with self._start_span(
-                client_info.full_method,
-                end_on_exit=False
+            client_info.full_method, end_on_exit=False
         ) as span:
             inject(mutable_metadata, setter=_carrier_setter)
             metadata = tuple(mutable_metadata.items())
@@ -222,7 +223,8 @@ def done_callback(future, span_):
                 except grpc.FutureCancelledError:
                     span_.set_status(Status(StatusCode.OK))
                     span_.set_attribute(
-                        RPC_GRPC_STATUS_CODE, grpc.StatusCode.CANCELLED.value[0]
+                        RPC_GRPC_STATUS_CODE,
+                        grpc.StatusCode.CANCELLED.value[0],
                     )
                 except grpc.RpcError as err:
                     span_.set_status(Status(StatusCode.ERROR))
@@ -236,7 +238,7 @@ def done_callback(future, span_):
             return stream
 
     def intercept_stream(
-            self, request_or_iterator, metadata, client_info, invoker
+        self, request_or_iterator, metadata, client_info, invoker
     ):
         if not is_instrumentation_enabled():
             return invoker(request_or_iterator, metadata)

instrumentation/opentelemetry-instrumentation-grpc/tests/test_client_interceptor.py

@@ -12,10 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # pylint:disable=cyclic-import
-import logging
 
 import threading
-import time
 from unittest import mock
 
 import grpc
@@ -64,32 +62,32 @@ def __init__(self):
         pass
 
     def intercept_unary_unary(
-            self, continuation, client_call_details, request
+        self, continuation, client_call_details, request
     ):
         return self._intercept_call(continuation, client_call_details, request)
 
     def intercept_unary_stream(
-            self, continuation, client_call_details, request
+        self, continuation, client_call_details, request
     ):
         return self._intercept_call(continuation, client_call_details, request)
 
     def intercept_stream_unary(
-            self, continuation, client_call_details, request_iterator
+        self, continuation, client_call_details, request_iterator
     ):
         return self._intercept_call(
             continuation, client_call_details, request_iterator
         )
 
     def intercept_stream_stream(
-            self, continuation, client_call_details, request_iterator
+        self, continuation, client_call_details, request_iterator
     ):
         return self._intercept_call(
             continuation, client_call_details, request_iterator
         )
 
     @staticmethod
     def _intercept_call(
-            continuation, client_call_details, request_or_iterator
+        continuation, client_call_details, request_or_iterator
     ):
         return continuation(client_call_details, request_or_iterator)
 
@@ -177,9 +175,9 @@ def test_unary_stream(self):
     def test_unary_stream_can_be_cancel(self):
         done = threading.Event()
         responses = server_streaming_method(self._stub, serialize=False)
-        responses.add_done_callback(lambda: done.set())
-        for i, _ in enumerate(responses):
-            if i == 1:
+        responses.add_done_callback(lambda _: done.set())
+        for resp, _ in enumerate(responses):
+            if resp == 1:
                 responses.cancel()
                 break
         self.assertEqual(responses.code(), grpc.StatusCode.CANCELLED)
@@ -202,9 +200,7 @@ def test_unary_stream_can_be_cancel(self):
                 RPC_METHOD: "ServerStreamingMethod",
                 RPC_SERVICE: "GRPCTestServer",
                 RPC_SYSTEM: "grpc",
-                RPC_GRPC_STATUS_CODE: grpc.StatusCode.CANCELLED.value[
-                    0
-                ],
+                RPC_GRPC_STATUS_CODE: grpc.StatusCode.CANCELLED.value[0],
             },
         )
 
@@ -261,9 +257,9 @@ def test_stream_stream(self):
     def test_stream_stream_can_be_cancel(self):
         done = threading.Event()
         responses = bidirectional_streaming_method(self._stub, serialize=False)
-        responses.add_done_callback(lambda: done.set())
-        for i, _ in enumerate(responses):
-            if i == 1:
+        responses.add_done_callback(lambda _: done.set())
+        for resp, _ in enumerate(responses):
+            if resp == 1:
                 responses.cancel()
                 break
         self.assertEqual(responses.code(), grpc.StatusCode.CANCELLED)
@@ -272,7 +268,9 @@ def test_stream_stream_can_be_cancel(self):
         self.assertEqual(len(spans), 1)
         span = spans[0]
 
-        self.assertEqual(span.name, "/GRPCTestServer/BidirectionalStreamingMethod")
+        self.assertEqual(
+            span.name, "/GRPCTestServer/BidirectionalStreamingMethod"
+        )
         self.assertIs(span.kind, trace.SpanKind.CLIENT)
 
         # Check version and name in span's instrumentation info
@@ -286,13 +284,10 @@ def test_stream_stream_can_be_cancel(self):
                 RPC_METHOD: "BidirectionalStreamingMethod",
                 RPC_SERVICE: "GRPCTestServer",
                 RPC_SYSTEM: "grpc",
-                RPC_GRPC_STATUS_CODE: grpc.StatusCode.CANCELLED.value[
-                    0
-                ],
+                RPC_GRPC_STATUS_CODE: grpc.StatusCode.CANCELLED.value[0],
             },
         )
 
-
     def test_error_simple(self):
         with self.assertRaises(grpc.RpcError):
             simple_method(self._stub, error=True)
@@ -368,7 +363,7 @@ def invoker(_request, _metadata):
             self.assertEqual(span_end_mock.call_count, 1)
 
     def test_client_interceptor_trace_context_propagation(
-            self,
+        self,
     ):  # pylint: disable=no-self-use
         """ensure that client interceptor correctly inject trace context into all outgoing requests."""
         previous_propagator = get_global_textmap()

instrumentation/opentelemetry-instrumentation-grpc/tests/test_client_interceptor_filter.py

@@ -101,9 +101,12 @@ def setUp(self):
         self.server.start()
         # use a user defined interceptor along with the opentelemetry client interceptor
         interceptors = [Interceptor()]
-        self.channel = grpc.insecure_channel("localhost:25565",options=[
-            (grpc.experimental.ChannelOptions.SingleThreadedUnaryStream, 1)
-        ])
+        self.channel = grpc.insecure_channel(
+            "localhost:25565",
+            options=[
+                (grpc.experimental.ChannelOptions.SingleThreadedUnaryStream, 1)
+            ],
+        )
         self.channel = grpc.intercept_channel(self.channel, *interceptors)
         self._stub = test_server_pb2_grpc.GRPCTestServerStub(self.channel)