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

Fixed a potential bug in metrics-event-stream-jaxrs #1539

Merged
merged 1 commit into from
Apr 19, 2017
Merged

Fixed a potential bug in metrics-event-stream-jaxrs #1539

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
6 changes: 1 addition & 5 deletions .../java/com/netflix/hystrix/contrib/metrics/controller/AbstractHystrixStreamController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ public abstract class AbstractHystrixStreamController {

private final int pausePollerThreadDelayInMs;

private static final AtomicInteger concurrentConnections = new AtomicInteger(0);

protected AbstractHystrixStreamController(Observable<String> sampleStream) {
this(sampleStream, DEFAULT_PAUSE_POLLER_THREAD_DELAY_IN_MS);
}
Expand All @@ -57,9 +55,7 @@ protected AbstractHystrixStreamController(Observable<String> sampleStream, int p

protected abstract int getMaxNumberConcurrentConnectionsAllowed();

protected final AtomicInteger getCurrentConnections() {
return concurrentConnections;
}
protected abstract AtomicInteger getCurrentConnections();

/**
* Maintain an open connection with the client. On initial connection send latest data of each requested event type and subsequently send all changes for each requested event type.
Expand Down
9 changes: 9 additions & 0 deletions .../main/java/com/netflix/hystrix/contrib/metrics/controller/HystrixConfigSseController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/
package com.netflix.hystrix.contrib.metrics.controller;

import java.util.concurrent.atomic.AtomicInteger;

import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.core.Application;
Expand Down Expand Up @@ -47,6 +49,7 @@
@Path("/hystrix/config.stream")
public class HystrixConfigSseController extends AbstractHystrixStreamController {

private static final AtomicInteger concurrentConnections = new AtomicInteger(0);
private static DynamicIntProperty maxConcurrentConnections = DynamicPropertyFactory.getInstance().getIntProperty("hystrix.config.stream.maxConcurrentConnections", 5);

public HystrixConfigSseController() {
Expand All @@ -68,4 +71,10 @@ protected int getMaxNumberConcurrentConnectionsAllowed() {
return maxConcurrentConnections.get();
}

@Override
protected AtomicInteger getCurrentConnections() {
return concurrentConnections;
}


}
7 changes: 7 additions & 0 deletions ...n/java/com/netflix/hystrix/contrib/metrics/controller/HystrixMetricsStreamController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/
package com.netflix.hystrix.contrib.metrics.controller;

import java.util.concurrent.atomic.AtomicInteger;

import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.core.Application;
Expand Down Expand Up @@ -47,6 +49,7 @@
@Path("/hystrix.stream")
public class HystrixMetricsStreamController extends AbstractHystrixStreamController {

private static final AtomicInteger concurrentConnections = new AtomicInteger(0);
private static DynamicIntProperty maxConcurrentConnections = DynamicPropertyFactory.getInstance().getIntProperty("hystrix.config.stream.maxConcurrentConnections", 5);

public HystrixMetricsStreamController() {
Expand All @@ -67,5 +70,9 @@ public Response getStream() {
protected int getMaxNumberConcurrentConnectionsAllowed() {
return maxConcurrentConnections.get();
}
@Override
protected AtomicInteger getCurrentConnections() {
return concurrentConnections;
}

}
7 changes: 7 additions & 0 deletions ...ava/com/netflix/hystrix/contrib/metrics/controller/HystrixRequestEventsSseController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/
package com.netflix.hystrix.contrib.metrics.controller;

import java.util.concurrent.atomic.AtomicInteger;

import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.core.Application;
Expand Down Expand Up @@ -48,6 +50,7 @@
@Path("/hystrix/request.stream")
public class HystrixRequestEventsSseController extends AbstractHystrixStreamController {

private static final AtomicInteger concurrentConnections = new AtomicInteger(0);
private static DynamicIntProperty maxConcurrentConnections = DynamicPropertyFactory.getInstance().getIntProperty("hystrix.config.stream.maxConcurrentConnections", 5);

public HystrixRequestEventsSseController() {
Expand All @@ -69,4 +72,8 @@ protected int getMaxNumberConcurrentConnectionsAllowed() {
return maxConcurrentConnections.get();
}

@Override
protected AtomicInteger getCurrentConnections() {
return concurrentConnections;
}
}
8 changes: 8 additions & 0 deletions .../java/com/netflix/hystrix/contrib/metrics/controller/HystrixUtilizationSseController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/
package com.netflix.hystrix.contrib.metrics.controller;

import java.util.concurrent.atomic.AtomicInteger;

import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.core.Application;
Expand Down Expand Up @@ -47,6 +49,7 @@
@Path("/hystrix/utilization.stream")
public class HystrixUtilizationSseController extends AbstractHystrixStreamController {

private static final AtomicInteger concurrentConnections = new AtomicInteger(0);
private static DynamicIntProperty maxConcurrentConnections = DynamicPropertyFactory.getInstance().getIntProperty("hystrix.config.stream.maxConcurrentConnections", 5);

public HystrixUtilizationSseController() {
Expand All @@ -67,5 +70,10 @@ public Response getStream() {
protected int getMaxNumberConcurrentConnectionsAllowed() {
return maxConcurrentConnections.get();
}

@Override
protected AtomicInteger getCurrentConnections() {
return concurrentConnections;
}

}
6 changes: 5 additions & 1 deletion ...test/java/com/netflix/hystrix/contrib/metrics/controller/StreamingOutputProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,15 @@ public void call(Subscriber<? super String> subscriber) {
}).subscribeOn(Schedulers.computation());

private AbstractHystrixStreamController sse = new AbstractHystrixStreamController(streamOfOnNexts) {

private final AtomicInteger concurrentConnections = new AtomicInteger(0);
@Override
protected int getMaxNumberConcurrentConnectionsAllowed() {
return 2;
}
@Override
protected AtomicInteger getCurrentConnections() {
return concurrentConnections;
}

};

Expand Down