fix(telemetry): pre-commit fixes

Author: iamemilio

src/llama_stack/providers/inline/agents/meta_reference/responses/streaming.py

@@ -8,14 +8,12 @@
 from collections.abc import AsyncIterator
 from typing import Any
 
-<<<<<<< HEAD
-from llama_stack.core.telemetry import tracing
+
 from llama_stack.log import get_logger
 from llama_stack.providers.utils.inference.prompt_adapter import interleaved_content_as_str
-=======
+
 from opentelemetry import trace
 
->>>>>>> 4b58468f (fix(telemetry): MCP tools capture spans using Open Telemetry)
 from llama_stack_api import (
     AllowedToolsFilter,
     ApprovalFilter,
@@ -72,6 +70,7 @@
     OpenAIResponseUsageOutputTokensDetails,
     WebSearchToolTypes,
 )
+from opentelemetry import trace
 
 from .types import ChatCompletionContext, ChatCompletionResult
 from .utils import (

src/llama_stack/providers/inline/agents/meta_reference/responses/tool_executor.py

@@ -9,8 +9,6 @@
 from collections.abc import AsyncIterator
 from typing import Any
 
-from opentelemetry import trace
-
 from llama_stack_api import (
     ImageContentItem,
     OpenAIChatCompletionContentPartImageParam,
@@ -38,6 +36,7 @@
     ToolRuntime,
     VectorIO,
 )
+from opentelemetry import trace
 
 from llama_stack.log import get_logger