multimeter 1.1.5-java → 1.1.6-java

data/lib/multimeter.rb

@@ -547,15 +547,17 @@ module Multimeter
           case property
           when :type, :event_type then values.first
           when :percentiles then nil
-          else 
-            min, max = values.compact.minmax
-            sum = values.compact.reduce(:+)
-            {
-              :max => max,
-              :min => min,
-              :sum => sum,
-              :avg => sum ? sum/values.size.to_f : nil,
-            }
+          else
+            if values.all? { |v| v.nil? || v.is_a?(Numeric) }
+              min, max = values.compact.minmax
+              sum = values.compact.reduce(:+)
+              {
+                :max => max,
+                :min => min,
+                :sum => sum,
+                :avg => sum ? sum.fdiv(values.size) : nil,
+              }
+            end
           end
         end
         h[property] = aggregate_value if aggregate_value
@@ -580,4 +582,4 @@ module Multimeter
   end
 
   GLOBAL_REGISTRY = registry('multimeter', 'global')
-end
+end

data/lib/multimeter/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Multimeter
-  VERSION = '1.1.5'
+  VERSION = '1.1.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multimeter
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease:
 platform: java
 authors:
@@ -9,38 +9,28 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metrics-core-jars
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &2058 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
     none: false
+  requirement: *2058
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: json
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &2076 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
     none: false
+  requirement: *2076
   prerelease: false
   type: :runtime
 description: Multimeter provides a JRuby DSL for instrumenting your application. It uses Yammer's Metrics library under the hood.
@@ -72,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
 requirements: []
 rubyforge_project: multimeter
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key:
 specification_version: 3
 summary: JRuby application metric instrumentation using Yammer's Metrics