multimeter 1.0.0.pre2-java → 1.0.0.pre3-java

data/lib/multimeter.rb

@@ -9,14 +9,15 @@ require 'json'
 
 module Yammer
   module Metrics
-    import 'com.yammer.metrics.core.MetricsRegistry'
-    import 'com.yammer.metrics.core.MetricName'
-    import 'com.yammer.metrics.core.Meter'
-    import 'com.yammer.metrics.core.Counter'
-    import 'com.yammer.metrics.core.Histogram'
-    import 'com.yammer.metrics.core.Gauge'
-    import 'com.yammer.metrics.core.Timer'
-    import 'com.yammer.metrics.reporting.JmxReporter'
+    java_import 'com.yammer.metrics.core.MetricsRegistry'
+    java_import 'com.yammer.metrics.core.MetricName'
+    java_import 'com.yammer.metrics.core.Meter'
+    java_import 'com.yammer.metrics.core.Counter'
+    java_import 'com.yammer.metrics.core.Histogram'
+    java_import 'com.yammer.metrics.core.Gauge'
+    java_import 'com.yammer.metrics.core.Timer'
+    java_import 'com.yammer.metrics.stats.Snapshot'
+    java_import 'com.yammer.metrics.reporting.JmxReporter'
 
     class Meter
       def type
@@ -63,7 +64,7 @@ module Yammer
           :mean => mean,
           :std_dev => std_dev,
           :sum => sum
-        }
+        }.merge(snapshot.to_h)
       end
     end
 
@@ -99,7 +100,7 @@ module Yammer
           :mean => mean,
           :std_dev => std_dev,
           :sum => sum
-        }
+        }.merge(snapshot.to_h)
       end
 
       def measure
@@ -111,14 +112,29 @@ module Yammer
         end
       end
     end
+
+    class Snapshot
+      def to_h
+        {
+          :median => median,
+          :percentiles => {
+            '75'   => get75thPercentile,
+            '95'   => get95thPercentile,
+            '98'   => get98thPercentile,
+            '99'   => get99thPercentile,
+            '99.9' => get999thPercentile
+          }
+        }
+      end
+    end
   end
 end
 
 module JavaConcurrency
-  import 'java.util.concurrent.TimeUnit'
-  import 'java.util.concurrent.ConcurrentHashMap'
-  import 'java.util.concurrent.atomic.AtomicReference'
-  import 'java.lang.Thread'
+  java_import 'java.util.concurrent.TimeUnit'
+  java_import 'java.util.concurrent.ConcurrentHashMap'
+  java_import 'java.util.concurrent.atomic.AtomicReference'
+  java_import 'java.lang.Thread'
 end
 
 module Multimeter
@@ -326,7 +342,7 @@ module Multimeter
           body = registry.to_h.to_json
           headers = JSON_HEADERS
           if (callback_name = env['QUERY_STRING'][/callback=([^$&]+)/, 1])
-            if callback_name =~ /^[\w\d]+$/
+            if callback_name =~ /^[\w\d.]+$/
               body = "#{callback_name}(#{body});"
               headers = JSONP_HEADERS
             else

data/lib/multimeter/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Multimeter
-  VERSION = '1.0.0.pre2'
+  VERSION = '1.0.0.pre3'
 end

metadata

@@ -2,14 +2,14 @@
 name: multimeter
 version: !ruby/object:Gem::Version
   prerelease: 6
-  version: 1.0.0.pre2
+  version: 1.0.0.pre3
 platform: java
 authors:
 - Theo Hultberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-07-11 00:00:00.000000000Z
+date: 2012-07-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metrics-core-jars