chore(analytics): Simplify error code checking, uniformly across platforms (#3191)

* Simplify error code checking, uniformly across platforms

* add unit test

---------

Co-authored-by: Thomas Leing <[email protected]>

Author: tjleing

aws-android-sdk-pinpoint/src/main/java/com/amazonaws/mobileconnectors/pinpoint/internal/event/EventRecorder.java

@@ -438,22 +438,22 @@ private void submitEventsAndEndpoint(final JSONArray eventArray,
         } catch (final AmazonServiceException amazonServiceException) {
             // This is service level exception, we also have item level exception.
             log.error("AmazonServiceException occurred during send of put event ", amazonServiceException);
-            final String errorCode = amazonServiceException.getErrorCode();
+            final int statusCode = amazonServiceException.getStatusCode();
 
             // If the error is not a retryable error, delete the events from the local database.
             // Else if the error is a retryable error, keep the events in the local database.
-            if (isRetryable(errorCode)) {
+            if (isRetryable(statusCode)) {
                 log.error(
                         String.format("AmazonServiceException: Unable to successfully deliver events to server. " +
                                         "Events will be saved, error is likely recoverable. " +
                                         "Response Status code: %s, Response Error Code: %s",
-                                amazonServiceException.getStatusCode(), amazonServiceException.getErrorCode()),
+                                statusCode, amazonServiceException.getErrorCode()),
                         amazonServiceException);
                 batchIdsAndSizeToDelete.clear();
             } else {
                 log.error(
                         String.format(Locale.getDefault(), "Failed to submit events to EventService: statusCode: " +
-                                amazonServiceException.getStatusCode() + " errorCode: ", errorCode),
+                                statusCode + " errorCode: ", amazonServiceException.getErrorCode()),
                         amazonServiceException);
                 log.error(
                         String.format(Locale.getDefault(), "Failed submission of %d events, events will be " +
@@ -531,7 +531,7 @@ private void processEventsResponse(final JSONArray eventArray,
                 // so the event does not get deleted from the local database.
                 if (responseMessage.getMessage().equalsIgnoreCase("Accepted")) {
                     log.info(String.format("Successful submit event with event id %s", eventId));
-                } else if (isRetryable(responseMessage.getMessage())) {
+                } else if (isRetryable(responseMessage.getStatusCode())) {
                     log.warn(String.format("Unable to successfully deliver event to server. " +
                             "Event will be saved. Event id %s", eventId));
                     batchIdsAndSizeToDelete.remove(eventArray.getJSONObject(i).getInt(DATABASE_ID_KEY));
@@ -548,13 +548,8 @@ private void processEventsResponse(final JSONArray eventArray,
         }
     }
 
-    private boolean isRetryable(String responseCode) {
-        if (responseCode.equalsIgnoreCase("ValidationException") ||
-            responseCode.equalsIgnoreCase("SerializationException") ||
-            responseCode.equalsIgnoreCase("BadRequestException")) {
-            return false;
-        }
-        return true;
+    private boolean isRetryable(int httpCode) {
+        return httpCode >= 500 && httpCode <= 599;
     }
 
     private boolean isClientExceptionRetryable(Throwable amazonClientException) {

aws-android-sdk-pinpoint/src/test/java/com/amazonaws/mobileconnectors/pinpoint/internal/event/EventRecorderTest.java

@@ -53,6 +53,7 @@
 import com.amazonaws.services.pinpoint.model.Event;
 import com.amazonaws.services.pinpoint.model.EventItemResponse;
 import com.amazonaws.services.pinpoint.model.EventsResponse;
+import com.amazonaws.services.pinpoint.model.InternalServerErrorException;
 import com.amazonaws.services.pinpoint.model.ItemResponse;
 import com.amazonaws.services.pinpoint.model.PutEventsRequest;
 import com.amazonaws.services.pinpoint.model.PutEventsResult;
@@ -194,6 +195,7 @@ public void testReadEventFromCursorThrowsException() throws Exception {
     public void testProcessEventWithAPIError() {
         BadRequestException badRequestException = new BadRequestException("BadRequestException");
         badRequestException.setErrorCode("BadRequestException");
+        badRequestException.setStatusCode(400);
         eventRecorder.recordEvent(analyticsEvent);
         final ArrayList<String> attrValues = new ArrayList<String>();
         attrValues.add("TestValue");
@@ -209,6 +211,26 @@ public void testProcessEventWithAPIError() {
         assertTrue(dbUtil.queryAllEvents().getCount() == 0);
     }
 
+    @Test
+    public void testProcessEventWithRetryableAPIError() {
+        InternalServerErrorException internalServerErrorException = new InternalServerErrorException("InternalServerErrorException");
+        internalServerErrorException.setErrorCode("InternalServerErrorException");
+        internalServerErrorException.setStatusCode(500);
+        eventRecorder.recordEvent(analyticsEvent);
+        final ArrayList<String> attrValues = new ArrayList<String>();
+        attrValues.add("TestValue");
+        mockContext.getTargetingClient().addAttribute("Test", attrValues);
+        //mock endpoint profile
+        when(mockContext.getTargetingClient().currentEndpoint()).thenReturn(endpointProfile);
+        //mock putEvents API response;
+        when(mockContext.getPinpointServiceClient().putEvents(any(PutEventsRequest.class))).thenThrow(internalServerErrorException);
+        //before processing events
+        assertTrue(dbUtil.queryAllEvents().getCount() == 1);
+        eventRecorder.processEvents();
+        //retryable, not removed from db.
+        assertTrue(dbUtil.queryAllEvents().getCount() == 1);
+    }
+
     @Test
     public void testProcessEvent_eventCount100() {
         PinpointDBUtil dbUtil = mock(PinpointDBUtil.class);