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

connect in dropwizard metrics listener to pushy 

// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-05-03 20:43:22 -07:00
parent 2e98c16f05
commit 13ea678e5e
2 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pom.xml
View File

@ -109,6 +109,11 @@
<artifactId>pushy</artifactId> <artifactId>pushy</artifactId>
<version>0.9.3</version> <version>0.9.3</version>
</dependency> </dependency>
<dependency>
<groupId>com.relayrides</groupId>
<artifactId>pushy-dropwizard-metrics-listener</artifactId>
<version>0.9.3</version>
</dependency>
<dependency> <dependency>
<groupId>org.whispersystems</groupId> <groupId>org.whispersystems</groupId>
<artifactId>gcm-sender-async</artifactId> <artifactId>gcm-sender-async</artifactId>

43
src/main/java/org/whispersystems/textsecuregcm/push/RetryingApnsClient.java
View File

@ -1,5 +1,8 @@
package org.whispersystems.textsecuregcm.push; package org.whispersystems.textsecuregcm.push;
import com.codahale.metrics.Metric;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.SharedMetricRegistries;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture; import com.google.common.util.concurrent.SettableFuture;
@ -13,11 +16,13 @@ import com.relayrides.pushy.apns.ApnsServerException;
import com.relayrides.pushy.apns.ClientNotConnectedException; import com.relayrides.pushy.apns.ClientNotConnectedException;
import com.relayrides.pushy.apns.DeliveryPriority; import com.relayrides.pushy.apns.DeliveryPriority;
import com.relayrides.pushy.apns.PushNotificationResponse; import com.relayrides.pushy.apns.PushNotificationResponse;
import com.relayrides.pushy.apns.metrics.dropwizard.DropwizardApnsClientMetricsListener;
import com.relayrides.pushy.apns.util.SimpleApnsPushNotification; import com.relayrides.pushy.apns.util.SimpleApnsPushNotification;
import org.bouncycastle.openssl.PEMReader; import org.bouncycastle.openssl.PEMReader;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.whispersystems.textsecuregcm.util.Constants;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
@ -26,10 +31,12 @@ import java.security.KeyPair;
import java.security.PrivateKey; import java.security.PrivateKey;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
import java.util.Date; import java.util.Date;
import java.util.Map;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import static com.codahale.metrics.MetricRegistry.name;
import io.netty.util.concurrent.Future; import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener; import io.netty.util.concurrent.GenericFutureListener;
@ -43,24 +50,36 @@ public class RetryingApnsClient {
RetryingApnsClient(String apnCertificate, String apnKey, int retryCount) RetryingApnsClient(String apnCertificate, String apnKey, int retryCount)
throws IOException throws IOException
{ {
this(new ApnsClientBuilder().setClientCredentials(initializeCertificate(apnCertificate), MetricRegistry metricRegistry = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME);
initializePrivateKey(apnKey), null) DropwizardApnsClientMetricsListener metricsListener = new DropwizardApnsClientMetricsListener();
.build(),
retryCount); for (Map.Entry<String, Metric> entry : metricsListener.getMetrics().entrySet()) {
metricRegistry.register(name(getClass(), entry.getKey()), entry.getValue());
}
this.apnsClient = new ApnsClientBuilder().setClientCredentials(initializeCertificate(apnCertificate),
initializePrivateKey(apnKey), null)
.setMetricsListener(metricsListener)
.build();
this.retryExecutor = initializeExecutor(retryCount);
} }
@VisibleForTesting @VisibleForTesting
public RetryingApnsClient(ApnsClient apnsClient, int retryCount) { public RetryingApnsClient(ApnsClient apnsClient, int retryCount) {
this.apnsClient = apnsClient;
this.retryExecutor = initializeExecutor(retryCount);
}
private static RetryExecutor initializeExecutor(int retryCount) {
ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor(); ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
this.apnsClient = apnsClient; return new AsyncRetryExecutor(executorService).retryOn(ClientNotConnectedException.class)
this.retryExecutor = new AsyncRetryExecutor(executorService).retryOn(ClientNotConnectedException.class) .retryOn(InterruptedException.class)
.retryOn(InterruptedException.class) .retryOn(ApnsServerException.class)
.retryOn(ApnsServerException.class) .withExponentialBackoff(100, 2.0)
.withExponentialBackoff(100, 2.0) .withUniformJitter()
.withUniformJitter() .withMaxDelay(4000)
.withMaxDelay(4000) .withMaxRetries(retryCount);
.withMaxRetries(retryCount);
} }
ListenableFuture<ApnResult> send(final String apnId, final String topic, final String payload, final Date expiration) { ListenableFuture<ApnResult> send(final String apnId, final String topic, final String payload, final Date expiration) {