logjam_agent 0.12.3 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7e8279fe1b7c12c2263946e8ec20859336bdff1
-  data.tar.gz: b07f94026782f2a936c4d25dfc7b6a1bbb676237
+  metadata.gz: 6729159239dcd10c5f56d76ae34d34f6798c102a
+  data.tar.gz: c55ddcfb030609b5018d8452509a285cdd5264c6
 SHA512:
-  metadata.gz: e5d97646965e5668d9a4d3b825d680b0620066f53f13ea3b0bfa007cccd2d01560461a3bf5fa1791e1724d3a0a12b893ff477fe1d29c14c4d2776079e8b8e2ec
-  data.tar.gz: c999c6cfd7290c1624fd524e222990c3c119365b11880e221f8377bc1fd7945de92e2152a2fe499d5c60400265729e42616b986c3df6e18c48b7d2506b7440a5
+  metadata.gz: f2d799502c05f8561e645e675e44d58dc6ef2e94c3513222d4afc3ce50a324854530cea6c2aefc8fb7574c588b3900bede0d4d03a3657ea183a709302854960e
+  data.tar.gz: abbf559d5e30c33cfd93599df6fb5aac070ddfec28abdf8fe1b8e08f05377a46335fc6e3fccabdfd2589a3b2d4a73fa6be420cd77d39ff98018672eae34c4ca0

data/README.md

@@ -94,7 +94,7 @@ LogjamAgent.error_handler = lambda {|exception| ... }
 
 The MIT License
 
-Copyright (c) 2013, 2014 Stefan Kaes
+Copyright (c) 2013 - 2015 Stefan Kaes
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/logjam_agent/rack/logger.rb

@@ -27,9 +27,9 @@ 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}"
+        start_time_header = env['HTTP_X_STARTTIME']
         if start_time_header && start_time_header =~ /\At=(\d+)\z/
-          # accuracy?
+          # HTTP_X_STARTTIME is microseconds since the epoch (UTC)
           http_start_time = Time.at($1.to_f / 1_000_000.0)
           if (wait_time_ms = (start_time - http_start_time) * 1000) > 0
             start_time = http_start_time
@@ -75,9 +75,10 @@ module LogjamAgent
         logjam_request = LogjamAgent.request
         logjam_request.ignore! if ignored_asset_request?(path)
 
+        logjam_request.start_time = start_time
         logjam_fields = logjam_request.fields
         ip = LogjamAgent.ip_obfuscator(request.ip)
-        logjam_fields.merge!(:started_at => start_time.iso8601, :ip => ip, :host => @hostname)
+        logjam_fields.merge!(:ip => ip, :host => @hostname)
         logjam_fields.merge!(extract_request_info(request))
 
         info "Started #{request.request_method} \"#{path}\" for #{ip} at #{start_time.to_default_s}" unless logjam_request.ignored?

data/lib/logjam_agent/request.rb

@@ -6,7 +6,7 @@ end
 
 module LogjamAgent
   class Request
-    attr_reader :fields, :uuid
+    attr_reader :fields, :uuid, :start_time
 
     def initialize(app, env, initial_fields)
       @app = app
@@ -14,7 +14,11 @@ module LogjamAgent
       @forwarder = Forwarders.get(app, env)
       @lines = []
       @uuid = LogjamAgent.generate_uuid
-      @fields = initial_fields.merge(:request_id => @uuid, :host => LogjamAgent.hostname, :process_id => Process.pid, :lines => @lines)
+      @fields = initial_fields.merge(:request_id => @uuid, :host => LogjamAgent.hostname,
+                                     :process_id => Process.pid, :lines => @lines)
+      if start_time = @fields.delete(:start_time)
+        self.start_time = start_time
+      end
       @mutex = Mutex.new
       @ignored = false
       @bytes_all_lines = 0
@@ -22,6 +26,12 @@ module LogjamAgent
       @max_line_length = LogjamAgent.max_line_length
     end
 
+    def start_time=(start_time)
+      @start_time = start_time
+      @fields[:started_at] = start_time.iso8601
+      @fields[:started_ms] = start_time.tv_sec * 1000 + start_time.tv_usec / 1000
+    end
+
     def ignore!
       @ignored = true
     end

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.12.3"
+  VERSION = "0.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.13.0
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake