appsignal 0.8.1.beta.0 → 0.8.1.beta.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDBhODkxNDkwODA4NjY4Yjc5Zjc0Zjk2MTJiNmEwMjU2YjYxZjZjZg==
+    MDVkNjBlODY5OTYzNTYwOWFiNzkzYjY3NzY1NTJhNjZkYmNmNDVmOQ==
   data.tar.gz: !binary |-
-    NzI5ZmExYmE1NGMxM2IyZGU1YzE0YWE4NjY5MjEzMzY0NWUxNWM3NA==
+    OWZjNGJiYjY2MzAwNDE2ZDk4NjY2MGU5OWJlMDJjODExNDRhMTAxNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODE2NGY5Zjc2Mjc0MTYzMmIwNGEyYThkNTQ5NGUxNzllYzAxOTYxMGVhMjQ5
-    MDg2NTdjMzFlNDk3YmQwN2ZlMzQ0NzhhNGYxYzI5MzRhZjVjZGNlNzZhZDI1
-    ODk1OWQ4OTUxMTAwOWRmOGIyODlmOGJlMGY3M2RhOTRiN2UxNjc=
+    MDE4N2EyYjE0MzE5M2Y3NWI1NTk0N2YxMTM0YmMzMzk3ZjY2Mzc4MTRmZTEy
+    NWMyM2E1ZjYwZmU3OWJlNjQwYTE5OTU2MGI4NmQ0MTA0YTExNTQ4YzJlZmQy
+    ZmI1NGY0M2JiNjU3ODA0OGNmYjU3NmEwZjkzMTAwYjgwMzc3Yjg=
   data.tar.gz: !binary |-
-    YjQ5NmQxOGYzZGU3MDI4MzRkNDk3NDkzOTNhZjliODMyYTQ3ZmE4NzQxZmFk
-    MTMxNzdkZWQ4MWM4ZDU2NWQ0M2NkZmNiYTNmNzg4MjViOWE3OWU5OWI3MDQ3
-    YzE1MDVhN2IyZGE2Mzk1ZDdjOTU5ODBhNGU0MzAyODg3YWMyZWU=
+    Njc3ZmU3N2Y1Yjc2MWQzZDdmYzBmYjI0NmM5NzA3OGIzNTdkM2Y2ZGZjOTM3
+    MWYzMjJlYmYzMjAwMTc2OTc4MWYyMjQ0Y2RiNzg4ZGQwZDYyMTk0NzhiMTY0
+    MzYwMTE0OWM3MWE4NGIyNDAwYzRjMzJiN2NkYzE1ZWVkZDczNzA=

data/lib/appsignal/transaction.rb

@@ -124,17 +124,20 @@ module Appsignal
     end
 
     def set_background_queue_start
-      return unless process_action_event.payload[:queue_start]
-      @queue_start = process_action_event.payload[:queue_start].to_f
+      queue_start = process_action_event.payload[:queue_start]
+      return unless queue_start
+      Appsignal.logger.debug("Setting background queue start: #{queue_start}")
+      @queue_start = queue_start.to_f
     end
 
     def set_http_queue_start
       return unless env
       env_var = env['HTTP_X_QUEUE_START'] || env['HTTP_X_REQUEST_START']
       if env_var
+        Appsignal.logger.debug("Setting http queue start: #{env_var}")
         value = env_var.tr('^0-9', '')
         unless value.empty?
-          @queue_start = value.to_f / 1_000_000
+          @queue_start = value.to_f / 1000
         end
       end
     end

data/lib/appsignal/transaction/formatter.rb

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

data/lib/appsignal/version.rb

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

data/spec/lib/appsignal/transaction/formatter_spec.rb

@@ -114,7 +114,8 @@ describe Appsignal::Transaction::Formatter do
     end
 
     context "with a background request" do
-      let(:transaction) { background_job_transaction }
+      let(:payload) { create_background_payload }
+      let(:transaction) { background_job_transaction({}, payload) }
       before { transaction.truncate! }
 
       its(:keys) { should =~ [:request_id, :log_entry, :failed] }
@@ -134,6 +135,16 @@ describe Appsignal::Transaction::Formatter do
         :time => 978364860.0,
       } }
       its([:failed]) { should be_false }
+
+      context "when queue_time is zero" do
+        let(:payload) { create_background_payload(:queue_start => 0) }
+
+        context "log entry" do
+          subject { formatter.hash[:log_entry] }
+
+          its([:queue_duration]) { should be_nil }
+        end
+      end
     end
   end
 end

data/spec/lib/appsignal/transaction_spec.rb

@@ -355,7 +355,7 @@ describe Appsignal::Transaction 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 }
+      let(:slightly_earlier_time_in_msec) { (slightly_earlier_time.to_f * 1000).to_i }
       before { transaction.set_http_queue_start }
       subject { transaction.queue_start }
 

data/spec/support/helpers/transaction_helpers.rb

@@ -33,7 +33,7 @@ module TransactionHelpers
   def regular_transaction_with_x_request_start
     appsignal_transaction(
       :process_action_event => notification_event,
-      'HTTP_X_REQUEST_START' => "t=#{((fixed_time.to_f - 40.0) * 1_000_000).to_i}"
+      'HTTP_X_REQUEST_START' => "t=#{((fixed_time.to_f - 40.0) * 1000).to_i}"
     )
   end
 
@@ -59,7 +59,7 @@ module TransactionHelpers
     )
   end
 
-  def background_job_transaction(args={})
+  def background_job_transaction(args={}, payload=create_background_payload)
     Appsignal::Transaction.create(
       '1',
       {
@@ -70,7 +70,7 @@ module TransactionHelpers
       o.set_perform_job_event(
         notification_event(
           :name => 'perform_job.delayed_job',
-          :payload => create_background_payload
+          :payload => payload
         )
       )
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.8.1.beta.0
+  version: 0.8.1.beta.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-04 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport