Use getExecutionException to handle timeout, short-circuit, etc... exceptions

build.gradle

@@ -8,7 +8,7 @@ buildscript {
 }
 
 plugins {
-    id 'nebula.netflixoss' version '3.1.2'
+    id 'nebula.netflixoss' version '3.2.3'
     id 'me.champeau.gradle.jmh' version '0.2.0'
     id 'net.saliman.cobertura' version '2.2.8'
 }
@@ -58,22 +58,24 @@ subprojects {
     publishing {
         publications {
             nebula(MavenPublication) {
-                pom.withXml {
-                    configurations.compile.resolvedConfiguration.firstLevelModuleDependencies.each { dep ->
-                        if (dep.moduleName == "servlet-api") {
-                            asNode().dependencies[0].dependency.find {
-                                it.artifactId[0].text() == dep.moduleName &&
-                                        it.groupId[0].text() == dep.moduleGroup
-                            }.scope[0].value = 'provided'
-                        } else {
-                            asNode().dependencies[0].dependency.find {
-                                it.artifactId[0].text() == dep.moduleName &&
-                                        it.groupId[0].text() == dep.moduleGroup
-                            }.scope[0].value = 'compile'
-                        }
-                    }
-                }
-            }
+				if (!project.name.equals("hystrix-dashboard") && !project.name.equals("hystrix-examples-webapp")) {
+					pom.withXml {
+						configurations.compile.resolvedConfiguration.firstLevelModuleDependencies.each { dep ->
+							if (dep.moduleName == "servlet-api") {
+								asNode().dependencies[0].dependency.find {
+									it.artifactId[0].text() == dep.moduleName &&
+									it.groupId[0].text() == dep.moduleGroup
+								}.scope[0].value = 'provided'
+							} else {
+								asNode().dependencies[0].dependency.find {
+									it.artifactId[0].text() == dep.moduleName &&
+									it.groupId[0].text() == dep.moduleGroup
+								}.scope[0].value = 'compile'
+							}
+						}
+					}
+				}
+			}
         }
     }
 }

hystrix-contrib/hystrix-javanica/README.md

@@ -182,7 +182,7 @@ If fallback method was marked with `@HystrixCommand` then this fallback method (
     }
 ```
 
-Javanica provides an ability to get execution exception (exception thrown that caused the failure of a command) within a fallback is being executed. A fallback method signature can be extended with an additional parameter in order to get an exception thrown by a command. Javanica exposes execution exception through additional parameter of fallback method. Execution exception is derived by calling  method getFailedExecutionException() as in vanilla hystrix.
+Javanica provides an ability to get execution exception (exception thrown that caused the failure of a command) within a fallback is being executed. A fallback method signature can be extended with an additional parameter in order to get an exception thrown by a command. Javanica exposes execution exception through additional parameter of fallback method. Execution exception is derived by calling method getExecutionException() as in vanilla hystrix.
 
 Example:
 

hystrix-contrib/hystrix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/cache/HystrixRequestCacheManager.java

@@ -18,7 +18,7 @@
 import com.netflix.hystrix.HystrixCommandKey;
 import com.netflix.hystrix.HystrixRequestCache;
 import com.netflix.hystrix.contrib.javanica.cache.annotation.CacheRemove;
-import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategyDefault;
+import com.netflix.hystrix.strategy.HystrixPlugins;
 
 
 /**
@@ -50,6 +50,6 @@ public void clearCache(CacheInvocationContext<CacheRemove> context) {
                 defaultCacheKeyGenerator.generateCacheKey(context);
         String key = hystrixGeneratedCacheKey.getCacheKey();
         HystrixRequestCache.getInstance(HystrixCommandKey.Factory.asKey(cacheName),
-                HystrixConcurrencyStrategyDefault.getInstance()).clear(key);
+                HystrixPlugins.getInstance().getConcurrencyStrategy()).clear(key);
     }
 }

hystrix-contrib/hystrix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/command/AbstractHystrixCommand.java

@@ -170,7 +170,7 @@ Object process(Action action) throws Exception {
      */
     @Override
     protected T getFallback() {
-        throw new RuntimeException("No fallback available.", getFailedExecutionException());
+        throw new RuntimeException("No fallback available.", getExecutionException());
     }
 
     /**

hystrix-contrib/hystrix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/command/BatchHystrixCommand.java

@@ -72,7 +72,7 @@ protected List<Object> getFallback() {
                     Object execute() {
                         MetaHolder metaHolder = commandAction.getMetaHolder();
                         Object[] args = toArgs(getCollapsedRequests());
-                        args = createArgsForFallback(args, metaHolder, getFailedExecutionException());
+                        args = createArgsForFallback(args, metaHolder, getExecutionException());
                         return commandAction.executeWithArgs(commandAction.getMetaHolder().getFallbackExecutionType(), args);
                     }
                 });

hystrix-contrib/hystrix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/command/GenericCommand.java

@@ -71,7 +71,7 @@ protected Object getFallback() {
                     @Override
                     Object execute() {
                         MetaHolder metaHolder = commandAction.getMetaHolder();
-                        Object[] args = createArgsForFallback(metaHolder, getFailedExecutionException());
+                        Object[] args = createArgsForFallback(metaHolder, getExecutionException());
                         return commandAction.executeWithArgs(commandAction.getMetaHolder().getFallbackExecutionType(), args);
                     }
                 });

hystrix-contrib/hystrix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/command/GenericObservableCommand.java

@@ -85,7 +85,7 @@ protected Observable construct() {
     protected Observable resumeWithFallback() {
         if (commandActions.hasFallbackAction()) {
             MetaHolder metaHolder = commandActions.getFallbackAction().getMetaHolder();
-            Throwable cause = getFailedExecutionException();
+            Throwable cause = getExecutionException();
             if (cause instanceof CommandActionExecutionException) {
                 cause = cause.getCause();
             }

hystrix-contrib/hystrix-metrics-event-stream/src/main/java/com/netflix/hystrix/contrib/metrics/eventstream/HystrixMetricsStreamServlet.java

@@ -15,22 +15,20 @@
  */
 package com.netflix.hystrix.contrib.metrics.eventstream;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.atomic.AtomicInteger;
+import com.netflix.config.DynamicIntProperty;
+import com.netflix.config.DynamicPropertyFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.netflix.config.DynamicIntProperty;
-import com.netflix.config.DynamicPropertyFactory;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Streams Hystrix metrics in text/event-stream format.
@@ -62,6 +60,7 @@ public class HystrixMetricsStreamServlet extends HttpServlet {
     /* used to track number of connections and throttle */
     private static AtomicInteger concurrentConnections = new AtomicInteger(0);
     private static DynamicIntProperty maxConcurrentConnections = DynamicPropertyFactory.getInstance().getIntProperty("hystrix.stream.maxConcurrentConnections", 5);
+    private static DynamicIntProperty defaultMetricListenerQueueSize = DynamicPropertyFactory.getInstance().getIntProperty("hystrix.stream.defaultMetricListenerQueueSize", 1000);
 
     private static volatile boolean isDestroyed = false;
 
@@ -135,7 +134,9 @@ private void handleRequest(HttpServletRequest request, HttpServletResponse respo
                 response.setHeader("Cache-Control", "no-cache, no-store, max-age=0, must-revalidate");
                 response.setHeader("Pragma", "no-cache");
 
-                MetricJsonListener jsonListener = new MetricJsonListener();
+                int queueSize = defaultMetricListenerQueueSize.get();
+
+                MetricJsonListener jsonListener = new MetricJsonListener(queueSize);
                 poller = new HystrixMetricsPoller(jsonListener, delay);
                 // start polling and it will write directly to the output stream
                 poller.start();
@@ -207,7 +208,11 @@ private static class MetricJsonListener implements HystrixMetricsPoller.MetricsA
          * <p>
          * This is a safety check against a runaway poller causing memory leaks.
          */
-        private final LinkedBlockingQueue<String> jsonMetrics = new LinkedBlockingQueue<String>(1000);
+        private LinkedBlockingQueue<String> jsonMetrics;
+
+        public MetricJsonListener(int queueSize) {
+            jsonMetrics = new LinkedBlockingQueue<String>(queueSize);
+        }
 
         /**
          * Store JSON messages in a queue.

hystrix-core/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'me.champeau.gradle.jmh'
 
 dependencies {
     compile 'com.netflix.archaius:archaius-core:0.4.1'
-    compile 'io.reactivex:rxjava:1.1.0'
+    compile 'io.reactivex:rxjava:1.1.1'
     compile 'org.slf4j:slf4j-api:1.7.0'
     testCompile 'junit:junit-dep:4.10'
 }

hystrix-core/src/main/java/com/netflix/hystrix/AbstractCommand.java

@@ -931,8 +931,6 @@ protected boolean shouldOutputOnNextEvents() {
         return false;
     }
 
-    private static final HystrixTimeoutException TIMEOUT_EXCEPTION_INSTANCE = new HystrixTimeoutException();
-
     private static class HystrixObservableTimeoutOperator<R> implements Operator<R, R> {
 
         final AbstractCommand<R> originalCommand;
@@ -955,7 +953,7 @@ public Subscriber<? super R> call(final Subscriber<? super R> child) {
 
                 @Override
                 public void run() {
-                    child.onError(TIMEOUT_EXCEPTION_INSTANCE);
+                    child.onError(new HystrixTimeoutException());
                 }
             });
 

hystrix-core/src/main/java/com/netflix/hystrix/strategy/concurrency/HystrixRequestContext.java

@@ -15,6 +15,7 @@
  */
 package com.netflix.hystrix.strategy.concurrency;
 
+import java.io.Closeable;
 import java.util.concurrent.ConcurrentHashMap;
 
 import com.netflix.hystrix.HystrixCollapser;
@@ -60,7 +61,7 @@
  * <p>
  * <b>NOTE:</b> If <code>initializeContext()</code> is called then <code>shutdown()</code> must also be called or a memory leak will occur.
  */
-public class HystrixRequestContext {
+public class HystrixRequestContext implements Closeable {
 
     /*
      * ThreadLocal on each thread will hold the HystrixRequestVariableState.
@@ -142,4 +143,16 @@ public void shutdown() {
             state = null;
         }
     }
-}
+
+    /**
+     * Shutdown {@link HystrixRequestVariableDefault} objects in this context.
+     * <p>
+     * <b>NOTE: This must be called if <code>initializeContext()</code> was called or a memory leak will occur.</b>
+     *
+     * This method invokes <code>shutdown()</code>
+     */
+    public void close() {
+      shutdown();
+    }
+
+}

hystrix-core/src/test/java/com/netflix/hystrix/HystrixCollapserTest.java

@@ -371,7 +371,7 @@ public void testRequestVariableLifecycle1() throws Exception {
         System.out.println("tasks in test: " + timer.tasks);
 
         // simulate request lifecycle
-        requestContext.shutdown();
+        requestContext.close();
 
         System.out.println("timer.tasks.size() B: " + timer.tasks.size());
 
@@ -454,7 +454,7 @@ public void run() {
         }
 
         // simulate request lifecycle
-        requestContext.shutdown();
+        requestContext.close();
 
         HystrixRequestVariableHolder<RequestCollapser<?, ?, ?>> rv = RequestCollapserFactory.getRequestVariable(new TestRequestCollapser(timer, 1).getCollapserKey().name());