SpringCloud/spring-cloud-gateway
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Guards against exceptions thrown by MeterRegistry

Browse Source
This commit is contained in:
Spencer Gibb
2019-02-26 12:04:55 -05:00
parent 42246e80a8
commit f9cb397a1f
1 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
spring-cloud-gateway-rsocket/src/main/java/org/springframework/cloud/gateway/rsocket/metrics/MicrometerResponderRSocket.java
View File

@@ -28,6 +28,8 @@ import io.micrometer.core.instrument.Timer;
import io.rsocket.Payload;
import io.rsocket.RSocket;
import io.rsocket.ResponderRSocket;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -41,6 +43,8 @@ import static reactor.core.publisher.SignalType.ON_ERROR;
public class MicrometerResponderRSocket implements ResponderRSocket {
private static final Log log = LogFactory.getLog(MicrometerResponderRSocket.class);
private final RSocket delegate;
private final InteractionCounters metadataPush;
@@ -146,22 +150,36 @@ public class MicrometerResponderRSocket implements ResponderRSocket {
public void accept(SignalType signalType) {
switch (signalType) {
case CANCEL:
cancel.increment();
if (this.cancel != null) {
this.cancel.increment();
}
break;
case ON_COMPLETE:
onComplete.increment();
if (this.onComplete != null) {
this.onComplete.increment();
}
break;
case ON_ERROR:
onError.increment();
if (this.onError != null) {
this.onError.increment();
}
break;
}
}
private static Counter counter(MeterRegistry meterRegistry,
String interactionModel, SignalType signalType, Tag... tags) {
private Counter counter(MeterRegistry meterRegistry, String interactionModel,
SignalType signalType, Tag... tags) {
return meterRegistry.counter("rsocket." + interactionModel,
Tags.of(tags).and("signal.type", signalType.name()));
Tags withType = Tags.of(tags).and("signal.type", signalType.name());
try {
return meterRegistry.counter("rsocket." + interactionModel, withType);
}
catch (Exception e) {
if (log.isTraceEnabled()) {
log.trace("Error creating counter with tags: " + withType, e);
}
return null;
}
}
}
@@ -190,13 +208,19 @@ public class MicrometerResponderRSocket implements ResponderRSocket {
public void accept(Timer.Sample sample, SignalType signalType) {
switch (signalType) {
case CANCEL:
sample.stop(cancel);
if (this.cancel != null) {
sample.stop(this.cancel);
}
break;
case ON_COMPLETE:
sample.stop(onComplete);
if (this.onComplete != null) {
sample.stop(this.onComplete);
}
break;
case ON_ERROR:
sample.stop(onError);
if (this.onError != null) {
sample.stop(this.onError);
}
break;
}
}
@@ -208,8 +232,16 @@ public class MicrometerResponderRSocket implements ResponderRSocket {
private static Timer timer(MeterRegistry meterRegistry, String interactionModel,
SignalType signalType, Tag... tags) {
return meterRegistry.timer("rsocket." + interactionModel,
Tags.of(tags).and("signal.type", signalType.name()));
Tags withType = Tags.of(tags).and("signal.type", signalType.name());
try {
return meterRegistry.timer("rsocket." + interactionModel, withType);
}
catch (Exception e) {
if (log.isTraceEnabled()) {
log.trace("Error creating timer with tags: " + withType, e);
}
return null;
}
}
}