aws-xray 0.12.2 → 0.13.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 263047b7e176ea3323645433bb42f1a04d451d17
-  data.tar.gz: 2361cf717b1e846fb4fda1b68c1bbf1da3f60b6a
+  metadata.gz: d0018b35cfa2fd693eac3478688682d814dc98e9
+  data.tar.gz: 5ee596913c20b16a040484f2d0888ccb28ada64a
 SHA512:
-  metadata.gz: 8a483a0f714c25c101227822512aecd2810f08f02676ed2883eb82b7044564aa9fb1e1a99394e9aaa02495e821f1173b7cd88a4f4eca332b5655a20762fab6d3
-  data.tar.gz: bc827a4ec3c100a2798655152886454e5b4dc9c350be088e51a96ec2f85a50da1f8fd7f3795c782f2a3430ae64baf6efad9ed1ced52fd2139ad196291109ee20
+  metadata.gz: 0f78e9501736f39266e1c496bf4c2f3c7bd7b974176763bc665fcd7e7a2d848d8925f2fb93d85449abbfb10e680fd4111eb32056bfcf4b0fd868fd1a6bb8d022
+  data.tar.gz: 527bcf973e2862796405774ee187ca10bc4f4eeb0dd20f09142e2e1cab5f37502ff7548f431cd40bda045118a39a6546ad3e6c084650fde91b886aa89c4a952b

data/example/Procfile

@@ -1,5 +1,5 @@
-front: env RECIPE_APP=127.0.0.1:3001 bundle exec rackup fron_app_config.ru -o 127.0.0.1 -p 3000
-recipe: env USER_APP=127.0.0.1:3002 CAMPAIN_APP=127.0.0.1:3003 bundle exec rackup recipe_app_config.ru -o 127.0.0.1 -p 3001
-user: bundle exec rackup user_app_config.ru -o 127.0.0.1 -p 3002
-campain: bundle exec rackup campain_app_config.ru -o 127.0.0.1 -p 3003
+front: env AWS_XRAY_LOCATION=localhost:2000 RECIPE_APP=127.0.0.1:3001 bundle exec rackup fron_app_config.ru -o 127.0.0.1 -p 3000
+recipe: env AWS_XRAY_LOCATION=localhost:2000 USER_APP=127.0.0.1:3002 CAMPAIN_APP=127.0.0.1:3003 bundle exec rackup recipe_app_config.ru -o 127.0.0.1 -p 3001
+user: env AWS_XRAY_LOCATION=localhost:2000 bundle exec rackup user_app_config.ru -o 127.0.0.1 -p 3002
+campain: env AWS_XRAY_LOCATION=localhost:2000 bundle exec rackup campain_app_config.ru -o 127.0.0.1 -p 3003
 agent: socat UDP-RECVFROM:2000,fork STDOUT

data/example/recipe_app_config.ru

@@ -1,6 +1,10 @@
 require 'pry'
+
+require 'net/http'
+
 require 'faraday'
 require 'aws-xray'
+require 'aws/xray/hooks/net_http'
 
 user_app = ENV.fetch('USER_APP') # host:port
 campain_app = ENV.fetch('CAMPAIN_APP') # host:port
@@ -15,11 +19,11 @@ run Proc.new {|env|
   end
   user_res = user_client.get('/')
 
-  campain_client = Faraday.new(url: "http://#{campain_app}/", headers: { 'Host' => 'campain-app' }) do |builder|
-    builder.use Aws::Xray::Faraday
-    builder.adapter Faraday.default_adapter
+  uri = URI("http://#{campain_app}")
+  host, port = campain_app.split(':')
+  campain_res = Net::HTTP.start(host, port) do |http|
+    http.request(Net::HTTP::Get.new(uri))
   end
-  campain_res = campain_client.get('/')
 
   body = "awesome recipe by #{user_res.body}"
   if campain_res.body == '1'

data/lib/aws/xray/context.rb

@@ -68,6 +68,7 @@ module Aws
         @client = client
         @trace = trace
         @base_segment_id = base_segment_id
+        @disabled_ids = []
       end
 
       # Curretly context object is thread safe, so copying is not necessary,
@@ -122,6 +123,24 @@ module Aws
           @client.send_segment(sub)
         end
       end
+
+      # Temporary disabling tracing for given id in given block.
+      # CAUTION: the disabling will NOT be propagated between threads!!
+      #
+      # @param [Symbol] id must be unique between tracing methods.
+      def disable_trace(id)
+        @disabled_ids << id
+
+        begin
+          yield
+        ensure
+          @disabled_ids.delete(id)
+        end
+      end
+
+      def disabled?(id)
+        @disabled_ids.include?(id)
+      end
     end
   end
 end

data/lib/aws/xray/faraday.rb

@@ -21,7 +21,8 @@ module Aws
           req_env.request_headers[TRACE_HEADER] = propagate_trace.to_header_value
           sub.set_http_request(Request.build_from_faraday_env(req_env))
 
-          @app.call(req_env).on_complete do |res_env|
+          res = Context.current.disable_trace(:net_http) { @app.call(req_env) }
+          res.on_complete do |res_env|
             sub.set_http_response(res_env.status, res_env.response_headers['Content-Length'])
             case res_env.status
             when 499

data/lib/aws/xray/hooks/net_http.rb

@@ -0,0 +1,51 @@
+require 'net/http'
+
+module Aws
+  module Xray
+    module Hooks
+      module NetHttp
+        def request(req, *args)
+          return super unless Context.started?
+          return super if Context.current.disabled?(:net_http)
+
+          uri = URI('')
+          uri.scheme = use_ssl? ? 'https' : 'http'
+          uri.host = address
+          uri.port = port
+          uri.path = URI(req.path).path
+          request_record = Request.build(
+            method: req.method,
+            url: uri.to_s,
+            user_agent: req['User-Agent'],
+          )
+          Context.current.child_trace(remote: true, name: address) do |sub|
+            propagate_trace = sub.generate_trace
+            req[TRACE_HEADER] = propagate_trace.to_header_value
+            sub.set_http_request(request_record)
+
+            res = super
+
+            sub.set_http_response(res.code.to_i, res['Content-Length'])
+            case res.code.to_i
+            when 499
+              cause = Cause.new(stack: caller, message: 'Got 499', type: 'http_request_error')
+              sub.set_error(error: true, throttle: true, cause: cause)
+            when 400..498
+              cause = Cause.new(stack: caller, message: 'Got 4xx', type: 'http_request_error')
+              sub.set_error(error: true, cause: cause)
+            when 500..599
+              cause = Cause.new(stack: caller, message: 'Got 5xx', type: 'http_request_error')
+              sub.set_error(fault: true, remote: true, cause: cause)
+            else
+              # pass
+            end
+
+            res
+          end
+        end
+      end
+    end
+  end
+end
+
+Net::HTTP.prepend(Aws::Xray::Hooks::NetHttp)

data/lib/aws/xray/version.rb

@@ -1,5 +1,5 @@
 module Aws
   module Xray
-    VERSION = '0.12.2'
+    VERSION = '0.13.0.beta1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-xray
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.0.beta1
 platform: ruby
 authors:
 - Taiki Ono
@@ -144,6 +144,7 @@ files:
 - lib/aws/xray/error.rb
 - lib/aws/xray/faraday.rb
 - lib/aws/xray/header_parser.rb
+- lib/aws/xray/hooks/net_http.rb
 - lib/aws/xray/rack.rb
 - lib/aws/xray/rails.rb
 - lib/aws/xray/request.rb
@@ -170,9 +171,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11