Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/google/adk/telemetry/_metrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
)

_agent_invocation_duration = meter.create_histogram(
"gen_ai.agent.invocation.duration",
"gen_ai.invoke_agent.duration",
unit="s",
description="Duration of agent invocations.",
explicit_bucket_boundaries_advisory=[
Expand All @@ -72,7 +72,7 @@
description="Duration of workflow invocations.",
)
_tool_execution_duration = meter.create_histogram(
"gen_ai.tool.execution.duration",
"gen_ai.execute_tool.duration",
unit="s",
description="Duration of tool executions.",
explicit_bucket_boundaries_advisory=[
Expand Down
8 changes: 4 additions & 4 deletions tests/unittests/telemetry/functional_node_test_cases.py
Original file line number Diff line number Diff line change
Expand Up @@ -2581,13 +2581,13 @@

# Expected metric points, grouped by metric name.
EXPECTED_NODE_METRICS_V1: dict[str, frozenset[MetricPoint]] = {
"gen_ai.agent.invocation.duration": frozenset({
"gen_ai.invoke_agent.duration": frozenset({
MetricPoint(
attributes={"gen_ai.agent.name": AGENT_NAME},
value=NON_DETERMINISTIC,
),
}),
"gen_ai.tool.execution.duration": frozenset({
"gen_ai.execute_tool.duration": frozenset({
MetricPoint(
attributes={
"gen_ai.agent.name": AGENT_NAME,
Expand Down Expand Up @@ -2637,13 +2637,13 @@


EXPECTED_NODE_METRICS_V2: dict[str, frozenset[MetricPoint]] = {
"gen_ai.agent.invocation.duration": frozenset({
"gen_ai.invoke_agent.duration": frozenset({
MetricPoint(
attributes={"gen_ai.agent.name": AGENT_NAME},
value=NON_DETERMINISTIC,
),
}),
"gen_ai.tool.execution.duration": frozenset({
"gen_ai.execute_tool.duration": frozenset({
MetricPoint(
attributes={
"gen_ai.agent.name": AGENT_NAME,
Expand Down
8 changes: 4 additions & 4 deletions tests/unittests/telemetry/functional_test_cases.py
Original file line number Diff line number Diff line change
Expand Up @@ -2275,13 +2275,13 @@

# Expected metric points, grouped by metric name.
EXPECTED_METRICS_V1: dict[str, frozenset[MetricPoint]] = {
"gen_ai.agent.invocation.duration": frozenset({
"gen_ai.invoke_agent.duration": frozenset({
MetricPoint(
attributes={"gen_ai.agent.name": AGENT_NAME},
value=NON_DETERMINISTIC,
),
}),
"gen_ai.tool.execution.duration": frozenset({
"gen_ai.execute_tool.duration": frozenset({
MetricPoint(
attributes={
"gen_ai.agent.name": AGENT_NAME,
Expand Down Expand Up @@ -2322,13 +2322,13 @@


EXPECTED_METRICS_V2: dict[str, frozenset[MetricPoint]] = {
"gen_ai.agent.invocation.duration": frozenset({
"gen_ai.invoke_agent.duration": frozenset({
MetricPoint(
attributes={"gen_ai.agent.name": AGENT_NAME},
value=NON_DETERMINISTIC,
),
}),
"gen_ai.tool.execution.duration": frozenset({
"gen_ai.execute_tool.duration": frozenset({
MetricPoint(
attributes={
"gen_ai.agent.name": AGENT_NAME,
Expand Down
4 changes: 2 additions & 2 deletions tests/unittests/telemetry/functional_test_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -307,12 +307,12 @@ class HistogramSpec(NamedTuple):
HistogramSpec(
module=_metrics,
attr="_agent_invocation_duration",
metric_name="gen_ai.agent.invocation.duration",
metric_name="gen_ai.invoke_agent.duration",
),
HistogramSpec(
module=_metrics,
attr="_tool_execution_duration",
metric_name="gen_ai.tool.execution.duration",
metric_name="gen_ai.execute_tool.duration",
),
HistogramSpec(
module=_metrics,
Expand Down
4 changes: 2 additions & 2 deletions tests/unittests/telemetry/test_metrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ def _mock_meter_setup(monkeypatch):
client_token_usage_hist.name = "client_token_usage"

def create_histogram_side_effect(name, **_kwargs):
if name == "gen_ai.agent.invocation.duration":
if name == "gen_ai.invoke_agent.duration":
return agent_duration_hist
elif name == "gen_ai.invoke_workflow.duration":
return workflow_duration_hist
elif name == "gen_ai.tool.execution.duration":
elif name == "gen_ai.execute_tool.duration":
return tool_duration_hist
elif name == "gen_ai.agent.request.size":
return request_size_hist
Expand Down
Loading