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

Add `identityType` tag to `SENT_MESSAGE_COUNTER_NAME`

This commit is contained in:
Fedor Indutny 2024-02-06 15:39:00 -08:00 committed by GitHub
parent e441ab60a2
commit 24a7762873
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,6 +179,7 @@ public class MessageController {
private static final String SENDER_COUNTRY_TAG_NAME = "senderCountry"; private static final String SENDER_COUNTRY_TAG_NAME = "senderCountry";
private static final String RATE_LIMIT_REASON_TAG_NAME = "rateLimitReason"; private static final String RATE_LIMIT_REASON_TAG_NAME = "rateLimitReason";
private static final String ENVELOPE_TYPE_TAG_NAME = "envelopeType"; private static final String ENVELOPE_TYPE_TAG_NAME = "envelopeType";
private static final String IDENTITY_TYPE_TAG_NAME = "identityType";
private static final String SENDER_TYPE_IDENTIFIED = "identified"; private static final String SENDER_TYPE_IDENTIFIED = "identified";
private static final String SENDER_TYPE_UNIDENTIFIED = "unidentified"; private static final String SENDER_TYPE_UNIDENTIFIED = "unidentified";
@ -342,7 +343,8 @@ public class MessageController {
final List<Tag> tags = List.of(UserAgentTagUtil.getPlatformTag(userAgent), final List<Tag> tags = List.of(UserAgentTagUtil.getPlatformTag(userAgent),
Tag.of(EPHEMERAL_TAG_NAME, String.valueOf(messages.online())), Tag.of(EPHEMERAL_TAG_NAME, String.valueOf(messages.online())),
Tag.of(SENDER_TYPE_TAG_NAME, senderType)); Tag.of(SENDER_TYPE_TAG_NAME, senderType),
Tag.of(IDENTITY_TYPE_TAG_NAME, destinationIdentifier.identityType().name()));
for (IncomingMessage incomingMessage : messages.messages()) { for (IncomingMessage incomingMessage : messages.messages()) {
Optional<Device> destinationDevice = destination.get().getDevice(incomingMessage.destinationDeviceId()); Optional<Device> destinationDevice = destination.get().getDevice(incomingMessage.destinationDeviceId());
@ -551,15 +553,16 @@ public class MessageController {
List<ServiceIdentifier> uuids404 = Collections.synchronizedList(new ArrayList<>()); List<ServiceIdentifier> uuids404 = Collections.synchronizedList(new ArrayList<>());
try { try {
final Counter sentMessageCounter = Metrics.counter(SENT_MESSAGE_COUNTER_NAME, Tags.of(
UserAgentTagUtil.getPlatformTag(userAgent),
Tag.of(EPHEMERAL_TAG_NAME, String.valueOf(online)),
Tag.of(SENDER_TYPE_TAG_NAME, SENDER_TYPE_UNIDENTIFIED)));
CompletableFuture.allOf( CompletableFuture.allOf(
recipients.values().stream() recipients.values().stream()
.flatMap(recipientData -> .flatMap(recipientData -> {
recipientData.deviceIdToRegistrationId().keySet().stream().map( final Counter sentMessageCounter = Metrics.counter(SENT_MESSAGE_COUNTER_NAME, Tags.of(
UserAgentTagUtil.getPlatformTag(userAgent),
Tag.of(EPHEMERAL_TAG_NAME, String.valueOf(online)),
Tag.of(SENDER_TYPE_TAG_NAME, SENDER_TYPE_UNIDENTIFIED),
Tag.of(IDENTITY_TYPE_TAG_NAME, recipientData.serviceIdentifier().identityType().name())));
return recipientData.deviceIdToRegistrationId().keySet().stream().map(
deviceId ->CompletableFuture.runAsync( deviceId ->CompletableFuture.runAsync(
() -> { () -> {
final Account destinationAccount = recipientData.account(); final Account destinationAccount = recipientData.account();
@ -580,7 +583,8 @@ public class MessageController {
uuids404.add(recipientData.serviceIdentifier()); uuids404.add(recipientData.serviceIdentifier());
} }
}, },
multiRecipientMessageExecutor))) multiRecipientMessageExecutor));
})
.toArray(CompletableFuture[]::new)) .toArray(CompletableFuture[]::new))
.get(); .get();
} catch (InterruptedException e) { } catch (InterruptedException e) {