From dea359ef91a921a3cdfa8c55096730db8c3d2ff8 Mon Sep 17 00:00:00 2001 From: Chris Eager Date: Wed, 31 Mar 2021 11:28:59 -0500 Subject: [PATCH] Add metric tag for prekey target type --- .../textsecuregcm/controllers/KeysController.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java index 06da186bb..9f93b4e80 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java @@ -8,6 +8,8 @@ import static com.codahale.metrics.MetricRegistry.name; import com.codahale.metrics.annotation.Timed; import io.dropwizard.auth.Auth; +import io.micrometer.core.instrument.Metrics; +import io.micrometer.core.instrument.Tags; import java.util.Collections; import java.util.LinkedList; import java.util.List; @@ -24,7 +26,6 @@ import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import io.micrometer.core.instrument.Metrics; import org.whispersystems.textsecuregcm.auth.AmbiguousIdentifier; import org.whispersystems.textsecuregcm.auth.Anonymous; import org.whispersystems.textsecuregcm.auth.DisabledPermittedAccount; @@ -56,6 +57,7 @@ public class KeysController { name(KeysController.class, "internationalPreKeyGet"); private static final String SOURCE_COUNTRY_TAG_NAME = "sourceCountry"; + private static final String PREKEY_TARGET_IDENTIFIER_TAG_NAME = "identifierType"; public KeysController(RateLimiters rateLimiters, KeysDynamoDb keysDynamoDb, AccountsManager accounts, DirectoryQueue directoryQueue) { this.rateLimiters = rateLimiters; @@ -132,7 +134,9 @@ public class KeysController { final String targetCountryCode = Util.getCountryCode(target.get().getNumber()); if (!accountCountryCode.equals(targetCountryCode)) { - Metrics.counter(INTERNATIONAL_PREKEY_REQUEST_COUNTER_NAME, SOURCE_COUNTRY_TAG_NAME, accountCountryCode) + final Tags tags = Tags.of(SOURCE_COUNTRY_TAG_NAME, accountCountryCode) + .and(PREKEY_TARGET_IDENTIFIER_TAG_NAME, targetName.hasNumber() ? "number" : "uuid"); + Metrics.counter(INTERNATIONAL_PREKEY_REQUEST_COUNTER_NAME, tags) .increment(); } }