Skip to content

Commit f7cc204

Browse files
committed
interop: reformat Python interop helper and client to <=80 char line limit
1 parent 7d00bea commit f7cc204

2 files changed

Lines changed: 43 additions & 12 deletions

File tree

src/python/grpcio_tests/tests/interop/client.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,9 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
220220
sent_span_name = f"Sent.{full_method}"
221221
attempt_span_name = f"Attempt.{full_method}"
222222

223-
sent_span = self._tracer.start_span(sent_span_name, kind=trace.SpanKind.CLIENT)
223+
sent_span = self._tracer.start_span(
224+
sent_span_name, kind=trace.SpanKind.CLIENT
225+
)
224226
sent_ctx = trace.set_span_in_context(sent_span)
225227
attempt_span = self._tracer.start_span(
226228
attempt_span_name, kind=trace.SpanKind.CLIENT, context=sent_ctx
@@ -271,8 +273,11 @@ def _create_channel(args):
271273

272274
if args.enable_opentelemetry:
273275
from tests.interop import otel_interop_helper
276+
274277
provider, tracer = otel_interop_helper.init_tracer_provider()
275-
channel = grpc.intercept_channel(channel, _OTelClientInterceptor(tracer))
278+
channel = grpc.intercept_channel(
279+
channel, _OTelClientInterceptor(tracer)
280+
)
276281

277282
return channel
278283

src/python/grpcio_tests/tests/interop/otel_interop_helper.py

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,18 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
"""OpenTelemetry Tracing Interop Helper for Python gRPC Interop Client/Server."""
14+
"""OpenTelemetry Tracing Interop Helper for Python gRPC Interop Client/Server
15+
"""
1516

1617
import os
1718
from typing import Optional, Tuple
1819

1920
import grpc
2021
from opentelemetry import trace
21-
from opentelemetry.proto.collector.trace.v1 import trace_service_pb2, trace_service_pb2_grpc
22+
from opentelemetry.proto.collector.trace.v1 import (
23+
trace_service_pb2,
24+
trace_service_pb2_grpc,
25+
)
2226
from opentelemetry.proto.common.v1 import common_pb2
2327
from opentelemetry.proto.trace.v1 import trace_pb2
2428
from opentelemetry.sdk.trace import ReadableSpan, TracerProvider
@@ -119,7 +123,9 @@ def force_flush(self, timeout_millis: int = 30000) -> bool:
119123
def init_tracer_provider() -> Tuple[TracerProvider, trace.Tracer]:
120124
global _GLOBAL_PROVIDER
121125
if _GLOBAL_PROVIDER is None:
122-
endpoint = os.environ.get("OTEL_EXPORTER_OTLP_ENDPOINT", "http://localhost:4317")
126+
endpoint = os.environ.get(
127+
"OTEL_EXPORTER_OTLP_ENDPOINT", "http://localhost:4317"
128+
)
123129
exporter = OTLPSpanExporter(endpoint)
124130
processor = SimpleSpanProcessor(exporter)
125131
_GLOBAL_PROVIDER = TracerProvider()
@@ -141,7 +147,14 @@ def pack_grpc_trace_bin(
141147
trace_id_bytes = trace_id_int.to_bytes(16, "big")
142148
span_id_bytes = span_id_int.to_bytes(8, "big")
143149
options = 1 if is_sampled else 0
144-
return b"\x00\x00" + trace_id_bytes + b"\x01" + span_id_bytes + b"\x02" + bytes([options])
150+
return (
151+
b"\x00\x00"
152+
+ trace_id_bytes
153+
+ b"\x01"
154+
+ span_id_bytes
155+
+ b"\x02"
156+
+ bytes([options])
157+
)
145158

146159

147160
def unpack_grpc_trace_bin(
@@ -171,31 +184,44 @@ def parse_traceparent(
171184

172185

173186
class OTelServerInterceptor(grpc.ServerInterceptor):
174-
"""Server interceptor to extract trace context and create server Recv span."""
187+
"""Server interceptor to extract trace context and create Recv span."""
175188

176189
def __init__(self, tracer: trace.Tracer):
177190
self._tracer = tracer
178191

179192
def intercept_service(self, continuation, handler_call_details):
180-
print(f"DEBUG_SERVER_METADATA: {handler_call_details.invocation_metadata}", flush=True)
181193
trace_bin_header = None
182194
traceparent_header = None
183195
for k, v in handler_call_details.invocation_metadata:
184-
k_str = k.decode("ascii", errors="ignore") if isinstance(k, bytes) else str(k)
196+
k_str = (
197+
k.decode("ascii", errors="ignore")
198+
if isinstance(k, bytes)
199+
else str(k)
200+
)
185201
if k_str.lower() == "grpc-trace-bin":
186202
trace_bin_header = v
187203
elif k_str.lower() == "traceparent":
188-
traceparent_header = v if isinstance(v, str) else v.decode("latin1")
204+
traceparent_header = (
205+
v if isinstance(v, str) else v.decode("latin1")
206+
)
189207

190208
parent_ctx = None
191209
trace_id, parent_span_id, is_sampled = None, None, False
192210

193211
if trace_bin_header:
194212
if isinstance(trace_bin_header, str):
195213
trace_bin_header = trace_bin_header.encode("latin1")
196-
trace_id, parent_span_id, is_sampled = unpack_grpc_trace_bin(trace_bin_header)
214+
(
215+
trace_id,
216+
parent_span_id,
217+
is_sampled,
218+
) = unpack_grpc_trace_bin(trace_bin_header)
197219
elif traceparent_header:
198-
trace_id, parent_span_id, is_sampled = parse_traceparent(traceparent_header)
220+
(
221+
trace_id,
222+
parent_span_id,
223+
is_sampled,
224+
) = parse_traceparent(traceparent_header)
199225

200226
if trace_id and parent_span_id:
201227
parent_ctx = trace.SpanContext(

0 commit comments

Comments
 (0)