Merge pull request #2470 from atlanhq/revert-2466-beta-token-metric

Revert "Add counter for service-account api requests"

webapp/src/main/java/org/apache/atlas/web/security/AtlasKeycloakAuthenticationProvider.java

@@ -16,10 +16,8 @@
  */
 package org.apache.atlas.web.security;
 
-import io.micrometer.core.instrument.Counter;
 import org.apache.atlas.ApplicationProperties;
 import org.apache.atlas.keycloak.client.AtlasKeycloakClient;
-import org.apache.atlas.service.metrics.MetricUtils;
 import org.apache.commons.configuration.Configuration;
 import org.keycloak.adapters.springsecurity.authentication.KeycloakAuthenticationProvider;
 import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken;
@@ -77,10 +75,8 @@ public Authentication authenticate(Authentication authentication) {
         authentication = new KeycloakAuthenticationToken(token.getAccount(), token.isInteractive(), grantedAuthorities);
       }
     }
-    if(authentication.getName().startsWith("service-account-apikey")) {
+    if(authentication.getName().startsWith("service-account")) {
       LOG.info("Validating request for clientId: {}", authentication.getName().substring("service-account-".length()));
-
-      Counter.builder("service_account_apikey_request_counter").register(MetricUtils.getMeterRegistry()).increment();
       try{
         KeycloakAuthenticationToken keycloakToken = (KeycloakAuthenticationToken)authentication;
         String bearerToken = keycloakToken.getAccount().getKeycloakSecurityContext().getTokenString();