appsignal 0.11.8.beta.3 → 0.11.8.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41eb79c820f9d67a1344387af4fc6397d11dcfaa
-  data.tar.gz: 26ea28e40d99d4f8a33eb9604620fcbc1caada42
+  metadata.gz: cd999ef92367b114d182d7446e8a3333086cb943
+  data.tar.gz: e89697a0e0176cc9d567ff575e556c4673258d02
 SHA512:
-  metadata.gz: 112b6cf13f7ac013141d1d3e351c373c727d6826d82d339f98904db17183bcb4fa6e5dc6b19f54b08de774a49b1db590bb515b15716fefba75f1916bcd1dc609
-  data.tar.gz: 480404bb50bbbdc7fbc9ad8cc76bf3487a90f8eef1cfe28e1e425d4986d7744c3262b58f6fdc73fa51ce40b41221e7b76327f379276fa96b6c520db59e3b1bb3
+  metadata.gz: 6031199359197cd2e20b089f07af4db8c6f9c94b7bf9d25d9a0654e8c5ab63be9ad32dd22638c974fcbc1ca4170b70f558a6315125108eb30aa03149f0ae56b4
+  data.tar.gz: e3f21c86f83751ac0d50e255b7e67308d9e916c5c7e72708f1662ee1f3a4af104e5d355226ccaf55ed555bbb5e880c545cb75a942bf45705dd61c4099edc863c

data/lib/appsignal.rb

@@ -201,6 +201,7 @@ require 'appsignal/transaction'
 require 'appsignal/transaction/formatter'
 require 'appsignal/transaction/params_sanitizer'
 require 'appsignal/transmitter'
+require 'appsignal/zipped_payload'
 require 'appsignal/ipc'
 require 'appsignal/version'
 require 'appsignal/integrations/rails'

data/lib/appsignal/agent.rb

@@ -1,10 +1,11 @@
 module Appsignal
   class Agent
     ACTION = 'log_entries'.freeze
-    AGGREGATOR_LIMIT = 5 # Five minutes with a sleep time of 60 seconds
+    AGGREGATOR_LIMIT = 3 # Three minutes with a sleep time of 60 seconds
 
     attr_accessor :aggregator, :thread, :master_pid, :pid, :active, :sleep_time,
-                  :transmitter, :subscriber, :paused, :aggregator_queue, :revision
+                  :transmitter, :subscriber, :paused, :aggregator_queue, :revision,
+                  :transmission_successful
 
     def initialize
       return unless Appsignal.config.active?
@@ -13,11 +14,12 @@ module Appsignal
       else
         @sleep_time = 60.0
       end
-      @master_pid       = Process.pid
-      @pid              = @master_pid
-      @aggregator       = Aggregator.new
-      @transmitter      = Transmitter.new(ACTION)
-      @aggregator_queue = []
+      @master_pid              = Process.pid
+      @pid                     = @master_pid
+      @aggregator              = Aggregator.new
+      @transmitter             = Transmitter.new(ACTION)
+      @aggregator_queue        = []
+      @transmission_successful = true
 
       subscribe
       start_thread
@@ -110,7 +112,8 @@ module Appsignal
       end
 
       begin
-        add_to_aggregator_queue(aggregator_to_be_sent.post_processed_queue!)
+        payload = Appsignal::ZippedPayload.new(aggregator_to_be_sent.post_processed_queue!)
+        add_to_aggregator_queue(payload)
         send_aggregators
       rescue Exception => ex
         Appsignal.logger.error "#{ex.class} while sending queue: #{ex.message}\n#{ex.backtrace.join("\n")}"
@@ -134,6 +137,7 @@ module Appsignal
           payload
         end
       end.compact!
+      @transmission_successful = @aggregator_queue.empty?
     end
 
     def truncate_aggregator_queue(limit = AGGREGATOR_LIMIT)
@@ -142,15 +146,6 @@ module Appsignal
       @aggregator_queue = @aggregator_queue.first(limit)
     end
 
-    def clear_queue
-      Appsignal.logger.debug('Clearing queue')
-      # Replace aggregator while making sure no thread
-      # is adding to it's queue
-      Thread.exclusive do
-        @aggregator = Aggregator.new
-      end
-    end
-
     def forked!
       Appsignal.logger.info('Forked worker process')
       @active = true
@@ -167,7 +162,9 @@ module Appsignal
       @active = false
       unsubscribe
       stop_thread
-      send_queue if send_current_queue
+
+      # Only attempt to send the queue on shutdown when there are no API issues
+      send_queue if @transmission_successful
     end
 
     protected

data/lib/appsignal/transmitter.rb

@@ -41,7 +41,12 @@ module Appsignal
       end
     end
 
+    # Accepts a string or `Appsignal::ZippedPayload`
+    # If no `Appsignal::ZippedPayload` is given, it will convert it to one.
     def transmit(payload)
+      unless payload.is_a?(Appsignal::ZippedPayload)
+        payload = Appsignal::ZippedPayload.new(payload)
+      end
       Appsignal.logger.debug "Transmitting payload to #{uri}"
       http_client.request(http_post(payload)).code
     end
@@ -52,10 +57,7 @@ module Appsignal
       Net::HTTP::Post.new(uri.request_uri).tap do |request|
         request['Content-Type'] = CONTENT_TYPE
         request['Content-Encoding'] = CONTENT_ENCODING
-        request.body = Zlib::Deflate.deflate(
-          JSON.generate(payload, :quirks_mode => true),
-          Zlib::BEST_SPEED
-        )
+        request.body = payload.body
       end
     end
 

data/lib/appsignal/version.rb

@@ -1,3 +1,3 @@
 module Appsignal
-  VERSION = '0.11.8.beta.3'
+  VERSION = '0.11.8.beta.4'
 end

data/lib/appsignal/zipped_payload.rb

@@ -0,0 +1,13 @@
+module Appsignal
+  class ZippedPayload
+    attr_reader :body
+
+    def initialize(given_body)
+      @body = Zlib::Deflate.deflate(
+        JSON.generate(given_body, :quirks_mode => true),
+        Zlib::BEST_SPEED
+      )
+    end
+
+  end
+end

data/spec/lib/appsignal/agent_spec.rb

@@ -269,9 +269,17 @@ describe Appsignal::Agent do
   end
 
   describe "#send_queue" do
-    it "adds aggregator to queue" do
+    let(:zipped_payload) { double(:body => :zip) }
+
+    it "adds Zipped Payload to queue" do
       subject.aggregator.stub(:post_processed_queue! => :foo)
-      subject.should_receive(:add_to_aggregator_queue).with(:foo)
+
+      Appsignal::ZippedPayload
+        .should_receive(:new)
+        .with(:foo)
+        .and_return(zipped_payload)
+
+      subject.should_receive(:add_to_aggregator_queue).with(zipped_payload)
     end
 
     it "sends aggregators" do
@@ -329,6 +337,11 @@ describe Appsignal::Agent do
             subject.send_aggregators
           }.to change(subject, :aggregator_queue).from([aggregator_hash]).to([])
         end
+
+        it "should set the transmission state to successful" do
+          subject.send_aggregators
+          expect( subject.transmission_successful ).to be_true
+        end
       end
 
       context "when failed to sent" do
@@ -339,6 +352,11 @@ describe Appsignal::Agent do
             subject.send_aggregators
           }.to_not change(subject, :aggregator_queue)
         end
+
+        it "should set the transmission state to unsuccessful" do
+          subject.send_aggregators
+          expect( subject.transmission_successful ).to be_false
+        end
       end
 
       context "when an exception related to connection problems occurred during sending" do
@@ -354,6 +372,10 @@ describe Appsignal::Agent do
           }.to_not change(subject, :aggregator_queue)
         end
 
+        it "should set the transmission state to unsuccessful" do
+          subject.send_aggregators
+          expect( subject.transmission_successful ).to be_false
+        end
       end
     end
   end
@@ -378,14 +400,6 @@ describe Appsignal::Agent do
     end
   end
 
-  describe "#clear_queue" do
-    it "starts a new aggregator" do
-      Appsignal::Aggregator.should_receive(:new).twice # once on start, once on clear
-    end
-
-    after { subject.clear_queue }
-  end
-
   describe "#forked!" do
     subject { Appsignal.agent }
 
@@ -428,12 +442,15 @@ describe Appsignal::Agent do
     end
 
     it "should send the queue and shut down if the queue is to be sent" do
+      subject.instance_variable_set(:@transmission_successful, true)
+
       subject.should_receive(:send_queue)
 
       subject.shutdown(true, nil)
     end
 
     it "should only shutdown if the queue is not be sent" do
+      subject.instance_variable_set(:@transmission_successful, false)
       subject.should_not_receive(:send_queue)
 
       subject.shutdown(false, nil)

data/spec/lib/appsignal/transmitter_spec.rb

@@ -4,6 +4,7 @@ describe Appsignal::Transmitter do
   let(:config) { project_fixture_config }
   let(:action) { 'action' }
   let(:instance) { Appsignal::Transmitter.new(action, config) }
+  let!(:payload)  { Appsignal::ZippedPayload.new({'the' => 'payload'}) }
 
   describe "#uri" do
     before { Socket.stub(:gethostname => 'app1.local') }
@@ -34,9 +35,25 @@ describe Appsignal::Transmitter do
       )
     end
 
-    subject { instance.transmit(:the => :payload) }
+    it "should post the ZippedPayload" do
+      instance.transmit(payload).should == '200'
+    end
+
+    it "should not instantiate a new ZippedPayload" do
+      expect( Appsignal::ZippedPayload ).to_not receive(:new)
+      instance.transmit(payload)
+    end
 
-    it { should == '200' }
+    context "when not given a ZippedPayload, but a hash" do
+      it "should post the ZippedPayload" do
+        instance.transmit({'the' => 'payload'}).should == '200'
+      end
+
+      it "should instantiate a new ZippedPayload" do
+        expect( Appsignal::ZippedPayload ).to receive(:new).and_return(payload)
+        instance.transmit({'the' => 'payload'})
+      end
+    end
   end
 
   describe "#http_post" do
@@ -44,7 +61,7 @@ describe Appsignal::Transmitter do
       Socket.stub(:gethostname => 'app1.local')
     end
 
-    subject { instance.send(:http_post, 'the' => 'payload') }
+    subject { instance.send(:http_post, payload) }
 
     its(:body) { should == Zlib::Deflate.deflate("{\"the\":\"payload\"}", Zlib::BEST_SPEED) }
     its(:path) { should == instance.uri.request_uri }

data/spec/lib/appsignal/zipped_payload_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Appsignal::ZippedPayload do
+
+  describe "#initialize" do
+    it "should initialize a new `Appsignal::ZippedPayload` and zip the body" do
+      payload = Appsignal::ZippedPayload.new({'the' => 'payload'})
+
+      expect( payload.body ).to eql(Zlib::Deflate.deflate(
+        "{\"the\":\"payload\"}",
+        Zlib::BEST_SPEED
+      ))
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.11.8.beta.3
+  version: 0.11.8.beta.4
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -182,6 +182,7 @@ files:
 - lib/appsignal/transaction/params_sanitizer.rb
 - lib/appsignal/transmitter.rb
 - lib/appsignal/version.rb
+- lib/appsignal/zipped_payload.rb
 - lib/generators/appsignal/USAGE
 - lib/generators/appsignal/appsignal_generator.rb
 - lib/generators/appsignal/templates/appsignal.yml
@@ -225,6 +226,7 @@ files:
 - spec/lib/appsignal/transaction/formatter_spec.rb
 - spec/lib/appsignal/transaction_spec.rb
 - spec/lib/appsignal/transmitter_spec.rb
+- spec/lib/appsignal/zipped_payload_spec.rb
 - spec/lib/appsignal_spec.rb
 - spec/lib/generators/appsignal/appsignal_generator_spec.rb
 - spec/lib/tmp/config/appsignal.yml
@@ -298,6 +300,7 @@ test_files:
 - spec/lib/appsignal/transaction/formatter_spec.rb
 - spec/lib/appsignal/transaction_spec.rb
 - spec/lib/appsignal/transmitter_spec.rb
+- spec/lib/appsignal/zipped_payload_spec.rb
 - spec/lib/appsignal_spec.rb
 - spec/lib/generators/appsignal/appsignal_generator_spec.rb
 - spec/lib/tmp/config/appsignal.yml