Rename for clarity

Author: vishalegbert-ttd

src/main/java/com/uid2/operator/vertx/UIDOperatorVerticle.java

@@ -72,7 +72,7 @@ public class UIDOperatorVerticle extends AbstractVerticle{
     private IUIDOperatorService idService;
     private final Map<String, DistributionSummary> _identityMapMetricSummaries = new HashMap<>();
     private final Map<Tuple.Tuple2<String, Boolean>, DistributionSummary> _refreshDurationMetricSummaries = new HashMap<>();
-    private final Map<Tuple.Tuple3<String, Boolean, Boolean>, Counter> _advertiserTokenExpiryStatus = new HashMap<>();
+    private final Map<Tuple.Tuple3<String, Boolean, Boolean>, Counter> _advertisingTokenExpiryStatus = new HashMap<>();
     private final Map<Tuple.Tuple2<String, TokenGeneratePolicy>, Counter> _tokenGeneratePolicyCounters = new HashMap<>();
     private final Map<Tuple.Tuple2<String, IdentityMapPolicy>, Counter> _identityMapPolicyCounters = new HashMap<>();
     private final Map<String, Tuple.Tuple2<Counter, Counter>> _identityMapUnmappedIdentifiers = new HashMap<>();
@@ -1268,9 +1268,9 @@ private void recordRefreshDurationStats(Integer siteId, String apiContact, Durat
         ds.record(durationSinceLastRefresh.getSeconds());
 
         boolean isExpired = durationSinceLastRefresh.compareTo(this.idService.getIdentityExpiryDuration()) > 0;
-        Counter c = _advertiserTokenExpiryStatus.computeIfAbsent(new Tuple.Tuple3<>(String.valueOf(siteId), hasOriginHeader, isExpired), k ->
+        Counter c = _advertisingTokenExpiryStatus.computeIfAbsent(new Tuple.Tuple3<>(String.valueOf(siteId), hasOriginHeader, isExpired), k ->
                 Counter
-                        .builder("uid2.advertiser_token_expired_on_refresh")
+                        .builder("uid2.advertising_token_expired_on_refresh")
                         .description("status of advertiser token expiry")
                         .tag("site_id", String.valueOf(siteId))
                         .tag("has_origin_header", hasOriginHeader ? "true" : "false")

src/test/java/com/uid2/operator/UIDOperatorVerticleTest.java

@@ -1104,7 +1104,7 @@ void captureDurationsBetweenRefresh(String apiVersion, Vertx vertx, VertxTestCon
                         .summary().mean());
 
                 assertEquals(1, Metrics.globalRegistry
-                        .get("uid2.advertiser_token_expired_on_refresh")
+                        .get("uid2.advertising_token_expired_on_refresh")
                         .tag("site_id", String.valueOf(clientSiteId))
                         .tag("is_expired", "false")
                         .counter().count());
@@ -1116,7 +1116,7 @@ void captureDurationsBetweenRefresh(String apiVersion, Vertx vertx, VertxTestCon
 
     @ParameterizedTest
     @ValueSource(strings = {"v1", "v2"})
-    void captureExpiredAdvertiserTokenStatus(String apiVersion, Vertx vertx, VertxTestContext testContext) {
+    void captureExpiredAdvertisingTokenStatus(String apiVersion, Vertx vertx, VertxTestContext testContext) {
         final int clientSiteId = 201;
         fakeAuth(clientSiteId, Role.GENERATOR);
         final String emailAddress = "[email protected]";
@@ -1129,7 +1129,7 @@ void captureExpiredAdvertiserTokenStatus(String apiVersion, Vertx vertx, VertxTe
                 assertEquals("success", refreshRespJson.getString("status"));
 
                 assertEquals(1, Metrics.globalRegistry
-                        .get("uid2.advertiser_token_expired_on_refresh")
+                        .get("uid2.advertising_token_expired_on_refresh")
                         .tag("site_id", String.valueOf(clientSiteId))
                         .tag("is_expired", "true")
                         .counter().count());