From 70134507f82eb53bd5cb281d507a7e4d88d670cb Mon Sep 17 00:00:00 2001
From: ravi-signal <99042880+ravi-signal@users.noreply.github.com>
Date: Fri, 19 Jan 2024 13:56:47 -0600
Subject: [PATCH] Add metric for ServiceId string parsing

---
 .../identity/AciServiceIdentifier.java              | 13 ++++++++-----
 .../textsecuregcm/metrics/MessageMetrics.java       |  2 +-
 .../textsecuregcm/metrics/MessageMetricsTest.java   |  4 +++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/identity/AciServiceIdentifier.java b/service/src/main/java/org/whispersystems/textsecuregcm/identity/AciServiceIdentifier.java
index a3a6b7246..c475b8d7e 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/identity/AciServiceIdentifier.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/identity/AciServiceIdentifier.java
@@ -5,13 +5,14 @@
 
 package org.whispersystems.textsecuregcm.identity;
 
+import io.micrometer.core.instrument.Metrics;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.HexFormat;
 import java.util.UUID;
-import io.swagger.v3.oas.annotations.media.Schema;
-
 import org.signal.libsignal.protocol.ServiceId;
+import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
 import org.whispersystems.textsecuregcm.util.UUIDUtil;
 
 /**
@@ -24,6 +25,7 @@ import org.whispersystems.textsecuregcm.util.UUIDUtil;
     description = "An identifier for an account based on the account's ACI"
 )
 public record AciServiceIdentifier(UUID uuid) implements ServiceIdentifier {
+  private static final String SERVICE_ID_STRING_COUNTER_NAME = MetricsUtil.name(AciServiceIdentifier.class, "serviceIdString");
 
   private static final IdentityType IDENTITY_TYPE = IdentityType.ACI;
 
@@ -59,9 +61,10 @@ public record AciServiceIdentifier(UUID uuid) implements ServiceIdentifier {
   }
 
   public static AciServiceIdentifier valueOf(final String string) {
-    return new AciServiceIdentifier(
-        UUID.fromString(string.startsWith(IDENTITY_TYPE.getStringPrefix())
-            ? string.substring(IDENTITY_TYPE.getStringPrefix().length()) : string));
+    final boolean valid = !string.startsWith(IDENTITY_TYPE.getStringPrefix());
+    final UUID uuid = UUID.fromString(valid ? string : string.substring(IDENTITY_TYPE.getStringPrefix().length()));
+    Metrics.counter(SERVICE_ID_STRING_COUNTER_NAME, "valid", String.valueOf(valid)).increment();
+    return new AciServiceIdentifier(uuid);
   }
 
   public static AciServiceIdentifier fromBytes(final byte[] bytes) {
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MessageMetrics.java b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MessageMetrics.java
index 2e8502f92..dfe64921e 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MessageMetrics.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MessageMetrics.java
@@ -26,7 +26,7 @@ public final class MessageMetrics {
 
   private static final Logger logger = LoggerFactory.getLogger(MessageMetrics.class);
 
-  private static final String MISMATCHED_ACCOUNT_ENVELOPE_UUID_COUNTER_NAME = name(MessageMetrics.class,
+  static final String MISMATCHED_ACCOUNT_ENVELOPE_UUID_COUNTER_NAME = name(MessageMetrics.class,
       "mismatchedAccountEnvelopeUuid");
 
   public static final String DELIVERY_LATENCY_TIMER_NAME = name(MessageMetrics.class, "deliveryLatency");
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MessageMetricsTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MessageMetricsTest.java
index c413d2cb9..002ad7d25 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MessageMetricsTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MessageMetricsTest.java
@@ -119,7 +119,9 @@ class MessageMetricsTest {
   }
 
   private Optional<Counter> findCounter(SimpleMeterRegistry meterRegistry) {
-    final Optional<Meter> maybeMeter = meterRegistry.getMeters().stream().findFirst();
+    final Optional<Meter> maybeMeter = meterRegistry.getMeters().stream()
+        .filter(meter -> meter.getId().getName().contains(MessageMetrics.MISMATCHED_ACCOUNT_ENVELOPE_UUID_COUNTER_NAME))
+        .findFirst();
     return maybeMeter.map(meter -> meter instanceof Counter ? (Counter) meter : null);
   }
 }