aws-xray 0.9.8 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02e461bf920f1836d099cd8c4a0ba0c86737019e
-  data.tar.gz: 216ec607b3cf660ad332533028d36d75236b8df0
+  metadata.gz: be0cc5b981db59d586eddd5427762402d293ab97
+  data.tar.gz: 6fc0e7a7856667b32a02f86fd65e82510ad30c43
 SHA512:
-  metadata.gz: 5925ddc3961fccccdb11c5d7153bd02e725570fd1aece1066be05f730b7cb6660265fb19e8ae7c431fed84014c1a0115d420ff0a746a12493195954f8615af2b
-  data.tar.gz: d7efc9adde70829acf88acfdf880721dbe6e52ccf56b6408d9d11464aa079b714efde341c33e5416cb7eb74f2e776e32bbee44c22a4a41dfa91b355178313501
+  metadata.gz: 9294ba8202504a3936ba1dc1fe68dc52a79a3a1762ed6d49e02b310e4965a12ca395f24c9dc0e019a2814df6726f937dc4ff4abe2673665e341e4cfe4f6b8e4e
+  data.tar.gz: 3d6d58c09af7728a868952ba24b0326016e287deda7d67e20d4ebb81921a6aab29fe1a7b235928d32ba40a23f4043e5ec030807e47801d23bf53b1276bf18758

data/aws-xray.gemspec

@@ -22,9 +22,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'faraday'
+  spec.add_dependency 'rack'
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rack-test'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'pry-byebug'
 end

data/example/Gemfile

@@ -6,3 +6,4 @@ gem 'aws-xray', path: File.expand_path('../', __dir__)
 
 gem 'foreman'
 gem 'pry-byebug'
+gem 'puma'

data/lib/aws/xray/request.rb

@@ -1,33 +1,35 @@
 require 'uri'
+require 'rack'
 
 module Aws
   module Xray
     attrs = [:method, :url, :user_agent, :client_ip, :x_forwarded_for, :traced]
     class Request < Struct.new(*attrs)
       class << self
-        def build(method:, url:, user_agent: nil, client_ip: nil, x_forwarded_for: nil, traced: false)
+        def build(method:, url:, user_agent: nil, client_ip: nil, x_forwarded_for: nil, traced: nil)
           new(encode(method), drop_params(encode(url)), encode(user_agent), encode(client_ip), x_forwarded_for, traced)
         end
 
         def build_from_rack_env(env)
+          req = ::Rack::Request.new(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,
+            method: req.request_method,
+            url: req.url,
+            user_agent: req.user_agent,
+            client_ip: req.ip,
+            x_forwarded_for: !!env['HTTP_X_FORWARDED_FOR'],
+            traced: nil,
           )
         end
 
-        def build_from_faraday_env(env)
+        def build_from_faraday_env(env, traced: false)
           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,
+            x_forwarded_for: nil,
+            traced: traced,
           )
         end
 

data/lib/aws/xray/version.rb

@@ -1,5 +1,5 @@
 module Aws
   module Xray
-    VERSION = '0.9.8'
+    VERSION = '0.10.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-xray
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.10.0
 platform: ruby
 authors:
 - Taiki Ono
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="