[pull] main from google:main#394
Merged
Merged
Conversation
Merge #5982 This ensures auth handling follows the same branch visibility semantics used by the rest of the invocation context. PiperOrigin-RevId: 941326155
Co-authored-by: Xuan Yang <xygoogle@google.com> PiperOrigin-RevId: 941350837
Co-authored-by: Xuan Yang <xygoogle@google.com> PiperOrigin-RevId: 941353505
When ADK_TELEMETRY_SCHEMA_VERSION_OPT_IN resolves to 2, replace the legacy
top-level 'invocation' span with an entrypoint 'invoke_workflow {entrypoint}'
span (entrypoint = root agent or root node name), set is_entrypoint, and emit
the gen_ai.invoke_workflow.duration metric alongside it. Entrypoint status is
tracked via a contextvar so nested/agent-as-tool workflows report
is_entrypoint=false and the span is not double-emitted when the ADK entrypoint
is itself a workflow. Schema v1 is unchanged.
Co-authored-by: Max Ind <maxind@google.com>
PiperOrigin-RevId: 941359381
…ionConnectorTool This change allows a credential key to be passed through the toolset and connector, enabling the ToolAuthHandler to use a specific key when looking up credentials in the tool context. Fixes #4553 Co-authored-by: Xuan Yang <xygoogle@google.com> PiperOrigin-RevId: 941375909
Merge #5235 `_determine_agent_language()` handled only 3 of the 4 agent structures that `load_agent()` supports. When an agent is a flat module (`agents_dir/my_agent.py`, with no subdirectory), `load_agent()` loads it successfully but `_determine_agent_language()` raised `ValueError`. This adds the missing flat-module branch so language detection is consistent with all four supported load patterns: - `{name}/agent.py` - `{name}/__init__.py` - `{name}/root_agent.yaml` - `{name}.py` (flat module) It also adds `__init__.py` to the recognized agent marker files listed in the `adk web` / `adk api_server` AGENTS_DIR docstrings, and adds a `TestDetermineAgentLanguage` suite covering all four patterns plus the unrecognized-structure error case. Co-authored-by: Haran Rajkumar <haranrk@google.com> PiperOrigin-RevId: 941382778
…on names Rename gen_ai.agent.invocation.duration to gen_ai.invoke_agent.duration and gen_ai.tool.execution.duration to gen_ai.execute_tool.duration so the metric names match the GenAI semantic-convention operation names (invoke_agent, execute_tool) already used for the corresponding spans. Co-authored-by: Max Ind <maxind@google.com> PiperOrigin-RevId: 941394506
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )