Merge branch 'master' into stable

Author: michaelklishin

ChangeLog.md

@@ -1,4 +1,47 @@
-## Changes Between 2.3.0 and 2.3.1
+## Changes Between 2.5.0 and 2.5.1
+
+### Infinite Recursion in Ganglia
+
+Ganglia reporter had an infinite recursion.
+
+GH issue: #71.
+
+
+## Changes Between 2.4.0 and 2.5.0
+
+### Type Hints Use Fully-Qualified Names
+
+Type hints across the libraries now use fully-qualified names, which means
+returned types don't have to be imported in the caller namespaces.
+
+Contributed by Jason Whitlark.
+
+### :total Key In Timers
+
+`metrics.timers/rate` return value now includes `:total`.
+
+Contributed by Andrew Rudenko.
+
+
+### Added remove-all-metrics function
+
+`metrics-clojure` Now has a function to remove all existing metrics from a given registry.
+
+Contributed by Jason Whitlark.
+
+
+### Metrics 3.1.1
+
+`metrics-clojure` is now based on [Metrics 3.1.1](https://github.com/dropwizard/metrics/issues/694#issuecomment-77668929).
+
+Contributed by Jason Whitlark.
+
+
+## Changes Between 2.3.0 and 2.4.0
+
+### Metrics 3.1.0
+
+`metrics-clojure` is now based on [Metrics 3.1.0](https://groups.google.com/forum/#!topic/metrics-user/zwzHnMBcAX4).
 
 ### Improve ring instrumentation.
 

LICENSE.markdown

@@ -1,7 +1,7 @@
 MIT/X11 License
 ===============
 
-Copyright (c) 2011-2014 Steve Losh and contributors
+Copyright (c) 2011-2015 Steve Losh and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.markdown

@@ -10,7 +10,7 @@ Installation
 
 Add this to your `project.clj`'s dependencies:
 
-    [metrics-clojure "2.3.0"]
+    [metrics-clojure "2.4.0"]
 
 That's it.
 

docs/source/aggregation.rst

@@ -22,7 +22,7 @@ Note: You must include ``metrics-clojure-graphite`` in your project.clj.
 metrics-clojure supports aggregating metrics to graphite::
 
     (require '[metrics.reporters.graphite :as graphite])
-    (import '[java.util.concurrent.TimeUnit])
+    (import '[java.util.concurrent TimeUnit])
     (import '[com.codahale.metrics MetricFilter])
 
     (def GR (graphite/reporter {:host "your.graphite.host"
@@ -56,7 +56,7 @@ and should work, it still needs testing.
 metrics-clojure supports aggregating metrics to ganglia::
 
     (require '[metrics.reporters.ganglia :as ganglia])
-    (import '[java.util.concurrent.TimeUnit])
+    (import '[java.util.concurrent TimeUnit])
     (import '[com.codahale.metrics MetricFilter])
 
     (def ganglia (... your ganglia GMetric config here ...))

docs/source/conf.py

@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.4.0-SNAPSHOT'
+version = '2.5.0-SNAPSHOT'
 # The full version, including alpha/beta/rc tags.
-release = '2.4.0-SNAPSHOT'
+release = '2.5.0-SNAPSHOT'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/source/installation.rst

@@ -3,6 +3,6 @@ Installation
 
 Add this to your ``project.clj``'s dependencies::
 
-    [metrics-clojure "2.3.1"]
+    [metrics-clojure "2.5.1"]
 
 That's it.

docs/source/metrics/gauges.rst

@@ -16,20 +16,7 @@ Examples of metrics you might want to track with a gauge:
 Creating
 --------
 
-Create your gauge::
-
-    (require '[metrics.core :refer [new-registry]])
-    (require '[metrics.gauges :refer [gauge]])
-
-    (def reg (new-registry))
-
-    (def files-open
-      (gauge reg "files-open"
-             (fn [] (return-number-of-files-open ...))))
-
-That's it. Pretty simple.
-
-``gauge`` is a macro.  If you need a function instead you can use ``gauge-fn``,
+Create your gauge using ``gauge-fn``::
 but you have to pass it a function, not just a body::
 
     (require '[metrics.gauges :refer [gauge-fn]])

docs/source/ring.rst

@@ -39,6 +39,13 @@ If you want to use a different endpoint you can pass it as a parameter::
 
     (def app (expose-metrics-as-json app "/admin/stats/"))
 
+Using compojure::
+
+    (def app
+      (-> (routes home-routes app-routes)
+      (wrap-base-url)
+      (expose-metrics-as-json)))
+
 **WARNING**: this URL will not be protected by a username or password in any way
 (yet), so if you have sensitive metrics you might want to think twice about
 using it (or protect it yourself).
@@ -70,6 +77,13 @@ You can add some common metrics by using the ``instrument`` middleware::
     (require '[metrics.ring.instrument :refer [instrument]])
 
     (def app (instrument app))
+    
+Using compojure::
+
+    (def app
+      (-> (routes home-routes app-routes)
+      (wrap-base-url)
+      (instrument)))
 
 This will add a number of metrics, listed below.
 

metrics-clojure-core/project.clj

@@ -1,7 +1,9 @@
-(defproject metrics-clojure "2.3.2-SNAPSHOT"
+(defproject metrics-clojure "2.5.1-SNAPSHOT"
   :description "A Clojure façade for Coda Hale's metrics library."
+  :url "https://github.com/sjl/metrics-clojure"
+  :license {:name "MIT"}
   :dependencies [[org.clojure/clojure "1.6.0"]
-                 [com.codahale.metrics/metrics-core "3.0.2"]]
+                 [io.dropwizard.metrics/metrics-core "3.1.1"]]
   :repositories {"repo.codahale.com" "http://repo.codahale.com"
                  ;; to get Clojure snapshots
                  "sonatype" {:url "http://oss.sonatype.org/content/repositories/releases"

metrics-clojure-core/src/metrics/core.clj

@@ -5,7 +5,7 @@
   default-registry
   (MetricRegistry.))
 
-(defn ^MetricRegistry new-registry
+(defn ^com.codahale.metrics.MetricRegistry new-registry
   []
   (MetricRegistry.))
 
@@ -35,6 +35,14 @@
   ([^MetricRegistry reg title]
    (.remove reg (metric-name title))))
 
+(defn remove-all-metrics
+  "Remove all the metrics in the given registry, or the default
+  registry if no registry given."
+  ([] (remove-all-metrics default-registry))
+  ([^MetricRegistry reg]
+   (doseq [metric (.getNames reg)]
+     (.remove reg metric))))
+
 (defn replace-metric
   "Replace a metric with the given title."
   ([title ^Metric metric]