Skip to content

fix(runtime): distinguish request parse errors from handler JSON errors #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jesseturner21 merged 2 commits into from
May 12, 2026
Merged

fix(runtime): distinguish request parse errors from handler JSON errors #472

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b690b15
fix(runtime): distinguish request parse errors from handler JSON errors
jesseturner21 May 12, 2026
040b523
test: add regression test for handler JSONDecodeError misclassification
jesseturner21 May 12, 2026
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
19 changes: 10 additions & 9 deletions src/bedrock_agentcore/runtime/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,16 @@ async def _handle_invocation(self, request):

try:
payload = await request.json()
except json.JSONDecodeError as e:
duration = time.time() - start_time
self.logger.warning("Invalid JSON in request (%.3fs): %s", duration, e)
return JSONResponse({"error": "Invalid JSON", "details": str(e)}, status_code=400)
except UnicodeDecodeError as e:
duration = time.time() - start_time
self.logger.warning("Invalid encoding in request (%.3fs): %s", duration, e)
return JSONResponse({"error": "Invalid encoding", "details": str(e)}, status_code=400)

try:
self.logger.debug("Processing invocation request")

if self.debug:
Expand Down Expand Up @@ -581,15 +591,6 @@ async def _handle_invocation(self, request):
# Use safe serialization for consistency with streaming paths
safe_json_string = self._safe_serialize_to_json_string(result)
return Response(safe_json_string, media_type="application/json")

except json.JSONDecodeError as e:
duration = time.time() - start_time
self.logger.warning("Invalid JSON in request (%.3fs): %s", duration, e)
return JSONResponse({"error": "Invalid JSON", "details": str(e)}, status_code=400)
except UnicodeDecodeError as e:
duration = time.time() - start_time
self.logger.warning("Invalid encoding in request (%.3fs): %s", duration, e)
return JSONResponse({"error": "Invalid encoding", "details": str(e)}, status_code=400)
except HTTPException as e:
duration = time.time() - start_time
# Use error level for 5xx to match the generic Exception handler's severity,
Expand Down
Loading