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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
szetszwo merged 2 commits into from
Jul 7, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
458c5e5
Use the shaded dropwizard metrics and remove the dependency
codings-dan Jul 7, 2022
cea387e
replace code
codings-dan Jul 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
5 changes: 0 additions & 5 deletions ratis-examples/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/GrpcServerMetrics.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ratis-grpc/src/test/java/org/apache/ratis/grpc/server/TestGrpcServerMetrics.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down
25 changes: 0 additions & 25 deletions ratis-metrics/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
8 changes: 4 additions & 4 deletions ratis-metrics/src/main/java/org/apache/ratis/metrics/JVMMetrics.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricRegistryInfo.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@

import java.util.Objects;

import com.codahale.metrics.MetricRegistry;
import org.apache.ratis.thirdparty.com.codahale.metrics.*;

/**
*
Expand Down
4 changes: 2 additions & 2 deletions ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricsReporting.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down
13 changes: 2 additions & 11 deletions ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisMetricRegistry.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisObjectNameFactory.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

Expand Down
22 changes: 6 additions & 16 deletions ratis-metrics/src/main/java/org/apache/ratis/metrics/impl/RatisMetricRegistryImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

/**
Expand DownExpand Up@@ -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);
}

Expand All@@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion ratis-netty/src/main/java/org/apache/ratis/netty/metrics/NettyServerStreamRpcMetrics.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineMetrics.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ratis-server/src/main/java/org/apache/ratis/server/metrics/LeaderElectionMetrics.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftLogMetricsBase.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftServerMetricsImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions ratis-server/src/main/java/org/apache/ratis/server/metrics/SegmentedRaftLogMetrics.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...erver/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogReader.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ...erver/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogWorker.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ratis-server/src/main/java/org/apache/ratis/statemachine/impl/BaseStateMachine.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ratis-server/src/test/java/org/apache/ratis/server/impl/LeaderElectionTests.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ratis-server/src/test/java/org/apache/ratis/server/impl/TestLogAppenderMetrics.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion ratis-server/src/test/java/org/apache/ratis/server/impl/TestRetryCacheMetrics.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
RATIS-1601. Use the shaded dropwizard metrics and remove the dependency#671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

szetszwo
merged 2 commits into

from

Jul 7, 2022
 Merged


RATIS-1601. Use the shaded dropwizard metrics and remove the dependency
#671
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
458c5e5

Use the shaded dropwizard metrics and remove the dependency


codings-dan Jul 7, 2022
cea387e

replace code


codings-dan Jul 7, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


25 changes: 0 additions & 25 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

5 changes: 0 additions & 5 deletions
ratis-examples/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

4 changes: 2 additions & 2 deletions
ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/GrpcServerMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand Down

2 changes: 1 addition & 1 deletion
ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

2 changes: 1 addition & 1 deletion
ratis-grpc/src/test/java/org/apache/ratis/grpc/server/TestGrpcServerMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

25 changes: 0 additions & 25 deletions
ratis-metrics/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

8 changes: 4 additions & 4 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/JVMMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

/**
Expand Down

2 changes: 1 addition & 1 deletion
ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricRegistryInfo.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@

import java.util.Objects;

import com.codahale.metrics.MetricRegistry;
import org.apache.ratis.thirdparty.com.codahale.metrics.*;

/**
 *
Expand Down

4 changes: 2 additions & 2 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricsReporting.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

13 changes: 2 additions & 11 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisMetricRegistry.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {
Expand Down

4 changes: 2 additions & 2 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisObjectNameFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

Expand Down

22 changes: 6 additions & 16 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/impl/RatisMetricRegistryImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

/**
Expand DownExpand Up@@ -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);
 }

Expand All@@ -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);
 }

Expand Down

2 changes: 1 addition & 1 deletion
ratis-netty/src/main/java/org/apache/ratis/netty/metrics/NettyServerStreamRpcMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/metrics/LeaderElectionMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftLogMetricsBase.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

6 changes: 3 additions & 3 deletions
ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftServerMetricsImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

4 changes: 1 addition & 3 deletions
ratis-server/src/main/java/org/apache/ratis/server/metrics/SegmentedRaftLogMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
...erver/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogReader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

4 changes: 2 additions & 2 deletions
...erver/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogWorker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/statemachine/impl/BaseStateMachine.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/server/impl/LeaderElectionTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/server/impl/TestLogAppenderMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {

Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/server/impl/TestRetryCacheMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
RATIS-1601. Use the shaded dropwizard metrics and remove the dependency#671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

szetszwo
merged 2 commits into

from

Jul 7, 2022
 Merged


RATIS-1601. Use the shaded dropwizard metrics and remove the dependency
#671
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
458c5e5

Use the shaded dropwizard metrics and remove the dependency


codings-dan Jul 7, 2022
cea387e

replace code


codings-dan Jul 7, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


25 changes: 0 additions & 25 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

5 changes: 0 additions & 5 deletions
ratis-examples/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

4 changes: 2 additions & 2 deletions
ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/GrpcServerMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand Down

2 changes: 1 addition & 1 deletion
ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

2 changes: 1 addition & 1 deletion
ratis-grpc/src/test/java/org/apache/ratis/grpc/server/TestGrpcServerMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

25 changes: 0 additions & 25 deletions
ratis-metrics/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

8 changes: 4 additions & 4 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/JVMMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

/**
Expand Down

2 changes: 1 addition & 1 deletion
ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricRegistryInfo.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@

import java.util.Objects;

import com.codahale.metrics.MetricRegistry;
import org.apache.ratis.thirdparty.com.codahale.metrics.*;

/**
 *
Expand Down

4 changes: 2 additions & 2 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricsReporting.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

13 changes: 2 additions & 11 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisMetricRegistry.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {
Expand Down

4 changes: 2 additions & 2 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisObjectNameFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

Expand Down

22 changes: 6 additions & 16 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/impl/RatisMetricRegistryImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

/**
Expand DownExpand Up@@ -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);
 }

Expand All@@ -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);
 }

Expand Down

2 changes: 1 addition & 1 deletion
ratis-netty/src/main/java/org/apache/ratis/netty/metrics/NettyServerStreamRpcMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/metrics/LeaderElectionMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftLogMetricsBase.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

6 changes: 3 additions & 3 deletions
ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftServerMetricsImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

4 changes: 1 addition & 3 deletions
ratis-server/src/main/java/org/apache/ratis/server/metrics/SegmentedRaftLogMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
...erver/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogReader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

4 changes: 2 additions & 2 deletions
...erver/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogWorker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/statemachine/impl/BaseStateMachine.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/server/impl/LeaderElectionTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/server/impl/TestLogAppenderMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {

Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/server/impl/TestRetryCacheMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
RATIS-1601. Use the shaded dropwizard metrics and remove the dependency#671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

szetszwo
merged 2 commits into

from

Jul 7, 2022
 Merged


RATIS-1601. Use the shaded dropwizard metrics and remove the dependency
#671
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
458c5e5

Use the shaded dropwizard metrics and remove the dependency


codings-dan Jul 7, 2022
cea387e

replace code


codings-dan Jul 7, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


25 changes: 0 additions & 25 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

5 changes: 0 additions & 5 deletions
ratis-examples/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

4 changes: 2 additions & 2 deletions
ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/GrpcServerMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand Down

2 changes: 1 addition & 1 deletion
ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

2 changes: 1 addition & 1 deletion
ratis-grpc/src/test/java/org/apache/ratis/grpc/server/TestGrpcServerMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

25 changes: 0 additions & 25 deletions
ratis-metrics/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

8 changes: 4 additions & 4 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/JVMMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

/**
Expand Down

2 changes: 1 addition & 1 deletion
ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricRegistryInfo.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@

import java.util.Objects;

import com.codahale.metrics.MetricRegistry;
import org.apache.ratis.thirdparty.com.codahale.metrics.*;

/**
 *
Expand Down

4 changes: 2 additions & 2 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricsReporting.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

13 changes: 2 additions & 11 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisMetricRegistry.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {
Expand Down

4 changes: 2 additions & 2 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisObjectNameFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

Expand Down

22 changes: 6 additions & 16 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/impl/RatisMetricRegistryImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

/**
Expand DownExpand Up@@ -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);
 }

Expand All@@ -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);
 }

Expand Down

2 changes: 1 addition & 1 deletion
ratis-netty/src/main/java/org/apache/ratis/netty/metrics/NettyServerStreamRpcMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/metrics/LeaderElectionMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftLogMetricsBase.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

6 changes: 3 additions & 3 deletions
ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftServerMetricsImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

4 changes: 1 addition & 3 deletions
ratis-server/src/main/java/org/apache/ratis/server/metrics/SegmentedRaftLogMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
...erver/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogReader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

4 changes: 2 additions & 2 deletions
...erver/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogWorker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/statemachine/impl/BaseStateMachine.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/server/impl/LeaderElectionTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/server/impl/TestLogAppenderMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {

Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/server/impl/TestRetryCacheMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
RATIS-1601. Use the shaded dropwizard metrics and remove the dependency#671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

szetszwo
merged 2 commits into

from

Jul 7, 2022
 Merged


RATIS-1601. Use the shaded dropwizard metrics and remove the dependency
#671
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
458c5e5

Use the shaded dropwizard metrics and remove the dependency


codings-dan Jul 7, 2022
cea387e

replace code


codings-dan Jul 7, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


25 changes: 0 additions & 25 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

5 changes: 0 additions & 5 deletions
ratis-examples/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

4 changes: 2 additions & 2 deletions
ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/GrpcServerMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand Down

2 changes: 1 addition & 1 deletion
ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

2 changes: 1 addition & 1 deletion
ratis-grpc/src/test/java/org/apache/ratis/grpc/server/TestGrpcServerMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

25 changes: 0 additions & 25 deletions
ratis-metrics/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

8 changes: 4 additions & 4 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/JVMMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

/**
Expand Down

2 changes: 1 addition & 1 deletion
ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricRegistryInfo.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@

import java.util.Objects;

import com.codahale.metrics.MetricRegistry;
import org.apache.ratis.thirdparty.com.codahale.metrics.*;

/**
 *
Expand Down

4 changes: 2 additions & 2 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricsReporting.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

13 changes: 2 additions & 11 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisMetricRegistry.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {
Expand Down

4 changes: 2 additions & 2 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisObjectNameFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

Expand Down

22 changes: 6 additions & 16 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/impl/RatisMetricRegistryImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

/**
Expand DownExpand Up@@ -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);
 }

Expand All@@ -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);
 }

Expand Down

2 changes: 1 addition & 1 deletion
ratis-netty/src/main/java/org/apache/ratis/netty/metrics/NettyServerStreamRpcMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/metrics/LeaderElectionMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftLogMetricsBase.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

6 changes: 3 additions & 3 deletions
ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftServerMetricsImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

4 changes: 1 addition & 3 deletions
ratis-server/src/main/java/org/apache/ratis/server/metrics/SegmentedRaftLogMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
...erver/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogReader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

4 changes: 2 additions & 2 deletions
...erver/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogWorker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/statemachine/impl/BaseStateMachine.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/server/impl/LeaderElectionTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/server/impl/TestLogAppenderMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {

Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/server/impl/TestRetryCacheMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
RATIS-1601. Use the shaded dropwizard metrics and remove the dependency#671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

szetszwo
merged 2 commits into

from

Jul 7, 2022
 Merged


RATIS-1601. Use the shaded dropwizard metrics and remove the dependency
#671
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
458c5e5

Use the shaded dropwizard metrics and remove the dependency


codings-dan Jul 7, 2022
cea387e

replace code


codings-dan Jul 7, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


25 changes: 0 additions & 25 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

5 changes: 0 additions & 5 deletions
ratis-examples/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

4 changes: 2 additions & 2 deletions
ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/GrpcServerMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand Down

2 changes: 1 addition & 1 deletion
ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

2 changes: 1 addition & 1 deletion
ratis-grpc/src/test/java/org/apache/ratis/grpc/server/TestGrpcServerMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

25 changes: 0 additions & 25 deletions
ratis-metrics/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

8 changes: 4 additions & 4 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/JVMMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

/**
Expand Down

2 changes: 1 addition & 1 deletion
ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricRegistryInfo.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@

import java.util.Objects;

import com.codahale.metrics.MetricRegistry;
import org.apache.ratis.thirdparty.com.codahale.metrics.*;

/**
 *
Expand Down

4 changes: 2 additions & 2 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricsReporting.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

13 changes: 2 additions & 11 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisMetricRegistry.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {
Expand Down

4 changes: 2 additions & 2 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisObjectNameFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

Expand Down

22 changes: 6 additions & 16 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/impl/RatisMetricRegistryImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

/**
Expand DownExpand Up@@ -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);
 }

Expand All@@ -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);
 }

Expand Down

2 changes: 1 addition & 1 deletion
ratis-netty/src/main/java/org/apache/ratis/netty/metrics/NettyServerStreamRpcMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/metrics/LeaderElectionMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftLogMetricsBase.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

6 changes: 3 additions & 3 deletions
ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftServerMetricsImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

4 changes: 1 addition & 3 deletions
ratis-server/src/main/java/org/apache/ratis/server/metrics/SegmentedRaftLogMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
...erver/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogReader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

4 changes: 2 additions & 2 deletions
...erver/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogWorker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/statemachine/impl/BaseStateMachine.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/server/impl/LeaderElectionTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/server/impl/TestLogAppenderMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {

Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/server/impl/TestRetryCacheMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
RATIS-1601. Use the shaded dropwizard metrics and remove the dependency#671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

szetszwo
merged 2 commits into

from

Jul 7, 2022
 Merged


RATIS-1601. Use the shaded dropwizard metrics and remove the dependency
#671
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
458c5e5

Use the shaded dropwizard metrics and remove the dependency


codings-dan Jul 7, 2022
cea387e

replace code


codings-dan Jul 7, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


25 changes: 0 additions & 25 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

5 changes: 0 additions & 5 deletions
ratis-examples/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

4 changes: 2 additions & 2 deletions
ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/GrpcServerMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand Down

2 changes: 1 addition & 1 deletion
ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

2 changes: 1 addition & 1 deletion
ratis-grpc/src/test/java/org/apache/ratis/grpc/server/TestGrpcServerMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

25 changes: 0 additions & 25 deletions
ratis-metrics/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

8 changes: 4 additions & 4 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/JVMMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

/**
Expand Down

2 changes: 1 addition & 1 deletion
ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricRegistryInfo.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@

import java.util.Objects;

import com.codahale.metrics.MetricRegistry;
import org.apache.ratis.thirdparty.com.codahale.metrics.*;

/**
 *
Expand Down

4 changes: 2 additions & 2 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricsReporting.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

13 changes: 2 additions & 11 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisMetricRegistry.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {
Expand Down

4 changes: 2 additions & 2 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisObjectNameFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

Expand Down

22 changes: 6 additions & 16 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/impl/RatisMetricRegistryImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

/**
Expand DownExpand Up@@ -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);
 }

Expand All@@ -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);
 }

Expand Down

2 changes: 1 addition & 1 deletion
ratis-netty/src/main/java/org/apache/ratis/netty/metrics/NettyServerStreamRpcMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/metrics/LeaderElectionMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftLogMetricsBase.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

6 changes: 3 additions & 3 deletions
ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftServerMetricsImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

4 changes: 1 addition & 3 deletions
ratis-server/src/main/java/org/apache/ratis/server/metrics/SegmentedRaftLogMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
...erver/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogReader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

4 changes: 2 additions & 2 deletions
...erver/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogWorker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/statemachine/impl/BaseStateMachine.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/server/impl/LeaderElectionTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/server/impl/TestLogAppenderMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {

Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/server/impl/TestRetryCacheMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
RATIS-1601. Use the shaded dropwizard metrics and remove the dependency#671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

szetszwo
merged 2 commits into

from

Jul 7, 2022
 Merged


RATIS-1601. Use the shaded dropwizard metrics and remove the dependency
#671
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
458c5e5

Use the shaded dropwizard metrics and remove the dependency


codings-dan Jul 7, 2022
cea387e

replace code


codings-dan Jul 7, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


25 changes: 0 additions & 25 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

5 changes: 0 additions & 5 deletions
ratis-examples/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

4 changes: 2 additions & 2 deletions
ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/GrpcServerMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand Down

2 changes: 1 addition & 1 deletion
ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

2 changes: 1 addition & 1 deletion
ratis-grpc/src/test/java/org/apache/ratis/grpc/server/TestGrpcServerMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

25 changes: 0 additions & 25 deletions
ratis-metrics/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

8 changes: 4 additions & 4 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/JVMMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

/**
Expand Down

2 changes: 1 addition & 1 deletion
ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricRegistryInfo.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@

import java.util.Objects;

import com.codahale.metrics.MetricRegistry;
import org.apache.ratis.thirdparty.com.codahale.metrics.*;

/**
 *
Expand Down

4 changes: 2 additions & 2 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricsReporting.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

13 changes: 2 additions & 11 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisMetricRegistry.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {
Expand Down

4 changes: 2 additions & 2 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/RatisObjectNameFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

Expand Down

22 changes: 6 additions & 16 deletions
ratis-metrics/src/main/java/org/apache/ratis/metrics/impl/RatisMetricRegistryImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

/**
Expand DownExpand Up@@ -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);
 }

Expand All@@ -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);
 }

Expand Down

2 changes: 1 addition & 1 deletion
ratis-netty/src/main/java/org/apache/ratis/netty/metrics/NettyServerStreamRpcMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/metrics/LeaderElectionMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftLogMetricsBase.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

6 changes: 3 additions & 3 deletions
ratis-server/src/main/java/org/apache/ratis/server/metrics/RaftServerMetricsImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

4 changes: 1 addition & 3 deletions
ratis-server/src/main/java/org/apache/ratis/server/metrics/SegmentedRaftLogMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
...erver/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogReader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

4 changes: 2 additions & 2 deletions
...erver/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogWorker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/main/java/org/apache/ratis/statemachine/impl/BaseStateMachine.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/server/impl/LeaderElectionTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/server/impl/TestLogAppenderMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {

Expand Down

2 changes: 1 addition & 1 deletion
ratis-server/src/test/java/org/apache/ratis/server/impl/TestRetryCacheMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down
Loading