logjam_agent 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cfa8b992d101abc573fa95d3efb28cdefe8d66e
-  data.tar.gz: 6746b125ed91579f0619409e96ee0184e1c79022
+  metadata.gz: fb53d525dcf6b2c781a75ac0518fde4df23a17aa
+  data.tar.gz: 58e74b68432d9be6670ae0aee104c6426476ae3b
 SHA512:
-  metadata.gz: ae23146aea9c14e6e3d928c910d78f55058128efb5dcbae8a0a72c676f17037932c5d63a9246c59ba0a79a0a2838227c1abb60c186c77c18837961b28f208f59
-  data.tar.gz: 6e5a3f6a09f1da1c9b0184bdbc285316f992205d03064acf24e0573f1fff24ec7d57fa3334e91ac5cb91fa634027f8864525837c7c2ba9f81d94315b67860422
+  metadata.gz: e6c892318c145e0ee870fcbe34a01767cb5bcf3107001670bf10c87b747cc171d21a4023b66a6e6d8d3210debf783e5b87384f3a18adcf1f76fa2f45b8044a05
+  data.tar.gz: f1a17d91b75b4c2a6a8fdd6d90ca1161f00fcc26d8023070ab92f145740b7f8f7096164620280cc4a8cb17af3175e7833fb380edce2fc3e197c55b51089ab0be

data/lib/logjam_agent/rack/logger.rb

@@ -26,11 +26,20 @@ module LogjamAgent
 
       def call_app(request, env)
         start_time = Time.now
+        start_time_header = env['HTTP_X_STARTTIME'] # || "t=#{((Time.now - 50.0/1_000.0).to_f*1_000_000).to_i}"
+        if start_time_header && start_time_header =~ /\At=(\d+)\z/
+          # accuracy?
+          http_start_time = Time.at($1.to_f / 1_000_000.0)
+          wait_time_ms = (start_time - http_start_time) * 1000
+          start_time = http_start_time
+        else
+          wait_time_ms = 0.0
+        end
         before_dispatch(request, env, start_time)
         result = @app.call(env)
       ensure
-        run_time = Time.now - start_time
-        after_dispatch(env, result, run_time*1000)
+        run_time_ms = (Time.now - start_time) * 1000
+        after_dispatch(env, result, run_time_ms, wait_time_ms)
       end
 
       def compute_tags(request)
@@ -71,12 +80,14 @@ module LogjamAgent
         info "Started #{request.request_method} \"#{path}\" for #{ip} at #{start_time.to_default_s}" unless logjam_request.ignored?
       end
 
-      def after_dispatch(env, result, run_time_ms)
+      def after_dispatch(env, result, run_time_ms, wait_time_ms)
         status = result ? result.first.to_i : 500
         if completed_info = Thread.current.thread_variable_get(:time_bandits_completed_info)
           _, additions, view_time, _ = completed_info
         end
-        request_info = {:total_time => run_time_ms, :code => status, :view_time => view_time || 0.0}
+        request_info = {
+          :total_time => run_time_ms, :code => status, :view_time => view_time || 0.0, :wait_time => wait_time_ms
+        }
         logjam_request = LogjamAgent.request
 
         if (allowed_time_ms = env['HTTP_X_LOGJAM_CALLER_TIMEOUT'].to_i) > 0 && (run_time_ms > allowed_time_ms)

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: logjam_agent
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Logjam client library to be used with logjam