zipkin-tracer 0.12.0 → 0.12.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDU1NDhkYTRmYTdjMGI5ZDg0M2ZhZDRmZTY3ZWI3MjQ0ZjAyMGQwMQ==
+    MzEzZmRjNmE5ZjhhMGRiY2EyOWFiNzIxZjczZjE0MDlkOWJkY2MyNQ==
   data.tar.gz: !binary |-
-    OTcwOTZmNWYyYmIxNGIxMzY5NWVlYjM4ODVlMzQ2MGE0MTk1NjJiNg==
+    ZDg5N2IyOGViYTVhODc3OWNlM2FjNGZmOTg3YjI5NjE0OGVlN2IwOA==
 SHA512:
   metadata.gz: !binary |-
-    ZTE4ZThiOTZjN2Y2MWUxNDBhMDRlMGZjYjI1NGUwZGIyNWQ0YThhNmFiN2I0
-    NzJjNzJiYmE0ZWJkNmFhZTI1YzYxNGFiYjk1NjM4NGZjNTZhMjQzZjMxODgx
-    ZTM3NmM1M2Y4OGFkNDc4ZTBkNDM3MTc4MjMyMWM5MWIyMjU0OTc=
+    YjBlMDNiNzE3Y2EzYWZmNjU1MGY5Yzg2N2RjZTA1YmFiZWIzYjEzZDU0MDdh
+    MjExNGJkZjBiZjU3MjlhYzQwMTc4YWY1YjZhMWI5ZTc0Y2ViYjQxMzgwYWJk
+    NjIzN2Y0YzQ5ZDQ4MWY3ZjA4OTFlM2M5MzQxYzk5YzdiMzZmNjg=
   data.tar.gz: !binary |-
-    YTU1YjJkZDU5NTU3MzY3OWFmNzE4Yjk4OTM0MGM5YTE3NjUyMzY1MzJmOGE0
-    MDNhYWNmNGI3NjEyMGQ3OGE4NDEyODRjZWQzNjUwYmEyMGIwMWFhNzU4ZDBi
-    MGRhMjM0YTRlNjE0ZTdhNjA0NTMzOTA4ZjYyYTNhNjg2Y2MxMWM=
+    OTFlZDAwZGZjNDE2ZGM1NmZmOGJlM2ZkNTQ1N2M2YTc5MzIwZjM4MDUxYjgz
+    YWY1MGZiYjY1OWVjNjcyNWJjNzE2ODM5MjhkNTYwMjhmYjgwNjcxNDI2YjYw
+    ZmQ4MTQ3MTIxYTMxNTA3Mzg2MzQ5ZTczYWUwMjBmMWRiNWUxZjE=

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

@@ -22,7 +22,7 @@ module ZipkinTracer
 
     def call(env)
       trace_id = Trace.id.next_id
-      with_trace_id(trace_id) do
+      Trace.with_trace_id(trace_id) do
         B3_HEADERS.each do |method, header|
           env[:request_headers][header] = trace_id.send(method).to_s
         end
@@ -62,12 +62,5 @@ module ZipkinTracer
       response
     end
 
-    def with_trace_id(trace_id, &block)
-      Trace.push(trace_id)
-      yield
-    ensure
-      Trace.pop
-    end
-
   end
 end

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

@@ -34,7 +34,7 @@ module ZipkinTracer
     def call(env)
       zipkin_env = ZipkinEnv.new(env, @config)
       trace_id = zipkin_env.trace_id
-      with_trace_id(trace_id) do
+      Trace.with_trace_id(trace_id) do
         if !trace_id.sampled? || !Application.routable_request?(env['PATH_INFO'])
           @app.call(env)
         else
@@ -47,13 +47,6 @@ module ZipkinTracer
 
     private
 
-    def with_trace_id(trace_id, &block)
-      Trace.push(trace_id)
-      yield
-    ensure
-      Trace.pop
-    end
-
     def annotate_plugin(env, status, response_headers, response_body)
       @config.annotate_plugin.call(env, status, response_headers, response_body) if @config.annotate_plugin
     end

data/lib/zipkin-tracer/trace.rb

@@ -8,6 +8,13 @@ module Trace
     @tracer
   end
 
+  def self.with_trace_id(trace_id, &block)
+    self.push(trace_id)
+    yield
+  ensure
+    self.pop
+  end
+
   # A span may contain many annotations
   # This class is defined in finagle-thrift. We are adding extra methods here
   class Span

data/lib/zipkin-tracer/trace_client.rb

@@ -12,9 +12,11 @@ module ZipkinTracer
 
     def initialize(name, &block)
       @trace_id = Trace.id.next_id
-      Trace.tracer.with_new_span(@trace_id, name) do |span|
-        @span = span
-        block.call(self)
+      Trace.with_trace_id(@trace_id) do
+        Trace.tracer.with_new_span(@trace_id, name) do |span|
+          @span = span
+          block.call(self)
+        end
       end
     end
 

data/lib/zipkin-tracer/version.rb

@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 module ZipkinTracer
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
 end

data/lib/zipkin-tracer/zipkin_tracer_base.rb

@@ -26,7 +26,7 @@ module Trace
     end
 
     def may_flush(span)
-      size = spans.values.map(&:size).inject(:+) || 0
+      size = spans.values.map(&:size).map(&:to_i).inject(:+) || 0
       if size >= @traces_buffer || span.annotations.any?{ |ann| ann.value == Annotation::SERVER_SEND }
         flush!
         reset

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipkin-tracer
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Franklin Hu
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday