This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new b74981fc2 [ZooKeeper] [Conflict] Bump dropwizard metrics to zookeeper
needed (#3229)
b74981fc2 is described below
commit b74981fc27f93bc36f549c2c3309cc5ef0c6d51d
Author: ZhangJian He <[email protected]>
AuthorDate: Thu Apr 21 15:50:09 2022 +0800
[ZooKeeper] [Conflict] Bump dropwizard metrics to zookeeper needed (#3229)
---
bookkeeper-dist/all/pom.xml | 6 ++++++
bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt | 9 +++++----
bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt | 2 +-
bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt | 4 ++--
bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt | 7 ++++---
.../codahale-metrics-provider/build.gradle | 1 +
bookkeeper-stats-providers/codahale-metrics-provider/pom.xml | 4 ++++
.../bookkeeper/stats/codahale/CodahaleMetricsProvider.java | 2 +-
dependencies.gradle | 3 ++-
pom.xml | 7 ++++++-
10 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml
index c38cc5e91..2fb45d749 100644
--- a/bookkeeper-dist/all/pom.xml
+++ b/bookkeeper-dist/all/pom.xml
@@ -49,6 +49,12 @@
<groupId>org.apache.bookkeeper.stats</groupId>
<artifactId>codahale-metrics-provider</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>amqp-client</artifactId>
+ <groupId>com.rabbitmq</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper.stats</groupId>
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
index 5442c2b9d..ab3807615 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
@@ -306,9 +306,10 @@ Apache Software License, Version 2.
- lib/com.google.auto.value-auto-value-annotations-1.9.jar [44]
- lib/com.google.j2objc-j2objc-annotations-1.3.jar [45]
- lib/com.google.re2j-re2j-1.5.jar [46]
-- lib/io.dropwizard.metrics-metrics-core-3.2.5.jar [47]
-- lib/io.dropwizard.metrics-metrics-graphite-3.2.5.jar [47]
-- lib/io.dropwizard.metrics-metrics-jvm-3.2.5.jar [47]
+- lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [47]
+- lib/io.dropwizard.metrics-metrics-graphite-4.1.12.1.jar [47]
+- lib/io.dropwizard.metrics-metrics-jmx-4.1.12.1.jar [47]
+- lib/io.dropwizard.metrics-metrics-jvm-4.1.12.1.jar [47]
- lib/io.perfmark-perfmark-api-0.23.0.jar [48]
- lib/org.conscrypt-conscrypt-openjdk-uber-2.5.1.jar [49]
- lib/org.xerial.snappy-snappy-java-1.1.7.7.jar [50]
@@ -357,7 +358,7 @@ Apache Software License, Version 2.
[44] Source available at
https://github.com/google/auto/releases/tag/auto-value-1.7.4
[45] Source available at https://github.com/google/j2objc/releases/tag/1.3
[46] Source available at https://github.com/google/re2j/releases/tag/re2j-1.5
-[47] Source available at
https://github.com/dropwizard/metrics/releases/tag/v3.2.5
+[47] Source available at
https://github.com/dropwizard/metrics/releases/tag/v4.1.12.1
[48] Source available at
https://github.com/perfmark/perfmark/releases/tag/v0.23.0
[49] Source available at https://github.com/google/conscrypt/releases/tag/2.5.1
[50] Source available at https://github.com/google/snappy/releases/tag/1.1.7.7
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
index 78ff0580a..b803f539e 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
@@ -285,7 +285,7 @@ Apache Software License, Version 2.
- lib/com.google.http-client-google-http-client-gson-1.41.0.jar [43]
- lib/com.google.j2objc-j2objc-annotations-1.3.jar [44]
- lib/com.google.re2j-re2j-1.5.jar [45]
-- lib/io.dropwizard.metrics-metrics-core-3.2.5.jar [46]
+- lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [46]
- lib/io.perfmark-perfmark-api-0.23.0.jar [47]
- lib/org.conscrypt-conscrypt-openjdk-uber-2.5.1.jar [49]
- lib/org.xerial.snappy-snappy-java-1.1.7.7.jar [50]
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
index 643cb721f..dc419e532 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
@@ -306,7 +306,7 @@ Apache Software License, Version 2.
- lib/com.google.auto.value-auto-value-annotations-1.9.jar [44]
- lib/com.google.j2objc-j2objc-annotations-1.3.jar [45]
- lib/com.google.re2j-re2j-1.5.jar [46]
-- lib/io.dropwizard.metrics-metrics-core-3.2.5.jar [47]
+- lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [47]
- lib/io.perfmark-perfmark-api-0.23.0.jar [48]
- lib/org.conscrypt-conscrypt-openjdk-uber-2.5.1.jar [49]
- lib/org.xerial.snappy-snappy-java-1.1.7.7.jar [50]
@@ -355,7 +355,7 @@ Apache Software License, Version 2.
[44] Source available at
https://github.com/google/auto/releases/tag/auto-value-1.7.4
[45] Source available at https://github.com/google/j2objc/releases/tag/1.3
[46] Source available at https://github.com/google/re2j/releases/tag/re2j-1.5
-[47] Source available at
https://github.com/dropwizard/metrics/releases/tag/v3.2.5
+[47] Source available at
https://github.com/dropwizard/metrics/releases/tag/v4.1.12.1
[48] Source available at
https://github.com/perfmark/perfmark/releases/tag/v0.23.0
[49] Source available at https://github.com/google/conscrypt/releases/tag/2.5.1
[50] Source available at https://github.com/google/snappy/releases/tag/1.1.7.7
diff --git a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt
b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt
index 687199bdc..0ed6c548c 100644
--- a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt
+++ b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt
@@ -5,9 +5,10 @@ This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
------------------------------------------------------------------------------------
-- lib/io.dropwizard.metrics-metrics-core-3.2.5.jar
-- lib/io.dropwizard.metrics-metrics-graphite-3.2.5.jar
-- lib/io.dropwizard.metrics-metrics-jvm-3.2.5.jar
+- lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar
+- lib/io.dropwizard.metrics-metrics-graphite-4.1.12.1.jar
+- lib/io.dropwizard.metrics-metrics-jmx-4.1.12.1.jar
+- lib/io.dropwizard.metrics-metrics-jvm-4.1.12.1.jar
Metrics
Copyright 2010-2013 Coda Hale and Yammer, Inc.
diff --git a/bookkeeper-stats-providers/codahale-metrics-provider/build.gradle
b/bookkeeper-stats-providers/codahale-metrics-provider/build.gradle
index a5e1868a8..6a6427f22 100644
--- a/bookkeeper-stats-providers/codahale-metrics-provider/build.gradle
+++ b/bookkeeper-stats-providers/codahale-metrics-provider/build.gradle
@@ -31,6 +31,7 @@ dependencies {
implementation depLibs.guava
implementation depLibs.metricsCore
implementation depLibs.metricsGraphite
+ implementation depLibs.metricsJmx
implementation depLibs.metricsJvm
compileOnly depLibs.lombok
diff --git a/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml
b/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml
index 47795674e..d8ae917d9 100644
--- a/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml
+++ b/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml
@@ -37,6 +37,10 @@
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-jmx</artifactId>
+ </dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jvm</artifactId>
diff --git
a/bookkeeper-stats-providers/codahale-metrics-provider/src/main/java/org/apache/bookkeeper/stats/codahale/CodahaleMetricsProvider.java
b/bookkeeper-stats-providers/codahale-metrics-provider/src/main/java/org/apache/bookkeeper/stats/codahale/CodahaleMetricsProvider.java
index f700e400a..8c58c5210 100644
---
a/bookkeeper-stats-providers/codahale-metrics-provider/src/main/java/org/apache/bookkeeper/stats/codahale/CodahaleMetricsProvider.java
+++
b/bookkeeper-stats-providers/codahale-metrics-provider/src/main/java/org/apache/bookkeeper/stats/codahale/CodahaleMetricsProvider.java
@@ -17,13 +17,13 @@
package org.apache.bookkeeper.stats.codahale;
import com.codahale.metrics.CsvReporter;
-import com.codahale.metrics.JmxReporter;
import com.codahale.metrics.MetricFilter;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.ScheduledReporter;
import com.codahale.metrics.Slf4jReporter;
import com.codahale.metrics.graphite.Graphite;
import com.codahale.metrics.graphite.GraphiteReporter;
+import com.codahale.metrics.jmx.JmxReporter;
import com.codahale.metrics.jvm.GarbageCollectorMetricSet;
import com.codahale.metrics.jvm.MemoryUsageGaugeSet;
import com.google.common.base.Strings;
diff --git a/dependencies.gradle b/dependencies.gradle
index e96c42909..e3737800c 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -37,7 +37,7 @@ depVersions = [
commonsBeanutils: "1.9.3",
curator: "5.1.0",
dockerJava: "3.2.13",
- dropwizard: "3.2.5",
+ dropwizard: "4.1.12.1",
errorprone: "2.4.0",
etcd: "0.5.11",
freebuilder: "2.7.0",
@@ -179,6 +179,7 @@ depLibs = [
lombok: "org.projectlombok:lombok:${depVersions.lombok}",
lz4: "net.jpountz.lz4:lz4:${depVersions.lz4}",
metricsCore:
"io.dropwizard.metrics:metrics-core:${depVersions.dropwizard}",
+ metricsJmx: "io.dropwizard.metrics:metrics-jmx:${depVersions.dropwizard}",
metricsJvm: "io.dropwizard.metrics:metrics-jvm:${depVersions.dropwizard}",
metricsGraphite:
"io.dropwizard.metrics:metrics-graphite:${depVersions.dropwizard}",
mockito: "org.mockito:mockito-core:${depVersions.mockito}",
diff --git a/pom.xml b/pom.xml
index 3ea99a9bc..886a0c1d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,7 @@
<commons-io.version>2.7</commons-io.version>
<bouncycastle.version>1.0.2.3</bouncycastle.version>
<curator.version>5.1.0</curator.version>
- <dropwizard.version>3.2.5</dropwizard.version>
+ <dropwizard.version>4.1.12.1</dropwizard.version>
<etcd.version>0.5.11</etcd.version>
<freebuilder.version>2.7.0</freebuilder.version>
<google.code.version>3.0.2</google.code.version>
@@ -601,6 +601,11 @@
</dependency>
<!-- stats dependencies -->
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-jmx</artifactId>
+ <version>${dropwizard.version}</version>
+ </dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jvm</artifactId>
