naming changes

This commit is contained in:
Dinesh Yeduguru 2025-03-21 15:30:01 -07:00
parent a7de2f3ce4
commit 4a64099243
2 changed files with 6 additions and 6 deletions

View file

@ -239,7 +239,7 @@ class TracingMiddleware:
trace_context = await start_trace(trace_path, {"__location__": "server", "raw_path": path}) trace_context = await start_trace(trace_path, {"__location__": "server", "raw_path": path})
async def send_wrapper(message): async def send_with_trace_id(message):
if message["type"] == "http.response.start": if message["type"] == "http.response.start":
headers = message.get("headers", []) headers = message.get("headers", [])
headers.append([b"x-trace-id", str(trace_context.trace_id).encode()]) headers.append([b"x-trace-id", str(trace_context.trace_id).encode()])
@ -247,7 +247,7 @@ class TracingMiddleware:
await send(message) await send(message)
try: try:
return await self.app(scope, receive, send_wrapper) return await self.app(scope, receive, send_with_trace_id)
finally: finally:
await end_trace() await end_trace()

View file

@ -34,7 +34,7 @@ INVALID_SPAN_ID = 0x0000000000000000
INVALID_TRACE_ID = 0x00000000000000000000000000000000 INVALID_TRACE_ID = 0x00000000000000000000000000000000
def format_trace_id(trace_id: int) -> str: def trace_id_to_str(trace_id: int) -> str:
"""Convenience trace ID formatting method """Convenience trace ID formatting method
Args: Args:
trace_id: Trace ID int trace_id: Trace ID int
@ -45,7 +45,7 @@ def format_trace_id(trace_id: int) -> str:
return format(trace_id, "032x") return format(trace_id, "032x")
def format_span_id(span_id: int) -> str: def span_id_to_str(span_id: int) -> str:
"""Convenience span ID formatting method """Convenience span ID formatting method
Args: Args:
span_id: Span ID int span_id: Span ID int
@ -60,14 +60,14 @@ def generate_span_id() -> str:
span_id = random.getrandbits(64) span_id = random.getrandbits(64)
while span_id == INVALID_SPAN_ID: while span_id == INVALID_SPAN_ID:
span_id = random.getrandbits(64) span_id = random.getrandbits(64)
return format_span_id(span_id) return span_id_to_str(span_id)
def generate_trace_id() -> str: def generate_trace_id() -> str:
trace_id = random.getrandbits(128) trace_id = random.getrandbits(128)
while trace_id == INVALID_TRACE_ID: while trace_id == INVALID_TRACE_ID:
trace_id = random.getrandbits(128) trace_id = random.getrandbits(128)
return format_trace_id(trace_id) return trace_id_to_str(trace_id)
CURRENT_TRACE_CONTEXT = contextvars.ContextVar("trace_context", default=None) CURRENT_TRACE_CONTEXT = contextvars.ContextVar("trace_context", default=None)