mirror/Signal-Server
0
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server.git synced 2024-09-20 12:02:18 +02:00
Code

Publish fcm retry metrics

Browse Source
This commit is contained in:
Moxie Marlinspike 2019-05-30 11:05:05 -07:00
parent 105a38a7db
commit 3c6b418ca8
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcm-sender-async/src/main/java/org/whispersystems/gcm/server/Sender.java
View File

@ -151,4 +151,8 @@ public class Sender {
}
}
public Retry getRetry() {
return retry;
}
}

6
gcm-sender-async/src/test/resources/logback-test.xml Normal file
View File

@ -0,0 +1,6 @@
<!-- Turning down the wiremock logging -->
<logger name="com.github.tomakehurst.wiremock" level="WARN"/>
<logger name="wiremock.org" level="ERROR"/>
<logger name="WireMock" level="WARN"/>
<!-- wiremock has per endpoint servlet logging -->
<logger name="/" level="WARN"/>

3
service/src/main/java/org/whispersystems/textsecuregcm/push/GCMSender.java
View File

@ -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

1
service/src/main/java/org/whispersystems/textsecuregcm/util/CircuitBreakerUtil.java
View File

@ -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 {