instrumental_agent 3.0.0.beta2 → 3.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a86fe597ab71c9660d590e42ef37e0d9012a4f5adbe7742d265f3d20ffda1b9e
-  data.tar.gz: cd56273db7523852982b58162361359fc3c9fcd3b8cae19bf87387bf63fe26b1
+  metadata.gz: 20bc1dfd989a1d555912b21cd1a43b0a2ebb235e411fed6b27746cd3c01ce2ad
+  data.tar.gz: 7e725c0d514db6cccba3827a76a7b73995b06084a54bf0637cf7c2423d2beb3b
 SHA512:
-  metadata.gz: c68427fe4c900db650e45b46423c808263d86df275b9f49b44896973f4db3e25cd61b8fe9a0b67cba54acbe831b4c00a7cbfb8c7b7d6cc30959159e9e149d3dd
-  data.tar.gz: 57f5554f876c9311d76305c60b754af1c7d1a8bb63b8682355217b014b927e1d0f500bea37daff954d5149d4015b1be80793f9f2ed8f713928b4af4d428e576f
+  metadata.gz: 356538412bb4aeeb4af6dbb912de961ca587b08410a48cc60b8246e7d138909dab5f75261dd441bf4fd9287868565c2a4554a313c0b9d43316ca7ac615f38b20
+  data.tar.gz: f819635e2b8ea0efaa7a25ed62cdf52d54b602e8b8703a7eea3b7975f83ed557ffe0cdd1a39b5dd97942492e3a872d4e343c6c179de18feb3dbb257c08faf1a8

data/lib/instrumental/event_aggregator.rb

@@ -1,26 +1,28 @@
-class EventAggregator
-  attr_accessor :counts, :values, :received_at, :frequency
- 
-  def initialize(frequency:)
-    @values = Hash.new
-    @frequency = frequency
-  end
+module Instrumental
+  class EventAggregator
+    attr_accessor :counts, :values, :received_at, :frequency
 
-  def put(command)
-    command_at = command.time
-    unless(command_at % frequency == 0)
-      command.time = (command_at - (command_at % frequency))
+    def initialize(frequency:)
+      @values = Hash.new
+      @frequency = frequency
     end
-    metadata = command.metadata
-    @values[metadata] = (command + @values[metadata])
-  end
 
-  def size
-    @values.size
-  end
+    def put(command)
+      command_at = command.time
+      unless(command_at % frequency == 0)
+        command.time = (command_at - (command_at % frequency))
+      end
+      metadata = command.metadata
+      @values[metadata] = (command + @values[metadata])
+    end
 
-  def coerce_time(time)
-    itime = time.to_i
-    (itime - (itime % frequency)).to_i
+    def size
+      @values.size
+    end
+
+    def coerce_time(time)
+      itime = time.to_i
+      (itime - (itime % frequency)).to_i
+    end
   end
 end

data/lib/instrumental/version.rb

@@ -1,3 +1,3 @@
 module Instrumental
-  VERSION = "3.0.0.beta2"
+  VERSION = "3.0.0.beta3"
 end

data/spec/agent_spec.rb

@@ -832,7 +832,7 @@ shared_examples "Instrumental Agent" do
 
         it "bypasses aggregator queue entirely for most commands when frequency == 0" do
           agent.frequency = 0 # this is red - 0 for green
-          expect(EventAggregator).not_to receive(:new)
+          expect(Instrumental::EventAggregator).not_to receive(:new)
           agent.increment('a_metric')
         end
 
@@ -909,7 +909,7 @@ shared_examples "Instrumental Agent" do
 
         it "can be disabled by setting frequency to nil" do
           agent.frequency = nil
-          expect(EventAggregator).not_to receive(:new)
+          expect(Instrumental::EventAggregator).not_to receive(:new)
           agent.increment('metric')
           wait do
             expect(server.commands.grep(/metric/).size).to eq(1)
@@ -918,7 +918,7 @@ shared_examples "Instrumental Agent" do
 
         it "can be disabled by setting frequency to 0" do
           agent.frequency = 0
-          expect(EventAggregator).not_to receive(:new)
+          expect(Instrumental::EventAggregator).not_to receive(:new)
           agent.increment('metric')
           wait do
             expect(server.commands.grep(/metric/).size).to eq(1)
@@ -979,23 +979,6 @@ shared_examples "Instrumental Agent" do
           expect(server.commands.grep(/other 3/).size).to eq(1)
         end
 
-        # this test really relies on the worker threads not working unexpectedly
-        it "will overflow if the aggregator queue is full" do
-          Timecop.travel(start_of_minute)
-          with_constants('Instrumental::Agent::MAX_BUFFER' => 3) do
-            allow(agent.logger).to receive(:debug)
-            expect(agent.logger).to receive(:debug).with("Dropping command, queue full(3): increment overflow_test 4 300 1")
-            agent.increment('overflow_test', 4, 300, 1)
-            agent.increment('overflow_test', 4, 300, 1)
-            agent.increment('overflow_test', 4, 300, 1)
-            agent.increment('overflow_test', 4, 300, 1)
-
-            expect(agent.instance_variable_get(:@aggregator_queue).size).to eq(3)
-            agent.flush
-            expect(agent.instance_variable_get(:@aggregator_queue).size).to eq(0)
-          end
-        end
-
         it "if aggregator is at max size, next command will force a forward to the sender thread" do
           Timecop.travel(start_of_minute)
           with_constants('Instrumental::Agent::MAX_AGGREGATOR_SIZE' => 3) do

data/spec/event_aggregator_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe EventAggregator, "time and frequency operations" do
+describe Instrumental::EventAggregator, "time and frequency operations" do
   it "should massage time values to match the start of a window" do
-    agg = EventAggregator.new(frequency: 10)
+    agg = Instrumental::EventAggregator.new(frequency: 10)
     Timecop.freeze do
       start_of_minute = Time.now.to_i - (Time.now.to_i % 60)
       times_to_report = [start_of_minute + 5, start_of_minute + 15]
@@ -20,11 +20,11 @@ describe EventAggregator, "time and frequency operations" do
   end
 end
 
-describe EventAggregator do
+describe Instrumental::EventAggregator do
   it "should aggregate put operations to a given frequency" do
     start_of_minute = Time.now.to_i - (Time.now.to_i % 60)
     Timecop.freeze(Time.at(start_of_minute)) do
-      agg = EventAggregator.new(frequency: 30)
+      agg = Instrumental::EventAggregator.new(frequency: 30)
       (Time.now.to_i..(Time.now.to_i + 119)).each do |time|
         agg.put(Instrumental::Command.new("increment", "abc", 1, time, 1))
       end
@@ -37,7 +37,7 @@ describe EventAggregator do
 
   it "should aggregate put operations to the same metric and last type wins" do
     Timecop.freeze do
-      agg = EventAggregator.new(frequency: 6)
+      agg = Instrumental::EventAggregator.new(frequency: 6)
 
       agg.put(Instrumental::Command.new("gauge", "hello", 3.0, Time.now, 1))
       agg.put(Instrumental::Command.new("increment", "hello", 4.0, Time.now, 1))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instrumental_agent
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta2
+  version: 3.0.0.beta3
 platform: ruby
 authors:
 - Expected Behavior