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

Switch PushSender queue depth metrics to gauge 

// FREEBIE
This commit is contained in:
Moxie Marlinspike 2016-02-02 15:15:05 -08:00
parent 635e16e934
commit fb705eee23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/org/whispersystems/textsecuregcm/push/PushSender.java
View File

@ -16,8 +16,7 @@
*/ */
package org.whispersystems.textsecuregcm.push; package org.whispersystems.textsecuregcm.push;
import com.codahale.metrics.Histogram; import com.codahale.metrics.Gauge;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.SharedMetricRegistries; import com.codahale.metrics.SharedMetricRegistries;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -44,9 +43,6 @@ public class PushSender implements Managed {
private static final String APN_PAYLOAD = "{\"aps\":{\"sound\":\"default\",\"badge\":%d,\"alert\":{\"loc-key\":\"APN_Message\"}}}"; private static final String APN_PAYLOAD = "{\"aps\":{\"sound\":\"default\",\"badge\":%d,\"alert\":{\"loc-key\":\"APN_Message\"}}}";
private final MetricRegistry metricRegistry = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME);
private final Histogram queueDepthGauge = metricRegistry.histogram(name(getClass(), "queue_depth"));
private final ApnFallbackManager apnFallbackManager; private final ApnFallbackManager apnFallbackManager;
private final PushServiceClient pushServiceClient; private final PushServiceClient pushServiceClient;
private final WebsocketSender webSocketSender; private final WebsocketSender webSocketSender;
@ -57,6 +53,15 @@ public class PushSender implements Managed {
this.pushServiceClient = pushServiceClient; this.pushServiceClient = pushServiceClient;
this.webSocketSender = websocketSender; this.webSocketSender = websocketSender;
this.executor = new BlockingThreadPoolExecutor(50, 200); this.executor = new BlockingThreadPoolExecutor(50, 200);
SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME)
.register(name(PushSender.class, "send_queue_depth"),
new Gauge<Integer>() {
@Override
public Integer getValue() {
return executor.getSize();
}
});
} }
public void sendMessage(final Account account, final Device device, final Envelope message) public void sendMessage(final Account account, final Device device, final Envelope message)
@ -75,8 +80,6 @@ public class PushSender implements Managed {
else throw new AssertionError(); else throw new AssertionError();
} }
}); });
queueDepthGauge.update(executor.getSize());
} }
public void sendQueuedNotification(Account account, Device device, int messageQueueDepth) public void sendQueuedNotification(Account account, Device device, int messageQueueDepth)