diff --git a/pom.xml b/pom.xml index 840e169805..c9f33a2cce 100644 --- a/pom.xml +++ b/pom.xml @@ -403,31 +403,6 @@ jcommander 1.72 - - - io.dropwizard.metrics - metrics-core - ${shaded.dropwizard.version} - - - - io.dropwizard.metrics - metrics-jvm - ${shaded.dropwizard.version} - - - - io.dropwizard.metrics - metrics-jmx - ${shaded.dropwizard.version} - - - - io.dropwizard.metrics - metrics-ganglia - ${shaded.dropwizard.ganglia.version} - - junit junit diff --git a/ratis-examples/pom.xml b/ratis-examples/pom.xml index 9c1c51223b..ecf5afb628 100644 --- a/ratis-examples/pom.xml +++ b/ratis-examples/pom.xml @@ -97,11 +97,6 @@ jcommander - - io.dropwizard.metrics - metrics-jvm - - org.slf4j slf4j-api diff --git a/ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/GrpcServerMetrics.java b/ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/GrpcServerMetrics.java index 01859c2967..0bc400d6bc 100644 --- a/ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/GrpcServerMetrics.java +++ b/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"; diff --git a/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java b/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java index 4c7fd6e2ab..65bb62b61b 100644 --- a/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java +++ b/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. diff --git a/ratis-grpc/src/test/java/org/apache/ratis/grpc/server/TestGrpcServerMetrics.java b/ratis-grpc/src/test/java/org/apache/ratis/grpc/server/TestGrpcServerMetrics.java index bc54300c59..252a0dc2e0 100644 --- a/ratis-grpc/src/test/java/org/apache/ratis/grpc/server/TestGrpcServerMetrics.java +++ b/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; diff --git a/ratis-metrics/pom.xml b/ratis-metrics/pom.xml index e8a01b4f1d..96e8716521 100644 --- a/ratis-metrics/pom.xml +++ b/ratis-metrics/pom.xml @@ -55,30 +55,5 @@ mockito-core test - - - io.dropwizard.metrics - metrics-core - - - io.dropwizard.metrics - metrics-jvm - true - - - io.dropwizard.metrics - metrics-jmx - - - io.dropwizard.metrics - metrics-ganglia - - - org.acplt - oncrpc - - - true - diff --git a/ratis-metrics/src/main/java/org/apache/ratis/metrics/JVMMetrics.java b/ratis-metrics/src/main/java/org/apache/ratis/metrics/JVMMetrics.java index 1e5ee846b6..402b6df633 100644 --- a/ratis-metrics/src/main/java/org/apache/ratis/metrics/JVMMetrics.java +++ b/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; /** diff --git a/ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricRegistryInfo.java b/ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricRegistryInfo.java index 1d9f2f10b0..5563b96d11 100644 --- a/ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricRegistryInfo.java +++ b/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.*; /** * diff --git a/ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricsReporting.java b/ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricsReporting.java index 1aee82f1b5..df51420f07 100644 --- a/ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricsReporting.java +++ b/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; diff --git a/ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisMetricRegistry.java b/ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisMetricRegistry.java index d4ee1738d4..388f9f4e03 100644 --- a/ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisMetricRegistry.java +++ b/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 { diff --git a/ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisObjectNameFactory.java b/ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisObjectNameFactory.java index 7dda6c858d..dd790f6ac3 100644 --- a/ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisObjectNameFactory.java +++ b/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; diff --git a/ratis-metrics/src/main/java/org/apache/ratis/metrics/impl/RatisMetricRegistryImpl.java b/ratis-metrics/src/main/java/org/apache/ratis/metrics/impl/RatisMetricRegistryImpl.java index 4e42731372..1b33efb8d6 100644 --- a/ratis-metrics/src/main/java/org/apache/ratis/metrics/impl/RatisMetricRegistryImpl.java +++ b/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,11 +57,11 @@ public boolean remove(String name) { return metricRegistry.remove(getMetricName(name)); } - @Override public Gauge gauge(String name, MetricSupplier supplier) { + @Override public Gauge gauge(String name, MetricRegistry.MetricSupplier supplier) { return metricRegistry.gauge(getMetricName(name), supplier); } - @Override public Timer timer(String name, MetricSupplier supplier) { + @Override public Timer timer(String name, MetricRegistry.MetricSupplier supplier) { return metricRegistry.timer(getMetricName(name), supplier); } @@ -79,7 +69,7 @@ public boolean remove(String name) { return metricRegistry.getGauges(filter); } - @Override public Counter counter(String name, MetricSupplier supplier) { + @Override public Counter counter(String name, MetricRegistry.MetricSupplier 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 supplier) { + @Override public Meter meter(String name, MetricRegistry.MetricSupplier supplier) { return metricRegistry.meter(getMetricName(name), supplier); } diff --git a/ratis-netty/src/main/java/org/apache/ratis/netty/metrics/NettyServerStreamRpcMetrics.java b/ratis-netty/src/main/java/org/apache/ratis/netty/metrics/NettyServerStreamRpcMetrics.java index 33f36328ee..6c8125508a 100644 --- a/ratis-netty/src/main/java/org/apache/ratis/netty/metrics/NettyServerStreamRpcMetrics.java +++ b/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; diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java index 1255046cd9..a6d9b6d1a5 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java +++ b/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. diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java index 5b7be2e2f3..32471dde82 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java +++ b/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, diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineMetrics.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineMetrics.java index 02aaefa6f0..3466f3f67b 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineMetrics.java +++ b/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. diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java index 87aac06b21..1d9b85e79d 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java +++ b/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 diff --git a/ratis-server/src/main/java/org/apache/ratis/server/metrics/LeaderElectionMetrics.java b/ratis-server/src/main/java/org/apache/ratis/server/metrics/LeaderElectionMetrics.java index ef4ca8d338..8b1b701a28 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/metrics/LeaderElectionMetrics.java +++ b/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; diff --git a/ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftLogMetricsBase.java b/ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftLogMetricsBase.java index aef6398d82..fc40082fb3 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftLogMetricsBase.java +++ b/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; diff --git a/ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftServerMetricsImpl.java b/ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftServerMetricsImpl.java index 4a0a9f336f..210bf7d1eb 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftServerMetricsImpl.java +++ b/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; diff --git a/ratis-server/src/main/java/org/apache/ratis/server/metrics/SegmentedRaftLogMetrics.java b/ratis-server/src/main/java/org/apache/ratis/server/metrics/SegmentedRaftLogMetrics.java index f359e1a0b6..80ad0df580 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/metrics/SegmentedRaftLogMetrics.java +++ b/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; diff --git a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java index f03095cac8..e5f4ab87af 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java +++ b/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 diff --git a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogReader.java b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogReader.java index dc67d31c47..98cd9022d0 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogReader.java +++ b/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); diff --git a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogWorker.java b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogWorker.java index a9e4b13fa9..e19584eff3 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogWorker.java +++ b/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; diff --git a/ratis-server/src/main/java/org/apache/ratis/statemachine/impl/BaseStateMachine.java b/ratis-server/src/main/java/org/apache/ratis/statemachine/impl/BaseStateMachine.java index 2dd41ee5de..9cc4c5b215 100644 --- a/ratis-server/src/main/java/org/apache/ratis/statemachine/impl/BaseStateMachine.java +++ b/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; diff --git a/ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java b/ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java index 0a0fdbe374..b187dabaef 100644 --- a/ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java +++ b/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 extends BaseTest diff --git a/ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java b/ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java index 7fdd4b9d1f..5f09c86d25 100644 --- a/ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java +++ b/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; diff --git a/ratis-server/src/test/java/org/apache/ratis/server/impl/LeaderElectionTests.java b/ratis-server/src/test/java/org/apache/ratis/server/impl/LeaderElectionTests.java index 08e7d22d4e..b988d3f4fd 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/impl/LeaderElectionTests.java +++ b/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 extends BaseTest diff --git a/ratis-server/src/test/java/org/apache/ratis/server/impl/TestLogAppenderMetrics.java b/ratis-server/src/test/java/org/apache/ratis/server/impl/TestLogAppenderMetrics.java index 30c547b95b..07870f981f 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/impl/TestLogAppenderMetrics.java +++ b/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 { diff --git a/ratis-server/src/test/java/org/apache/ratis/server/impl/TestRetryCacheMetrics.java b/ratis-server/src/test/java/org/apache/ratis/server/impl/TestRetryCacheMetrics.java index 37032381b3..93d466b521 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/impl/TestRetryCacheMetrics.java +++ b/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; diff --git a/ratis-server/src/test/java/org/apache/ratis/server/metrics/TestLeaderElectionMetrics.java b/ratis-server/src/test/java/org/apache/ratis/server/metrics/TestLeaderElectionMetrics.java index af000f3a8e..3592afc58f 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/metrics/TestLeaderElectionMetrics.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/metrics/TestLeaderElectionMetrics.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import com.codahale.metrics.Gauge; +import org.apache.ratis.thirdparty.com.codahale.metrics.Gauge; import org.apache.ratis.BaseTest; import org.apache.ratis.metrics.RatisMetricRegistry; import org.apache.ratis.protocol.RaftGroupId; diff --git a/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java b/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java index 9538be62c9..d168b7e2f7 100644 --- a/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java +++ b/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java @@ -61,8 +61,8 @@ import java.util.stream.Collectors; import java.util.stream.LongStream; -import com.codahale.metrics.Counter; -import com.codahale.metrics.Timer; +import org.apache.ratis.thirdparty.com.codahale.metrics.Counter; +import org.apache.ratis.thirdparty.com.codahale.metrics.Timer; public abstract class RaftSnapshotBaseTest extends BaseTest { { diff --git a/ratis-test/pom.xml b/ratis-test/pom.xml index 2da4434448..ce05786a92 100644 --- a/ratis-test/pom.xml +++ b/ratis-test/pom.xml @@ -99,12 +99,6 @@ mockito-core test - - - io.dropwizard.metrics - metrics-jvm - test - org.apache.ratis ratis-shell diff --git a/ratis-test/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java b/ratis-test/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java index fded493bd8..9b850e2756 100644 --- a/ratis-test/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java +++ b/ratis-test/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java @@ -44,7 +44,7 @@ import java.util.SortedMap; import java.util.concurrent.TimeUnit; -import com.codahale.metrics.Gauge; +import org.apache.ratis.thirdparty.com.codahale.metrics.Gauge; /** * Test Raft Server Slowness detection and notification to Leader's statemachine. diff --git a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftServerWithGrpc.java b/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftServerWithGrpc.java index 16e11f7d30..509916db53 100644 --- a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftServerWithGrpc.java +++ b/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftServerWithGrpc.java @@ -26,7 +26,7 @@ import static org.apache.ratis.server.metrics.RaftServerMetricsImpl.REQUEST_BYTE_SIZE_LIMIT_HIT_COUNTER; import static org.apache.ratis.server.metrics.RaftServerMetricsImpl.RESOURCE_LIMIT_HIT_COUNTER; -import com.codahale.metrics.Gauge; +import org.apache.ratis.thirdparty.com.codahale.metrics.Gauge; import org.apache.log4j.Level; import org.apache.ratis.BaseTest; import org.apache.ratis.protocol.RaftGroup; diff --git a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftSnapshotWithGrpc.java b/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftSnapshotWithGrpc.java index 38301772d8..2c72df09f2 100644 --- a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftSnapshotWithGrpc.java +++ b/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftSnapshotWithGrpc.java @@ -27,7 +27,7 @@ import org.apache.ratis.statemachine.RaftSnapshotBaseTest; import org.junit.Assert; -import com.codahale.metrics.Counter; +import org.apache.ratis.thirdparty.com.codahale.metrics.Counter; public class TestRaftSnapshotWithGrpc extends RaftSnapshotBaseTest { @Override diff --git a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/TestRaftLogMetrics.java b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/TestRaftLogMetrics.java index e5f7f7055d..92a9a90ddf 100644 --- a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/TestRaftLogMetrics.java +++ b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/TestRaftLogMetrics.java @@ -17,7 +17,7 @@ */ package org.apache.ratis.server.raftlog; -import com.codahale.metrics.Timer; +import org.apache.ratis.thirdparty.com.codahale.metrics.Timer; import org.apache.ratis.BaseTest; import org.apache.ratis.RaftTestUtil; import org.apache.ratis.client.RaftClient; diff --git a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestLogSegment.java b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestLogSegment.java index fca2974f02..8765196349 100644 --- a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestLogSegment.java +++ b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestLogSegment.java @@ -52,7 +52,7 @@ import static org.apache.ratis.server.raftlog.RaftLog.INVALID_LOG_INDEX; import static org.apache.ratis.server.raftlog.segmented.LogSegment.getEntrySize; -import com.codahale.metrics.Timer; +import org.apache.ratis.thirdparty.com.codahale.metrics.Timer; /** * Test basic functionality of {@link LogSegment} diff --git a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLog.java b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLog.java index 50ec159b2c..b4bb098a89 100644 --- a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLog.java +++ b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLog.java @@ -67,7 +67,7 @@ import java.util.function.LongSupplier; import java.util.function.Supplier; -import com.codahale.metrics.Timer; +import org.apache.ratis.thirdparty.com.codahale.metrics.Timer; public class TestSegmentedRaftLog extends BaseTest { static {