From c82c2c0ba4ea774905708b2269843863434a931f Mon Sep 17 00:00:00 2001
From: Ravi Khadiwala <ravi@signal.org>
Date: Thu, 29 Sep 2022 10:13:40 -0500
Subject: [PATCH] Add country tag to twilio failures

---
 .../textsecuregcm/sms/TwilioSmsSender.java            | 11 +++++++++--
 .../textsecuregcm/sms/TwilioVerifySender.java         |  9 +++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/sms/TwilioSmsSender.java b/service/src/main/java/org/whispersystems/textsecuregcm/sms/TwilioSmsSender.java
index e3bbb2221..0bfbbfcce 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/sms/TwilioSmsSender.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/sms/TwilioSmsSender.java
@@ -60,6 +60,8 @@ public class TwilioSmsSender {
   static final String SERVICE_NAME_TAG = "service";
   static final String STATUS_CODE_TAG_NAME = "statusCode";
   static final String ERROR_CODE_TAG_NAME = "errorCode";
+  static final String COUNTRY_CODE_TAG_NAME = "countryCode";
+  static final String REGION_TAG_NAME = "region";
 
   private final String            accountId;
   private final String            accountToken;
@@ -213,14 +215,19 @@ public class TwilioSmsSender {
       return true;
     } else if (response != null && response.isFailure()) {
 
+      String countryCode = Util.getCountryCode(destination);
+      String region = Util.getRegion(destination);
+
       Metrics.counter(FAILED_REQUEST_COUNTER_NAME,
           SERVICE_NAME_TAG, "classic",
           STATUS_CODE_TAG_NAME, String.valueOf(response.failureResponse.status),
-          ERROR_CODE_TAG_NAME, String.valueOf(response.failureResponse.code)).increment();
+          ERROR_CODE_TAG_NAME, String.valueOf(response.failureResponse.code),
+          COUNTRY_CODE_TAG_NAME, countryCode,
+          REGION_TAG_NAME, region).increment();
 
       logger.info("Failed with code={}, country={}",
           response.failureResponse.code,
-          Util.getCountryCode(destination));
+          countryCode);
 
       return false;
     } else if (throwable != null) {
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/sms/TwilioVerifySender.java b/service/src/main/java/org/whispersystems/textsecuregcm/sms/TwilioVerifySender.java
index 797857e97..65de9df5b 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/sms/TwilioVerifySender.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/sms/TwilioVerifySender.java
@@ -157,14 +157,19 @@ class TwilioVerifySender {
     }
 
     if (twilioVerifyResponse.isFailure()) {
+      String countryCode = Util.getCountryCode(destination);
+      String region = Util.getRegion(destination);
+
       Metrics.counter(TwilioSmsSender.FAILED_REQUEST_COUNTER_NAME,
           TwilioSmsSender.SERVICE_NAME_TAG, "verify",
           TwilioSmsSender.STATUS_CODE_TAG_NAME, String.valueOf(twilioVerifyResponse.failureResponse.status),
-          TwilioSmsSender.ERROR_CODE_TAG_NAME, String.valueOf(twilioVerifyResponse.failureResponse.code)).increment();
+          TwilioSmsSender.ERROR_CODE_TAG_NAME, String.valueOf(twilioVerifyResponse.failureResponse.code),
+          TwilioSmsSender.COUNTRY_CODE_TAG_NAME, countryCode,
+          TwilioSmsSender.REGION_TAG_NAME, region).increment();
 
       logger.info("Failed with code={}, country={}",
           twilioVerifyResponse.failureResponse.code,
-          Util.getCountryCode(destination));
+          countryCode);
 
       return Optional.empty();
     }