diff --git a/gcm-sender-async/src/main/java/org/whispersystems/gcm/server/Sender.java b/gcm-sender-async/src/main/java/org/whispersystems/gcm/server/Sender.java
index 06aad2176..5394f525d 100644
--- a/gcm-sender-async/src/main/java/org/whispersystems/gcm/server/Sender.java
+++ b/gcm-sender-async/src/main/java/org/whispersystems/gcm/server/Sender.java
@@ -151,4 +151,8 @@ public class Sender {
}
}
+ public Retry getRetry() {
+ return retry;
+ }
+
}
\ No newline at end of file
diff --git a/gcm-sender-async/src/test/resources/logback-test.xml b/gcm-sender-async/src/test/resources/logback-test.xml
new file mode 100644
index 000000000..ecd9eb548
--- /dev/null
+++ b/gcm-sender-async/src/test/resources/logback-test.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/push/GCMSender.java b/service/src/main/java/org/whispersystems/textsecuregcm/push/GCMSender.java
index 76f1767bd..744f1d006 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/push/GCMSender.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/push/GCMSender.java
@@ -12,6 +12,7 @@ import org.whispersystems.gcm.server.Sender;
import org.whispersystems.textsecuregcm.storage.Account;
import org.whispersystems.textsecuregcm.storage.AccountsManager;
import org.whispersystems.textsecuregcm.storage.Device;
+import org.whispersystems.textsecuregcm.util.CircuitBreakerUtil;
import org.whispersystems.textsecuregcm.util.Constants;
import org.whispersystems.textsecuregcm.util.SystemMapper;
import org.whispersystems.textsecuregcm.util.Util;
@@ -49,6 +50,8 @@ public class GCMSender implements Managed {
public GCMSender(AccountsManager accountsManager, String signalKey) {
this.accountsManager = accountsManager;
this.signalSender = new Sender(signalKey, SystemMapper.getMapper(), 6);
+
+ CircuitBreakerUtil.registerMetrics(metricRegistry, signalSender.getRetry(), Sender.class);
}
@VisibleForTesting
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/util/CircuitBreakerUtil.java b/service/src/main/java/org/whispersystems/textsecuregcm/util/CircuitBreakerUtil.java
index 8ab36c70a..9b6bb817c 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/util/CircuitBreakerUtil.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/util/CircuitBreakerUtil.java
@@ -5,7 +5,6 @@ import com.codahale.metrics.MetricRegistry;
import static com.codahale.metrics.MetricRegistry.name;
import io.github.resilience4j.circuitbreaker.CircuitBreaker;
-import io.github.resilience4j.retry.AsyncRetry;
import io.github.resilience4j.retry.Retry;
public class CircuitBreakerUtil {