chore: fix ruff check failure

Change-Id: Ib739c8edde37921c0c8b6b9d7289465d28896af3
Co-developed-by: Cursor <noreply@cursor.com>

Author: ralf0131

instrumentation-loongsuite/loongsuite-instrumentation-google-adk/examples/main.py

@@ -247,7 +247,7 @@ async def run_conversation(
 
     except Exception as e:
         logger.error(f"处理消息时出错: {e}")
-        import traceback
+        import traceback  # noqa: PLC0415
 
         logger.error(f"详细错误信息: {traceback.format_exc()}")
         raise HTTPException(status_code=500, detail=f"处理消息失败: {str(e)}")

instrumentation-loongsuite/loongsuite-instrumentation-google-adk/src/opentelemetry/instrumentation/google_adk/__init__.py

@@ -26,7 +26,7 @@
 from opentelemetry.util.genai.extended_handler import ExtendedTelemetryHandler
 
 from .internal._plugin import GoogleAdkObservabilityPlugin
-from .version import __version__
+from .version import __version__ as __version__  # noqa: F401
 
 _logger = logging.getLogger(__name__)
 
@@ -168,7 +168,7 @@ def _instrument(self, **kwargs):
                 - logger_provider: Custom logger provider
         """
         # Check if google-adk is installed
-        import importlib.util
+        import importlib.util  # noqa: PLC0415
 
         if importlib.util.find_spec("google.adk.runners") is None:
             _logger.warning(
@@ -181,7 +181,9 @@ def _instrument(self, **kwargs):
         logger_provider = kwargs.get("logger_provider")
 
         # Create or get the global plugin instance
-        _create_plugin_if_needed(tracer_provider, meter_provider, logger_provider)
+        _create_plugin_if_needed(
+            tracer_provider, meter_provider, logger_provider
+        )
 
         # Wrap the Runner initialization to auto-inject our plugin
         try:
@@ -205,7 +207,7 @@ def _uninstrument(self, **kwargs):
 
         try:
             # Unwrap the Runner initialization
-            from google.adk.runners import Runner
+            from google.adk.runners import Runner  # noqa: PLC0415
 
             unwrap(Runner, "__init__")
 

instrumentation-loongsuite/loongsuite-instrumentation-google-adk/src/opentelemetry/instrumentation/google_adk/internal/_plugin.py

@@ -92,13 +92,11 @@ async def before_run_callback(
         According to OTel GenAI conventions, Runner is treated as a top-level agent.
         """
         try:
-            # Extract conversation_id and user_id
+            # Extract conversation_id
             conversation_id = None
-            user_id = None
 
             if invocation_context.session:
                 conversation_id = invocation_context.session.id
-            user_id = getattr(invocation_context, "user_id", None)
 
             # Create invocation object
             invocation = InvokeAgentInvocation(
@@ -269,17 +267,13 @@ async def before_agent_callback(
         Start Agent execution - create invoke_agent span.
         """
         try:
-            # Extract conversation_id and user_id
+            # Extract conversation_id
             conversation_id = None
-            user_id = None
 
             if callback_context._invocation_context.session:
                 conversation_id = (
                     callback_context._invocation_context.session.id
                 )
-            user_id = getattr(
-                callback_context._invocation_context, "user_id", None
-            )
 
             # Create invocation object
             invocation = InvokeAgentInvocation(
@@ -304,7 +298,9 @@ async def before_agent_callback(
             agent_key = f"agent_{id(agent)}_{conversation_id}"
             self._active_agent_invocations[agent_key] = invocation
 
-            _logger.debug(f"Started Agent invocation: invoke_agent {agent.name}")
+            _logger.debug(
+                f"Started Agent invocation: invoke_agent {agent.name}"
+            )
 
         except Exception as e:
             _logger.exception(f"Error in before_agent_callback: {e}")
@@ -376,7 +372,7 @@ async def before_model_callback(
                 invocation.attributes["gen_ai.conversation.id"] = (
                     callback_context._invocation_context.session.id
                 )
-            
+
             user_id = getattr(callback_context, "user_id", None)
             if not user_id:
                 user_id = getattr(
@@ -465,7 +461,9 @@ async def after_model_callback(
                 model_name = self._resolve_model_name(
                     llm_response, request_key, llm_invocation
                 )
-                _logger.debug(f"Finished LLM invocation for model {model_name}")
+                _logger.debug(
+                    f"Finished LLM invocation for model {model_name}"
+                )
 
         except Exception as e:
             _logger.exception(f"Error in after_model_callback: {e}")
@@ -718,7 +716,9 @@ def _convert_llm_response_to_output_messages(
 
         try:
             # Extract finish reason
-            finish_reason = getattr(llm_response, "finish_reason", None) or "stop"
+            finish_reason = (
+                getattr(llm_response, "finish_reason", None) or "stop"
+            )
             if hasattr(finish_reason, "value"):
                 finish_reason = finish_reason.value
             elif not isinstance(finish_reason, (str, int, float, bool)):

instrumentation-loongsuite/loongsuite-instrumentation-google-adk/tests/conftest.py

@@ -3,8 +3,7 @@
 
 import json
 import os
-import re
-from typing import List, Optional
+from typing import List
 
 import pytest
 import yaml
@@ -28,7 +27,6 @@
 from opentelemetry.sdk.trace.export.in_memory_span_exporter import (
     InMemorySpanExporter,
 )
-from opentelemetry.sdk.trace.sampling import ALWAYS_OFF
 from opentelemetry.util.genai.environment_variables import (
     OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT,
 )
@@ -189,11 +187,11 @@ def instrument_with_content_and_events(
 def find_spans_by_operation(spans: List, operation_name: str) -> List:
     """
     Find spans by operation name.
-    
+
     Args:
         spans: List of spans to search
         operation_name: Operation name to search for (e.g., "chat", "invoke_agent")
-        
+
     Returns:
         List of spans matching the operation name
     """
@@ -207,11 +205,11 @@ def find_spans_by_operation(spans: List, operation_name: str) -> List:
 def find_spans_by_name_prefix(spans: List, prefix: str) -> List:
     """
     Find spans by name prefix.
-    
+
     Args:
         spans: List of spans to search
         prefix: Prefix to match against span names
-        
+
     Returns:
         List of spans with names starting with the prefix
     """
@@ -221,37 +219,38 @@ def find_spans_by_name_prefix(spans: List, prefix: str) -> List:
 def print_span_tree(spans: List, indent: int = 0):
     """
     Print span hierarchy as a tree structure.
-    
+
     Args:
         spans: List of spans to print
         indent: Current indentation level
     """
     # Build a map of span_id -> span for quick lookup
     span_map = {span.context.span_id: span for span in spans}
-    
+
     # Find root spans (spans with no parent or parent not in the list)
     root_spans = [
         span
         for span in spans
-        if span.parent is None
-        or span.parent.span_id not in span_map
+        if span.parent is None or span.parent.span_id not in span_map
     ]
-    
+
     def print_span_recursive(span, level=0):
         """Recursively print span and its children"""
         prefix = "  " * level
         operation = span.attributes.get("gen_ai.operation.name", "unknown")
         print(f"{prefix}- {span.name} ({operation})")
-        
+
         # Find children
         children = [
-            s for s in spans
-            if s.parent is not None and s.parent.span_id == span.context.span_id
+            s
+            for s in spans
+            if s.parent is not None
+            and s.parent.span_id == span.context.span_id
         ]
-        
+
         for child in children:
             print_span_recursive(child, level + 1)
-    
+
     for root_span in root_spans:
         print_span_recursive(root_span, indent)
 
@@ -273,20 +272,20 @@ def literal_block_scalar_presenter(dumper, data):
 
 def process_string_value(string_value):
     """Format JSON or return long string as LiteralBlockScalar"""
-    import gzip
-    
+    import gzip  # noqa: PLC0415
+
     # Handle bytes type - decompress if gzip, then decode
     if isinstance(string_value, bytes):
         try:
             # Check if gzip compressed (magic number 0x1f 0x8b)
-            if string_value[:2] == b'\x1f\x8b':
-                string_value = gzip.decompress(string_value).decode('utf-8')
+            if string_value[:2] == b"\x1f\x8b":
+                string_value = gzip.decompress(string_value).decode("utf-8")
             else:
-                string_value = string_value.decode('utf-8')
+                string_value = string_value.decode("utf-8")
         except Exception:
             # If we can't decode, return as-is (will be handled by YAML)
             return string_value
-    
+
     try:
         json_data = json.loads(string_value)
         return LiteralBlockScalar(json.dumps(json_data, indent=2))
@@ -344,13 +343,13 @@ def fixture_vcr(vcr):
 def normalize_request_headers(request):
     """
     Normalize request headers by removing dynamic headers that change between requests.
-    
+
     This function removes headers like x-stainless-retry-count that may differ
     between recording and playback, causing VCR matching failures.
-    
+
     Args:
         request: VCR request object
-        
+
     Returns:
         Request object with normalized headers
     """
@@ -418,7 +417,9 @@ def vcr_config():
         "before_record_request": normalize_request_headers,
         # Ignore LiteLLM's model price fetching requests to avoid matching issues
         # These requests are made by LiteLLM internally and don't affect our tests
-        "ignore_hosts": ["raw.githubusercontent.com"],  # Ignore LiteLLM model price requests
+        "ignore_hosts": [
+            "raw.githubusercontent.com"
+        ],  # Ignore LiteLLM model price requests
         # Allow recording new interactions when cassette exists
         "record_mode": "new_episodes",
     }