appsignal 0.11.8.beta.1 → 0.11.8.beta.2

data/CHANGELOG.md

@@ -2,6 +2,7 @@
 * Add frontend error catcher
 * Add background job metadata (queue, priority etc.) to transaction overview
 * Add APPSIGNAL_APP_ENV variable to Rails config, so you can override the environment
+* Handle http queue times in microseconds too
 
 # 0.11.7
 * Add option to override Job name in Delayed Job

data/Rakefile

@@ -141,3 +141,5 @@ task :console do
   ARGV.clear
   IRB.start
 end
+
+task :default => [:generate_bundle_and_spec_all, :spec]

data/lib/appsignal/integrations/delayed_job.rb

@@ -20,12 +20,13 @@ if defined?(::Delayed::Plugin)
 
           Appsignal.monitor_transaction(
             'perform_job.delayed_job',
-            :class => class_name,
-            :method => method_name,
+            :class    => class_name,
+            :method   => method_name,
             :metadata => {
-              :priority => job.priority,
-              :attempts => job.attempts,
+              :id       => job.id,
               :queue    => job.queue,
+              :priority => job.priority || 0,
+              :attempts => job.attempts || 0
             },
             :queue_start => job.created_at
           ) do

data/lib/appsignal/transaction.rb

@@ -181,9 +181,13 @@ module Appsignal
       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 / 1000.0
+        cleaned_value = env_var.tr('^0-9', '')
+        unless cleaned_value.empty?
+          value = cleaned_value.to_i
+          [1_000_000.0, 1_000.0].each do |factor|
+            @queue_start = value / factor
+            break if @queue_start > 946_681_200.0 # Ok if it's later than 2000
+          end
         end
       end
     end

data/lib/appsignal/version.rb

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

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

@@ -30,6 +30,7 @@ describe "Delayed Job integration" do
       let(:time) { Time.parse('01-01-2001 10:01:00UTC') }
       let(:job) do
         double(
+          :id             => 123,
           :name           => 'TestClass#perform',
           :priority       => 1,
           :attempts       => 1,
@@ -51,6 +52,7 @@ describe "Delayed Job integration" do
               :priority => 1,
               :attempts => 1,
               :queue    => 'default',
+              :id       => 123
             },
             :queue_start => time - 60_000,
           )
@@ -66,10 +68,11 @@ describe "Delayed Job integration" do
               :payload_object => double(
                 :appsignal_name => 'CustomClass#perform'
               ),
-              :name => 'TestClass#perform',
-              :priority => 1,
-              :attempts => 1,
-              :queue    => 'default',
+              :id         => 123,
+              :name       => 'TestClass#perform',
+              :priority   => 1,
+              :attempts   => 1,
+              :queue      => 'default',
               :created_at => time - 60_000
             )
           end
@@ -82,6 +85,7 @@ describe "Delayed Job integration" do
                 :priority => 1,
                 :attempts => 1,
                 :queue    => 'default',
+                :id       => 123
               },
               :queue_start => time - 60_000
             )

data/spec/lib/appsignal/transaction_spec.rb

@@ -482,45 +482,59 @@ describe Appsignal::Transaction do
 
     describe "#set_http_queue_start" do
       let(:slightly_earlier_time) { fixed_time - 0.4 }
-      let(:slightly_earlier_time_in_ms) { (slightly_earlier_time.to_f * 1000).to_i }
+      let(:slightly_earlier_time_value) { (slightly_earlier_time * factor).to_i }
       before { transaction.set_http_queue_start }
       subject { transaction.queue_start }
 
-      context "without env" do
-        let(:env) { nil }
+      shared_examples "http queue start" do
+        context "without env" do
+          let(:env) { nil }
 
-        it { should be_nil }
-      end
+          it { should be_nil }
+        end
 
-      context "with no relevant header set" do
-        let(:env) { {} }
+        context "with no relevant header set" do
+          let(:env) { {} }
 
-        it { should be_nil }
-      end
+          it { should be_nil }
+        end
 
-      context "with the HTTP_X_REQUEST_START header set" do
-        let(:env) { {'HTTP_X_REQUEST_START' => "t=#{slightly_earlier_time_in_ms}"} }
+        context "with the HTTP_X_REQUEST_START header set" do
+          let(:env) { {'HTTP_X_REQUEST_START' => "t=#{slightly_earlier_time_value}"} }
 
-        it { should == 1389783599.6 }
+          it { should == 1389783599.6 }
 
-        context "with unparsable content" do
-          let(:env) { {'HTTP_X_REQUEST_START' => 'something'} }
+          context "with unparsable content" do
+            let(:env) { {'HTTP_X_REQUEST_START' => 'something'} }
 
-          it { should be_nil }
-        end
+            it { should be_nil }
+          end
 
-        context "with some cruft" do
-          let(:env) { {'HTTP_X_REQUEST_START' => "t=#{slightly_earlier_time_in_ms}aaaa"} }
+          context "with some cruft" do
+            let(:env) { {'HTTP_X_REQUEST_START' => "t=#{slightly_earlier_time_value}aaaa"} }
 
-          it { should == 1389783599.6 }
-        end
+            it { should == 1389783599.6 }
+          end
 
-        context "with the alternate HTTP_X_QUEUE_START header set" do
-          let(:env) { {'HTTP_X_QUEUE_START' => "t=#{slightly_earlier_time_in_ms}"} }
+          context "with the alternate HTTP_X_QUEUE_START header set" do
+            let(:env) { {'HTTP_X_QUEUE_START' => "t=#{slightly_earlier_time_value}"} }
 
-          it { should == 1389783599.6 }
+            it { should == 1389783599.6 }
+          end
         end
       end
+
+      context "time in miliseconds" do
+        let(:factor) { 1_000 }
+
+        it_should_behave_like "http queue start"
+      end
+
+      context "time in microseconds" do
+        let(:factor) { 1_000_000 }
+
+        it_should_behave_like "http queue start"
+      end
     end
 
     # protected

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.11.8.beta.1
+  version: 0.11.8.beta.2
+  prerelease: 7
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,104 +13,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: The official appsignal.com gem
@@ -120,9 +135,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -242,26 +257,27 @@ files:
 homepage: https://github.com/appsignal/appsignal
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">"
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Logs performance and exception data from your app to appsignal.com
 test_files:
 - spec/lib/appsignal/agent_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: d352412d00bbd2c1cf81315d80ae4a5c08d8115e
-  data.tar.gz: df2cda49d433880e1c89b5c42c1c12cf1abb65bd
-SHA512:
-  metadata.gz: 8347c842bde632030871bbe90392115a744d1676d1afc98c9f796987b587be7ce5d8c56a742019dd004b1f8b580fc05a9250e2b59ed099ef555d6e31052b1deb
-  data.tar.gz: cda5f26ebd0b612f46feca9952f1e420c6370e89e9682e8879e91f1250e9d47edcee7ff61e2cd5b11f6c2e0b08ae1a063451e92e008f1bc4cc10e1d006ec48ca