Skip to content

[SPARK-29674][CORE] Update dropwizard metrics to 4.1.x for JDK 9+ #26332

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

Closed
srowen wants to merge 3 commits into from
Closed

[SPARK-29674][CORE] Update dropwizard metrics to 4.1.x for JDK 9+ #26332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aefde48
Update dropwizard metrics to 4.1.x for JDK 9+
srowen Oct 30, 2019
b842ad4
Copy GangliaReporter from no-longer-published metrics-ganglia
srowen Oct 31, 2019
79bd378
Fix rat exclude
srowen Oct 31, 2019
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
1 change: 1 addition & 0 deletions LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ core/src/main/resources/org/apache/spark/ui/static/bootstrap*
core/src/main/resources/org/apache/spark/ui/static/jsonFormatter*
core/src/main/resources/org/apache/spark/ui/static/vis*
docs/js/vendor/bootstrap.js
external/spark-ganglia-lgpl/src/main/java/com/codahale/metrics/ganglia/GangliaReporter.java


Python Software Foundation License
Expand Down
2 changes: 1 addition & 1 deletion LICENSE-binary
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,10 +243,10 @@ com.vlkan:flatbuffers
com.ning:compress-lzf
io.airlift:aircompressor
io.dropwizard.metrics:metrics-core
io.dropwizard.metrics:metrics-ganglia
io.dropwizard.metrics:metrics-graphite
io.dropwizard.metrics:metrics-json
io.dropwizard.metrics:metrics-jvm
io.dropwizard.metrics:metrics-jmx
org.iq80.snappy:snappy
com.clearspring.analytics:stream
com.jamesmurty.utils:java-xmlbuilder
Expand Down
13 changes: 13 additions & 0 deletions NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,16 @@ The following provides more details on the included cryptographic software:
This software uses Apache Commons Crypto (https://commons.apache.org/proper/commons-crypto/) to
support authentication, and encryption and decryption of data sent across the network between
services.


Metrics
Copyright 2010-2013 Coda Hale and Yammer, Inc.

This product includes software developed by Coda Hale and Yammer, Inc.

This product includes code derived from the JSR-166 project (ThreadLocalRandom, Striped64,
LongAdder), which was released with the following comments:

Written by Doug Lea with assistance from members of JCP JSR-166
Expert Group and released to the public domain, as explained at
http://creativecommons.org/publicdomain/zero/1.0/
13 changes: 13 additions & 0 deletions NOTICE-binary
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1515,3 +1515,16 @@ Copyright 2014-2017 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).


Metrics
Copy link
Member Author

@srowen srowen Oct 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should have already been there, but now would also need to be in NOTICE

Copyright 2010-2013 Coda Hale and Yammer, Inc.

This product includes software developed by Coda Hale and Yammer, Inc.

This product includes code derived from the JSR-166 project (ThreadLocalRandom, Striped64,
LongAdder), which was released with the following comments:

Written by Doug Lea with assistance from members of JCP JSR-166
Expert Group and released to the public domain, as explained at
http://creativecommons.org/publicdomain/zero/1.0/
10 changes: 10 additions & 0 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,16 @@
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-graphite</artifactId>
<exclusions>
<exclusion>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
Copy link
Member Author

@srowen srowen Oct 30, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would otherwise be a new dependency on RabbitMQ, but, my hunch is that it is not necessary for Spark.

</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jmx</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/scala/org/apache/spark/metrics/sink/JmxSink.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ package org.apache.spark.metrics.sink

import java.util.Properties

import com.codahale.metrics.{JmxReporter, MetricRegistry}
import com.codahale.metrics.MetricRegistry
import com.codahale.metrics.jmx.JmxReporter

import org.apache.spark.SecurityManager

Expand Down
1 change: 1 addition & 0 deletions dev/.rat-excludes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,4 @@ announce.tmpl
vote.tmpl
SessionManager.java
SessionHandler.java
GangliaReporter.java
2 changes: 2 additions & 0 deletions dev/checkstyle-suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
<suppressions>
<suppress checks=".*"
files="core/src/main/java/org/apache/spark/util/collection/TimSort.java"/>
<suppress checks=".*"
files="external/spark-ganglia-lgpl/src/main/java/com/codahale/metrics/ganglia/GangliaReporter.java"/>
<suppress checks=".*"
files="sql/core/src/main/java/org/apache/spark/sql/api.java/*"/>
<suppress checks="LineLength"
Expand Down
9 changes: 5 additions & 4 deletions dev/deps/spark-deps-hadoop-2.7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,11 @@ lz4-java-1.6.0.jar
machinist_2.12-0.6.8.jar
macro-compat_2.12-1.1.1.jar
mesos-1.4.0-shaded-protobuf.jar
metrics-core-3.2.6.jar
metrics-graphite-3.2.6.jar
metrics-json-3.2.6.jar
metrics-jvm-3.2.6.jar
metrics-core-4.1.1.jar
metrics-graphite-4.1.1.jar
metrics-jmx-4.1.1.jar
metrics-json-4.1.1.jar
metrics-jvm-4.1.1.jar
minlog-1.3.0.jar
netty-all-4.1.42.Final.jar
objenesis-2.5.1.jar
Expand Down
9 changes: 5 additions & 4 deletions dev/deps/spark-deps-hadoop-3.2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,11 @@ lz4-java-1.6.0.jar
machinist_2.12-0.6.8.jar
macro-compat_2.12-1.1.1.jar
mesos-1.4.0-shaded-protobuf.jar
metrics-core-3.2.6.jar
metrics-graphite-3.2.6.jar
metrics-json-3.2.6.jar
metrics-jvm-3.2.6.jar
metrics-core-4.1.1.jar
metrics-graphite-4.1.1.jar
metrics-jmx-4.1.1.jar
metrics-json-4.1.1.jar
metrics-jvm-4.1.1.jar
minlog-1.3.0.jar
mssql-jdbc-6.2.1.jre7.jar
netty-all-4.1.42.Final.jar
Expand Down
6 changes: 3 additions & 3 deletions external/spark-ganglia-lgpl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
<artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-ganglia</artifactId>
<groupId>info.ganglia.gmetric4j</groupId>
Copy link
Member Author

@srowen srowen Oct 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was previously a transitive dependency anyway, and should have been directly referenced.

<artifactId>gmetric4j</artifactId>
<version>1.0.10</version>
</dependency>
</dependencies>
</project>
Loading