Update dependencies.

Update dropwizard dependencies to 4.x. Use the dropwizard metrics 4.x based Riemann reporter. Use the InfluxDB reporter that supports Java 9+. metrics-clojure-jvm: depend on new module. com.codahale.metrics.JmxReporter → com.codahale.metrics.jmx.JmxReporter. metrics-clojure-jvm: com.codahale.metrics.JvmAttributeGaugeSet → com.codahale.metrics.jvm.JvmAttributeGaugeSet.
clj-commons · May 7, 2019 · e68ddb4 · e68ddb4
1 parent f10e54b
commit e68ddb4
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 11 deletions.
diff --git a/metrics-clojure-core/project.clj b/metrics-clojure-core/project.clj
@@ -3,7 +3,8 @@
   :url "https://github.com/sjl/metrics-clojure"
   :license {:name "MIT"}
   :dependencies [[org.clojure/clojure "1.8.0"]
-                 [io.dropwizard.metrics/metrics-core "3.2.2"]]
+                 [io.dropwizard.metrics/metrics-core "4.0.5"]
+                 [io.dropwizard.metrics/metrics-jmx "4.0.5"]]
   :repositories {"repo.codahale.com" "http://repo.codahale.com"
                  ;; to get Clojure snapshots
                  "sonatype" {:url "http://oss.sonatype.org/content/repositories/releases"

diff --git a/metrics-clojure-core/src/metrics/reporters/jmx.clj b/metrics-clojure-core/src/metrics/reporters/jmx.clj
@@ -1,10 +1,11 @@
 (ns metrics.reporters.jmx
   "JMX reporting"
   (:require [metrics.core  :refer [default-registry]])
-  (:import java.util.concurrent.TimeUnit
-           [com.codahale.metrics JmxReporter MetricRegistry MetricFilter]))
+  (:import [com.codahale.metrics MetricRegistry MetricFilter]
+           com.codahale.metrics.jmx.JmxReporter
+           java.util.concurrent.TimeUnit))
 
-(defn ^com.codahale.metrics.JmxReporter reporter
+(defn ^JmxReporter reporter
   ([opts]
    (reporter default-registry opts))
   ([^MetricRegistry reg opts]

diff --git a/metrics-clojure-graphite/project.clj b/metrics-clojure-graphite/project.clj
@@ -4,4 +4,4 @@
   :license {:name "MIT"}
   :profiles {:dev {:global-vars {*warn-on-reflection* true}}}
   :dependencies [[metrics-clojure "3.0.0-SNAPSHOT"]
-                 [io.dropwizard.metrics/metrics-graphite "3.2.2"]])
+                 [io.dropwizard.metrics/metrics-graphite "4.0.5"]])
diff --git a/metrics-clojure-health/project.clj b/metrics-clojure-health/project.clj
@@ -4,4 +4,4 @@
   :license {:name "MIT"}
   :profiles {:dev {:global-vars {*warn-on-reflection* true}}}
   :dependencies [[metrics-clojure "3.0.0-SNAPSHOT"]
-                 [io.dropwizard.metrics/metrics-healthchecks "3.2.2"]])
+                 [io.dropwizard.metrics/metrics-healthchecks "4.0.5"]])
diff --git a/metrics-clojure-influxdb/project.clj b/metrics-clojure-influxdb/project.clj
@@ -4,4 +4,5 @@
   :license {:name "MIT"}
   :profiles {:dev {:global-vars {*warn-on-reflection* true}}}
   :dependencies [[metrics-clojure "3.0.0-SNAPSHOT"]
-                 [com.izettle/dropwizard-metrics-influxdb "1.2.2"]])
+                 ;; FIXME: not yet released upstream
+                 [com.izettle/dropwizard-metrics-influxdb "1.2.4"]])
diff --git a/metrics-clojure-jvm/project.clj b/metrics-clojure-jvm/project.clj
@@ -4,4 +4,4 @@
   :license {:name "MIT"}
   :profiles {:dev {:global-vars {*warn-on-reflection* true}}}
   :dependencies [[metrics-clojure "3.0.0-SNAPSHOT"]
-                 [io.dropwizard.metrics/metrics-jvm "3.2.2"]])
+                 [io.dropwizard.metrics/metrics-jvm "4.0.5"]])
diff --git a/metrics-clojure-jvm/src/metrics/jvm/core.clj b/metrics-clojure-jvm/src/metrics/jvm/core.clj
@@ -1,7 +1,7 @@
 (ns metrics.jvm.core
-  (:import (com.codahale.metrics MetricRegistry JvmAttributeGaugeSet)
+  (:import (com.codahale.metrics MetricRegistry)
            (com.codahale.metrics.jvm ThreadStatesGaugeSet GarbageCollectorMetricSet FileDescriptorRatioGauge
-                                     MemoryUsageGaugeSet))
+                                     MemoryUsageGaugeSet  JvmAttributeGaugeSet))
   (:require [metrics.core :refer [add-metric default-registry]]))
 
 (defn register-jvm-attribute-gauge-set

diff --git a/metrics-clojure-riemann/project.clj b/metrics-clojure-riemann/project.clj
@@ -4,4 +4,5 @@
   :license {:name "MIT"}
   :profiles {:dev {:global-vars {*warn-on-reflection* true}}}
   :dependencies [[metrics-clojure "3.0.0-SNAPSHOT"]
-                 [io.riemann/metrics3-riemann-reporter "0.4.6"]])
+                 ;; FIXME: this does not yet exist in clojars
+                 [io.riemann/metrics4-riemann-reporter "0.5.1"]])