faraday-tracer 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64f607d713975def48233f8a8308a896dbce4fd3
-  data.tar.gz: 0454f69a116f4fdfbe2f74126a5db084c05898f6
+  metadata.gz: ebb9960d735ab728eeb7ea97317ac3378a4b7111
+  data.tar.gz: b9af0f69baaddb24470e057d34e78fb37d9eaa8d
 SHA512:
-  metadata.gz: fcec16b4cc9f6165c7570da33cc12f5fe2cb545b5250c95a3d12ffd1a8e8cd6c0d36763fb9813cecb62e9b94999b00ae5be4cd3a9cfbafd9abcf4f89df6af4d7
-  data.tar.gz: 796d59ae3ab0758dfca00a98cfec28cee08a90070bc07047edbc4889934832afc8608d88fe0116da06f49b89850c8d0287d8150dcebe28364f416fa49eedd774
+  metadata.gz: 30bd6106865461b9fff352d085ed182fc217b1cb9194d9f717bc3cee8cb7f5aa8165cd163cda261d222b6b791e33d7ef5ca2b44540d36affdaab1d8db8f471b3
+  data.tar.gz: 27192e04ec6ce63b7cea72c362e9321e74b91b089fc813d86aa7df984b4caf5fabf56ea4fc380cd541d99010f3e6b3c75a44ae55af37c3b9438415d932552794

data/README.md

@@ -61,6 +61,11 @@ conn = Faraday.new(url: 'http://localhost:3000/') do |faraday|
 end
 ```
 
+
+### Service name
+
+It's possible to define the remote service name by using `:service_name` option.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

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.4.0'
+  spec.version       = '0.5.0'
   spec.authors       = ['SaleMove TechMovers']
   spec.email         = ['techmovers@salemove.com']
 

data/lib/faraday/tracer.rb

@@ -9,26 +9,24 @@ module Faraday
     # @param span [Span, SpanContext, Proc, nil] SpanContext that acts as a parent to
     #        the newly-started by the middleware Span. If a Proc is provided, its
     #        evaluated during the call method invocation.
+    # @param service_name [String, nil] Remote service name (for some
+    #        unspecified definition of "service")
     # @param tracer [OpenTracing::Tracer] A tracer to be used when start_span, and inject
     #        is called.
     # @param errors [Array<Class>] An array of error classes to be captured by the tracer
     #        as errors. Errors are **not** muted by the middleware.
-    def initialize(app, span: nil, tracer: OpenTracing.global_tracer, errors: [StandardError])
+    def initialize(app, span: nil, service_name: nil, tracer: OpenTracing.global_tracer, errors: [StandardError])
       super(app)
       @tracer = tracer
       @parent_span = span
+      @service_name = service_name
       @errors = errors
     end
 
     def call(env)
       span = @tracer.start_span(env[:method].to_s.upcase,
         child_of: parent_span(env),
-        tags: {
-          'component' => 'faraday',
-          'span.kind' => 'client',
-          'http.method' => env[:method],
-          'http.url' => env[:url].to_s
-        }
+        tags: prepare_tags(env)
       )
       @tracer.inject(span.context, OpenTracing::FORMAT_RACK, env[:request_headers])
       @app.call(env).on_complete do |response|
@@ -52,5 +50,25 @@ module Faraday
         span.respond_to?(:call) ? span.call : span
       end
     end
+
+    def prepare_tags(env)
+      tags = {
+        'component' => 'faraday',
+        'span.kind' => 'client',
+        'http.method' => env[:method],
+        'http.url' => env[:url].to_s,
+      }
+
+      if (service_name = peer_service(env))
+        tags['peer.service'] = service_name
+      end
+
+      tags
+    end
+
+    def peer_service(env)
+      context = env.request.context
+      context.is_a?(Hash) && context[:service_name] || @service_name
+    end
   end
 end

metadata

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