aws-xray 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e625bb57c33f79d96bf18d717e824613f1028a3
-  data.tar.gz: 618ad109a0539d4e0efb80cb8adfc42ba59a31b2
+  metadata.gz: 9d82e4757318127e11c0c2a78eb5596c1059ff30
+  data.tar.gz: 668dee6504fd3e56e8df90348ab3625ece176575
 SHA512:
-  metadata.gz: f21c15606b990eafc9319d4c3ae4234c77838af4e48820c8cb2af7933d247d4837f868296fff09f54dde564f57acff163d3a7cc639fa118b9e60a88c85882d98
-  data.tar.gz: 29fb2b2b74383ae1d46c6471b95344d85cb34f616e2b1e6367e2af179be426b5d79ac4c60e2a40f33653323f420ce2e329035d2e4ca312edc193a915728f6d1f
+  metadata.gz: a9028ac1bfd372c9a31c6d15fe8608e4bfc53807c5a71f0c6c5e8d7304a43e5a07282d420afb6549d11d51645c6ce166b6295aa6e78db0bf247940cc65a39cf3
+  data.tar.gz: 6f1cdb13bfeb144815b4ba5b3733ba6e00264afe0e526b1ca1e5bdda55cdade106cbf315cd243ace055c6e8593495b5240e80b189d496281aecb75580d685f04

data/lib/aws/xray/request.rb

@@ -2,26 +2,45 @@ module Aws
   module Xray
     attrs = [:method, :url, :user_agent, :client_ip, :x_forwarded_for, :traced]
     class Request < Struct.new(*attrs)
-      def self.build_from_rack_env(env)
-        new(
-          env['REQUEST_METHOD'], # method
-          env['REQUEST_URI'], # url
-          env['HTTP_USER_AGENT'], # user_agent
-          env['X-Forwarded-For'], # client_ip
-          !!env['X-Forwarded-For'], # x_forwarded_for
-          false, # traced
-        )
-      end
+      class << self
+        def build(method:, url:, user_agent: nil, client_ip: nil, x_forwarded_for: nil, traced: false)
+          new(encode(method), encode(url), encode(user_agent), encode(client_ip), x_forwarded_for, traced)
+        end
+
+        def build_from_rack_env(env)
+          build(
+            method: env['REQUEST_METHOD'],
+            url: env['REQUEST_URI'],
+            user_agent: env['HTTP_USER_AGENT'],
+            client_ip: env['X-Forwarded-For'],
+            x_forwarded_for: !!env['X-Forwarded-For'],
+            traced: false,
+          )
+        end
+
+        def build_from_faraday_env(env)
+          build(
+            method: env.method.to_s.upcase,
+            url: env.url.to_s,
+            user_agent: env.request_headers['User-Agent'],
+            client_ip: nil,
+            x_forwarded_for: false,
+            traced: false,
+          )
+        end
+
+        private
 
-      def self.build_from_faraday_env(env)
-        new(
-          env.method.to_s.upcase, # method
-          env.url.to_s, # url
-          env.request_headers['User-Agent'], # user_agent
-          nil, # client_ip
-          false, # x_forwarded_for
-          false, # traced
-        )
+        # Ensure all strings have same encoding to JSONify them.
+        # If the given string has illegal bytes or a undefined byte sequence,
+        # replace them with a default character.
+        def encode(str)
+          if str.nil?
+            nil
+          else
+            str.to_s.encode(__ENCODING__, invalid: :replace, undef: :replace)
+          end
+        end
       end
     end
   end

data/lib/aws/xray/version.rb

@@ -1,5 +1,5 @@
 module Aws
   module Xray
-    VERSION = '0.9.1'
+    VERSION = '0.9.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-xray
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Taiki Ono
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: The unofficial X-Ray Tracing SDK for Ruby.