addressing PR comments

Netflix · Nov 29, 2023 · ed4f0d8 · ed4f0d8
1 parent d6dd5d9
commit ed4f0d8
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 30 deletions.
diff --git a/...src/main/java/com/netflix/discovery/shared/transport/jersey2/EurekaJersey2ClientImpl.java b/...src/main/java/com/netflix/discovery/shared/transport/jersey2/EurekaJersey2ClientImpl.java
@@ -3,7 +3,6 @@
 import static com.netflix.discovery.util.DiscoveryBuildInfo.buildVersion;
 
 import com.netflix.discovery.util.ServoUtil;
-import com.netflix.spectator.api.CompositeRegistry;
 import com.netflix.spectator.api.Counter;
 import com.netflix.spectator.api.Spectator;
 import com.netflix.spectator.api.Timer;
@@ -329,7 +328,7 @@ private class ConnectionCleanerTask implements Runnable {
 
         private ConnectionCleanerTask(int connectionIdleTimeout) {
             this.connectionIdleTimeout = connectionIdleTimeout;
-            final CompositeRegistry registry = Spectator.globalRegistry();
+            final com.netflix.spectator.api.Registry registry = Spectator.globalRegistry();
             executionTimeStats = registry.timer("Eureka-Connection-Cleaner-Time");
             cleanupFailed = registry.counter("Eureka-Connection-Cleaner-Failure");
         }

diff --git a/eureka-client/src/main/java/com/netflix/discovery/DiscoveryClient.java b/eureka-client/src/main/java/com/netflix/discovery/DiscoveryClient.java
@@ -21,8 +21,9 @@
 import static com.netflix.spectator.api.Spectator.globalRegistry;
 
 import com.netflix.discovery.util.ServoUtil;
-import com.netflix.spectator.api.CompositeRegistry;
 import com.netflix.spectator.api.Counter;
+import com.netflix.spectator.api.Registry;
+import com.netflix.spectator.api.Spectator;
 import com.netflix.spectator.api.Timer;
 import com.netflix.spectator.api.patterns.PolledMeter;
 import java.util.ArrayList;
@@ -179,7 +180,10 @@ public class DiscoveryClient implements EurekaClient {
 
     private InstanceInfoReplicator instanceInfoReplicator;
 
-    private volatile int registrySize = 0;
+    private final AtomicInteger registrySize = PolledMeter
+        .using(Spectator.globalRegistry())
+        .withName(METRIC_REGISTRY_PREFIX + "localRegistrySize")
+        .monitorValue(new AtomicInteger());
     private volatile long lastSuccessfulRegistryFetchTimestamp = -1;
     private volatile long lastSuccessfulHeartbeatTimestamp = -1;
     private final ThresholdLevelsMetric heartbeatStalenessMonitor;
@@ -363,10 +367,10 @@ public synchronized BackupRegistry get() {
         } else {
             this.registryStalenessMonitor = ThresholdLevelsMetric.NO_OP_METRIC;
         }
-        final CompositeRegistry registry = globalRegistry();
+        final Registry registry = globalRegistry();
         PolledMeter.using(registry)
             .withName(METRIC_REGISTRY_PREFIX + "lastSuccessfulRegistryFetchTimePeriod")
-            .monitorValue(getLastSuccessfulRegistryFetchTimePeriodInternal());
+            .monitorValue(this, DiscoveryClient::getLastSuccessfulRegistryFetchTimePeriodInternal);
 
         if (config.shouldRegisterWithEureka()) {
             this.heartbeatStalenessMonitor = new ThresholdLevelsMetric(this, METRIC_REGISTRATION_PREFIX + "lastHeartbeatSec_", new long[]{15L, 30L, 60L, 120L, 240L, 480L});
@@ -375,7 +379,7 @@ public synchronized BackupRegistry get() {
         }
         PolledMeter.using(registry)
             .withName(METRIC_REGISTRATION_PREFIX + "lastSuccessfulHeartbeatTimePeriod")
-            .monitorValue(getLastSuccessfulHeartbeatTimePeriodInternal());
+            .monitorValue(this, DiscoveryClient::getLastSuccessfulHeartbeatTimePeriodInternal);
 
         logger.info("Initializing Eureka in region {}", clientConfig.getRegion());
 
@@ -394,10 +398,7 @@ public synchronized BackupRegistry get() {
 
             initTimestampMs = System.currentTimeMillis();
             initRegistrySize = this.getApplications().size();
-            registrySize = initRegistrySize;
-            PolledMeter.using(registry)
-                .withName(METRIC_REGISTRY_PREFIX + "localRegistrySize")
-                .monitorValue(registrySize);
+            registrySize.set(initRegistrySize);
             logger.info("Discovery Client initialized at timestamp {} with initial instances count: {}",
                     initTimestampMs, initRegistrySize);
 
@@ -493,7 +494,7 @@ public synchronized BackupRegistry get() {
 
         initTimestampMs = System.currentTimeMillis();
         initRegistrySize = this.getApplications().size();
-        registrySize = initRegistrySize;
+        registrySize.set(initRegistrySize);
         logger.info("Discovery Client initialized at timestamp {} with initial instances count: {}",
                 initTimestampMs, initRegistrySize);
     }
@@ -1528,7 +1529,7 @@ void refreshRegistry() {
 
             boolean success = fetchRegistry(remoteRegionsModified);
             if (success) {
-                registrySize = localRegionApps.get().size();
+                registrySize.set(localRegionApps.get().size());
                 lastSuccessfulRegistryFetchTimestamp = System.currentTimeMillis();
             }
 
@@ -1781,7 +1782,7 @@ public long initTimestampMs() {
         }
 
         public int localRegistrySize() {
-            return registrySize;
+            return registrySize.get();
         }
 
         public long lastSuccessfulRegistryFetchTimestampMs() {

diff --git a/eureka-client/src/main/java/com/netflix/discovery/TimedSupervisorTask.java b/eureka-client/src/main/java/com/netflix/discovery/TimedSupervisorTask.java
@@ -1,7 +1,7 @@
 package com.netflix.discovery;
 
-import com.netflix.spectator.api.CompositeRegistry;
 import com.netflix.spectator.api.Counter;
+import com.netflix.spectator.api.Registry;
 import com.netflix.spectator.api.Spectator;
 import com.netflix.spectator.api.patterns.PolledMeter;
 import java.util.TimerTask;
@@ -51,7 +51,7 @@ public TimedSupervisorTask(String name, ScheduledExecutorService scheduler, Thre
         this.maxDelay = timeoutMillis * expBackOffBound;
 
         // Initialize the counters and register.
-        final CompositeRegistry registry = Spectator.globalRegistry();
+        final Registry registry = Spectator.globalRegistry();
         successCounter = registry.counter("success");
         timeoutCounter = registry.counter("timeouts");
         rejectedCounter = registry.counter("rejectedExecutions");

diff --git a/eureka-client/src/main/java/com/netflix/discovery/shared/NamedConnectionPool.java b/eureka-client/src/main/java/com/netflix/discovery/shared/NamedConnectionPool.java
@@ -1,8 +1,8 @@
 package com.netflix.discovery.shared;
 
 import com.netflix.discovery.util.ServoUtil;
-import com.netflix.spectator.api.CompositeRegistry;
 import com.netflix.spectator.api.Counter;
+import com.netflix.spectator.api.Registry;
 import com.netflix.spectator.api.Spectator;
 import com.netflix.spectator.api.Timer;
 import com.netflix.spectator.api.patterns.PolledMeter;
@@ -76,7 +76,7 @@ public NamedConnectionPool(String name, ClientConnectionOperator operator,
 
     void initMonitors(String name) {
         Preconditions.checkNotNull(name);
-        final CompositeRegistry registry = Spectator.globalRegistry();
+        final Registry registry = Spectator.globalRegistry();
         freeEntryCounter = registry.counter(name + "_Reuse");
         createEntryCounter = registry.counter(name + "_CreateNew");
         requestCounter = registry.counter(name + "_Request");
@@ -85,7 +85,7 @@ void initMonitors(String name) {
         requestTimer = registry.timer(name + "_RequestConnectionTimer");
         creationTimer = registry.timer(name + "_CreateConnectionTimer");
         PolledMeter.using(registry).withName("connectionCount")
-            .monitorValue(this.getConnectionsInPool());
+            .monitorValue(this, NamedConnectionPool::getConnectionsInPool);
         this.name = name;
     }
 

diff --git a/eureka-client/src/main/java/com/netflix/discovery/shared/resolver/AsyncResolver.java b/eureka-client/src/main/java/com/netflix/discovery/shared/resolver/AsyncResolver.java
@@ -2,7 +2,7 @@
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.netflix.discovery.TimedSupervisorTask;
-import com.netflix.spectator.api.CompositeRegistry;
+import com.netflix.spectator.api.Registry;
 import com.netflix.spectator.api.Spectator;
 import com.netflix.spectator.api.patterns.PolledMeter;
 import org.slf4j.Logger;
@@ -107,10 +107,10 @@ public AsyncResolver(String name,
         this.refreshIntervalMs = refreshIntervalMs;
         this.warmUpTimeoutMs = warmUpTimeoutMs;
 
-        final CompositeRegistry registry = Spectator.globalRegistry();
+        final Registry registry = Spectator.globalRegistry();
         PolledMeter.using(registry)
             .withName(METRIC_RESOLVER_PREFIX + "lastLoadTimestamp")
-            .monitorValue(getLastLoadTimestamp());
+            .monitorValue(this, AsyncResolver::getLastLoadTimestamp);
 
         this.executorService = Executors.newScheduledThreadPool(1,
                 new ThreadFactoryBuilder()
@@ -140,7 +140,7 @@ public AsyncResolver(String name,
         this.resultsRef = new AtomicReference<>(initialValue);
         PolledMeter.using(registry)
             .withName(METRIC_RESOLVER_PREFIX + "endpointsSize")
-            .monitorValue(getEndpointsSize());
+            .monitorValue(this, AsyncResolver::getEndpointsSize);
     }
 
     @Override

diff --git a/...-client/src/main/java/com/netflix/discovery/shared/resolver/ReloadingClusterResolver.java b/...-client/src/main/java/com/netflix/discovery/shared/resolver/ReloadingClusterResolver.java
@@ -75,7 +75,7 @@ public ReloadingClusterResolver(final ClusterResolverFactory<T> factory, final l
         }
         PolledMeter.using(Spectator.globalRegistry())
             .withName(METRIC_RESOLVER_PREFIX + "lastReloadTimestamp")
-            .monitorValue(getLastReloadTimestamp());
+            .monitorValue(this, ReloadingClusterResolver::getLastReloadTimestamp);
     }
 
     @Override

diff --git a/...a/com/netflix/discovery/shared/transport/decorator/MetricsCollectingEurekaHttpClient.java b/...a/com/netflix/discovery/shared/transport/decorator/MetricsCollectingEurekaHttpClient.java
@@ -17,8 +17,8 @@
 package com.netflix.discovery.shared.transport.decorator;
 
 import com.netflix.discovery.util.ServoUtil;
-import com.netflix.spectator.api.CompositeRegistry;
 import com.netflix.spectator.api.Counter;
+import com.netflix.spectator.api.Registry;
 import com.netflix.spectator.api.Spectator;
 import com.netflix.spectator.api.Timer;
 import java.util.EnumMap;
@@ -168,7 +168,7 @@ enum Status {x100, x200, x300, x400, x500, Unknown}
         EurekaHttpClientRequestMetrics(String resourceName) {
             this.countersByStatus = createStatusCounters(resourceName);
 
-            final CompositeRegistry registry = Spectator.globalRegistry();
+            final Registry registry = Spectator.globalRegistry();
             latencyTimer = registry.timer(EurekaClientNames.METRIC_TRANSPORT_PREFIX + "latency",
                             "id", resourceName,
                             "class", MetricsCollectingEurekaHttpClient.class.getSimpleName());

diff --git a/...main/java/com/netflix/discovery/shared/transport/decorator/SessionedEurekaHttpClient.java b/...main/java/com/netflix/discovery/shared/transport/decorator/SessionedEurekaHttpClient.java
@@ -57,7 +57,7 @@ public SessionedEurekaHttpClient(String name, EurekaHttpClientFactory clientFact
         this.currentSessionDurationMs = randomizeSessionDuration(sessionDurationMs);
         PolledMeter.using(Spectator.globalRegistry())
             .withName(METRIC_TRANSPORT_PREFIX + "currentSessionDuration")
-            .monitorValue(getCurrentSessionDuration());
+            .monitorValue(this, SessionedEurekaHttpClient::getCurrentSessionDuration);
     }
 
     @Override

diff --git a/...java/com/netflix/discovery/shared/transport/jersey/ApacheHttpClientConnectionCleaner.java b/...java/com/netflix/discovery/shared/transport/jersey/ApacheHttpClientConnectionCleaner.java
@@ -16,8 +16,8 @@
 
 package com.netflix.discovery.shared.transport.jersey;
 
-import com.netflix.spectator.api.CompositeRegistry;
 import com.netflix.spectator.api.Counter;
+import com.netflix.spectator.api.Registry;
 import com.netflix.spectator.api.Spectator;
 import com.netflix.spectator.api.Timer;
 import java.util.concurrent.Executors;
@@ -72,9 +72,9 @@ public void run() {
                 TimeUnit.MILLISECONDS
         );
 
-      final CompositeRegistry registry = Spectator.globalRegistry();
+      final Registry registry = Spectator.globalRegistry();
       executionTimeStats = registry.timer("Eureka-Connection-Cleaner-Time");
-        cleanupFailed = registry.counter("Eureka-Connection-Cleaner-Failure");
+      cleanupFailed = registry.counter("Eureka-Connection-Cleaner-Failure");
     }
 
     public void shutdown() {