From e8835da740556f47446220d69cf4cfb0642ecf1a Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Tue, 1 Mar 2022 18:03:34 -0500
Subject: [PATCH] Tag captcha success rate counter by country

---
 .../textsecuregcm/controllers/AccountController.java           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java
index aa31e7e16..0cf4cb6a2 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java
@@ -682,6 +682,7 @@ public class AccountController {
       Optional<String> pushChallenge,
       String userAgent)
   {
+    final String countryCode = Util.getCountryCode(number);
 
     if (captchaToken.isPresent()) {
       boolean validToken = recaptchaClient.verify(captchaToken.get(), sourceHost);
@@ -690,6 +691,7 @@ public class AccountController {
         final List<Tag> tags = new ArrayList<>();
         tags.add(Tag.of("success", String.valueOf(validToken)));
         tags.add(UserAgentTagUtil.getPlatformTag(userAgent));
+        tags.add(Tag.of(COUNTRY_CODE_TAG_NAME, countryCode));
         Metrics.counter(CAPTCHA_ATTEMPT_COUNTER_NAME, tags).increment();
       }
 
@@ -700,7 +702,6 @@ public class AccountController {
       }
     }
 
-    final String countryCode = Util.getCountryCode(number);
     {
       final List<Tag> tags = new ArrayList<>();
       tags.add(Tag.of(COUNTRY_CODE_TAG_NAME, countryCode));