fix: repair google adk py39 tests and misc runners

Author: sipercai

.github/workflows/generate_workflows.py

@@ -25,5 +25,9 @@
     batch_size=4,
     parallelism=4,
 )
-generate_misc_workflow(tox_ini_path, workflows_directory_path)
+generate_misc_workflow(
+    tox_ini_path,
+    workflows_directory_path,
+    runner=arc_runner_label,
+)
 generate_contrib_workflow(workflows_directory_path)

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/__init__.py

@@ -356,11 +356,13 @@ def generate_contrib_workflow(
 def generate_misc_workflow(
     tox_ini_path: Path,
     workflow_directory_path: Path,
+    runner="ubuntu-latest",
 ) -> None:
     _generate_workflow(
         get_misc_job_datas(get_tox_envs(tox_ini_path)),
         "misc",
         workflow_directory_path,
+        runner=runner,
     )
 
 
@@ -445,6 +447,7 @@ def generate_extension_misc_workflow(
     tox_ini_path: Path,
     workflow_directory_path: Path,
     additional_config_path: Path,
+    runner="ubuntu-latest",
 ) -> None:
     loongsuite_envs = get_loongsuite_tox_envs(additional_config_path)
     if not loongsuite_envs:
@@ -455,6 +458,7 @@ def generate_extension_misc_workflow(
         "loongsuite_misc",
         "loongsuite_misc",
         workflow_directory_path,
+        runner=runner,
     )
 
 

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/loongsuite_misc.yml.j2

@@ -36,7 +36,7 @@ jobs:
 
   {{ job_data }}:
     name: LoongSuite {{ job_data }}
-    runs-on: ubuntu-latest
+    runs-on: {{ runner }}
     timeout-minutes: 30
     {%- if job_data == "generate-workflows" %}
     if: |

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2

@@ -5,9 +5,8 @@ name: Misc {{ file_number }}
 
 on:
   push:
-    branches-ignore:
-    - 'release/*'
-    - 'otelbot/*'
+    branches:
+    - main
   pull_request:
 
 permissions:
@@ -36,7 +35,7 @@ jobs:
 
   {{ job_data }}:
     name: {{ job_data }}
-    runs-on: ubuntu-latest
+    runs-on: {{ "ubuntu-latest" if job_data == "docker-tests" else runner }}
     timeout-minutes: 30
     {%- if job_data == "generate-workflows" %}
     if: |

.github/workflows/generate_workflows_loongsuite.py

@@ -29,5 +29,8 @@
     control_runner=arc_runner_label,
 )
 generate_extension_misc_workflow(
-    tox_ini_path, workflows_directory_path, tox_loongsuite_ini_path
+    tox_ini_path,
+    workflows_directory_path,
+    tox_loongsuite_ini_path,
+    runner=arc_runner_label,
 )

.github/workflows/loongsuite_misc_0.yml

@@ -35,7 +35,7 @@ jobs:
 
   check-license-header:
     name: LoongSuite check-license-header
-    runs-on: ubuntu-latest
+    runs-on: loongsuite-python-arc
     timeout-minutes: 30
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
@@ -54,7 +54,7 @@ jobs:
 
   generate-loongsuite:
     name: LoongSuite generate-loongsuite
-    runs-on: ubuntu-latest
+    runs-on: loongsuite-python-arc
     timeout-minutes: 30
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}

.github/workflows/misc_0.yml

@@ -5,9 +5,8 @@ name: Misc 0
 
 on:
   push:
-    branches-ignore:
-    - 'release/*'
-    - 'otelbot/*'
+    branches:
+    - main
   pull_request:
 
 permissions:
@@ -35,7 +34,7 @@ jobs:
 
   spellcheck:
     name: spellcheck
-    runs-on: ubuntu-latest
+    runs-on: loongsuite-python-arc
     timeout-minutes: 30
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
@@ -73,7 +72,7 @@ jobs:
 
   docs:
     name: docs
-    runs-on: ubuntu-latest
+    runs-on: loongsuite-python-arc
     timeout-minutes: 30
     if: |
       github.event.pull_request.user.login != 'otelbot[bot]' && github.event_name == 'pull_request'
@@ -94,7 +93,7 @@ jobs:
 
   generate:
     name: generate
-    runs-on: ubuntu-latest
+    runs-on: loongsuite-python-arc
     timeout-minutes: 30
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
@@ -116,7 +115,7 @@ jobs:
 
   generate-workflows:
     name: generate-workflows
-    runs-on: ubuntu-latest
+    runs-on: loongsuite-python-arc
     timeout-minutes: 30
     if: |
       !contains(github.event.pull_request.labels.*.name, 'Skip generate-workflows')
@@ -141,7 +140,7 @@ jobs:
 
   shellcheck:
     name: shellcheck
-    runs-on: ubuntu-latest
+    runs-on: loongsuite-python-arc
     timeout-minutes: 30
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
@@ -160,7 +159,7 @@ jobs:
 
   precommit:
     name: precommit
-    runs-on: ubuntu-latest
+    runs-on: loongsuite-python-arc
     timeout-minutes: 30
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
@@ -179,7 +178,7 @@ jobs:
 
   typecheck:
     name: typecheck
-    runs-on: ubuntu-latest
+    runs-on: loongsuite-python-arc
     timeout-minutes: 30
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}

instrumentation-loongsuite/loongsuite-instrumentation-agno/src/opentelemetry/instrumentation/agno/utils.py

@@ -16,7 +16,7 @@
 
 import json
 from dataclasses import asdict, is_dataclass
-from typing import Any, Mapping, Sequence
+from typing import Any, Dict, Mapping, Optional, Sequence
 
 from opentelemetry.util.genai.extended_semconv.gen_ai_extended_attributes import (
     GEN_AI_SESSION_ID,
@@ -87,7 +87,7 @@ def _to_dict(value: Any) -> dict[str, Any] | None:
     return None
 
 
-def _mapping_from_any(value: Any) -> dict[str, Any]:
+def _mapping_from_any(value: Any) -> Dict[str, Any]:
     data = _to_dict(value)
     if data is not None:
         return data
@@ -100,7 +100,7 @@ def _mapping_from_any(value: Any) -> dict[str, Any]:
     return {}
 
 
-def _first_text(*values: Any) -> str | None:
+def _first_text(*values: Any) -> Optional[str]:
     for value in values:
         if value is None:
             continue
@@ -110,7 +110,7 @@ def _first_text(*values: Any) -> str | None:
     return None
 
 
-def _extract_skill_metadata(value: Any) -> dict[str, Any]:
+def _extract_skill_metadata(value: Any) -> Dict[str, Any]:
     data = _mapping_from_any(value)
     if not data:
         return {}

instrumentation-loongsuite/loongsuite-instrumentation-agno/tests/test_agno.py

@@ -254,6 +254,36 @@ def test_agno_skill_tool_invocation_captures_skill_attributes():
     assert invocation.skill_version == "1.2.3"
 
 
+def test_agno_non_skill_tool_invocation_ignores_skill_like_payload():
+    fn = Function.from_callable(lambda skill_name: f"loaded {skill_name}")
+    fn.name = "get_weather"
+    function_call = FunctionCall(
+        function=fn,
+        arguments={"skill_name": "code-review"},
+        call_id="call_regular_1",
+    )
+
+    invocation = create_tool_invocation(function_call)
+    update_tool_invocation_from_response(
+        invocation,
+        SimpleNamespace(
+            result={
+                "skill_name": "code-review",
+                "frontmatter": {
+                    "description": "Review code for quality and security.",
+                    "metadata": {"version": "1.2.3"},
+                },
+            }
+        ),
+    )
+
+    assert invocation.tool_name == "get_weather"
+    assert invocation.skill_name is None
+    assert invocation.skill_id is None
+    assert invocation.skill_description is None
+    assert invocation.skill_version is None
+
+
 def test_streaming_agent_finishes_agent_and_model_spans(
     span_exporter: InMemorySpanExporter,
 ):

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

@@ -26,7 +26,7 @@
 import timeit
 from contextvars import ContextVar, Token
 from dataclasses import asdict, is_dataclass
-from typing import Any, Dict, List, Mapping, Optional
+from typing import Any, Dict, List, Mapping, Optional, Tuple
 
 from google.adk.agents.base_agent import BaseAgent
 from google.adk.agents.callback_context import CallbackContext
@@ -62,7 +62,7 @@
 _SKILL_LOAD_TOOL_NAMES = {"load_skill", "load_skill_resource"}
 
 
-def _mapping_from_any(value: Any) -> dict[str, Any]:
+def _mapping_from_any(value: Any) -> Dict[str, Any]:
     if value is None:
         return {}
     if isinstance(value, Mapping):
@@ -88,7 +88,7 @@ def _mapping_from_any(value: Any) -> dict[str, Any]:
     return {}
 
 
-def _first_text(*values: Any) -> str | None:
+def _first_text(*values: Any) -> Optional[str]:
     for value in values:
         if value is None:
             continue
@@ -98,7 +98,7 @@ def _first_text(*values: Any) -> str | None:
     return None
 
 
-def _extract_skill_metadata(value: Any) -> dict[str, Any]:
+def _extract_skill_metadata(value: Any) -> Dict[str, Any]:
     data = _mapping_from_any(value)
     if not data:
         return {}
@@ -602,7 +602,7 @@ async def before_tool_callback(
         self,
         *,
         tool: BaseTool,
-        tool_args: dict[str, Any],
+        tool_args: Dict[str, Any],
         tool_context: ToolContext,
     ) -> None:
         """
@@ -646,9 +646,9 @@ async def after_tool_callback(
         self,
         *,
         tool: BaseTool,
-        tool_args: dict[str, Any],
+        tool_args: Dict[str, Any],
         tool_context: ToolContext,
-        result: dict,
+        result: Dict[str, Any],
     ) -> None:
         """
         End Tool execution - finish execute_tool span.
@@ -674,7 +674,7 @@ async def on_tool_error_callback(
         self,
         *,
         tool: BaseTool,
-        tool_args: dict[str, Any],
+        tool_args: Dict[str, Any],
         tool_context: ToolContext,
         error: Exception,
     ) -> Optional[dict]:
@@ -832,7 +832,7 @@ def _llm_key(
     def _tool_key(
         self,
         tool: BaseTool,
-        tool_args: dict[str, Any],
+        tool_args: Dict[str, Any],
         tool_context: ToolContext,
     ) -> str:
         invocation_context = getattr(tool_context, "_invocation_context", None)
@@ -848,7 +848,7 @@ def _find_active_llm_invocation(
         self,
         callback_context: CallbackContext,
         llm_request: Optional[LlmRequest] = None,
-    ) -> tuple[Optional[str], Optional[LLMInvocation]]:
+    ) -> Tuple[Optional[str], Optional[LLMInvocation]]:
         context_request_key = _ACTIVE_LLM_REQUEST_KEY.get()
         if context_request_key:
             invocation = self._active_llm_invocations.get(context_request_key)
@@ -915,7 +915,7 @@ def _is_mock_placeholder(value: Any) -> bool:
 
     @staticmethod
     def _mock_has_explicit_attrs(
-        value: Any, attr_names: tuple[str, ...]
+        value: Any, attr_names: Tuple[str, ...]
     ) -> bool:
         value_dict = getattr(value, "__dict__", {})
         return any(attr_name in value_dict for attr_name in attr_names)