appsignal 0.8.0 → 0.8.1.beta.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTA0NmQ5NjdiOGVhYjQyNGY2NTlhYzkxZmZlYzhjYzNiMTMyMWQ3ZA==
+    NDBhODkxNDkwODA4NjY4Yjc5Zjc0Zjk2MTJiNmEwMjU2YjYxZjZjZg==
   data.tar.gz: !binary |-
-    OTJkNmVkODA5MGI1NjE4OTE3ZDU0NzIyOGY5YzhhZjZkNzE5NjczMQ==
+    NzI5ZmExYmE1NGMxM2IyZGU1YzE0YWE4NjY5MjEzMzY0NWUxNWM3NA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2U1NzI0NWQxMjkzNWU1N2Q4OTgwMjE3MGU5ZDIwYjA5MWUwODBjMzQyMzE2
-    NjdlMDMzNDkyNzQzNDdlMzZiNjJmMGJiNTcxNmE0ODllMzdmMTQxZjE2ZmE1
-    ZDEwYWJjNTkxNmVlOWEwMDExYjQ2M2FlOWU3NDFiOTc3OGJlNjE=
+    ODE2NGY5Zjc2Mjc0MTYzMmIwNGEyYThkNTQ5NGUxNzllYzAxOTYxMGVhMjQ5
+    MDg2NTdjMzFlNDk3YmQwN2ZlMzQ0NzhhNGYxYzI5MzRhZjVjZGNlNzZhZDI1
+    ODk1OWQ4OTUxMTAwOWRmOGIyODlmOGJlMGY3M2RhOTRiN2UxNjc=
   data.tar.gz: !binary |-
-    MTVhMjg3NTNiZjdiYmNlMGQ5NjQ2YWY0MDAyN2ZmOTJkZDdjOGVmN2MwN2Jl
-    YmQwYzdkOGUyZDVlNjNkODk3ZDhlNDRmMjRjOTg5ZmZjNzAwOGQ5NzI4NGQw
-    N2U4YmU5NWY3NmZhMmM3YzIyNWQyNzM0MTQzZDEwMjVhZTJlYzI=
+    YjQ5NmQxOGYzZGU3MDI4MzRkNDk3NDkzOTNhZjliODMyYTQ3ZmE4NzQxZmFk
+    MTMxNzdkZWQ4MWM4ZDU2NWQ0M2NkZmNiYTNmNzg4MjViOWE3OWU5OWI3MDQ3
+    YzE1MDVhN2IyZGE2Mzk1ZDdjOTU5ODBhNGU0MzAyODg3YWMyZWU=

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.8.1
+* Fix in monitoring of queue times
+
 # 0.8.0
 * Support for background processors (Delayed Job and Sidekiq)
 

data/lib/appsignal/integrations/sidekiq.rb

@@ -6,14 +6,13 @@ if defined?(::Sidekiq)
       class SidekiqPlugin
         def call(worker, item, queue)
           Appsignal::Transaction.create(SecureRandom.uuid, ENV.to_hash)
-
           ActiveSupport::Notifications.instrument(
             'perform_job.sidekiq',
             :class => item['class'],
             :method => 'perform',
             :attempts => item['retry_count'],
             :queue => item['queue'],
-            :queue_time => (Time.now.to_f - item['enqueued_at'].to_f) * 1000
+            :queue_start => item['enqueued_at']
           ) do
             yield
           end

data/lib/appsignal/transaction.rb

@@ -22,7 +22,7 @@ module Appsignal
     end
 
     attr_reader :request_id, :events, :process_action_event, :action, :exception,
-                :env, :fullpath, :time, :tags, :kind
+                :env, :fullpath, :time, :tags, :kind, :queue_start
 
     def initialize(request_id, env)
       @request_id = request_id
@@ -54,6 +54,7 @@ module Appsignal
       return unless event && event.payload
       @action = "#{event.payload[:controller]}##{event.payload[:action]}"
       @kind = 'http_request'
+      set_http_queue_start
     end
 
     def set_perform_job_event(event)
@@ -61,6 +62,7 @@ module Appsignal
       return unless event && event.payload
       @action = "#{event.payload[:class]}##{event.payload[:method]}"
       @kind = 'background_job'
+      set_background_queue_start
     end
 
     def add_event(event)
@@ -121,21 +123,18 @@ module Appsignal
       end
     end
 
-    def queue_start
-      if @kind == 'background_job'
-        @process_action_event.payload[:queue_start].to_f
-      else
-        http_queue_start
-      end
+    def set_background_queue_start
+      return unless process_action_event.payload[:queue_start]
+      @queue_start = process_action_event.payload[:queue_start].to_f
     end
 
-    def http_queue_start
+    def set_http_queue_start
       return unless env
       env_var = env['HTTP_X_QUEUE_START'] || env['HTTP_X_REQUEST_START']
       if env_var
         value = env_var.tr('^0-9', '')
         unless value.empty?
-          value.to_f / 1_000_000
+          @queue_start = value.to_f / 1_000_000
         end
       end
     end

data/lib/appsignal/transaction/formatter.rb

@@ -49,8 +49,8 @@ module Appsignal
       end
 
       def add_queue_duration_to_hash!
-        start = queue_start
-        if start
+        start = queue_start || 0.0
+        if start > 0
           hash[:log_entry][:queue_duration] = hash[:log_entry][:time] - start
         end
       end

data/lib/appsignal/version.rb

@@ -1,3 +1,3 @@
 module Appsignal
-  VERSION = '0.8.0'
+  VERSION = '0.8.1.beta.0'
 end

data/spec/lib/appsignal/integrations/sidekiq_spec.rb

@@ -39,7 +39,7 @@ describe "Sidekiq integration" do
         :method => 'perform',
         :attempts => 0,
         :queue => 'default',
-        :queue_time => 60_000
+        :queue_start => Time.parse('01-01-2001 10:00:00UTC')
       )
     end
 

data/spec/lib/appsignal/transaction_spec.rb

@@ -32,7 +32,8 @@ describe Appsignal::Transaction do
       {
         'HTTP_USER_AGENT' => 'IE6',
         'SERVER_NAME' => 'localhost',
-        'action_dispatch.routes' => 'not_available'
+        'action_dispatch.routes' => 'not_available',
+        'HTTP_X_REQUEST_START' => '1000000'
       }
     end
     let(:transaction) { Appsignal::Transaction.create('1', env) }
@@ -45,6 +46,7 @@ describe Appsignal::Transaction do
 
     describe '#set_process_action_event' do
       before { transaction.set_process_action_event(process_action_event) }
+
       let(:process_action_event) { notification_event }
 
       it 'should add a process action event' do
@@ -58,14 +60,20 @@ describe Appsignal::Transaction do
       it "should set the kind" do
         transaction.kind.should == 'http_request'
       end
+
+      it "should call set_http_queue_start" do
+        transaction.queue_start.should_not be_nil
+      end
     end
 
     describe "set_perform_job_event" do
       before { transaction.set_perform_job_event(perform_job_event) }
+
+      let(:payload) { create_background_payload }
       let(:perform_job_event) do
         notification_event(
           :name => 'perform_job.delayed_job',
-          :payload => create_background_payload
+          :payload => payload
         )
       end
 
@@ -80,6 +88,10 @@ describe Appsignal::Transaction do
       it "should set the kind" do
         transaction.kind.should == 'background_job'
       end
+
+      it "should set call set_background_queue_start" do
+        transaction.queue_start.should_not be_nil
+      end
     end
 
     describe "#set_tags" do
@@ -316,39 +328,46 @@ describe Appsignal::Transaction do
       end
     end
 
-    describe "#queue_start" do
+    describe "#set_background_queue_start" do
+      before do
+        transaction.stub(:process_action_event =>
+          notification_event(
+            :name => 'perform_job.delayed_job',
+            :payload => payload
+          )
+        )
+        transaction.set_background_queue_start
+      end
       subject { transaction.queue_start }
 
-      context "for a http request" do
-        let(:transaction) { regular_transaction }
+      context "when queue start is nil" do
+        let(:payload) { create_background_payload(:queue_start => nil) }
 
-        it "should call http_queue_start" do
-          transaction.should_receive(:http_queue_start)
-          subject
-        end
+        it { should be_nil }
       end
 
-      context "for a background job" do
-        let(:transaction) { background_job_transaction }
+      context "when queue start is set" do
+        let(:payload) { create_background_payload }
 
-        it "should get the queue start from the payload" do
-          subject.should == 978364850.0
-        end
+        it { should == 978364850.0 }
       end
     end
 
-    describe "#http_queue_start" do
+    describe "#set_http_queue_start" do
       let(:slightly_earlier_time) { fixed_time - 10.0 }
       let(:slightly_earlier_time_in_msec) { (slightly_earlier_time.to_f * 1_000_000).to_i }
-      subject { transaction.send(:http_queue_start) }
+      before { transaction.set_http_queue_start }
+      subject { transaction.queue_start }
 
-      context "without the env" do
+      context "without env" do
         let(:env) { nil }
 
         it { should be_nil }
       end
 
       context "with no relevant header set" do
+        let(:env) { {} }
+
         it { should be_nil }
       end
 

data/spec/support/helpers/notification_helpers.rb

@@ -12,7 +12,7 @@ module NotificationHelpers
     )
   end
 
-  def create_payload(args = {})
+  def create_payload(args={})
     {
       :path => '/blog',
       :action => 'show',
@@ -33,6 +33,6 @@ module NotificationHelpers
       :attempts => 0,
       :queue => 'default',
       :queue_start => fixed_time - 10,
-    }
+    }.merge(args)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1.beta.0
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -237,9 +237,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3