From 4a64099243ba07e22717b2319f3dad692c4ac29f Mon Sep 17 00:00:00 2001 From: Dinesh Yeduguru Date: Fri, 21 Mar 2025 15:30:01 -0700 Subject: [PATCH] naming changes --- llama_stack/distribution/server/server.py | 4 ++-- llama_stack/providers/utils/telemetry/tracing.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/llama_stack/distribution/server/server.py b/llama_stack/distribution/server/server.py index 0a39e7558..39de1e4df 100644 --- a/llama_stack/distribution/server/server.py +++ b/llama_stack/distribution/server/server.py @@ -239,7 +239,7 @@ class TracingMiddleware: 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": headers = message.get("headers", []) headers.append([b"x-trace-id", str(trace_context.trace_id).encode()]) @@ -247,7 +247,7 @@ class TracingMiddleware: await send(message) try: - return await self.app(scope, receive, send_wrapper) + return await self.app(scope, receive, send_with_trace_id) finally: await end_trace() diff --git a/llama_stack/providers/utils/telemetry/tracing.py b/llama_stack/providers/utils/telemetry/tracing.py index 0918fb988..3d5c717d6 100644 --- a/llama_stack/providers/utils/telemetry/tracing.py +++ b/llama_stack/providers/utils/telemetry/tracing.py @@ -34,7 +34,7 @@ INVALID_SPAN_ID = 0x0000000000000000 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 Args: trace_id: Trace ID int @@ -45,7 +45,7 @@ def format_trace_id(trace_id: int) -> str: 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 Args: span_id: Span ID int @@ -60,14 +60,14 @@ def generate_span_id() -> str: span_id = random.getrandbits(64) while span_id == INVALID_SPAN_ID: span_id = random.getrandbits(64) - return format_span_id(span_id) + return span_id_to_str(span_id) def generate_trace_id() -> str: trace_id = random.getrandbits(128) while trace_id == INVALID_TRACE_ID: 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)