Revert "feat: Emit OTEL attributes for AgentCore Evaluation support (#368)" (#380)

This reverts commit 8bae410.

Co-authored-by: Trirmadura J Ariyawansa <tjariy@amazon.com>

Author: notgitika

src/bedrock_agentcore/runtime/app.py

@@ -120,8 +120,6 @@ def __init__(
         self.handlers: Dict[str, Callable] = {}
         self._ping_handler: Optional[Callable] = None
         self._websocket_handler: Optional[Callable] = None
-        self._prompt_key: Optional[str] = None
-        self._response_key: Optional[str] = None
         self._active_tasks: Dict[int, Dict[str, Any]] = {}
         self._task_counter_lock: threading.Lock = threading.Lock()
         self._forced_ping_status: Optional[PingStatus] = None
@@ -146,44 +144,18 @@ def __init__(
             self.logger.addHandler(handler)
             self.logger.setLevel(logging.DEBUG if self.debug else logging.INFO)
 
-    def entrypoint(
-        self, func: Callable = None, *, prompt_key: Optional[str] = None, response_key: Optional[str] = None
-    ) -> Callable:
+    def entrypoint(self, func: Callable) -> Callable:
         """Decorator to register a function as the main entrypoint.
 
         Args:
             func: The function to register as entrypoint
-            prompt_key: Optional key to extract user prompt from the payload dict.
-                If not specified, tries common keys in order (prompt, input, query,
-                message, question, user_input) then falls back to JSON serialization.
-            response_key: Optional key to extract agent response from the result dict.
-                If not specified, the full result is used.
 
         Returns:
             The decorated function with added serve method
-
-        Examples:
-            @app.entrypoint
-            def handler(payload):
-                ...
-
-            @app.entrypoint(prompt_key="user_input")
-            def handler(payload):
-                ...
         """
-
-        def decorator(f: Callable) -> Callable:
-            self.handlers["main"] = f
-            self._prompt_key = prompt_key
-            self._response_key = response_key
-            f.run = lambda port=8080, host=None: self.run(port, host)
-            return f
-
-        if func is not None:
-            # Called as @app.entrypoint without arguments
-            return decorator(func)
-        # Called as @app.entrypoint(...) with arguments
-        return decorator
+        self.handlers["main"] = func
+        func.run = lambda port=8080, host=None: self.run(port, host)
+        return func
 
     def ping(self, func: Callable) -> Callable:
         """Decorator to register a custom ping status handler.
@@ -412,78 +384,6 @@ def _takes_context(self, handler: Callable) -> bool:
         except Exception:
             return False
 
-    def _emit_invocation_otel_attributes(self, payload: Any, result: Any) -> None:
-        """Emit OTEL span attributes with the invocation input and output.
-
-        These attributes provide a canonical, framework-agnostic source of the
-        user's prompt and the agent's response for AgentCore Evaluation. They
-        enable evaluation of agents that use custom state schemas (e.g. workflow
-        agents with TypedDict states) where the default MessagesState-based
-        extraction in the evaluation mapper would fail.
-
-        The attributes are set on the current active span (typically the root
-        POST /invocations span created by ADOT auto-instrumentation).
-
-        When prompt_key or response_key is configured via @app.entrypoint(),
-        those specific keys are used to extract from dict payloads/results.
-        Otherwise, a heuristic tries common keys in priority order.
-        """
-        try:
-            from opentelemetry import trace as otel_trace
-
-            span = otel_trace.get_current_span()
-            if not span or not span.is_recording():
-                return
-
-            # Extract user prompt from payload
-            user_prompt = None
-            if isinstance(payload, dict):
-                if self._prompt_key is not None:
-                    value = payload.get(self._prompt_key)
-                    if isinstance(value, str):
-                        user_prompt = value
-                else:
-                    for key in ("prompt", "input", "query", "message", "question", "user_input"):
-                        if key in payload and isinstance(payload[key], str):
-                            user_prompt = payload[key]
-                            break
-                if user_prompt is None:
-                    user_prompt = json.dumps(payload, ensure_ascii=False, default=str)
-            elif isinstance(payload, str):
-                user_prompt = payload
-            else:
-                user_prompt = str(payload)
-
-            # Extract agent response from result
-            agent_response = None
-            if isinstance(result, str):
-                agent_response = result
-            elif isinstance(result, Response):
-                pass  # Skip for streaming/custom responses — cannot capture full output
-            elif isinstance(result, dict) and self._response_key is not None:
-                value = result.get(self._response_key)
-                if isinstance(value, str):
-                    agent_response = value
-                elif value is not None:
-                    try:
-                        agent_response = json.dumps(value, ensure_ascii=False, default=str)
-                    except Exception:
-                        agent_response = str(value)
-            elif result is not None:
-                try:
-                    agent_response = json.dumps(result, ensure_ascii=False, default=str)
-                except Exception:
-                    agent_response = str(result)
-
-            if user_prompt:
-                span.set_attribute("agentcore.invocation.user_prompt", user_prompt[:16384])
-            if agent_response:
-                span.set_attribute("agentcore.invocation.agent_response", agent_response[:16384])
-        except ImportError:
-            pass  # OpenTelemetry not installed — silently skip
-        except Exception:
-            self.logger.debug("Failed to emit invocation OTEL attributes", exc_info=True)
-
     async def _handle_invocation(self, request):
         request_context = self._build_request_context(request)
 
@@ -511,8 +411,6 @@ async def _handle_invocation(self, request):
             self.logger.debug("Invoking handler: %s", handler_name)
             result = await self._invoke_handler(handler, request_context, takes_context, payload)
 
-            self._emit_invocation_otel_attributes(payload, result)
-
             duration = time.time() - start_time
             if inspect.isgenerator(result):
                 self.logger.info("Returning streaming response (generator) (%.3fs)", duration)