the_garage 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40c843f3541b358a20f20fce55a9e09913d75722
-  data.tar.gz: 17d0231446753d51c7bbebd42bcf9c5f348e49e8
+  metadata.gz: c8bcdbb3fc2ac73accc53baf8d79885ac8cf7b87
+  data.tar.gz: a51a1b809c89f4aeecb8af09d1586407bdbe546e
 SHA512:
-  metadata.gz: f46a8245d7e9df31072d13b3607df7bdcf9e7a91b03b3e3e67460f9d2240f00086d366acf126cc580520d7073365b28a7e9e73012093eaa0b56783129c920dfb
-  data.tar.gz: 93e345d15e4d1126e761be0e379e7346f3607d7675b77e41ff46363e5e70a0aa8a7c0f20a26595caea2510cde2a6e29d8f2488de466ea99f48c825345bac533c
+  metadata.gz: 52c2f76b2c2f65b0dd09219a2853ca31723259a3a9f863f11f787741b2a6b9d352db80ef46008ad2142ec8466763c57628ec60fa0e7109c7c3c25eecda0f728a
+  data.tar.gz: c1ee5249a83694c6ee4b569b957142e8bd7c1bb82b07fba73007fc1b04011bf3e834344fdedd76e79150ea782286f1d77b16fb700404ca70942c6815b15adfe0

data/README.md

@@ -197,7 +197,7 @@ Currently, we support following tracers:
 
 ```ruby
 # e.g. aws-xray tracer
-require 'aws/xray'
+require 'aws/xray/hooks/net_http'
 Garage::Tracer::AwsXrayTracer.service = 'your-auth-server-name'
 Garage.configuration.tracer = Garage::Tracer::AwsXrayTracer
 ```

data/lib/garage/tracer.rb

@@ -45,48 +45,17 @@ module Garage
       end
 
       def self.start(&block)
-        if Aws::Xray::Context.started?
-          Aws::Xray::Context.current.child_trace(remote: true, name: service) do |sub|
-            if Aws::Xray::Context.current.respond_to?(:disable_trace)
-              Aws::Xray::Context.current.disable_trace(:net_http) { yield new(sub) }
-            else
-              yield new(sub)
-            end
-          end
-        else
-          yield NullTracer.new
-        end
-      end
-
-      def initialize(sub_segment)
-        @sub = sub_segment
+        yield new
       end
 
       def inject_trace_context(header)
-        header.merge('X-Amzn-Trace-Id' => @sub.generate_trace.to_header_value)
+        header.merge('X-Aws-Xray-Name' => self.class.service)
       end
 
       def record_http_request(method, url, user_agent)
-        request = Aws::Xray::Request.build(method: method.to_s.upcase, url: url, user_agent: user_agent)
-        @sub.set_http_request(request)
       end
 
       def record_http_response(status, content_length)
-        @sub.set_http_response(status, content_length || 0)
-
-        case status
-        when 499
-          cause = Aws::Xray::Cause.new(stack: caller, message: 'Got 499', type: 'http_request_error')
-          @sub.set_error(error: true, throttle: true, cause: cause)
-        when 400..498
-          cause = Aws::Xray::Cause.new(stack: caller, message: 'Got 4xx', type: 'http_request_error')
-          @sub.set_error(error: true, cause: cause)
-        when 500..599
-          cause = Aws::Xray::Cause.new(stack: caller, message: 'Got 5xx', type: 'http_request_error')
-          @sub.set_error(fault: true, remote: true, cause: cause)
-        else
-          # pass
-        end
       end
     end
   end

data/lib/garage/version.rb

@@ -1,3 +1,3 @@
 module Garage
-  VERSION = '2.4.1'
+  VERSION = '2.4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: the_garage
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Tatsuhiko Miyagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -271,7 +271,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: Garage Platform Engine