Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-20 19:18:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Record delivery duration excluding noise from non-primary devices (#311)

Browse Source 
* Record delivery duration excluding noise from non-primary devices

* Extract method
This commit is contained in:
Ehren Kret
2020-12-21 10:28:39 -06:00
committed by GitHub
parent b2d335e0da
commit ebf332a8c9
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java
View File

@@ -53,7 +53,8 @@ import static org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope;
public class WebSocketConnection implements MessageAvailabilityListener, DisplacedPresenceListener {
private static final MetricRegistry metricRegistry = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME);
public static final Histogram messageTime = metricRegistry.histogram(name(MessageController.class, "message_delivery_duration"));
private static final Histogram messageTime = metricRegistry.histogram(name(MessageController.class, "message_delivery_duration"));
private static final Histogram primaryDeviceMessageTime = metricRegistry.histogram(name(MessageController.class, "primary_device_message_delivery_duration"));
private static final Meter sendMessageMeter = metricRegistry.meter(name(WebSocketConnection.class, "send_message"));
private static final Meter messageAvailableMeter = metricRegistry.meter(name(WebSocketConnection.class, "messagesAvailable"));
private static final Meter ephemeralMessageAvailableMeter = metricRegistry.meter(name(WebSocketConnection.class, "ephemeralMessagesAvailable"));
@@ -145,7 +146,7 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac
}
if (message.getType() != Envelope.Type.RECEIPT) {
messageTime.update(System.currentTimeMillis() - message.getTimestamp());
recordMessageDeliveryDuration(message.getTimestamp(), device);
sendDeliveryReceiptFor(message);
}
} else {
@@ -164,6 +165,14 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac
}
}
public static void recordMessageDeliveryDuration(long timestamp, Device messageDestinationDevice) {
final long messageDeliveryDuration = System.currentTimeMillis() - timestamp;
messageTime.update(messageDeliveryDuration);
if (messageDestinationDevice.isMaster()) {
primaryDeviceMessageTime.update(messageDeliveryDuration);
}
}
private void sendDeliveryReceiptFor(Envelope message) {
if (!message.hasSource()) return;