zipkin-tracer 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e370dd751832be287e591eb227b01384f939a87
-  data.tar.gz: 1c14cb00ffa226c6f301130e543ac6bd4e4b81a4
+  metadata.gz: 17ea0ff62e644d02b42274491b09f3227c8e8609
+  data.tar.gz: ce92768b4d619d4a72c729af05246c9aafc4edf4
 SHA512:
-  metadata.gz: 5403b8f35d8ae2c2b63e84b8b205bd89f54790c2ccada5e60e83c6d5f64cdd3315b28a765149d47269327f9bca1d07229dfb59c248b7959032fc5e6d4bad47c2
-  data.tar.gz: bc38a24c9a4dcc616f662bf9009009abd437e967d519e93b68d9a015a3a1fb08627755d7a396d710726d96b4c185c03d69cb4b6917e58ae6b0a0cfd3a81e6a80
+  metadata.gz: c5f70bce1a97b561a1b68937d6674ad7854574ab786360c6970ac7cf7124aecd0c36a95724f4ca2d8a80b34e64e4351af32a7ab0f0a2f8bafa47e917288a97cd
+  data.tar.gz: 640149e01616e7d9f4e1867608e539c8a54e1b7b552e9217c65c7223c86985b189218ad225cae874cd025846b9b7b77f3ebbefdc37bbe8e9bb5f3364789449d6

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

@@ -38,6 +38,7 @@ module ZipkinTracer
           )
         end
         span.record(Trace::Annotation::CLIENT_RECV, local_endpoint)
+        Trace.tracer.end_span(span)
       end
 
       super(datum)
@@ -78,15 +79,14 @@ module ZipkinTracer
       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)
+      span = Trace.tracer.start_span(trace_id, datum[:method].to_s.downcase)
+      # 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
+      # store the span in the datum hash so it can be used in the response_call
+      datum[:span] = span
     rescue ArgumentError, URI::Error => e
       # Ignore URI errors, don't trace if there is no URI
     end

data/lib/zipkin-tracer/version.rb

@@ -1,3 +1,3 @@
 module ZipkinTracer
-  VERSION = '0.22.0'.freeze
+  VERSION = '0.23.0'.freeze
 end

data/lib/zipkin-tracer/zipkin_null_tracer.rb

@@ -4,8 +4,18 @@ module Trace
   # the NullTracer also.
   class NullTracer
     def with_new_span(trace_id, name)
-      span = Span.new(name, trace_id)
-      yield span
+      span = start_span(trace_id, name)
+      result = yield span
+      end_span(span)
+      result
+    end
+
+    def start_span(trace_id, name)
+      Span.new(name, trace_id)
+    end
+
+    def end_span(span)
+      span.close if span.respond_to?(:close)
     end
 
     def flush!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipkin-tracer
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Franklin Hu
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday