faraday-tracer 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 993a3acba723ece134d346cb9ceed77d05d6a7bb
-  data.tar.gz: d2e69959bc6c063c567216bf246372e5e92149b2
+  metadata.gz: 64f607d713975def48233f8a8308a896dbce4fd3
+  data.tar.gz: 0454f69a116f4fdfbe2f74126a5db084c05898f6
 SHA512:
-  metadata.gz: 30e6f601be1807e8884f9a32c5bd16da5816de1b6adeccb5fab83b30bb2d475d7c28f83a667efb101198905969558ae572e85e91ec2963cec0f7027ae3e08c21
-  data.tar.gz: d31c003982a524fa62775212c50f7d5aa80514872aaf05b07478dc9734e1dea4bd95f473db4478acd88f30f0d947879937524d074a4297eb9ce0b889abbf4aaf
+  metadata.gz: fcec16b4cc9f6165c7570da33cc12f5fe2cb545b5250c95a3d12ffd1a8e8cd6c0d36763fb9813cecb62e9b94999b00ae5be4cd3a9cfbafd9abcf4f89df6af4d7
+  data.tar.gz: 796d59ae3ab0758dfca00a98cfec28cee08a90070bc07047edbc4889934832afc8608d88fe0116da06f49b89850c8d0287d8150dcebe28364f416fa49eedd774

data/README.md

@@ -12,6 +12,35 @@ gem 'faraday-tracer'
 
 ## Usage
 
+### Using request context
+
+```ruby
+require 'opentracing'
+OpenTracing.global_tracer = TracerImplementation.new
+
+require 'faraday'
+require 'faraday/tracer'
+
+conn = Faraday.new(url: 'http://localhost:3000/') do |faraday|
+  # Add tracing support
+  faraday.use Faraday::Tracer
+
+  # default Faraday stack
+  faraday.request :url_encoded
+  faraday.adapter Faraday.default_adapter
+end
+
+span = request.env['rack.span'] # when using rack-tracer gem
+
+conn.post('/test') do |request|
+  # Leave undefined or set span to nil if there's no existing span
+  request.options.context = {span: span}
+end
+```
+
+
+### Defining span in the connection builder
+
 ```ruby
 require 'opentracing'
 OpenTracing.global_tracer = TracerImplementation.new

data/faraday-tracer.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'faraday-tracer'
-  spec.version       = '0.3.0'
+  spec.version       = '0.4.0'
   spec.authors       = ['SaleMove TechMovers']
   spec.email         = ['techmovers@salemove.com']
 

data/lib/faraday/tracer.rb

@@ -22,7 +22,7 @@ module Faraday
 
     def call(env)
       span = @tracer.start_span(env[:method].to_s.upcase,
-        child_of: @parent_span.respond_to?(:call) ? @parent_span.call : @parent_span,
+        child_of: parent_span(env),
         tags: {
           'component' => 'faraday',
           'span.kind' => 'client',
@@ -41,5 +41,16 @@ module Faraday
     ensure
       span.finish
     end
+
+    private
+
+    def parent_span(env)
+      context = env.request.context
+      span = context.is_a?(Hash) && context[:span] || @parent_span
+
+      if span
+        span.respond_to?(:call) ? span.call : span
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-tracer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - SaleMove TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-22 00:00:00.000000000 Z
+date: 2018-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentracing