From 3b30e33d74d635e508d8696759462ea952eeb2be Mon Sep 17 00:00:00 2001
From: Tomasz Nurkiewicz <nurkiewicz@gmail.com>
Date: Mon, 10 Nov 2014 12:06:24 +0100
Subject: [PATCH 1/2] HystrixThreadPoolMetrics.getRollingCountThreadsExecuted()
 always returns 0 in 1.4.x - failing test case

---
 .../hystrix/HystrixThreadPoolMetrics.java     |  4 ++
 .../hystrix/HystrixThreadPoolMetricsTest.java | 69 +++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 hystrix-core/src/test/java/com/netflix/hystrix/HystrixThreadPoolMetricsTest.java

diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/HystrixThreadPoolMetrics.java b/hystrix-core/src/main/java/com/netflix/hystrix/HystrixThreadPoolMetrics.java
index 450a707f8..cc13cd5c7 100644
--- a/hystrix-core/src/main/java/com/netflix/hystrix/HystrixThreadPoolMetrics.java
+++ b/hystrix-core/src/main/java/com/netflix/hystrix/HystrixThreadPoolMetrics.java
@@ -90,6 +90,10 @@ public static Collection<HystrixThreadPoolMetrics> getInstances() {
         return Collections.unmodifiableCollection(metrics.values());
     }
 
+    public static void resetAll() {
+        metrics.clear();
+    }
+
     private final HystrixThreadPoolKey threadPoolKey;
     private final HystrixRollingNumber counter;
     private final ThreadPoolExecutor threadPool;
diff --git a/hystrix-core/src/test/java/com/netflix/hystrix/HystrixThreadPoolMetricsTest.java b/hystrix-core/src/test/java/com/netflix/hystrix/HystrixThreadPoolMetricsTest.java
new file mode 100644
index 000000000..18f088839
--- /dev/null
+++ b/hystrix-core/src/test/java/com/netflix/hystrix/HystrixThreadPoolMetricsTest.java
@@ -0,0 +1,69 @@
+package com.netflix.hystrix;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Collection;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Copyright 2013 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+public class HystrixThreadPoolMetricsTest {
+
+	@Before
+	public void resetAll() {
+		HystrixThreadPoolMetrics.resetAll();
+	}
+
+	@Test
+	public void shouldYieldNoExecutedTasksOnStartup() throws Exception {
+		//given
+		final Collection<HystrixThreadPoolMetrics> instances = HystrixThreadPoolMetrics.getInstances();
+
+		//then
+		assertEquals(0, instances.size());
+
+	}
+	@Test
+	public void shouldReturnOneExecutedTask() throws Exception {
+		//given
+		final Collection<HystrixThreadPoolMetrics> instances = HystrixThreadPoolMetrics.getInstances();
+
+		//when
+		new NoOpHystrixCommand().execute();
+
+		//then
+		assertEquals(1, instances.size());
+		assertEquals(1, instances.iterator().next().getRollingCountThreadsExecuted());
+	}
+
+	private static class NoOpHystrixCommand extends HystrixCommand<Void> {
+		public NoOpHystrixCommand() {
+			super(
+					Setter.withGroupKey(
+							HystrixCommandGroupKey.Factory.asKey("HystrixThreadPoolMetrics-UnitTest")));
+		}
+
+		@Override
+		protected Void run() throws Exception {
+			return null;
+		}
+	}
+
+
+}
\ No newline at end of file

From 4fb44dbc9e5211ecc69cd10f1a473e08bc1eac2d Mon Sep 17 00:00:00 2001
From: Matt Jacobs <mjacobs@netflix.com>
Date: Tue, 16 Dec 2014 16:18:17 -0800
Subject: [PATCH 2/2] Added back calls to threadPool.markThreadExecution() and
 .markThreadCompletion() in AbstractCommand

---
 .../src/main/java/com/netflix/hystrix/AbstractCommand.java      | 2 ++
 .../java/com/netflix/hystrix/HystrixThreadPoolMetricsTest.java  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/AbstractCommand.java b/hystrix-core/src/main/java/com/netflix/hystrix/AbstractCommand.java
index f59137a7d..eb54f5a0a 100644
--- a/hystrix-core/src/main/java/com/netflix/hystrix/AbstractCommand.java
+++ b/hystrix-core/src/main/java/com/netflix/hystrix/AbstractCommand.java
@@ -515,12 +515,14 @@ public void call(Subscriber<? super R> s) {
                     } else {
                         // not timed out so execute
                         try {
+                            threadPool.markThreadExecution();
                             final Action0 endCurrentThread = Hystrix.startCurrentThreadExecutingCommand(getCommandKey());
                             getExecutionObservable().doOnTerminate(new Action0() {
 
                                 @Override
                                 public void call() {
                                     // TODO is this actually the end of the thread?
+                                    threadPool.markThreadCompletion();
                                     executionHook.onThreadComplete(_self);
                                     endCurrentThread.call();
                                 }
diff --git a/hystrix-core/src/test/java/com/netflix/hystrix/HystrixThreadPoolMetricsTest.java b/hystrix-core/src/test/java/com/netflix/hystrix/HystrixThreadPoolMetricsTest.java
index 18f088839..2cab94b43 100644
--- a/hystrix-core/src/test/java/com/netflix/hystrix/HystrixThreadPoolMetricsTest.java
+++ b/hystrix-core/src/test/java/com/netflix/hystrix/HystrixThreadPoolMetricsTest.java
@@ -27,7 +27,7 @@ public class HystrixThreadPoolMetricsTest {
 
 	@Before
 	public void resetAll() {
-		HystrixThreadPoolMetrics.resetAll();
+		HystrixThreadPoolMetrics.reset();
 	}
 
 	@Test