From b608ece57e4a912e2d5a1a941466d688a268a402 Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Fri, 11 Mar 2022 12:47:37 -0800
Subject: [PATCH] Remove `supportsAnnouncementGroups` metric

---
 .../textsecuregcm/auth/AccountAuthenticator.java | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/auth/AccountAuthenticator.java b/service/src/main/java/org/whispersystems/textsecuregcm/auth/AccountAuthenticator.java
index 15dbbc4f0..382c9eff7 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/auth/AccountAuthenticator.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/auth/AccountAuthenticator.java
@@ -7,32 +7,18 @@ package org.whispersystems.textsecuregcm.auth;
 import io.dropwizard.auth.Authenticator;
 import io.dropwizard.auth.basic.BasicCredentials;
 import java.util.Optional;
-import io.micrometer.core.instrument.Metrics;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
 
-import static com.codahale.metrics.MetricRegistry.name;
-
 public class AccountAuthenticator extends BaseAccountAuthenticator implements
     Authenticator<BasicCredentials, AuthenticatedAccount> {
 
-  private static final String AUTHENTICATION_COUNTER_NAME = name(AccountAuthenticator.class, "authenticate");
-
   public AccountAuthenticator(AccountsManager accountsManager) {
     super(accountsManager);
   }
 
   @Override
   public Optional<AuthenticatedAccount> authenticate(BasicCredentials basicCredentials) {
-    final Optional<AuthenticatedAccount> maybeAuthenticatedAccount = super.authenticate(basicCredentials, true);
-
-    // TODO Remove after announcement groups have launched
-    maybeAuthenticatedAccount.ifPresent(authenticatedAccount ->
-        Metrics.counter(AUTHENTICATION_COUNTER_NAME,
-            "supportsAnnouncementGroups",
-            String.valueOf(authenticatedAccount.getAccount().isAnnouncementGroupSupported()))
-            .increment());
-
-    return maybeAuthenticatedAccount;
+    return super.authenticate(basicCredentials, true);
   }
 
 }