Merge pull request #1527 from Netflix/josh/guava

Revert servo commit to master

build.gradle

@@ -42,8 +42,7 @@ allprojects {
         commonsConfigurationVersion = '1.10'
         jsr305Version = '3.0.2'
         guiceVersion = '4.1.0'
-        spectatorVersion = '1.7.3'
-        slf4jVersion = '1.7.36'
+        servoVersion = '0.12.21'
         governatorVersion = '1.17.5'
         archaiusVersion = '0.7.6'
         jacksonVersion = '2.10.5'

eureka-client-archaius2/build.gradle

@@ -1,7 +1,6 @@
 apply plugin: 'nebula.test-jar'
 
 def archaius2Version = '2.1.7'
-def slf4jVersion = '1.7.36'
 
 sourceSets {
     test {
@@ -15,8 +14,6 @@ dependencies {
     // archaius2
     compile "com.netflix.archaius:archaius2-core:${archaius2Version}"
     compile "com.netflix.archaius:archaius2-api:${archaius2Version}"
-    compile "org.slf4j:slf4j-api:${slf4jVersion}"
-    compile "com.netflix.spectator:spectator-api:${spectatorVersion}"
 
     testCompile project(':eureka-test-utils')
 

eureka-client-jersey2/build.gradle

@@ -27,8 +27,6 @@ dependencies {
     compile project(':eureka-client')
     compile 'org.glassfish.jersey.core:jersey-client:2.23.1'
     compile 'org.glassfish.jersey.connectors:jersey-apache-connector:2.23.1'
-    compile "org.slf4j:slf4j-api:1.7.36"
-    compile 'com.netflix.spectator:spectator-api:1.7.3'
 
     testCompile (project(':eureka-test-utils')) {
         // exclude all transitives to avoid bringing in jersey1 eureka-core

eureka-client-jersey2/src/main/java/com/netflix/discovery/shared/transport/jersey2/EurekaJersey2ClientImpl.java

@@ -2,10 +2,6 @@
 
 import static com.netflix.discovery.util.DiscoveryBuildInfo.buildVersion;
 
-import com.netflix.discovery.util.ServoUtil;
-import com.netflix.spectator.api.Counter;
-import com.netflix.spectator.api.Spectator;
-import com.netflix.spectator.api.Timer;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.security.KeyStore;
@@ -40,6 +36,12 @@
 import com.netflix.discovery.converters.wrappers.DecoderWrapper;
 import com.netflix.discovery.converters.wrappers.EncoderWrapper;
 import com.netflix.discovery.provider.DiscoveryJerseyProvider;
+import com.netflix.servo.monitor.BasicCounter;
+import com.netflix.servo.monitor.BasicTimer;
+import com.netflix.servo.monitor.Counter;
+import com.netflix.servo.monitor.MonitorConfig;
+import com.netflix.servo.monitor.Monitors;
+import com.netflix.servo.monitor.Stopwatch;
 
 /**
  * @author Tomasz Bak
@@ -323,19 +325,24 @@ private PoolingHttpClientConnectionManager createCustomSslCM() {
     private class ConnectionCleanerTask implements Runnable {
 
         private final int connectionIdleTimeout;
-        private final Timer executionTimeStats;
+        private final BasicTimer executionTimeStats;
         private final Counter cleanupFailed;
 
         private ConnectionCleanerTask(int connectionIdleTimeout) {
             this.connectionIdleTimeout = connectionIdleTimeout;
-            final com.netflix.spectator.api.Registry registry = Spectator.globalRegistry();
-            executionTimeStats = registry.timer("Eureka-Connection-Cleaner-Time");
-            cleanupFailed = registry.counter("Eureka-Connection-Cleaner-Failure");
+            MonitorConfig.Builder monitorConfigBuilder = MonitorConfig.builder("Eureka-Connection-Cleaner-Time");
+            executionTimeStats = new BasicTimer(monitorConfigBuilder.build());
+            cleanupFailed = new BasicCounter(MonitorConfig.builder("Eureka-Connection-Cleaner-Failure").build());
+            try {
+                Monitors.registerObject(this);
+            } catch (Exception e) {
+                s_logger.error("Unable to register with servo.", e);
+            }
         }
 
         @Override
         public void run() {
-            long monotonicTime = ServoUtil.time(executionTimeStats);
+            Stopwatch start = executionTimeStats.start();
             try {
                 HttpClientConnectionManager cm = (HttpClientConnectionManager) apacheHttpClient
                         .getConfiguration()
@@ -345,8 +352,11 @@ public void run() {
                 s_logger.error("Cannot clean connections", e);
                 cleanupFailed.increment();
             } finally {
-                ServoUtil.record(executionTimeStats, monotonicTime);
+                if (null != start) {
+                    start.stop();
+                }
             }
+
         }
     }
 }

eureka-client/build.gradle

@@ -6,13 +6,11 @@ configurations.all {
 }
 
 dependencies {
+    compile "com.netflix.netflix-commons:netflix-eventbus:0.3.0"
     compile 'com.thoughtworks.xstream:xstream:1.4.19'
     compile "com.netflix.archaius:archaius-core:${archaiusVersion}"
     compile 'javax.ws.rs:jsr311-api:1.1.1'
-    implementation "com.netflix.spectator:spectator-api:${spectatorVersion}"
-    implementation "org.slf4j:slf4j-api:${slf4jVersion}"
-    implementation "com.netflix.netflix-commons:netflix-eventbus:0.3.0"
-    implementation "javax.annotation:javax.annotation-api:1.2"
+    compile "com.netflix.servo:servo-core:${servoVersion}"
     compile "com.sun.jersey:jersey-core:${jerseyVersion}"
     compile "com.sun.jersey:jersey-client:${jerseyVersion}"
     compile "com.sun.jersey.contribs:jersey-apache-client4:${jerseyVersion}"

eureka-client/src/main/java/com/netflix/discovery/DiscoveryClient.java

@@ -18,14 +18,7 @@
 
 import static com.netflix.discovery.EurekaClientNames.METRIC_REGISTRATION_PREFIX;
 import static com.netflix.discovery.EurekaClientNames.METRIC_REGISTRY_PREFIX;
-import static com.netflix.spectator.api.Spectator.globalRegistry;
-
-import com.netflix.discovery.util.ServoUtil;
-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;
 import java.util.Collection;
 import java.util.Collections;
@@ -90,6 +83,10 @@
 import com.netflix.discovery.shared.transport.jersey.Jersey1TransportClientFactories;
 import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;
 import com.netflix.discovery.util.ThresholdLevelsMetric;
+import com.netflix.servo.annotations.DataSourceType;
+import com.netflix.servo.monitor.Counter;
+import com.netflix.servo.monitor.Monitors;
+import com.netflix.servo.monitor.Stopwatch;
 
 /**
  * The class that is instrumental for interactions with <tt>Eureka Server</tt>.
@@ -133,10 +130,11 @@ public class DiscoveryClient implements EurekaClient {
 
     // Timers
     private static final String PREFIX = "DiscoveryClient_";
-    private final Counter RECONCILE_HASH_CODES_MISMATCH = globalRegistry().counter(PREFIX + "ReconcileHashCodeMismatch");
-    private final Timer FETCH_REGISTRY_TIMER = globalRegistry().timer(PREFIX + "FetchRegistry");
-    private final Counter REREGISTER_COUNTER = globalRegistry().counter(PREFIX
-        + "Reregister");
+    private final Counter RECONCILE_HASH_CODES_MISMATCH = Monitors.newCounter(PREFIX + "ReconcileHashCodeMismatch");
+    private final com.netflix.servo.monitor.Timer FETCH_REGISTRY_TIMER = Monitors
+            .newTimer(PREFIX + "FetchRegistry");
+    private final Counter REREGISTER_COUNTER = Monitors.newCounter(PREFIX
+            + "Reregister");
 
     // instance variables
     /**
@@ -180,10 +178,7 @@ public class DiscoveryClient implements EurekaClient {
 
     private InstanceInfoReplicator instanceInfoReplicator;
 
-    private final AtomicInteger registrySize = PolledMeter
-        .using(Spectator.globalRegistry())
-        .withName(METRIC_REGISTRY_PREFIX + "localRegistrySize")
-        .monitorValue(new AtomicInteger());
+    private volatile int registrySize = 0;
     private volatile long lastSuccessfulRegistryFetchTimestamp = -1;
     private volatile long lastSuccessfulHeartbeatTimestamp = -1;
     private final ThresholdLevelsMetric heartbeatStalenessMonitor;
@@ -367,19 +362,12 @@ public synchronized BackupRegistry get() {
         } else {
             this.registryStalenessMonitor = ThresholdLevelsMetric.NO_OP_METRIC;
         }
-        final Registry registry = globalRegistry();
-        PolledMeter.using(registry)
-            .withName(METRIC_REGISTRY_PREFIX + "lastSuccessfulRegistryFetchTimePeriod")
-            .monitorValue(this, DiscoveryClient::getLastSuccessfulRegistryFetchTimePeriodInternal);
 
         if (config.shouldRegisterWithEureka()) {
             this.heartbeatStalenessMonitor = new ThresholdLevelsMetric(this, METRIC_REGISTRATION_PREFIX + "lastHeartbeatSec_", new long[]{15L, 30L, 60L, 120L, 240L, 480L});
         } else {
             this.heartbeatStalenessMonitor = ThresholdLevelsMetric.NO_OP_METRIC;
         }
-        PolledMeter.using(registry)
-            .withName(METRIC_REGISTRATION_PREFIX + "lastSuccessfulHeartbeatTimePeriod")
-            .monitorValue(this, DiscoveryClient::getLastSuccessfulHeartbeatTimePeriodInternal);
 
         logger.info("Initializing Eureka in region {}", clientConfig.getRegion());
 
@@ -398,7 +386,7 @@ public synchronized BackupRegistry get() {
 
             initTimestampMs = System.currentTimeMillis();
             initRegistrySize = this.getApplications().size();
-            registrySize.set(initRegistrySize);
+            registrySize = initRegistrySize;
             logger.info("Discovery Client initialized at timestamp {} with initial instances count: {}",
                     initTimestampMs, initRegistrySize);
 
@@ -487,14 +475,20 @@ public synchronized BackupRegistry get() {
         // finally, init the schedule tasks (e.g. cluster resolvers, heartbeat, instanceInfo replicator, fetch
         initScheduledTasks();
 
+        try {
+            Monitors.registerObject(this);
+        } catch (Throwable e) {
+            logger.warn("Cannot register timers", e);
+        }
+
         // This is a bit of hack to allow for existing code using DiscoveryManager.getInstance()
         // to work with DI'd DiscoveryClient
         DiscoveryManager.getInstance().setDiscoveryClient(this);
         DiscoveryManager.getInstance().setEurekaClientConfig(config);
 
         initTimestampMs = System.currentTimeMillis();
         initRegistrySize = this.getApplications().size();
-        registrySize.set(initRegistrySize);
+        registrySize = initRegistrySize;
         logger.info("Discovery Client initialized at timestamp {} with initial instances count: {}",
                 initTimestampMs, initRegistrySize);
     }
@@ -958,6 +952,11 @@ public synchronized void shutdown() {
                 eurekaTransport.shutdown();
             }
 
+            heartbeatStalenessMonitor.shutdown();
+            registryStalenessMonitor.shutdown();
+
+            Monitors.unregisterObject(this);
+
             logger.info("Completed shut down of DiscoveryClient");
         }
     }
@@ -991,7 +990,7 @@ void unregister() {
      * @return true if the registry was fetched
      */
     private boolean fetchRegistry(boolean forceFullRegistryFetch) {
-        long monotonicTime = ServoUtil.time(FETCH_REGISTRY_TIMER);
+        Stopwatch tracer = FETCH_REGISTRY_TIMER.start();
 
         try {
             // If the delta is disabled or if it is the first time, get all
@@ -1023,7 +1022,9 @@ private boolean fetchRegistry(boolean forceFullRegistryFetch) {
                     appPathIdentifier, clientConfig.getRegistryFetchIntervalSeconds(), e.getMessage(), ExceptionUtils.getStackTrace(e));
             return false;
         } finally {
-            ServoUtil.record(FETCH_REGISTRY_TIMER, monotonicTime);
+            if (tracer != null) {
+                tracer.stop();
+            }
         }
 
         // Notify about cache refresh before updating the instance remote status
@@ -1529,7 +1530,7 @@ void refreshRegistry() {
 
             boolean success = fetchRegistry(remoteRegionsModified);
             if (success) {
-                registrySize.set(localRegionApps.get().size());
+                registrySize = localRegionApps.get().size();
                 lastSuccessfulRegistryFetchTimestamp = System.currentTimeMillis();
             }
 
@@ -1729,6 +1730,8 @@ public long getLastSuccessfulRegistryFetchTimePeriod() {
                 : System.currentTimeMillis() - lastSuccessfulRegistryFetchTimestamp;
     }
 
+    @com.netflix.servo.annotations.Monitor(name = METRIC_REGISTRATION_PREFIX + "lastSuccessfulHeartbeatTimePeriod",
+            description = "How much time has passed from last successful heartbeat", type = DataSourceType.GAUGE)
     private long getLastSuccessfulHeartbeatTimePeriodInternal() {
         final long delay = (!clientConfig.shouldRegisterWithEureka() || isShutdown.get())
             ? 0
@@ -1739,6 +1742,8 @@ private long getLastSuccessfulHeartbeatTimePeriodInternal() {
     }
 
     // for metrics only
+    @com.netflix.servo.annotations.Monitor(name = METRIC_REGISTRY_PREFIX + "lastSuccessfulRegistryFetchTimePeriod",
+            description = "How much time has passed from last successful local registry update", type = DataSourceType.GAUGE)
     private long getLastSuccessfulRegistryFetchTimePeriodInternal() {
         final long delay = (!clientConfig.shouldFetchRegistry() || isShutdown.get())
             ? 0
@@ -1748,6 +1753,13 @@ private long getLastSuccessfulRegistryFetchTimePeriodInternal() {
         return delay;
     }
 
+    @com.netflix.servo.annotations.Monitor(name = METRIC_REGISTRY_PREFIX + "localRegistrySize",
+            description = "Count of instances in the local registry", type = DataSourceType.GAUGE)
+    public int localRegistrySize() {
+        return registrySize;
+    }
+
+
     private long computeStalenessMonitorDelay(long delay) {
         if (delay < 0) {
             return System.currentTimeMillis() - initTimestampMs;
@@ -1782,7 +1794,7 @@ public long initTimestampMs() {
         }
 
         public int localRegistrySize() {
-            return registrySize.get();
+            return registrySize;
         }
 
         public long lastSuccessfulRegistryFetchTimestampMs() {

eureka-client/src/main/java/com/netflix/discovery/TimedSupervisorTask.java

@@ -1,9 +1,5 @@
 package com.netflix.discovery;
 
-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;
 import java.util.concurrent.Future;
 import java.util.concurrent.RejectedExecutionException;
@@ -13,6 +9,10 @@
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicLong;
 
+import com.netflix.servo.monitor.Counter;
+import com.netflix.servo.monitor.LongGauge;
+import com.netflix.servo.monitor.MonitorConfig;
+import com.netflix.servo.monitor.Monitors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,7 +29,7 @@ public class TimedSupervisorTask extends TimerTask {
     private final Counter timeoutCounter;
     private final Counter rejectedCounter;
     private final Counter throwableCounter;
-    private final AtomicLong threadPoolLevelGauge;
+    private final LongGauge threadPoolLevelGauge;
 
     private final String name;
     private final ScheduledExecutorService scheduler;
@@ -51,12 +51,12 @@ public TimedSupervisorTask(String name, ScheduledExecutorService scheduler, Thre
         this.maxDelay = timeoutMillis * expBackOffBound;
 
         // Initialize the counters and register.
-        final Registry registry = Spectator.globalRegistry();
-        successCounter = registry.counter("success");
-        timeoutCounter = registry.counter("timeouts");
-        rejectedCounter = registry.counter("rejectedExecutions");
-        throwableCounter = registry.counter("throwables");
-        threadPoolLevelGauge = PolledMeter.using(registry).withName("threadPoolUsed").monitorValue(new AtomicLong());
+        successCounter = Monitors.newCounter("success");
+        timeoutCounter = Monitors.newCounter("timeouts");
+        rejectedCounter = Monitors.newCounter("rejectedExecutions");
+        throwableCounter = Monitors.newCounter("throwables");
+        threadPoolLevelGauge = new LongGauge(MonitorConfig.builder("threadPoolUsed").build());
+        Monitors.registerObject(name, this);
     }
 
     @Override
@@ -106,6 +106,7 @@ public void run() {
 
     @Override
     public boolean cancel() {
+        Monitors.unregisterObject(name, this);
         return super.cancel();
     }
 }

eureka-client/src/main/java/com/netflix/discovery/converters/Converters.java

@@ -16,8 +16,6 @@
 
 package com.netflix.discovery.converters;
 
-import com.netflix.spectator.api.Counter;
-import com.netflix.spectator.api.Spectator;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -37,6 +35,8 @@
 import com.netflix.discovery.shared.Application;
 import com.netflix.discovery.shared.Applications;
 import com.netflix.discovery.util.StringCache;
+import com.netflix.servo.monitor.Counter;
+import com.netflix.servo.monitor.Monitors;
 import com.thoughtworks.xstream.converters.Converter;
 import com.thoughtworks.xstream.converters.MarshallingContext;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
@@ -73,7 +73,7 @@ public final class Converters {
 
     private static final Logger logger = LoggerFactory.getLogger(Converters.class);
 
-    private static final Counter UNMARSHALL_ERROR_COUNTER = Spectator.globalRegistry().counter(UNMARSHAL_ERROR);
+    private static final Counter UNMARSHALL_ERROR_COUNTER = Monitors.newCounter(UNMARSHAL_ERROR);
 
     /**
      * Serialize/deserialize {@link Applications} object types.