π OpenHands: AI-Driven Development
fix: PLTF-2956 Log 5xx responses at error level in AutomationEventService (#14819)
aivong-openhands5f554c6949f2
diff --git a/enterprise/server/services/automation_event_service.py b/enterprise/server/services/automation_event_service.pyindex 5bb6592087..14f2013213 100644--- a/enterprise/server/services/automation_event_service.py+++ b/enterprise/server/services/automation_event_service.py@@ -552,6 +552,18 @@ class AutomationEventService:payload=payload,)+ @staticmethod+ async def _read_response_body(resp: aiohttp.ClientResponse) -> Any:+ """Return the response body as JSON, falling back to text.++ Infrastructure errors (e.g. 502/503 from a load balancer) often return+ a non-JSON body, so we can't assume the expected JSON interface.+ """+ try:+ return await resp.json()+ except (aiohttp.ContentTypeError, ValueError):+ return await resp.text()+async def _send_source_to_automation_service(self,source: str,@@ -598,13 +610,16 @@ class AutomationEventService:headers=headers,timeout=aiohttp.ClientTimeout(total=AUTOMATION_SERVICE_TIMEOUT),) as resp:- if resp.status >= 400:- # Try JSON first (expected interface), fall back to text- # for infrastructure errors (502/503 from load balancer)- try:- body = await resp.json()- except (aiohttp.ContentTypeError, ValueError):- body = await resp.text()+ if resp.status >= 500:+ # 5xx = downstream failure, event dropped, user impact+ body = await self._read_response_body(resp)+ logger.error(+ f'[AutomationEventService] Automation service returned '+ f'{resp.status} for {source} org {org_id}: {body}'+ )+ elif resp.status >= 400:+ # 4xx = client/contract problem, not a downstream outage+ body = await self._read_response_body(resp)logger.warning(f'[AutomationEventService] Automation service returned 'f'{resp.status} for {source} org {org_id}: {body}'diff --git a/enterprise/tests/unit/server/services/test_automation_event_service.py b/enterprise/tests/unit/server/services/test_automation_event_service.pyindex 5925afe057..10b7bb3c13 100644--- a/enterprise/tests/unit/server/services/test_automation_event_service.py+++ b/enterprise/tests/unit/server/services/test_automation_event_service.py@@ -897,6 +897,51 @@ class TestSendToAutomationService:or 'timeout' in str(mock_logger.error.call_args).lower())+ @pytest.mark.asyncio+ async def test_send_5xx_logs_error(self, mock_token_manager):+ """+ GIVEN: Automation service returns 5xx (server error)+ WHEN: _send_to_automation_service is called+ THEN: Error is logged (event was dropped, user impact)+ """+ org_id = uuid.UUID('12345678-1234-5678-1234-567812345678')+ payload = {'organization': {'git_org': 'test'}, 'payload': {}}++ mock_response = MagicMock()+ mock_response.status = 500+ mock_response.json = AsyncMock(return_value={'error': 'internal error'})++ mock_post_context = MagicMock()+ mock_post_context.__aenter__ = AsyncMock(return_value=mock_response)+ mock_post_context.__aexit__ = AsyncMock(return_value=None)++ mock_session_instance = MagicMock()+ mock_session_instance.post = MagicMock(return_value=mock_post_context)++ mock_session_context = MagicMock()+ mock_session_context.__aenter__ = AsyncMock(return_value=mock_session_instance)+ mock_session_context.__aexit__ = AsyncMock(return_value=None)++ with (+ patch(+ 'server.services.automation_event_service.AUTOMATION_SERVICE_URL',+ 'https://automation.example.com',+ ),+ patch(+ 'server.services.automation_event_service.aiohttp.ClientSession',+ return_value=mock_session_context,+ ),+ patch('server.services.automation_event_service.logger') as mock_logger,+ ):+ service = create_service(mock_token_manager)+ await service._send_to_automation_service(+ ProviderType.GITHUB, org_id, payload+ )++ mock_logger.error.assert_called()+ assert '500' in str(mock_logger.error.call_args)+ mock_logger.warning.assert_not_called()+@pytest.mark.asyncioasync def test_send_client_error_logs_error(self, mock_token_manager):"""@@ -944,6 +989,105 @@ class TestSendToAutomationService:mock_logger.error.assert_called()assert 'HTTP error' in str(mock_logger.error.call_args)+ @pytest.mark.asyncio+ async def test_send_503_logs_error(self, mock_token_manager):+ """+ GIVEN: Automation service returns 503 (service unavailable)+ WHEN: _send_to_automation_service is called+ THEN: Error is logged (event was dropped, user impact)+ """+ import aiohttp++ org_id = uuid.UUID('12345678-1234-5678-1234-567812345678')+ payload = {'organization': {'git_org': 'test'}, 'payload': {}}++ mock_response = MagicMock()+ mock_response.status = 503+ # Simulate JSON parse failure (e.g., load balancer 503 returns text)+ mock_response.json = AsyncMock(+ side_effect=aiohttp.ContentTypeError(+ request_info=MagicMock(),+ history=(),+ )+ )+ mock_response.text = AsyncMock(return_value='Service Temporarily Unavailable')++ mock_post_context = MagicMock()+ mock_post_context.__aenter__ = AsyncMock(return_value=mock_response)+ mock_post_context.__aexit__ = AsyncMock(return_value=None)++ mock_session_instance = MagicMock()+ mock_session_instance.post = MagicMock(return_value=mock_post_context)++ mock_session_context = MagicMock()+ mock_session_context.__aenter__ = AsyncMock(return_value=mock_session_instance)+ mock_session_context.__aexit__ = AsyncMock(return_value=None)++ with (+ patch(+ 'server.services.automation_event_service.AUTOMATION_SERVICE_URL',+ 'https://automation.example.com',+ ),+ patch(+ 'server.services.automation_event_service.aiohttp.ClientSession',+ return_value=mock_session_context,+ ),+ patch('server.services.automation_event_service.logger') as mock_logger,+ ):+ service = create_service(mock_token_manager)+ await service._send_to_automation_service(+ ProviderType.GITHUB, org_id, payload+ )++ mock_logger.error.assert_called()+ assert '503' in str(mock_logger.error.call_args)+ mock_logger.warning.assert_not_called()++ @pytest.mark.asyncio+ async def test_send_4xx_logs_warning(self, mock_token_manager):+ """+ GIVEN: Automation service returns 4xx (client error)+ WHEN: _send_to_automation_service is called+ THEN: Warning is logged (contract/client problem, not downstream outage)+ """+ org_id = uuid.UUID('12345678-1234-5678-1234-567812345678')+ payload = {'organization': {'git_org': 'test'}, 'payload': {}}++ mock_response = MagicMock()+ mock_response.status = 400+ mock_response.json = AsyncMock(return_value={'error': 'bad request'})++ mock_post_context = MagicMock()+ mock_post_context.__aenter__ = AsyncMock(return_value=mock_response)+ mock_post_context.__aexit__ = AsyncMock(return_value=None)++ mock_session_instance = MagicMock()+ mock_session_instance.post = MagicMock(return_value=mock_post_context)++ mock_session_context = MagicMock()+ mock_session_context.__aenter__ = AsyncMock(return_value=mock_session_instance)+ mock_session_context.__aexit__ = AsyncMock(return_value=None)++ with (+ patch(+ 'server.services.automation_event_service.AUTOMATION_SERVICE_URL',+ 'https://automation.example.com',+ ),+ patch(+ 'server.services.automation_event_service.aiohttp.ClientSession',+ return_value=mock_session_context,+ ),+ patch('server.services.automation_event_service.logger') as mock_logger,+ ):+ service = create_service(mock_token_manager)+ await service._send_to_automation_service(+ ProviderType.GITHUB, org_id, payload+ )++ mock_logger.warning.assert_called()+ assert '400' in str(mock_logger.warning.call_args)+ mock_logger.error.assert_not_called()+class TestSignPayload:"""Tests for _sign_payload method."""