DRILL-6282: Update Drill's Metrics dependencies - Replacing com.codahale.metrics with last io.dropwizard.metrics Metrics for Drill - com.yammer.metrics is removed, since isn't used directly by Drill
closes #1189 Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/56b943be Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/56b943be Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/56b943be Branch: refs/heads/master Commit: 56b943beed5ff928022c1123688fb271cd9f45e9 Parents: 23d8909 Author: Vitalii Diravka <[email protected]> Authored: Wed Mar 21 16:16:10 2018 +0200 Committer: Vitalii Diravka <[email protected]> Committed: Sun Apr 29 23:20:54 2018 +0300 ---------------------------------------------------------------------- common/pom.xml | 14 ++++++++---- .../apache/drill/exec/metrics/DrillMetrics.java | 2 +- contrib/gis/pom.xml | 6 ----- contrib/storage-hbase/pom.xml | 6 ----- contrib/storage-hive/hive-exec-shade/pom.xml | 4 ++++ contrib/storage-jdbc/pom.xml | 6 ----- contrib/storage-mongo/pom.xml | 6 ----- exec/memory/base/pom.xml | 5 ----- logical/pom.xml | 11 ---------- pom.xml | 23 +++++++++++++++++++- 10 files changed, 37 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/56b943be/common/pom.xml ---------------------------------------------------------------------- diff --git a/common/pom.xml b/common/pom.xml index 2891f1e..5d54534 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -87,14 +87,20 @@ </dependency> <dependency> - <groupId>com.codahale.metrics</groupId> + <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-core</artifactId> - <version>3.0.1</version> </dependency> <dependency> - <groupId>com.codahale.metrics</groupId> + <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-servlets</artifactId> - <version>3.0.1</version> + </dependency> + <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-jvm</artifactId> + </dependency> + <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-jmx</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/drill/blob/56b943be/common/src/main/java/org/apache/drill/exec/metrics/DrillMetrics.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/exec/metrics/DrillMetrics.java b/common/src/main/java/org/apache/drill/exec/metrics/DrillMetrics.java index 4c67f44..a0e664f 100644 --- a/common/src/main/java/org/apache/drill/exec/metrics/DrillMetrics.java +++ b/common/src/main/java/org/apache/drill/exec/metrics/DrillMetrics.java @@ -20,7 +20,7 @@ package org.apache.drill.exec.metrics; import java.lang.management.ManagementFactory; import java.util.concurrent.TimeUnit; -import com.codahale.metrics.JmxReporter; +import com.codahale.metrics.jmx.JmxReporter; import com.codahale.metrics.Metric; import com.codahale.metrics.MetricFilter; import com.codahale.metrics.MetricRegistry; http://git-wip-us.apache.org/repos/asf/drill/blob/56b943be/contrib/gis/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/gis/pom.xml b/contrib/gis/pom.xml index 2d09682..30a0924 100644 --- a/contrib/gis/pom.xml +++ b/contrib/gis/pom.xml @@ -61,12 +61,6 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>com.yammer.metrics</groupId> - <artifactId>metrics-core</artifactId> - <version>2.1.1</version> - <scope>test</scope> - </dependency> </dependencies> <build> <plugins> http://git-wip-us.apache.org/repos/asf/drill/blob/56b943be/contrib/storage-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/storage-hbase/pom.xml b/contrib/storage-hbase/pom.xml index f07043f..b6ea90a 100644 --- a/contrib/storage-hbase/pom.xml +++ b/contrib/storage-hbase/pom.xml @@ -74,12 +74,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.yammer.metrics</groupId> - <artifactId>metrics-core</artifactId> - <version>2.1.1</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>commons-logging</groupId> <!-- Needed by HBase test cluster, set to provided scope to avoid dependency propagation --> http://git-wip-us.apache.org/repos/asf/drill/blob/56b943be/contrib/storage-hive/hive-exec-shade/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/storage-hive/hive-exec-shade/pom.xml b/contrib/storage-hive/hive-exec-shade/pom.xml index cfbd6d0..3d4dceb 100644 --- a/contrib/storage-hive/hive-exec-shade/pom.xml +++ b/contrib/storage-hive/hive-exec-shade/pom.xml @@ -62,6 +62,10 @@ <groupId>org.apache.calcite</groupId> <artifactId>calcite-druid</artifactId> </exclusion> + <exclusion> + <groupId>com.github.joshelser</groupId> + <artifactId>dropwizard-metrics-hadoop-metrics2-reporter</artifactId> + </exclusion> </exclusions> </dependency> <!--Once newer hive-exec version leverages parquet-column 1.9.0, this dependency can be deleted --> http://git-wip-us.apache.org/repos/asf/drill/blob/56b943be/contrib/storage-jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/storage-jdbc/pom.xml b/contrib/storage-jdbc/pom.xml index 34b3a72..e9692d8 100755 --- a/contrib/storage-jdbc/pom.xml +++ b/contrib/storage-jdbc/pom.xml @@ -60,12 +60,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.yammer.metrics</groupId> - <artifactId>metrics-core</artifactId> - <version>2.1.1</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.derby</groupId> <artifactId>derbyclient</artifactId> <version>10.11.1.1</version> http://git-wip-us.apache.org/repos/asf/drill/blob/56b943be/contrib/storage-mongo/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/storage-mongo/pom.xml b/contrib/storage-mongo/pom.xml index 12be696..221524d 100644 --- a/contrib/storage-mongo/pom.xml +++ b/contrib/storage-mongo/pom.xml @@ -64,12 +64,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.yammer.metrics</groupId> - <artifactId>metrics-core</artifactId> - <version>2.1.1</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>de.flapdoodle.embed</groupId> <artifactId>de.flapdoodle.embed.mongo</artifactId> <version>1.50.5</version> http://git-wip-us.apache.org/repos/asf/drill/blob/56b943be/exec/memory/base/pom.xml ---------------------------------------------------------------------- diff --git a/exec/memory/base/pom.xml b/exec/memory/base/pom.xml index f8cdf72..8bf5937 100644 --- a/exec/memory/base/pom.xml +++ b/exec/memory/base/pom.xml @@ -29,11 +29,6 @@ <name>exec/memory/base</name> <dependencies> - <dependency> - <groupId>com.codahale.metrics</groupId> - <artifactId>metrics-core</artifactId> - <version>3.0.1</version> - </dependency> <dependency> <groupId>org.apache.drill</groupId> http://git-wip-us.apache.org/repos/asf/drill/blob/56b943be/logical/pom.xml ---------------------------------------------------------------------- diff --git a/logical/pom.xml b/logical/pom.xml index d6e27e6..07a942b 100644 --- a/logical/pom.xml +++ b/logical/pom.xml @@ -85,17 +85,6 @@ </dependency> <dependency> - <groupId>com.codahale.metrics</groupId> - <artifactId>metrics-core</artifactId> - <version>3.0.1</version> - </dependency> - <dependency> - <groupId>com.codahale.metrics</groupId> - <artifactId>metrics-servlets</artifactId> - <version>3.0.1</version> - </dependency> - - <dependency> <groupId>org.antlr</groupId> <artifactId>antlr-runtime</artifactId> <version>3.4</version> http://git-wip-us.apache.org/repos/asf/drill/blob/56b943be/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index eb3ed06..8233d1c 100644 --- a/pom.xml +++ b/pom.xml @@ -72,6 +72,7 @@ <javassist.version>3.22.0-GA</javassist.version> <msgpack.version>0.6.6</msgpack.version> <reflections.version>0.9.10</reflections.version> + <metrics.version>4.0.2</metrics.version> <excludedGroups/> <memoryMb>4096</memoryMb> <directMemoryMb>4096</directMemoryMb> @@ -1164,7 +1165,27 @@ <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-core</artifactId> - <version>4.0.2</version> + <version>${metrics.version}</version> + </dependency> + <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-servlets</artifactId> + <version>${metrics.version}</version> + </dependency> + <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-jvm</artifactId> + <version>${metrics.version}</version> + </dependency> + <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-json</artifactId> + <version>${metrics.version}</version> + </dependency> + <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-jmx</artifactId> + <version>${metrics.version}</version> </dependency> <dependency> <groupId>org.codehaus.janino</groupId>
