Skip to content

Allow multiple consumers of sample data to only trigger work once #1254

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

Merged
merged 4 commits into from
Jun 22, 2016
Merged

Allow multiple consumers of sample data to only trigger work once #1254

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
910ee48
Made HystrixUtilizationStream support sharing
Jun 21, 2016
8f304c8
Made HystrixConfigurationStream support sharing
Jun 21, 2016
c0d6d6c
Proper initialization of streams
Jun 21, 2016
e712bb7
Removed delay parameter from SSE metrics servlets. This will allow s…
Jun 21, 2016
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
Prev Previous commit
Next Next commit
Proper initialization of streams
  • Loading branch information
Matt Jacobs committed Jun 21, 2016
commit c0d6d6c85daf60ea9568e88665ba84a571dee1a7
1 change: 0 additions & 1 deletion ...c/main/java/com/netflix/hystrix/contrib/sample/stream/HystrixConfigurationJsonStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import com.netflix.hystrix.config.HystrixConfiguration;
import com.netflix.hystrix.config.HystrixConfigurationStream;
import com.netflix.hystrix.config.HystrixThreadPoolConfiguration;
import com.netflix.hystrix.metric.sample.HystrixUtilizationStream;
import rx.Observable;
import rx.functions.Func1;

Expand Down
1 change: 1 addition & 0 deletions ...vent-stream/src/test/java/com/netflix/hystrix/contrib/reactivesocket/EventStreamTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ public void onCompleted() {

@Override
public void onError(Throwable e) {
e.printStackTrace();
System.out.println(System.currentTimeMillis() + " : " + Thread.currentThread().getName() + " Config OnError : " + e);
latch.countDown();
}
Expand Down
24 changes: 13 additions & 11 deletions hystrix-core/src/main/java/com/netflix/hystrix/config/HystrixConfigurationStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,18 @@ public class HystrixConfigurationStream {
private final Observable<HystrixConfiguration> allConfigurationStream;
private final AtomicBoolean isSourceCurrentlySubscribed = new AtomicBoolean(false);

private static final Func1<Long, HystrixConfiguration> getAllConfig =
new Func1<Long, HystrixConfiguration>() {
@Override
public HystrixConfiguration call(Long timestamp) {
return HystrixConfiguration.from(
getAllCommandConfig.call(timestamp),
getAllThreadPoolConfig.call(timestamp),
getAllCollapserConfig.call(timestamp)
);
}
};

/**
* @deprecated Not for public use. Please use {@link #getInstance()}. This facilitates better stream-sharing
* @param intervalInMilliseconds milliseconds between data emissions
Expand Down Expand Up @@ -159,17 +171,7 @@ public Map<HystrixCollapserKey, HystrixCollapserConfiguration> call(Long timesta
}
};

private static final Func1<Long, HystrixConfiguration> getAllConfig =
new Func1<Long, HystrixConfiguration>() {
@Override
public HystrixConfiguration call(Long timestamp) {
return HystrixConfiguration.from(
getAllCommandConfig.call(timestamp),
getAllThreadPoolConfig.call(timestamp),
getAllCollapserConfig.call(timestamp)
);
}
};


private static final Func1<HystrixConfiguration, Map<HystrixCommandKey, HystrixCommandConfiguration>> getOnlyCommandConfig =
new Func1<HystrixConfiguration, Map<HystrixCommandKey, HystrixCommandConfiguration>>() {
Expand Down
22 changes: 11 additions & 11 deletions hystrix-core/src/main/java/com/netflix/hystrix/metric/sample/HystrixUtilizationStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,17 @@ public class HystrixUtilizationStream {
private final Observable<HystrixUtilization> allUtilizationStream;
private final AtomicBoolean isSourceCurrentlySubscribed = new AtomicBoolean(false);

private static final Func1<Long, HystrixUtilization> getAllUtilization =
new Func1<Long, HystrixUtilization>() {
@Override
public HystrixUtilization call(Long timestamp) {
return HystrixUtilization.from(
getAllCommandUtilization.call(timestamp),
getAllThreadPoolUtilization.call(timestamp)
);
}
};

/**
* @deprecated Not for public use. Please use {@link #getInstance()}. This facilitates better stream-sharing
* @param intervalInMilliseconds milliseconds between data emissions
Expand Down Expand Up @@ -128,17 +139,6 @@ public Map<HystrixThreadPoolKey, HystrixThreadPoolUtilization> call(Long timesta
}
};

private static final Func1<Long, HystrixUtilization> getAllUtilization =
new Func1<Long, HystrixUtilization>() {
@Override
public HystrixUtilization call(Long timestamp) {
return HystrixUtilization.from(
getAllCommandUtilization.call(timestamp),
getAllThreadPoolUtilization.call(timestamp)
);
}
};

private static final Func1<HystrixUtilization, Map<HystrixCommandKey, HystrixCommandUtilization>> getOnlyCommandUtilization =
new Func1<HystrixUtilization, Map<HystrixCommandKey, HystrixCommandUtilization>>() {
@Override
Expand Down