Merge pull request #876 from mattrjacobs/fix-racy-request-log

Fixed #847 by adding BAD_REQUEST to the HystrixRequestLog
Netflix · Aug 25, 2015 · 0e92136 · 0e92136
2 parents a98f3de + 81cdd45
commit 0e92136
Show file tree

Hide file tree

Showing 3 changed files with 107 additions and 55 deletions.
diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/AbstractCommand.java b/hystrix-core/src/main/java/com/netflix/hystrix/AbstractCommand.java
@@ -613,6 +613,7 @@ public Observable<R> call(Throwable t) {
                      */
                     try {
                         metrics.markBadRequest(System.currentTimeMillis() - invocationStartTime);
+                        executionResult = executionResult.addEvents(HystrixEventType.BAD_REQUEST);
                         Exception decorated = executionHook.onError(_self, FailureType.BAD_REQUEST_EXCEPTION, (Exception) t);
 
                         if (decorated instanceof HystrixBadRequestException) {

diff --git a/hystrix-core/src/test/java/com/netflix/hystrix/CommonHystrixCommandTests.java b/hystrix-core/src/test/java/com/netflix/hystrix/CommonHystrixCommandTests.java
@@ -157,6 +157,20 @@ public void onNext(Object t) {
         }
     }
 
+    protected void assertSaneHystrixRequestLog(final int numCommands) {
+        HystrixRequestLog currentRequestLog = HystrixRequestLog.getCurrentRequest();
+
+        try {
+            assertEquals(numCommands, currentRequestLog.getAllExecutedCommands().size());
+            assertFalse(currentRequestLog.getExecutedCommandsAsString().contains("Executed"));
+            assertTrue(currentRequestLog.getAllExecutedCommands().iterator().next().getExecutionEvents().size() >= 1);
+            //Most commands should have 1 execution event, but fallbacks / responses from cache can cause more than 1.  They should never have 0
+        } catch (Throwable ex) {
+            System.out.println("Problematic Request log : " + currentRequestLog.getExecutedCommandsAsString() + " , expected : " + numCommands);
+            throw new RuntimeException(ex);
+        }
+    }
+
     /**
      * Threadpool with 1 thread, queue of size 1
      */