RATIS-1601. Use the shaded dropwizard metrics and remove the dependency

pom.xml

@@ -403,31 +403,6 @@
         <artifactId>jcommander</artifactId>
         <version>1.72</version>
       </dependency>
-
-      <dependency>
-        <groupId>io.dropwizard.metrics</groupId>
-        <artifactId>metrics-core</artifactId>
-        <version>${shaded.dropwizard.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.dropwizard.metrics</groupId>
-        <artifactId>metrics-jvm</artifactId>
-        <version>${shaded.dropwizard.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.dropwizard.metrics</groupId>
-        <artifactId>metrics-jmx</artifactId>
-        <version>${shaded.dropwizard.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.dropwizard.metrics</groupId>
-        <artifactId>metrics-ganglia</artifactId>
-        <version>${shaded.dropwizard.ganglia.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>

ratis-examples/pom.xml

@@ -97,11 +97,6 @@
       <artifactId>jcommander</artifactId>
     </dependency>
 
-    <dependency>
-       <groupId>io.dropwizard.metrics</groupId>
-       <artifactId>metrics-jvm</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>

ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/GrpcServerMetrics.java

@@ -17,13 +17,13 @@
  */
 package org.apache.ratis.grpc.metrics;
 
-import com.codahale.metrics.Gauge;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Gauge;
 import org.apache.ratis.metrics.MetricRegistryInfo;
 import org.apache.ratis.metrics.RatisMetricRegistry;
 import org.apache.ratis.metrics.RatisMetrics;
 import org.apache.ratis.thirdparty.com.google.common.annotations.VisibleForTesting;
 
-import com.codahale.metrics.Timer;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Timer;
 
 public class GrpcServerMetrics extends RatisMetrics {
   private static final String RATIS_GRPC_METRICS_APP_NAME = "ratis_grpc";

ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java

@@ -47,7 +47,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import com.codahale.metrics.Timer;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Timer;
 
 /**
  * A new log appender implementation using grpc bi-directional stream API.

ratis-grpc/src/test/java/org/apache/ratis/grpc/server/TestGrpcServerMetrics.java

@@ -30,7 +30,7 @@
 import java.util.SortedMap;
 import java.util.function.Consumer;
 
-import com.codahale.metrics.Gauge;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Gauge;
 import org.apache.ratis.grpc.metrics.GrpcServerMetrics;
 import org.apache.ratis.metrics.RatisMetricRegistry;
 import org.apache.ratis.proto.RaftProtos;

ratis-metrics/pom.xml

@@ -55,30 +55,5 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>io.dropwizard.metrics</groupId>
-      <artifactId>metrics-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.dropwizard.metrics</groupId>
-      <artifactId>metrics-jvm</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.dropwizard.metrics</groupId>
-      <artifactId>metrics-jmx</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.dropwizard.metrics</groupId>
-      <artifactId>metrics-ganglia</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.acplt</groupId>
-          <artifactId>oncrpc</artifactId>
-        </exclusion>
-      </exclusions>
-      <optional>true</optional>
-    </dependency>
   </dependencies>
 </project>

ratis-metrics/src/main/java/org/apache/ratis/metrics/JVMMetrics.java

@@ -17,10 +17,10 @@
  */
 package org.apache.ratis.metrics;
 
-import com.codahale.metrics.jvm.ClassLoadingGaugeSet;
-import com.codahale.metrics.jvm.GarbageCollectorMetricSet;
-import com.codahale.metrics.jvm.MemoryUsageGaugeSet;
-import com.codahale.metrics.jvm.ThreadStatesGaugeSet;
+import org.apache.ratis.thirdparty.com.codahale.metrics.jvm.ClassLoadingGaugeSet;
+import org.apache.ratis.thirdparty.com.codahale.metrics.jvm.GarbageCollectorMetricSet;
+import org.apache.ratis.thirdparty.com.codahale.metrics.jvm.MemoryUsageGaugeSet;
+import org.apache.ratis.thirdparty.com.codahale.metrics.jvm.ThreadStatesGaugeSet;
 import org.apache.ratis.util.TimeDuration;
 
 /**

ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricRegistryInfo.java

@@ -21,7 +21,7 @@
 
 import java.util.Objects;
 
-import com.codahale.metrics.MetricRegistry;
+import org.apache.ratis.thirdparty.com.codahale.metrics.*;
 
 /**
  *

ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricsReporting.java

@@ -20,8 +20,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
-import com.codahale.metrics.ConsoleReporter;
-import com.codahale.metrics.jmx.JmxReporter;
+import org.apache.ratis.thirdparty.com.codahale.metrics.*;
+import org.apache.ratis.thirdparty.com.codahale.metrics.jmx.JmxReporter;
 import org.apache.ratis.util.TimeDuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisMetricRegistry.java

@@ -19,17 +19,8 @@
 
 import java.util.SortedMap;
 
-import com.codahale.metrics.ConsoleReporter;
-import com.codahale.metrics.Counter;
-import com.codahale.metrics.Gauge;
-import com.codahale.metrics.Histogram;
-import com.codahale.metrics.Meter;
-import com.codahale.metrics.Metric;
-import com.codahale.metrics.MetricFilter;
-import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.MetricSet;
-import com.codahale.metrics.Timer;
-import com.codahale.metrics.jmx.JmxReporter;
+import org.apache.ratis.thirdparty.com.codahale.metrics.*;
+import org.apache.ratis.thirdparty.com.codahale.metrics.jmx.JmxReporter;
 import org.apache.ratis.thirdparty.com.google.common.annotations.VisibleForTesting;
 
 public interface RatisMetricRegistry {

ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisObjectNameFactory.java

@@ -18,8 +18,8 @@
 
 package org.apache.ratis.metrics;
 
-import com.codahale.metrics.jmx.JmxReporter;
-import com.codahale.metrics.jmx.ObjectNameFactory;
+import org.apache.ratis.thirdparty.com.codahale.metrics.jmx.JmxReporter;
+import org.apache.ratis.thirdparty.com.codahale.metrics.jmx.ObjectNameFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

ratis-metrics/src/main/java/org/apache/ratis/metrics/impl/RatisMetricRegistryImpl.java

@@ -20,20 +20,10 @@
 import java.util.Map;
 import java.util.SortedMap;
 
-import com.codahale.metrics.ConsoleReporter;
-import com.codahale.metrics.Counter;
-import com.codahale.metrics.Gauge;
-import com.codahale.metrics.Histogram;
-import com.codahale.metrics.Meter;
-import com.codahale.metrics.Metric;
-import com.codahale.metrics.MetricFilter;
-import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.MetricRegistry.MetricSupplier;
-import com.codahale.metrics.MetricSet;
-import com.codahale.metrics.Timer;
-import com.codahale.metrics.jmx.JmxReporter;
+import org.apache.ratis.thirdparty.com.codahale.metrics.*;
 import org.apache.ratis.metrics.MetricRegistryInfo;
 import org.apache.ratis.metrics.RatisMetricRegistry;
+import org.apache.ratis.thirdparty.com.codahale.metrics.jmx.JmxReporter;
 import org.apache.ratis.thirdparty.com.google.common.annotations.VisibleForTesting;
 
 /**
@@ -67,19 +57,19 @@ public boolean remove(String name) {
     return metricRegistry.remove(getMetricName(name));
   }
 
-  @Override public Gauge gauge(String name, MetricSupplier<Gauge> supplier) {
+  @Override public Gauge gauge(String name, MetricRegistry.MetricSupplier<Gauge> supplier) {
     return metricRegistry.gauge(getMetricName(name), supplier);
   }
 
-  @Override public Timer timer(String name, MetricSupplier<Timer> supplier) {
+  @Override public Timer timer(String name, MetricRegistry.MetricSupplier<Timer> supplier) {
     return metricRegistry.timer(getMetricName(name), supplier);
   }
 
   @Override public SortedMap<String, Gauge> getGauges(MetricFilter filter) {
     return metricRegistry.getGauges(filter);
   }
 
-  @Override public Counter counter(String name, MetricSupplier<Counter> supplier) {
+  @Override public Counter counter(String name, MetricRegistry.MetricSupplier<Counter> supplier) {
     return metricRegistry.counter(getMetricName(name), supplier);
   }
 
@@ -91,7 +81,7 @@ public boolean remove(String name) {
     return metricRegistry.meter(getMetricName(name));
   }
 
-  @Override public Meter meter(String name, MetricSupplier<Meter> supplier) {
+  @Override public Meter meter(String name, MetricRegistry.MetricSupplier<Meter> supplier) {
     return metricRegistry.meter(getMetricName(name), supplier);
   }
 

ratis-netty/src/main/java/org/apache/ratis/netty/metrics/NettyServerStreamRpcMetrics.java

@@ -17,7 +17,7 @@
  */
 package org.apache.ratis.netty.metrics;
 
-import com.codahale.metrics.Timer;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Timer;
 import org.apache.ratis.metrics.MetricRegistryInfo;
 import org.apache.ratis.metrics.RatisMetricRegistry;
 import org.apache.ratis.metrics.RatisMetrics;

ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java

@@ -58,7 +58,7 @@
 import static org.apache.ratis.util.LifeCycle.State.RUNNING;
 import static org.apache.ratis.util.LifeCycle.State.STARTING;
 
-import com.codahale.metrics.Timer;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Timer;
 
 /**
  * For a candidate to start an election for becoming the leader.

ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java

@@ -91,7 +91,7 @@
 import static org.apache.ratis.util.LifeCycle.State.RUNNING;
 import static org.apache.ratis.util.LifeCycle.State.STARTING;
 
-import com.codahale.metrics.Timer;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Timer;
 import org.apache.ratis.util.function.CheckedSupplier;
 
 class RaftServerImpl implements RaftServer.Division,

ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineMetrics.java

@@ -26,7 +26,7 @@
 
 import java.util.function.LongSupplier;
 
-import com.codahale.metrics.Timer;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Timer;
 
 /**
  * Metrics Registry for the State Machine Updater. One instance per group.

ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java

@@ -46,7 +46,7 @@
 import java.util.function.Consumer;
 import java.util.stream.LongStream;
 
-import com.codahale.metrics.Timer;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Timer;
 
 /**
  * This class tracks the log entries that have been committed in a quorum and

ratis-server/src/main/java/org/apache/ratis/server/metrics/LeaderElectionMetrics.java

@@ -24,7 +24,7 @@
 import org.apache.ratis.protocol.RaftGroupMemberId;
 import org.apache.ratis.util.Timestamp;
 
-import com.codahale.metrics.Timer;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Timer;
 
 import java.util.Optional;
 import java.util.function.LongSupplier;

ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftLogMetricsBase.java

@@ -18,7 +18,7 @@
 
 package org.apache.ratis.server.metrics;
 
-import com.codahale.metrics.Timer;
+import org.apache.ratis.thirdparty.com.codahale.metrics.*;
 import org.apache.ratis.metrics.MetricRegistryInfo;
 import org.apache.ratis.metrics.RatisMetricRegistry;
 import org.apache.ratis.metrics.RatisMetrics;

ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftServerMetricsImpl.java

@@ -26,9 +26,9 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import com.codahale.metrics.Counter;
-import com.codahale.metrics.Gauge;
-import com.codahale.metrics.Timer;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Counter;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Gauge;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Timer;
 
 import org.apache.ratis.metrics.MetricRegistryInfo;
 import org.apache.ratis.metrics.RatisMetricRegistry;

ratis-server/src/main/java/org/apache/ratis/server/metrics/SegmentedRaftLogMetrics.java

@@ -18,9 +18,7 @@
 
 package org.apache.ratis.server.metrics;
 
-import com.codahale.metrics.Gauge;
-import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.Timer;
+import org.apache.ratis.thirdparty.com.codahale.metrics.*;
 import org.apache.ratis.protocol.RaftGroupMemberId;
 import org.apache.ratis.server.raftlog.segmented.SegmentedRaftLogCache;
 import org.apache.ratis.util.DataQueue;

ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java

@@ -50,7 +50,7 @@
 import java.util.function.Consumer;
 import java.util.function.LongSupplier;
 
-import com.codahale.metrics.Timer;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Timer;
 
 /**
  * The RaftLog implementation that writes log entries into segmented files in

ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogReader.java

@@ -35,7 +35,7 @@
 import java.util.Optional;
 import java.util.zip.Checksum;
 
-import com.codahale.metrics.Timer;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Timer;
 
 class SegmentedRaftLogReader implements Closeable {
   static final Logger LOG = LoggerFactory.getLogger(SegmentedRaftLogReader.class);

ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogWorker.java

@@ -17,8 +17,8 @@
  */
 package org.apache.ratis.server.raftlog.segmented;
 
-import com.codahale.metrics.Gauge;
-import com.codahale.metrics.Timer;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Timer;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Gauge;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.ratis.conf.RaftProperties;
 import org.apache.ratis.proto.RaftProtos.StateMachineLogEntryProto;

ratis-server/src/main/java/org/apache/ratis/statemachine/impl/BaseStateMachine.java

@@ -18,7 +18,7 @@
 
 package org.apache.ratis.statemachine.impl;
 
-import com.codahale.metrics.Timer;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Timer;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.ratis.proto.RaftProtos;
 import org.apache.ratis.protocol.Message;

ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java

@@ -54,7 +54,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 
-import com.codahale.metrics.Gauge;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Gauge;
 
 public abstract class LogAppenderTests<CLUSTER extends MiniRaftCluster>
     extends BaseTest

ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java

@@ -17,7 +17,7 @@
  */
 package org.apache.ratis;
 
-import com.codahale.metrics.Gauge;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Gauge;
 import org.apache.log4j.Level;
 import org.apache.ratis.RaftTestUtil.SimpleMessage;
 import org.apache.ratis.client.RaftClient;

ratis-server/src/test/java/org/apache/ratis/server/impl/LeaderElectionTests.java

@@ -65,7 +65,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import com.codahale.metrics.Timer;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Timer;
 
 public abstract class LeaderElectionTests<CLUSTER extends MiniRaftCluster>
     extends BaseTest

ratis-server/src/test/java/org/apache/ratis/server/impl/TestLogAppenderMetrics.java

@@ -31,7 +31,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.codahale.metrics.Gauge;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Gauge;
 
 public class TestLogAppenderMetrics {
 

ratis-server/src/test/java/org/apache/ratis/server/impl/TestRetryCacheMetrics.java

@@ -21,7 +21,7 @@
 import static org.apache.ratis.server.metrics.RaftServerMetricsImpl.*;
 import static org.junit.Assert.assertEquals;
 
-import com.codahale.metrics.Gauge;
+import org.apache.ratis.thirdparty.com.codahale.metrics.Gauge;
 import org.apache.ratis.metrics.RatisMetricRegistry;
 import org.apache.ratis.protocol.ClientInvocationId;
 import org.apache.ratis.protocol.ClientId;