aws-xray 0.16.3 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efddd11613513c31deae81a7c19e585c27561d65
-  data.tar.gz: 634485ac1a3a2d4f1c64b20feb639e7b4a1f8f44
+  metadata.gz: c18e62bee058b20f2bbfc0a46732b491974cfd1b
+  data.tar.gz: 245d0a54a8eda2e84fb317eaed923f7aa340a042
 SHA512:
-  metadata.gz: 8f496597a77629249e31d91c238235bffa6e9429ee86335a94db18936f41ec6dd22e7de96c69330d6cd509474e9609cef23da4911cb9454dc2576f90e7437c21
-  data.tar.gz: 1515645eba3847d0fe33d00f941a52bcd3c962adecffb4ebc637967fd6b15621d2e3366d1d7a2d0415b8e9f981c52dc53517088ff1609bdb3f617d9e6c76f10e
+  metadata.gz: c25b50647422653efcaecaae9fef3d22be3aa70dd90ee24839531f0a64e39905d34bd43c529793cda76a90865ba43e6674245640127a804479b480978f662952
+  data.tar.gz: 4e7ef29b919b9ae8d97d9027c7c99397611df28216196d6782bdee3476269aff99aaed83cc5034979e112b13c5c8d7bdd71b233b3c6521bea657bc70b371203d

data/lib/aws/xray/faraday.rb

@@ -23,20 +23,7 @@ module Aws
 
           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
-              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
+            sub.set_http_response_with_error(res_env.status, res_env.response_headers['Content-Length'], remote: true)
           end
         end
       end

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

@@ -28,21 +28,7 @@ module Aws
 
             res = request_without_aws_xray(req, *args, &block)
 
-            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
-
+            sub.set_http_response_with_error(res.code.to_i, res['Content-Length'], remote: true)
             res
           end
         end

data/lib/aws/xray/rack.rb

@@ -39,7 +39,8 @@ 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'] || 0)
+            length = headers['Content-Length'] || 0
+            seg.set_http_response_with_error(status, length, remote: false)
             headers[TRACE_HEADER] = trace.to_header_value
             [status, headers, body]
           end

data/lib/aws/xray/segment.rb

@@ -43,6 +43,28 @@ module Aws
         @http_response = Response.new(status, length)
       end
 
+      # Automatically set error according to status code.
+      # @param [Integer] status HTTP status
+      # @param [Integer] length Size of HTTP response body
+      # @param [Boolean] remote Whether the response is from remote server or not.
+      def set_http_response_with_error(status, length, remote:)
+        set_http_response(status, length)
+        type = remote ? 'http_request_error' : 'http_response_error'
+        case status.to_i
+        when 499
+          cause = Cause.new(stack: caller, message: 'Got 499', type: type)
+          set_error(error: true, throttle: true, cause: cause)
+        when 400..498
+          cause = Cause.new(stack: caller, message: 'Got 4xx', type: type)
+          set_error(error: true, cause: cause)
+        when 500..599
+          cause = Cause.new(stack: caller, message: 'Got 5xx', type: type)
+          set_error(fault: true, remote: remote, cause: cause)
+        else
+          # pass
+        end
+      end
+
       # @param [Boolean] error Indicating that a client error occurred (response status code was 4XX Client Error).
       # @param [Boolean] throttle Indicating that a request was throttled (response status code was 429 Too Many Requests).
       # @param [Boolean] fault Indicating that a server error occurred (response status code was 5XX Server Error).

data/lib/aws/xray/version.rb

@@ -1,5 +1,5 @@
 module Aws
   module Xray
-    VERSION = '0.16.3'
+    VERSION = '0.16.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-xray
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.16.4
 platform: ruby
 authors:
 - Taiki Ono
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -177,7 +177,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.