Merge pull request #1144 from r4inee:feature/default-message-content-in-tracing-to-false

PiperOrigin-RevId: 1004753853

Author: copybara-github

core/src/main/java/com/google/adk/telemetry/README.md

@@ -152,6 +152,7 @@ The following classes are the primary places where spans are created:
 
 **ADK_CAPTURE_MESSAGE_CONTENT_IN_SPANS**: This environment variable controls
 whether LLM request/response content and tool arguments/responses are captured
-in span attributes. It defaults to `true`. Set to `false` to exclude potentially
-large or sensitive data from traces, in which case a `{}` JSON object will be
-recorded instead.
+in span attributes. It defaults to `false` per OpenTelemetry GenAI semantic
+conventions, which classify content attributes as opt-in due to privacy and data
+volume concerns. Set to `true` to include content in traces (e.g., for local
+development or debugging). When disabled, a `{}` JSON object is recorded instead.

core/src/main/java/com/google/adk/telemetry/Tracing.java

@@ -146,7 +146,7 @@ public class Tracing {
 
   private static final boolean CAPTURE_MESSAGE_CONTENT_IN_SPANS =
       Boolean.parseBoolean(
-          System.getenv().getOrDefault("ADK_CAPTURE_MESSAGE_CONTENT_IN_SPANS", "true"));
+          System.getenv().getOrDefault("ADK_CAPTURE_MESSAGE_CONTENT_IN_SPANS", "false"));
 
   private Tracing() {}
 

core/src/test/java/com/google/adk/telemetry/ContextPropagationTest.java

@@ -324,9 +324,7 @@ public void testTraceToolCall() {
     assertEquals("tool-name", attrs.get(AttributeKey.stringKey("gen_ai.tool.name")));
     assertEquals("tool-description", attrs.get(AttributeKey.stringKey("gen_ai.tool.description")));
     assertEquals("tool-type", attrs.get(AttributeKey.stringKey("gen_ai.tool.type")));
-    assertEquals(
-        "{\"arg1\":\"value1\"}",
-        attrs.get(AttributeKey.stringKey("gcp.vertex.agent.tool_call_args")));
+    assertEquals("{}", attrs.get(AttributeKey.stringKey("gcp.vertex.agent.tool_call_args")));
     assertEquals("{}", attrs.get(AttributeKey.stringKey("gcp.vertex.agent.llm_request")));
     assertEquals("{}", attrs.get(AttributeKey.stringKey("gcp.vertex.agent.llm_response")));
   }
@@ -371,9 +369,7 @@ public void testTraceToolResponse() {
     assertEquals("tool-description", attrs.get(AttributeKey.stringKey("gen_ai.tool.description")));
     assertEquals("tool-type", attrs.get(AttributeKey.stringKey("gen_ai.tool.type")));
     assertEquals("{}", attrs.get(AttributeKey.stringKey("gcp.vertex.agent.tool_call_args")));
-    assertEquals(
-        "{\"result\":\"tool-result\"}",
-        attrs.get(AttributeKey.stringKey("gcp.vertex.agent.tool_response")));
+    assertEquals("{}", attrs.get(AttributeKey.stringKey("gcp.vertex.agent.tool_response")));
   }
 
   @Test
@@ -420,9 +416,8 @@ public void testTraceCallLlm() {
     assertEquals(
         ImmutableList.of("stop"),
         attrs.get(AttributeKey.stringArrayKey("gen_ai.response.finish_reasons")));
-    assertTrue(
-        attrs.get(AttributeKey.stringKey("gcp.vertex.agent.llm_request")).contains("gemini-pro"));
-    assertTrue(attrs.get(AttributeKey.stringKey("gcp.vertex.agent.llm_response")).contains("STOP"));
+    assertEquals("{}", attrs.get(AttributeKey.stringKey("gcp.vertex.agent.llm_request")));
+    assertEquals("{}", attrs.get(AttributeKey.stringKey("gcp.vertex.agent.llm_response")));
   }
 
   @Test
@@ -618,7 +613,7 @@ public void testTraceSendData() {
         "test-invocation-id", attrs.get(AttributeKey.stringKey("gcp.vertex.agent.invocation_id")));
     assertEquals("event-1", attrs.get(AttributeKey.stringKey("gcp.vertex.agent.event_id")));
     assertEquals("test-session", attrs.get(AttributeKey.stringKey("gcp.vertex.agent.session_id")));
-    assertTrue(attrs.get(AttributeKey.stringKey("gcp.vertex.agent.data")).contains("hello"));
+    assertEquals("{}", attrs.get(AttributeKey.stringKey("gcp.vertex.agent.data")));
   }
 
   // Agent that emits one event on a computation thread.