From 5245b686899fc2bcf00a00c3ff23964c541243e9 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Thu, 1 Oct 2020 15:13:40 -0400
Subject: [PATCH] Remove temporary metrics.

---
 .../textsecuregcm/storage/Account.java        | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/Account.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/Account.java
index e1dca89e8..bfb8a8167 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/Account.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/Account.java
@@ -20,8 +20,6 @@ package org.whispersystems.textsecuregcm.storage;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.annotations.VisibleForTesting;
-import io.micrometer.core.instrument.Counter;
-import io.micrometer.core.instrument.Metrics;
 import org.whispersystems.textsecuregcm.auth.AmbiguousIdentifier;
 import org.whispersystems.textsecuregcm.auth.StoredRegistrationLock;
 
@@ -32,16 +30,9 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-import static com.codahale.metrics.MetricRegistry.name;
 
 public class Account implements Principal  {
 
-  // TODO Remove these temporary metrics
-  private static final Counter ENABLED_ACCOUNT_COUNTER  = Metrics.counter(name(Account.class, "isEnabled"), "enabled", "true");
-  private static final Counter DISABLED_ACCOUNT_COUNTER = Metrics.counter(name(Account.class, "isEnabled"), "enabled", "false");
-
   @JsonIgnore
   private UUID uuid;
 
@@ -160,15 +151,7 @@ public class Account implements Principal  {
   }
 
   public boolean isEnabled() {
-    final boolean enabled = getMasterDevice().map(Device::isEnabled).orElse(false);
-
-    if (enabled) {
-      ENABLED_ACCOUNT_COUNTER.increment();
-    } else {
-      DISABLED_ACCOUNT_COUNTER.increment();
-    }
-
-    return enabled;
+    return getMasterDevice().map(Device::isEnabled).orElse(false);
   }
 
   public long getNextDeviceId() {