feat: Add Google ADK instrumentation support to Tox and GitHub workflows

- Introduced new Tox environments for testing and linting Google ADK instrumentation across multiple Python versions.
- Updated GitHub Actions workflows to include jobs for linting and testing Google ADK instrumentation.
- Added requirements files for both latest and oldest dependencies for Google ADK tests.
- Enhanced error handling in main.py and improved logging for better debugging.

This update enhances the testing framework and ensures comprehensive coverage for Google ADK instrumentation.

Change-Id: [insert-change-id-here]
Change-Id: I0013d216d47a9dd8146752ffb67d4cd18dfe3679
Co-developed-by: Cursor <[email protected]>

Author: ralf0131

.github/workflows/loongsuite_lint_0.yml

@@ -70,6 +70,25 @@ jobs:
       - name: Run tests
         run: tox -c tox-loongsuite.ini -e lint-loongsuite-instrumentation-dashscope
 
+  lint-loongsuite-instrumentation-google-adk:
+    name: LoongSuite loongsuite-instrumentation-google-adk
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.13
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -c tox-loongsuite.ini -e lint-loongsuite-instrumentation-google-adk
+
   lint-loongsuite-instrumentation-mem0:
     name: LoongSuite loongsuite-instrumentation-mem0
     runs-on: ubuntu-latest

.github/workflows/loongsuite_test_0.yml

@@ -374,6 +374,196 @@ jobs:
       - name: Run tests
         run: tox -c tox-loongsuite.ini -e py313-test-loongsuite-instrumentation-dashscope-latest -- -ra
 
+  py39-test-loongsuite-instrumentation-google-adk-oldest_ubuntu-latest:
+    name: LoongSuite loongsuite-instrumentation-google-adk-oldest 3.9 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.9"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -c tox-loongsuite.ini -e py39-test-loongsuite-instrumentation-google-adk-oldest -- -ra
+
+  py39-test-loongsuite-instrumentation-google-adk-latest_ubuntu-latest:
+    name: LoongSuite loongsuite-instrumentation-google-adk-latest 3.9 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.9"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -c tox-loongsuite.ini -e py39-test-loongsuite-instrumentation-google-adk-latest -- -ra
+
+  py310-test-loongsuite-instrumentation-google-adk-oldest_ubuntu-latest:
+    name: LoongSuite loongsuite-instrumentation-google-adk-oldest 3.10 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -c tox-loongsuite.ini -e py310-test-loongsuite-instrumentation-google-adk-oldest -- -ra
+
+  py310-test-loongsuite-instrumentation-google-adk-latest_ubuntu-latest:
+    name: LoongSuite loongsuite-instrumentation-google-adk-latest 3.10 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -c tox-loongsuite.ini -e py310-test-loongsuite-instrumentation-google-adk-latest -- -ra
+
+  py311-test-loongsuite-instrumentation-google-adk-oldest_ubuntu-latest:
+    name: LoongSuite loongsuite-instrumentation-google-adk-oldest 3.11 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -c tox-loongsuite.ini -e py311-test-loongsuite-instrumentation-google-adk-oldest -- -ra
+
+  py311-test-loongsuite-instrumentation-google-adk-latest_ubuntu-latest:
+    name: LoongSuite loongsuite-instrumentation-google-adk-latest 3.11 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -c tox-loongsuite.ini -e py311-test-loongsuite-instrumentation-google-adk-latest -- -ra
+
+  py312-test-loongsuite-instrumentation-google-adk-oldest_ubuntu-latest:
+    name: LoongSuite loongsuite-instrumentation-google-adk-oldest 3.12 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -c tox-loongsuite.ini -e py312-test-loongsuite-instrumentation-google-adk-oldest -- -ra
+
+  py312-test-loongsuite-instrumentation-google-adk-latest_ubuntu-latest:
+    name: LoongSuite loongsuite-instrumentation-google-adk-latest 3.12 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -c tox-loongsuite.ini -e py312-test-loongsuite-instrumentation-google-adk-latest -- -ra
+
+  py313-test-loongsuite-instrumentation-google-adk-oldest_ubuntu-latest:
+    name: LoongSuite loongsuite-instrumentation-google-adk-oldest 3.13 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.13
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -c tox-loongsuite.ini -e py313-test-loongsuite-instrumentation-google-adk-oldest -- -ra
+
+  py313-test-loongsuite-instrumentation-google-adk-latest_ubuntu-latest:
+    name: LoongSuite loongsuite-instrumentation-google-adk-latest 3.13 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.13
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -c tox-loongsuite.ini -e py313-test-loongsuite-instrumentation-google-adk-latest -- -ra
+
   py310-test-loongsuite-instrumentation-mem0-oldest_ubuntu-latest:
     name: LoongSuite loongsuite-instrumentation-mem0-oldest 3.10 Ubuntu
     runs-on: ubuntu-latest

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

@@ -8,6 +8,7 @@
 import logging
 import os
 import sys
+import traceback
 from datetime import datetime
 from typing import Any, Dict, Optional
 
@@ -247,8 +248,6 @@ async def run_conversation(
 
     except Exception as e:
         logger.error(f"处理消息时出错: {e}")
-        import traceback
-
         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

@@ -13,6 +13,7 @@
     # opentelemetry-instrument python your_app.py
 """
 
+import importlib.util
 import logging
 from typing import Collection, Optional
 
@@ -25,6 +26,7 @@
 from opentelemetry.semconv.schemas import Schemas
 
 from .internal._plugin import GoogleAdkObservabilityPlugin
+from .package import _instruments
 from .version import __version__
 
 _logger = logging.getLogger(__name__)
@@ -148,7 +150,7 @@ def instrumentation_dependencies(self) -> Collection[str]:
         Returns:
             Collection of required packages
         """
-        return ["google-adk >= 0.1.0"]
+        return _instruments
 
     def _instrument(self, **kwargs):
         """
@@ -164,8 +166,6 @@ def _instrument(self, **kwargs):
                 - meter_provider: Custom meter provider
         """
         # Check if google-adk is installed
-        import importlib.util
-
         if importlib.util.find_spec("google.adk.runners") is None:
             _logger.warning(
                 "google-adk not found, instrumentation will not be applied"
@@ -200,7 +200,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/_metrics.py

@@ -71,8 +71,6 @@ def record_llm_call(
         error_type: Optional[str] = None,
         prompt_tokens: int = 0,
         completion_tokens: int = 0,
-        conversation_id: Optional[str] = None,
-        user_id: Optional[str] = None,
     ) -> None:
         """
         Record LLM call metrics following standard OTel GenAI conventions.
@@ -84,8 +82,6 @@ def record_llm_call(
             error_type: Error type if error occurred
             prompt_tokens: Number of prompt tokens
             completion_tokens: Number of completion tokens
-            conversation_id: Conversation ID (not used in metrics due to high cardinality)
-            user_id: User ID (not used in metrics due to high cardinality)
         """
         try:
             # ✅ Build standard attributes for operation.duration
@@ -139,8 +135,6 @@ def record_agent_call(
         agent_name: str,
         duration: float,
         error_type: Optional[str] = None,
-        conversation_id: Optional[str] = None,
-        user_id: Optional[str] = None,
     ) -> None:
         """
         Record Agent call metrics following standard OTel GenAI conventions.
@@ -150,8 +144,6 @@ def record_agent_call(
             agent_name: Agent name
             duration: Duration in seconds
             error_type: Error type if error occurred
-            conversation_id: Conversation ID (not used in metrics due to high cardinality)
-            user_id: User ID (not used in metrics due to high cardinality)
         """
         try:
             # ✅ Build standard attributes
@@ -184,8 +176,6 @@ def record_tool_call(
         tool_name: str,
         duration: float,
         error_type: Optional[str] = None,
-        conversation_id: Optional[str] = None,
-        user_id: Optional[str] = None,
     ) -> None:
         """
         Record Tool call metrics following standard OTel GenAI conventions.
@@ -195,8 +185,6 @@ def record_tool_call(
             tool_name: Tool name
             duration: Duration in seconds
             error_type: Error type if error occurred
-            conversation_id: Conversation ID (not used in metrics due to high cardinality)
-            user_id: User ID (not used in metrics due to high cardinality)
         """
         try:
             # ✅ Build standard attributes