aws-xray 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f77fd82652bf06893e19113dcfaa5c63a5edc3d
-  data.tar.gz: 7a8600ae15a4d91bd6eb6851438fdf4dd4a8e278
+  metadata.gz: 49d78b0969ee078afa62cbc258f473c778b70058
+  data.tar.gz: 5f9f8dd748de3e9792d6f89a820fb67e4af1e8cc
 SHA512:
-  metadata.gz: 95504c375874a4b29bd2d658c8efcc32ae36327e1324ea87ffd63dc40aee0918e4a7c837eaa8bf3b1b475d6aa7954ddd3fec691b1ffe8f796939736265bc34d0
-  data.tar.gz: 852ed588119d19c51a22f6406288adf76ff8d76f4bba0d7cbeb625640d74936c7e544f74bca7b872332cdb0dcf639e2bb1f39ae24a09960720b55d0ea30f1f22
+  metadata.gz: bf5667f8ddfc6b89c5c1ff5131925e4a75da426716401511b039ccf219f0761180301ea53d2431b70fb3a3589fd2753a6817d76bf65261152388a7ff61d28d46
+  data.tar.gz: fb0a771492810d55279fafe53b94a8ab530baf7945f300e433cfa73aa17f31cd25aa20b2b9137e4485755839b748d50ab3e8d7bbe39a22dbb9176424e1074cb9

data/lib/aws/xray/configuration.rb

@@ -1,5 +1,6 @@
 require 'socket'
 require 'aws/xray/annotation_normalizer'
+require 'aws/xray/version_detector'
 
 module Aws
   module Xray

data/lib/aws/xray/header_parser.rb

@@ -3,7 +3,6 @@ module Aws
     module HeaderParser
       extend self
 
-      # XXX: returns error when given invaild header_value
       # Header format document: http://docs.aws.amazon.com/xray/latest/devguide/xray-concepts.html#xray-concepts-tracingheader
       def parse(header_value)
         h = {}
@@ -13,7 +12,7 @@ module Aws
         header_value.chars.each_with_index do |c, i|
           next if space?(c)
           if delim?(c)
-            h[key] = value
+            h[key] = value unless key.empty?
             key, value = '', ''
             value_mode = false
             next

data/lib/aws/xray/rack.rb

@@ -1,7 +1,6 @@
 require 'aws/xray/trace'
 require 'aws/xray/client'
 require 'aws/xray/context'
-require 'aws/xray/version_detector'
 
 module Aws
   module Xray
@@ -32,12 +31,7 @@ module Aws
       private
 
       def call_with_tracing(env)
-        header_value = env[TRACE_ENV]
-        trace = if header_value
-                         Trace.build_from_header_value(header_value)
-                       else
-                         Trace.generate
-                       end
+        trace = build_trace(env[TRACE_ENV])
         env[ORIGINAL_TRACE_ENV] = env[TRACE_ENV] # just for the record
         env[TRACE_ENV] = trace.to_header_value
 
@@ -45,12 +39,20 @@ module Aws
           Context.current.base_trace do |seg|
             seg.set_http_request(Request.build_from_rack_env(env))
             status, headers, body = @app.call(env)
-            seg.set_http_response(status, headers['Content-Length'])
+            seg.set_http_response(status, headers['Content-Length'] || 0)
             headers[TRACE_HEADER] = trace.to_header_value
             [status, headers, body]
           end
         end
       end
+
+      def build_trace(header_value)
+        if header_value
+          Trace.build_from_header_value(header_value)
+        else
+          Trace.generate
+        end
+      end
     end
   end
 end

data/lib/aws/xray/segment.rb

@@ -17,7 +17,6 @@ module Aws
 
       attr_reader :name, :id, :trace_id, :parent_id
 
-      # TODO: securerandom?
       def initialize(name:, trace_id:, parent_id: nil)
         @name = name
         @id = SecureRandom.hex(8)

data/lib/aws/xray/trace.rb

@@ -9,14 +9,14 @@ module Aws
           new(root: generate_root(now))
         end
 
-        def build_from_header_value(header_value)
+        def build_from_header_value(header_value, now = Time.now)
           h = HeaderParser.parse(header_value)
-          new(root: h.fetch('Root'), sampled: h['Sampled'] != '0', parent: h['Parent'])
+          root = h['Root'] || generate_root(now)
+          new(root: root, sampled: h['Sampled'] != '0', parent: h['Parent'])
         end
 
         private
 
-        # XXX: securerandom?
         def generate_root(now)
           "1-#{now.to_i.to_s(16)}-#{SecureRandom.hex(12)}"
         end

data/lib/aws/xray/version.rb

@@ -1,5 +1,5 @@
 module Aws
   module Xray
-    VERSION = '0.9.5'
+    VERSION = '0.9.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-xray
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Taiki Ono
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-03 00:00:00.000000000 Z
+date: 2017-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday