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

Add primary platform tag to transfer archive metrics

This commit is contained in:
Ravi Khadiwala 2025-02-12 10:55:46 -06:00 committed by ravi-signal
parent 4908a0aa9e
commit 2356d7c629
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
service/src/main/java/org/whispersystems/textsecuregcm/controllers/DeviceController.java
View File

@ -42,7 +42,9 @@ import java.time.Instant;
import java.util.Arrays; import java.util.Arrays;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException; import java.util.concurrent.CompletionException;
@ -588,9 +590,27 @@ public class DeviceController {
if (response != null && response.getStatus() == Response.Status.OK.getStatusCode()) { if (response != null && response.getStatus() == Response.Status.OK.getStatusCode()) {
sample.stop(Timer.builder(WAIT_FOR_TRANSFER_ARCHIVE_TIMER_NAME) sample.stop(Timer.builder(WAIT_FOR_TRANSFER_ARCHIVE_TIMER_NAME)
.publishPercentileHistogram(true) .publishPercentileHistogram(true)
.tags(Tags.of(UserAgentTagUtil.getPlatformTag(userAgent))) .tags(Tags.of(
UserAgentTagUtil.getPlatformTag(userAgent),
primaryPlatformTag(authenticatedDevice.getAccount())))
.register(Metrics.globalRegistry)); .register(Metrics.globalRegistry));
} }
})); }));
} }
private static io.micrometer.core.instrument.Tag primaryPlatformTag(final Account account) {
final Optional<ClientPlatform> clientPlatform = Optional.ofNullable(
switch (account.getPrimaryDevice().getUserAgent()) {
case "OWA" -> ClientPlatform.ANDROID;
case "OWI", "OWP" -> ClientPlatform.IOS;
case "OWD" -> ClientPlatform.DESKTOP;
case null, default -> null;
});
return io.micrometer.core.instrument.Tag.of(
"primaryPlatform",
clientPlatform
.map(p -> p.name().toLowerCase(Locale.ROOT))
.orElse("unknown"));
}
} }