librato-metrics 1.3.0 → 1.3.1

data.tar.gz.sig

@@ -1,4 +1,2 @@
-k6A��IM�7�1�Q-�pE�
-'�d�Je�$x�B�6�u��^]�S-2dw�
-r��L�v}�L$��@3r{�Z�Rt��y�R�\�)���X����?M/� ��"k�b��7����x�¡+Y�Z��*�LI)5�����(�����p�9��tĬS:�Vpε.��U
-�פ���{��q���D�;��k��&���a�g���M��2�)\Aq%EV�.X�ղ��ʾ嬓:	����;��=���n
+~[�uJE�.h�D�(
+"�=Y@��@�1Ν%.nj��j�ߓ�ii)䱺
Ձ�޳�Y���rB:&��I�n�4{nf�3��W܊�����9����8*��t{���[�/��wU�t��bٗ

data/.travis.yml

@@ -4,10 +4,9 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - jruby-19mode
-  - jruby-18mode
-  - rbx-19mode
-  - rbx-18mode
+  # - rbx
   - ruby-head
 
 matrix:

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Changelog
 
+### Version 1.3.1
+* Fix auto-chunking for large measurements sets with a global source
+
 ### Version 1.3.0
 * Add support for working with sources as a first-class entity
 

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 platforms :jruby do
   gem 'jruby-openssl'
@@ -9,7 +9,13 @@ platforms :ruby_19 do
   gem 'redcarpet'
 end
 
+platforms :rbx do
+   # rubinius stdlib
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+end
+
 gemspec
 
 # easily generate test data
-gem 'quixote'
+gem 'quixote'

data/README.md

@@ -180,7 +180,9 @@ Both `Queue` and `Aggregator` support automatically submitting measurements on a
 
 These options can also be combined for more flexible behavior.
 
-Both options are driven by the addition of measurements. Specifically for time-based autosubmission if you are adding measurements irregularly (less than once per second), submission may lag past your specified interval until the next measurement is added.
+Both options are driven by the addition of measurements. *If you are adding measurements irregularly (less than once per second), time-based submission may lag past your specified interval until the next measurement is added.*
+
+If your goal is to collect metrics every _x_ seconds and submit them, [check out this code example](https://github.com/librato/librato-metrics/blob/master/examples/submit_every.rb).
 
 ## Querying Metrics
 

data/lib/librato/metrics/persistence/direct.rb

@@ -5,6 +5,7 @@ module Librato
   module Metrics
     module Persistence
       class Direct
+        MEASUREMENT_TYPES = [:gauges, :counters]
 
         # Persist the queued metrics directly to the
         # Metrics web API.
@@ -28,21 +29,32 @@ module Librato
         def chunk_queued(queued, per_request)
           return [queued] if queue_count(queued) <= per_request
           reqs = []
-          queued.each do |metric_type, measurements|
-            if measurements.size <= per_request
-              # we can fit all of this metric type in a single
-              # request, so do so
-              reqs << {metric_type => measurements}
+          # separate metric-containing values from global values
+          globals = fetch_globals(queued)
+          MEASUREMENT_TYPES.each do |metric_type|
+            metrics = queued[metric_type]
+            next unless metrics
+            if metrics.size <= per_request
+              # we can fit all of this metric type in a single request
+              reqs << build_request(metric_type, metrics, globals)
             else
               # going to have to split things up
-              measurements.each_slice(per_request) do |elements|
-                reqs << {metric_type => elements}
+              metrics.each_slice(per_request) do |elements|
+                reqs << build_request(metric_type, elements, globals)
               end
             end
           end
           reqs
         end
 
+        def build_request(type, metrics, globals)
+          {type => metrics}.merge(globals)
+        end
+
+        def fetch_globals(queued)
+          queued.reject {|k, v| MEASUREMENT_TYPES.include?(k)}
+        end
+
         def queue_count(queued)
           queued.inject(0) { |result, data| result + data.last.size }
         end

data/lib/librato/metrics/version.rb

@@ -1,5 +1,5 @@
 module Librato
   module Metrics
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

data/spec/integration/metrics/queue_spec.rb

@@ -35,6 +35,26 @@ module Librato
           gauge = Metrics.get_measurements :gauge_5, :count => 1
           gauge['unassigned'][0]['value'].should == 5
         end
+
+        it "should apply globals to each request" do
+          source = 'yogi'
+          measure_time = Time.now.to_i-3
+          queue = Queue.new(
+            :per_request => 3,
+            :source => source,
+            :measure_time => measure_time,
+            :skip_measurement_times => true
+          )
+          (1..5).each do |i|
+            queue.add "gauge_#{i}" => 1
+          end
+          queue.submit
+
+          # verify globals have persisted for all requests
+          gauge = Metrics.get_measurements :gauge_5, :count => 1
+          gauge[source][0]["value"].should eq(1.0)
+          gauge[source][0]["measure_time"].should eq(measure_time)
+        end
       end
 
       it "should respect default and individual sources" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librato-metrics
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -37,7 +37,7 @@ cert_chain:
   bktaNmhlblFBRjFDSDk2WmNxY0pIMTc5UzJ0SWlLRE04a2VlUklVT1BDM1dU
   MGZhb2svMgpnQTJvemRyODUxYy9uQT09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -251,7 +251,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 694362489325963939
+      hash: -294425092678136572
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: