Merge branch 'main' into fix/subprocess-blocklist-bypass

RobertoLuzanilla · web-flow · commit a5b00bef7d8a · 2026-04-29T01:37:39.000-07:00
diff --git a/src/google/adk/telemetry/_experimental_semconv.py b/src/google/adk/telemetry/_experimental_semconv.py
@@ -51,7 +51,7 @@
 try:
   from opentelemetry.semconv._incubating.attributes.gen_ai_attributes import GEN_AI_TOOL_DEFINITIONS
 except ImportError:
-  GEN_AI_TOOL_DEFINITIONS = 'gen_ai.tool_definitions'
+  GEN_AI_TOOL_DEFINITIONS = 'gen_ai.tool.definitions'
 
 OTEL_SEMCONV_STABILITY_OPT_IN = 'OTEL_SEMCONV_STABILITY_OPT_IN'
 
diff --git a/tests/unittests/telemetry/test_spans.py b/tests/unittests/telemetry/test_spans.py
@@ -60,7 +60,7 @@
 try:
   from opentelemetry.semconv._incubating.attributes.gen_ai_attributes import GEN_AI_TOOL_DEFINITIONS
 except ImportError:
-  GEN_AI_TOOL_DEFINITIONS = 'gen_ai.tool_definitions'
+  GEN_AI_TOOL_DEFINITIONS = 'gen_ai.tool.definitions'
 
 
 class Event:
