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

Combine/expand existing "get keys" counter

This commit is contained in:
Jon Chambers 2024-02-16 11:25:41 -05:00 committed by Jon Chambers
parent 4dce0f1b9d
commit f41e1716c6
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
service/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java
View File

@ -73,8 +73,6 @@ public class KeysController {
private final AccountsManager accounts; private final AccountsManager accounts;
private static final String GET_KEYS_COUNTER_NAME = MetricsUtil.name(KeysController.class, "getKeys"); private static final String GET_KEYS_COUNTER_NAME = MetricsUtil.name(KeysController.class, "getKeys");
private static final String ONE_TIME_EC_PRE_KEY_UNAVAILABLE_COUNTER_NAME =
MetricsUtil.name(KeysController.class, "oneTimeEcPreKeyUnavailable");
private static final CompletableFuture<?>[] EMPTY_FUTURE_ARRAY = new CompletableFuture[0]; private static final CompletableFuture<?>[] EMPTY_FUTURE_ARRAY = new CompletableFuture[0];
@ -215,11 +213,6 @@ public class KeysController {
+ "." + deviceId); + "." + deviceId);
} }
Metrics.counter(GET_KEYS_COUNTER_NAME, Tags.of(
UserAgentTagUtil.getPlatformTag(userAgent),
io.micrometer.core.instrument.Tag.of("wildcardDeviceId", String.valueOf("*".equals(deviceId)))))
.increment();
final List<Device> devices = parseDeviceId(deviceId, target); final List<Device> devices = parseDeviceId(deviceId, target);
final List<PreKeyResponseItem> responseItems = new ArrayList<>(devices.size()); final List<PreKeyResponseItem> responseItems = new ArrayList<>(devices.size());
@ -239,14 +232,14 @@ public class KeysController {
final ECPreKey unsignedEcPreKey = unsignedEcPreKeyFuture.join().orElse(null); final ECPreKey unsignedEcPreKey = unsignedEcPreKeyFuture.join().orElse(null);
final ECSignedPreKey signedEcPreKey = signedEcPreKeyFuture.join().orElse(null); final ECSignedPreKey signedEcPreKey = signedEcPreKeyFuture.join().orElse(null);
if (unsignedEcPreKey == null) { Metrics.counter(GET_KEYS_COUNTER_NAME, Tags.of(
Metrics.counter(ONE_TIME_EC_PRE_KEY_UNAVAILABLE_COUNTER_NAME, io.micrometer.core.instrument.Tag.of("isPrimary", String.valueOf(device.isPrimary())),
"isPrimary", String.valueOf(device.isPrimary()), UserAgentTagUtil.getPlatformTag(userAgent),
"platform", getDevicePlatform(device).map(Enum::name).orElse("unknown"), io.micrometer.core.instrument.Tag.of("targetPlatform", getDevicePlatform(device).map(Enum::name).orElse("unknown")),
"identityType", targetIdentifier.identityType().name(), io.micrometer.core.instrument.Tag.of("identityType", targetIdentifier.identityType().name()),
"isStale", String.valueOf(isDeviceStale(device))) io.micrometer.core.instrument.Tag.of("isStale", String.valueOf(isDeviceStale(device))),
.increment(); io.micrometer.core.instrument.Tag.of("oneTimeEcKeyAvailable", String.valueOf(unsignedEcPreKey == null))))
} .increment();
if (signedEcPreKey != null || unsignedEcPreKey != null || pqPreKey != null) { if (signedEcPreKey != null || unsignedEcPreKey != null || pqPreKey != null) {
final int registrationId = switch (targetIdentifier.identityType()) { final int registrationId = switch (targetIdentifier.identityType()) {