httprb-opentracing 0.3.0 → 0.4.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50b18a2d9a0feda14fd4a6ae95e83990e8d0a8c5
-  data.tar.gz: ad8f234aabbdf45219673abb58a118e87a058b53
+  metadata.gz: e601dfdf8da237f5fe9141cdc60700ff86fc2171
+  data.tar.gz: 352c715930e748714e3005653c7438f9957d4b0a
 SHA512:
-  metadata.gz: ab6f34d863c17bba047b8bfc89559d6cf30101e47dd5d8cba50a7109db2c90462ac8be894f0be8f306113da58634979e8d0b9d5bfd7a1daaf042c5016d364b2f
-  data.tar.gz: afbe3a44cc99fd5d93887c95174af889a7939f4613893c0de47ff9e4068171d2f01b3566bbd3c2f0c791d27add2324505e0071fb29f13c5126b952b034a26a60
+  metadata.gz: 0b15e644bca4cc6ef7ab3c16cd50c22ae56b2019b6d99dcd74f7f80fbcb4c0e11016a0b6baf79404b12ff1874e20d830a46e7bae47e6941e1bbb60d17c4c4fd6
+  data.tar.gz: 364b19b2e0034991269655bcc7f807a27025126bc14c6c01837a1f06c8403ecdbbcad9c2d44cf9f5240c4e9c2ce63a395d419ac4a40757a55c6187397f10beb8

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    httprb-opentracing (0.3.0)
+    httprb-opentracing (0.4.0.pre)
       opentracing (~> 0.5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     byebug (11.0.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -16,19 +16,19 @@ GEM
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     hashdiff (1.0.0)
-    http (2.2.3.doxpre1)
+    http (4.1.1)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
-      http-form_data (~> 1.0.1)
+      http-form_data (~> 2.0)
       http_parser.rb (~> 0.6.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    http-form_data (1.0.3)
+    http-form_data (2.1.1)
     http_parser.rb (0.6.0)
     opentracing (0.5.0)
     opentracing_test_tracer (0.1.1)
       opentracing
-    public_suffix (3.1.1)
+    public_suffix (4.0.1)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)

data/README.md

@@ -33,7 +33,7 @@ If you need more control over the tracer or which requests get their own span yo
 ```
     HTTP::Tracer.instrument(
         tracer: tracer,
-        ignore_request: ->(verb, uri, opts) { uri.host == 'localhost' }
+        ignore_request: ->(request, opts) { request.uri.host == 'localhost' }
     )
 ```
 

data/lib/http/tracer.rb

@@ -8,7 +8,7 @@ module HTTP
     class << self
       attr_accessor :ignore_request, :tracer
 
-      IngoreRequest = ->(_verb, _uri, _opts) { false }
+      IngoreRequest = ->(_request, _options) { false }
 
       def instrument(tracer: OpenTracing.global_tracer, ignore_request: IngoreRequest)
         begin
@@ -20,7 +20,7 @@ module HTTP
 
         @ignore_request = ignore_request
         @tracer = tracer
-        patch_request
+        patch_perform
       end
 
       def compatible_version?
@@ -28,30 +28,26 @@ module HTTP
       end
 
       def remove
-        return unless ::HTTP::Client.method_defined?(:request_original)
+        return unless ::HTTP::Client.method_defined?(:perform_without_tracing)
 
         ::HTTP::Client.class_eval do
-          remove_method :request
-          alias_method :request, :request_original
-          remove_method :request_original
+          remove_method :perform
+          alias_method :perform, :perform_without_tracing
+          remove_method :perform_without_tracing
         end
       end
 
-      def patch_request
+      def patch_perform
         ::HTTP::Client.class_eval do
-          alias_method :request_original, :request
-
-          def request(verb, uri, opts = {})
-            options = HTTP::Options.new.merge(opts)
-            parsed_uri = uri.is_a?(String) ? URI(uri) : uri
-
-            if ::HTTP::Tracer.ignore_request.call(verb, uri, options)
-              res = request_original(verb, uri, options)
+          def perform_with_tracing(request, options)
+            if ::HTTP::Tracer.ignore_request.call(request, options)
+              res = perform_without_tracing(request, options)
             else
-              path, host, port = nil
-              path = parsed_uri.path if parsed_uri.respond_to?(:path)
-              host = parsed_uri.host if parsed_uri.respond_to?(:host)
-              port = parsed_uri.port if parsed_uri.respond_to?(:port)
+              path, host, port, verb = nil
+              path = request.uri.path if request.uri.respond_to?(:path)
+              host = request.uri.host if request.uri.respond_to?(:host)
+              port = request.uri.port if request.uri.respond_to?(:port)
+              verb = request.verb.to_s.upcase if request.respond_to?(:verb)
 
               tags = {
                 'component' => 'ruby-httprb',
@@ -60,14 +56,14 @@ module HTTP
                 'http.url' => path,
                 'peer.host' => host,
                 'peer.port' => port
-              }
+              }.compact
 
               tracer = ::HTTP::Tracer.tracer
 
               tracer.start_active_span('http.request', tags: tags) do |scope|
                 OpenTracing.inject(scope.span.context, OpenTracing::FORMAT_RACK, options.headers)
 
-                res = request_original(verb, uri, options)
+                res = perform_without_tracing(request, options)
 
                 scope.span.set_tag('http.status_code', res.status)
                 scope.span.set_tag('error', true) if res.is_a?(StandardError)
@@ -76,6 +72,9 @@ module HTTP
 
             res
           end
+
+          alias perform_without_tracing perform
+          alias perform perform_with_tracing
         end
       end
     end

data/lib/http/tracer/version.rb

@@ -2,6 +2,6 @@
 
 module HTTP
   module Tracer
-    VERSION = '0.3.0'
+    VERSION = '0.4.0.pre'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httprb-opentracing
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0.pre
 platform: ruby
 authors:
 - Ben Fischer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-06 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentracing
@@ -164,9 +164,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.5.2.3