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

Measure source country for all pre-key requests.

This commit is contained in:
Jon Chambers 2021-04-30 10:11:38 -04:00 committed by Jon Chambers
parent 350de1c759
commit b41f97233e
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,10 +53,10 @@ public class KeysController {
private final AccountsManager accounts; private final AccountsManager accounts;
private final DirectoryQueue directoryQueue; private final DirectoryQueue directoryQueue;
private static final String INTERNATIONAL_PREKEY_REQUEST_COUNTER_NAME = private static final String PREKEY_REQUEST_COUNTER_NAME = name(KeysController.class, "preKeyGet");
name(KeysController.class, "internationalPreKeyGet");
private static final String SOURCE_COUNTRY_TAG_NAME = "sourceCountry"; private static final String SOURCE_COUNTRY_TAG_NAME = "sourceCountry";
private static final String INTERNATIONAL_TAG_NAME = "international";
private static final String PREKEY_TARGET_IDENTIFIER_TAG_NAME = "identifierType"; private static final String PREKEY_TARGET_IDENTIFIER_TAG_NAME = "identifierType";
public KeysController(RateLimiters rateLimiters, KeysDynamoDb keysDynamoDb, AccountsManager accounts, DirectoryQueue directoryQueue) { public KeysController(RateLimiters rateLimiters, KeysDynamoDb keysDynamoDb, AccountsManager accounts, DirectoryQueue directoryQueue) {
@ -129,16 +129,17 @@ public class KeysController {
if (account.isPresent()) { if (account.isPresent()) {
rateLimiters.getPreKeysLimiter().validate(account.get().getNumber() + "." + account.get().getAuthenticatedDevice().get().getId() + "__" + target.get().getNumber() + "." + deviceId); rateLimiters.getPreKeysLimiter().validate(account.get().getNumber() + "." + account.get().getAuthenticatedDevice().get().getId() + "__" + target.get().getNumber() + "." + deviceId);
}
final String accountCountryCode = Util.getCountryCode(account.get().getNumber()); {
final String targetCountryCode = Util.getCountryCode(target.get().getNumber()); final String sourceCountryCode = account.map(a -> Util.getCountryCode(a.getNumber())).orElse("0");
final String targetCountryCode = target.map(a -> Util.getCountryCode(a.getNumber())).orElseThrow();
if (!accountCountryCode.equals(targetCountryCode)) { Metrics.counter(PREKEY_REQUEST_COUNTER_NAME, Tags.of(
final Tags tags = Tags.of(SOURCE_COUNTRY_TAG_NAME, accountCountryCode) SOURCE_COUNTRY_TAG_NAME, sourceCountryCode,
.and(PREKEY_TARGET_IDENTIFIER_TAG_NAME, targetName.hasNumber() ? "number" : "uuid"); INTERNATIONAL_TAG_NAME, String.valueOf(!sourceCountryCode.equals(targetCountryCode)),
Metrics.counter(INTERNATIONAL_PREKEY_REQUEST_COUNTER_NAME, tags) PREKEY_TARGET_IDENTIFIER_TAG_NAME, targetName.hasNumber() ? "number" : "uuid"
.increment(); )).increment();
}
} }
Map<Long, PreKey> preKeysByDeviceId = getLocalKeys(target.get(), deviceId); Map<Long, PreKey> preKeysByDeviceId = getLocalKeys(target.get(), deviceId);