Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Filter out all thread pool objects from thread pool metric streams which have not executed a command #1363

Merged
merged 1 commit into from
Sep 26, 2016
Merged

Filter out all thread pool objects from thread pool metric streams which have not executed a command #1363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion hystrix-core/src/main/java/com/netflix/hystrix/HystrixThreadPoolMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@
import rx.functions.Func0;
import rx.functions.Func2;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ThreadPoolExecutor;
Expand Down Expand Up @@ -93,7 +95,18 @@ public static HystrixThreadPoolMetrics getInstance(HystrixThreadPoolKey key) {
* @return {@code Collection<HystrixThreadPoolMetrics>}
*/
public static Collection<HystrixThreadPoolMetrics> getInstances() {
return Collections.unmodifiableCollection(metrics.values());
List<HystrixThreadPoolMetrics> threadPoolMetrics = new ArrayList<HystrixThreadPoolMetrics>();
for (HystrixThreadPoolMetrics tpm: metrics.values()) {
if (hasExecutedCommandsOnThread(tpm)) {
threadPoolMetrics.add(tpm);
}
}

return Collections.unmodifiableCollection(threadPoolMetrics);
}

private static boolean hasExecutedCommandsOnThread(HystrixThreadPoolMetrics threadPoolMetrics) {
return threadPoolMetrics.getCurrentCompletedTaskCount().intValue() > 0;
}

public static final Func2<long[], HystrixCommandCompletion, long[]> appendEventToBucket
Expand Down
67 changes: 33 additions & 34 deletions hystrix-core/src/test/java/com/netflix/hystrix/HystrixThreadPoolMetricsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,51 +25,50 @@

public class HystrixThreadPoolMetricsTest {

private static final HystrixCommandGroupKey groupKey = HystrixCommandGroupKey.Factory.asKey("HystrixThreadPoolMetrics-UnitTest");
private static final HystrixThreadPoolKey tpKey = HystrixThreadPoolKey.Factory.asKey("HystrixThreadPoolMetrics-ThreadPool");
private static final HystrixCommandGroupKey groupKey = HystrixCommandGroupKey.Factory.asKey("HystrixThreadPoolMetrics-UnitTest");
private static final HystrixThreadPoolKey tpKey = HystrixThreadPoolKey.Factory.asKey("HystrixThreadPoolMetrics-ThreadPool");

@Before
public void resetAll() {
HystrixThreadPoolMetrics.reset();
}
HystrixThreadPoolMetrics.reset();
}

@Test
public void shouldYieldNoExecutedTasksOnStartup() throws Exception {
//given
final Collection<HystrixThreadPoolMetrics> instances = HystrixThreadPoolMetrics.getInstances();
@Test
public void shouldYieldNoExecutedTasksOnStartup() throws Exception {
//given
final Collection<HystrixThreadPoolMetrics> instances = HystrixThreadPoolMetrics.getInstances();

//then
assertEquals(0, instances.size());
//then
assertEquals(0, instances.size());

}
@Test
public void shouldReturnOneExecutedTask() throws Exception {
//given
final Collection<HystrixThreadPoolMetrics> instances = HystrixThreadPoolMetrics.getInstances();
RollingThreadPoolEventCounterStream.getInstance(tpKey, 10, 100).startCachingStreamValuesIfUnstarted();
}
@Test
public void shouldReturnOneExecutedTask() throws Exception {
//given
RollingThreadPoolEventCounterStream.getInstance(tpKey, 10, 100).startCachingStreamValuesIfUnstarted();

//when
new NoOpHystrixCommand().execute();
new NoOpHystrixCommand().execute();
Thread.sleep(100);

//then
Thread.sleep(100);
assertEquals(1, instances.size());
assertEquals(1, instances.iterator().next().getRollingCountThreadsExecuted());
}
final Collection<HystrixThreadPoolMetrics> instances = HystrixThreadPoolMetrics.getInstances();

private static class NoOpHystrixCommand extends HystrixCommand<Void> {
public NoOpHystrixCommand() {
super(Setter.withGroupKey(groupKey)
//then
assertEquals(1, instances.size());
HystrixThreadPoolMetrics metrics = instances.iterator().next();
assertEquals(1, instances.iterator().next().getRollingCountThreadsExecuted());
}

private static class NoOpHystrixCommand extends HystrixCommand<Void> {
public NoOpHystrixCommand() {
super(Setter.withGroupKey(groupKey)
.andThreadPoolKey(tpKey)
.andThreadPoolPropertiesDefaults(HystrixThreadPoolProperties.Setter().withMetricsRollingStatisticalWindowInMilliseconds(100)));
}
}

@Override
protected Void run() throws Exception {
System.out.println("Run in thread : " + Thread.currentThread().getName());
@Override
protected Void run() throws Exception {
System.out.println("Run in thread : " + Thread.currentThread().getName());
return null;
}
}


}
}
}