diff --git a/.build/parent-pom-template.xml b/.build/parent-pom-template.xml index 8c39e531fa..41791f3767 100644 --- a/.build/parent-pom-template.xml +++ b/.build/parent-pom-template.xml @@ -418,12 +418,12 @@ ch.qos.logback logback-core - 1.2.9 + 1.2.12 ch.qos.logback logback-classic - 1.2.9 + 1.2.12 com.fasterxml.jackson.core @@ -678,17 +678,39 @@ io.dropwizard.metrics metrics-core - 3.1.5 + 4.2.19 + + + org.slf4j + slf4j-api + + io.dropwizard.metrics metrics-jvm - 3.1.5 + 4.2.19 + + + org.slf4j + slf4j-api + + io.dropwizard.metrics metrics-logback - 3.1.5 + 4.2.19 + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + com.addthis.metrics @@ -920,7 +942,7 @@ com.datastax.cassandra cassandra-driver-core - 3.11.0 + 3.11.5 shaded diff --git a/CHANGES.txt b/CHANGES.txt index 91b5320c18..bca22c4580 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 5.0-alpha2 + * Upgrade Dropwizard Metrics to 4.2.19 (CASSANDRA-14667) * Upgrade caffeine cache and fix CIDR permissions cache invalidation (CASSANDRA-18805) * Remove deprecated properties in CompressionParams (CASSANDRA-18742) * Add support for repair coordinator to retry messages that timeout (CASSANDRA-18816) diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java index 1adc15df95..b99ae46fe5 100644 --- a/src/java/org/apache/cassandra/tools/NodeProbe.java +++ b/src/java/org/apache/cassandra/tools/NodeProbe.java @@ -112,7 +112,6 @@ import org.apache.cassandra.streaming.StreamState; import org.apache.cassandra.streaming.management.StreamStateCompositeData; import org.apache.cassandra.tools.nodetool.formatter.TableBuilder; -import com.codahale.metrics.JmxReporter; import com.google.common.base.Function; import com.google.common.base.Strings; import com.google.common.collect.HashMultimap; @@ -1833,10 +1832,10 @@ public class NodeProbe implements AutoCloseable case ThreadPoolMetrics.PENDING_TASKS: case ThreadPoolMetrics.COMPLETED_TASKS: case ThreadPoolMetrics.MAX_POOL_SIZE: - return JMX.newMBeanProxy(mbeanServerConn, oName, JmxReporter.JmxGaugeMBean.class).getValue(); + return JMX.newMBeanProxy(mbeanServerConn, oName, CassandraMetricsRegistry.JmxGaugeMBean.class).getValue(); case ThreadPoolMetrics.TOTAL_BLOCKED_TASKS: case ThreadPoolMetrics.CURRENTLY_BLOCKED_TASKS: - return JMX.newMBeanProxy(mbeanServerConn, oName, JmxReporter.JmxCounterMBean.class).getCount(); + return JMX.newMBeanProxy(mbeanServerConn, oName, CassandraMetricsRegistry.JmxCounterMBean.class).getCount(); default: throw new AssertionError("Unknown ThreadPools metric name " + metricName); } diff --git a/test/unit/org/apache/cassandra/tools/nodetool/ClientStatsTest.java b/test/unit/org/apache/cassandra/tools/nodetool/ClientStatsTest.java index d39fc63694..d5b01730ef 100644 --- a/test/unit/org/apache/cassandra/tools/nodetool/ClientStatsTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/ClientStatsTest.java @@ -166,7 +166,7 @@ public class ClientStatsTest tool.assertOnCleanExit(); String stdout = tool.getStdout(); assertThat(stdout).containsPattern("Address +SSL +Cipher +Protocol +Version +User +Keyspace +Requests +Driver-Name +Driver-Version"); - assertThat(stdout).containsPattern("/127.0.0.1:[0-9]+ false undefined undefined [0-9]+ +anonymous +[0-9]+ +DataStax Java Driver 3.11.0"); + assertThat(stdout).containsPattern("/127.0.0.1:[0-9]+ false undefined undefined [0-9]+ +anonymous +[0-9]+ +DataStax Java Driver 3.11.5"); assertThat(stdout).contains("Total connected clients: 2"); assertThat(stdout).contains("User Connections"); assertThat(stdout).contains("anonymous 2"); @@ -179,9 +179,9 @@ public class ClientStatsTest tool.assertOnCleanExit(); String stdout = tool.getStdout(); assertThat(stdout).containsPattern("Address +SSL +Cipher +Protocol +Version +User +Keyspace +Requests +Driver-Name +Driver-Version +Client-Options"); - assertThat(stdout).containsPattern("/127.0.0.1:[0-9]+ false undefined undefined [0-9]+ +anonymous +[0-9]+ +DataStax Java Driver 3.11.0"); + assertThat(stdout).containsPattern("/127.0.0.1:[0-9]+ false undefined undefined [0-9]+ +anonymous +[0-9]+ +DataStax Java Driver 3.11.5"); assertThat(stdout).containsPattern("DRIVER_NAME=DataStax Java Driver"); - assertThat(stdout).containsPattern("DRIVER_VERSION=3.11.0"); + assertThat(stdout).containsPattern("DRIVER_VERSION=3.11.5"); assertThat(stdout).containsPattern("CQL_VERSION=3.0.0"); assertThat(stdout).contains("Total connected clients: 2"); assertThat(stdout).contains("User Connections");