zipkin-tracer 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 875a585c719b81da5b6ec5e7e6aff0f81b3ec9d1
-  data.tar.gz: f893dc0e63cc5a17aeade2b290378344ef28ec63
+  metadata.gz: e002f70c008b6d4adb6dde3eb8889ca235734c90
+  data.tar.gz: 200e21061d741afec8bee82ac70c64161296b29f
 SHA512:
-  metadata.gz: adef43d068c3cc6c936d6b22f9c1997ec6efdf82f2fcf50b4f36c447aa2b4aa995d6ed220b88a654b5f4043b1d37a9a5d4092b0286074c941ce07e205c279e59
-  data.tar.gz: 4e5cc0ecb720484865284897a760a3ce25cbd83d27d0f0b241fc9515ed1864aa92115cca6b671dc02ac3b2779ecfbab76b73dc2179263767ca5d6d0985277926
+  metadata.gz: bda12147fb3da63f9c084e2cd5296c17eefdb7f5c772556cd9279b88958e8ff1e703d025eed9be11a26221882decf350e9e1d78e3dbd2afd87d1b3374ae708c3
+  data.tar.gz: 96bf6c9f089226c241f0ad53817826bfb6983d9792594dec392ae1ff02ade9befca66807723fca937f12984640d3ae4218b5e25017484f9331738d69b6856948

data/lib/zipkin-tracer.rb

@@ -10,3 +10,9 @@ begin
   require 'zipkin-tracer/faraday/zipkin-tracer'
 rescue LoadError #Faraday is not available, we do not load our code.
 end
+
+begin
+  require 'excon'
+  require 'zipkin-tracer/excon/zipkin-tracer'
+rescue LoadError
+end

data/lib/zipkin-tracer/excon/zipkin-tracer.rb

@@ -0,0 +1,85 @@
+require 'finagle-thrift/trace'
+require 'finagle-thrift/tracer'
+require 'uri'
+require 'excon'
+
+module ZipkinTracer
+  class ExconHandler < Excon::Middleware::Base
+    def initialize(_)
+      super
+    end
+
+    def error_call(datum)
+      super(datum)
+    end
+
+    def request_call(datum)
+      trace_id = TraceGenerator.new.next_trace_id
+
+      TraceContainer.with_trace_id(trace_id) do
+        b3_headers.each do |method, header|
+          datum[:headers][header] = trace_id.send(method).to_s
+        end
+
+        trace!(datum, trace_id) if trace_id.sampled?
+      end
+
+      super(datum)
+    end
+
+    def response_call(datum)
+      response = datum[:response]
+
+      if span = datum[:span]
+        span.record_tag(Trace::BinaryAnnotation::STATUS, response[:status].to_s, Trace::BinaryAnnotation::Type::STRING, local_endpoint)
+        span.record(Trace::Annotation::CLIENT_RECV, local_endpoint)
+      end
+
+      super(datum)
+    end
+
+    private
+
+    SERVER_ADDRESS_SPECIAL_VALUE = '1'.freeze
+
+    def b3_headers
+      {
+        trace_id: 'X-B3-TraceId',
+        parent_id: 'X-B3-ParentSpanId',
+        span_id: 'X-B3-SpanId',
+        sampled: 'X-B3-Sampled',
+        flags: 'X-B3-Flags'
+      }
+    end
+
+    def local_endpoint
+      Trace.default_endpoint # The rack middleware set this up for us.
+    end
+
+    def remote_endpoint(url, service_name)
+      Trace::Endpoint.remote_endpoint(url, service_name, local_endpoint.ip_format) # The endpoint we are calling.
+    end
+
+    def service_name(datum, default)
+      datum.fetch(:zipkin_service_name, default)
+    end
+
+    def trace!(datum, trace_id)
+      url_string = Excon::Utils::request_uri(datum)
+      url = URI(url_string)
+      service_name = service_name(datum, url.host)
+
+      Trace.tracer.with_new_span(trace_id, datum[:method].to_s.downcase) do |span|
+        # annotate with method (GET/POST/etc.) and uri path
+        span.record_tag(Trace::BinaryAnnotation::PATH, url.path, Trace::BinaryAnnotation::Type::STRING, local_endpoint)
+        span.record_tag(Trace::BinaryAnnotation::SERVER_ADDRESS, SERVER_ADDRESS_SPECIAL_VALUE, Trace::BinaryAnnotation::Type::BOOL, remote_endpoint(url, service_name))
+        span.record(Trace::Annotation::CLIENT_SEND, local_endpoint)
+
+        # store the span in the datum hash so it can be used in the response_call
+        datum[:span] = span
+      end
+    rescue ArgumentError, URI::Error => e
+      # Ignore URI errors, don't trace if there is no URI
+    end
+  end
+end

data/lib/zipkin-tracer/version.rb

@@ -1,3 +1,3 @@
 module ZipkinTracer
-  VERSION = '0.20.1'.freeze
+  VERSION = '0.21.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipkin-tracer
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Franklin Hu
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-28 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -71,6 +71,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.53'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.53'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -156,6 +170,7 @@ files:
 - lib/zipkin-tracer.rb
 - lib/zipkin-tracer/application.rb
 - lib/zipkin-tracer/config.rb
+- lib/zipkin-tracer/excon/zipkin-tracer.rb
 - lib/zipkin-tracer/faraday/zipkin-tracer.rb
 - lib/zipkin-tracer/hostname_resolver.rb
 - lib/zipkin-tracer/rack/zipkin-tracer.rb