MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add micrometer timer to `FaultTolerantPubSubConnection`

This commit is contained in:
Chris Eager 2023-02-22 18:45:40 -06:00 committed by Chris Eager
parent 859f2302a9
commit d7ad8dd448
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantPubSubConnection.java
View File

@ -14,8 +14,10 @@ import io.github.resilience4j.circuitbreaker.CircuitBreaker;
import io.github.resilience4j.retry.Retry; import io.github.resilience4j.retry.Retry;
import io.lettuce.core.RedisException; import io.lettuce.core.RedisException;
import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection; import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection;
import io.micrometer.core.instrument.Metrics;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
import org.whispersystems.textsecuregcm.util.CircuitBreakerUtil; import org.whispersystems.textsecuregcm.util.CircuitBreakerUtil;
import org.whispersystems.textsecuregcm.util.Constants; import org.whispersystems.textsecuregcm.util.Constants;
@ -26,7 +28,9 @@ public class FaultTolerantPubSubConnection<K, V> {
private final CircuitBreaker circuitBreaker; private final CircuitBreaker circuitBreaker;
private final Retry retry; private final Retry retry;
private final Timer executeTimer; @Deprecated
private final Timer executeTimer;
private final io.micrometer.core.instrument.Timer newExecuteTimer;
public FaultTolerantPubSubConnection(final String name, final StatefulRedisClusterPubSubConnection<K, V> pubSubConnection, final CircuitBreaker circuitBreaker, final Retry retry) { public FaultTolerantPubSubConnection(final String name, final StatefulRedisClusterPubSubConnection<K, V> pubSubConnection, final CircuitBreaker circuitBreaker, final Retry retry) {
this.pubSubConnection = pubSubConnection; this.pubSubConnection = pubSubConnection;
@ -37,6 +41,7 @@ public class FaultTolerantPubSubConnection<K, V> {
final MetricRegistry metricRegistry = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME); final MetricRegistry metricRegistry = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME);
this.executeTimer = metricRegistry.timer(name(getClass(), name + "-pubsub", "execute")); this.executeTimer = metricRegistry.timer(name(getClass(), name + "-pubsub", "execute"));
this.newExecuteTimer = Metrics.timer(MetricsUtil.name(getClass(), "execute", "name", name + "-pubsub"));
CircuitBreakerUtil.registerMetrics(circuitBreaker, FaultTolerantPubSubConnection.class); CircuitBreakerUtil.registerMetrics(circuitBreaker, FaultTolerantPubSubConnection.class);
} }
@ -45,7 +50,7 @@ public class FaultTolerantPubSubConnection<K, V> {
try { try {
circuitBreaker.executeCheckedRunnable(() -> retry.executeRunnable(() -> { circuitBreaker.executeCheckedRunnable(() -> retry.executeRunnable(() -> {
try (final Timer.Context ignored = executeTimer.time()) { try (final Timer.Context ignored = executeTimer.time()) {
consumer.accept(pubSubConnection); newExecuteTimer.record(() -> consumer.accept(pubSubConnection));
} }
})); }));
} catch (final Throwable t) { } catch (final Throwable t) {
@ -61,7 +66,7 @@ public class FaultTolerantPubSubConnection<K, V> {
try { try {
return circuitBreaker.executeCheckedSupplier(() -> retry.executeCallable(() -> { return circuitBreaker.executeCheckedSupplier(() -> retry.executeCallable(() -> {
try (final Timer.Context ignored = executeTimer.time()) { try (final Timer.Context ignored = executeTimer.time()) {
return function.apply(pubSubConnection); return newExecuteTimer.record(() -> function.apply(pubSubConnection));
} }
})); }));
} catch (final Throwable t) { } catch (final Throwable t) {