From e68ddb4d9ed646e5b458aee8f18700865d005d04 Mon Sep 17 00:00:00 2001 From: Alex ter Weele Date: Thu, 2 May 2019 14:01:46 -0500 Subject: [PATCH] Update dependencies. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- metrics-clojure-core/project.clj | 3 ++- metrics-clojure-core/src/metrics/reporters/jmx.clj | 7 ++++--- metrics-clojure-graphite/project.clj | 2 +- metrics-clojure-health/project.clj | 2 +- metrics-clojure-influxdb/project.clj | 3 ++- metrics-clojure-jvm/project.clj | 2 +- metrics-clojure-jvm/src/metrics/jvm/core.clj | 4 ++-- metrics-clojure-riemann/project.clj | 3 ++- 8 files changed, 15 insertions(+), 11 deletions(-) diff --git a/metrics-clojure-core/project.clj b/metrics-clojure-core/project.clj index 899ae5c..fb1974d 100644 --- 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 index 63d41be..c1be816 100644 --- 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 index 2054631..1b51946 100644 --- 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 index 4a524b6..2fe6feb 100644 --- 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 index 30fa5e2..3067fad 100644 --- 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 index 62a1a81..8366bad 100644 --- 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 index bc6473a..773b44d 100644 --- 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 index 918b23a..f9a3ab3 100644 --- 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"]])