feat: disable prompt/response content in ADK spans if telemetry env is set

PiperOrigin-RevId: 822709528

Author: vertex-sdk-bot

tests/unit/vertex_adk/test_agent_engine_templates_adk.py

@@ -608,10 +608,10 @@ def test_span_content_capture_disabled_by_default(self):
     @mock.patch.dict(
         os.environ, {"OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT": "true"}
     )
-    def test_span_content_capture_enabled_with_env_var(self):
+    def test_span_content_capture_disabled_with_env_var(self):
         app = agent_engines.AdkApp(agent=_TEST_AGENT)
         app.set_up()
-        assert os.environ["ADK_CAPTURE_MESSAGE_CONTENT_IN_SPANS"] == "true"
+        assert os.environ["ADK_CAPTURE_MESSAGE_CONTENT_IN_SPANS"] == "false"
 
     @mock.patch.dict(os.environ)
     def test_span_content_capture_enabled_with_tracing(self):

vertexai/agent_engines/templates/adk.py

@@ -641,14 +641,10 @@ def set_up(self):
         location = self._tmpl_attrs.get("location")
         os.environ["GOOGLE_CLOUD_LOCATION"] = location
 
-        content_enabled = os.getenv(
-            "OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT", "false"
-        ).lower() in ("true", "1")
-        # Disable content capture in custom ADK spans unless:
-        # 1. User opted-in for content capture.
-        # 2. Or user enabled tracing explicitly with the old flag (this is to
-        #    preserve compatibility with old behavior).
-        if self._tmpl_attrs.get("enable_tracing") or content_enabled:
+        # Disable content capture in custom ADK spans unless user enabled
+        # tracing explicitly with the old flag
+        # (this is to preserve compatibility with old behavior).
+        if self._tmpl_attrs.get("enable_tracing"):
             os.environ["ADK_CAPTURE_MESSAGE_CONTENT_IN_SPANS"] = "true"
         else:
             os.environ["ADK_CAPTURE_MESSAGE_CONTENT_IN_SPANS"] = "false"