From bab6b36e4d9c69e1f59cb167ed5d2b81dce55960 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Fri, 18 Mar 2022 16:43:26 -0400
Subject: [PATCH] Count reported messages by destination country code in
 addition to source country code

---
 .../textsecuregcm/WhisperServerService.java     |  2 +-
 .../metrics/ReportedMessageMetricsListener.java | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index 62d3025ae..b5132ef74 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -474,7 +474,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     SubscriptionManager subscriptionManager = new SubscriptionManager(
         config.getDynamoDbTables().getSubscriptions().getTableName(), dynamoDbAsyncClient);
 
-    ReportedMessageMetricsListener reportedMessageMetricsListener = new ReportedMessageMetricsListener();
+    ReportedMessageMetricsListener reportedMessageMetricsListener = new ReportedMessageMetricsListener(accountsManager);
     reportMessageManager.addListener(reportedMessageMetricsListener);
 
     AccountAuthenticator                  accountAuthenticator                  = new AccountAuthenticator(accountsManager);
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/ReportedMessageMetricsListener.java b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/ReportedMessageMetricsListener.java
index aa53e4122..90fcbcc60 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/ReportedMessageMetricsListener.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/ReportedMessageMetricsListener.java
@@ -9,17 +9,30 @@ import static com.codahale.metrics.MetricRegistry.name;
 
 import io.micrometer.core.instrument.Metrics;
 import java.util.UUID;
+import org.whispersystems.textsecuregcm.storage.AccountsManager;
 import org.whispersystems.textsecuregcm.storage.ReportMessageManager;
 import org.whispersystems.textsecuregcm.storage.ReportedMessageListener;
 import org.whispersystems.textsecuregcm.util.Util;
 
 public class ReportedMessageMetricsListener implements ReportedMessageListener {
 
+  private final AccountsManager accountsManager;
+
   // ReportMessageManager name used deliberately to preserve continuity of metrics
-  private static final String REPORT_COUNTER_NAME = name(ReportMessageManager.class, "reported");
+  private static final String REPORTED_COUNTER_NAME = name(ReportMessageManager.class, "reported");
+  private static final String REPORTER_COUNTER_NAME = name(ReportMessageManager.class, "reporter");
+
+  private static final String COUNTRY_CODE_TAG_NAME = "countryCode";
+
+  public ReportedMessageMetricsListener(final AccountsManager accountsManager) {
+    this.accountsManager = accountsManager;
+  }
 
   @Override
   public void handleMessageReported(final String sourceNumber, final UUID messageGuid, final UUID reporterUuid) {
-    Metrics.counter(REPORT_COUNTER_NAME, "countryCode", Util.getCountryCode(sourceNumber)).increment();
+    Metrics.counter(REPORTED_COUNTER_NAME, COUNTRY_CODE_TAG_NAME, Util.getCountryCode(sourceNumber)).increment();
+
+    accountsManager.getByAccountIdentifier(reporterUuid).ifPresent(reporter ->
+        Metrics.counter(REPORTER_COUNTER_NAME, COUNTRY_CODE_TAG_NAME, Util.getCountryCode(reporter.getNumber())).increment());
   }
 }