zipkin-tracer 0.25.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 056a3c8673074ba57da8f43ba8c894bfc64a8c60
-  data.tar.gz: 1c460f925e75c449a4453336a7a3fca17fd04068
+  metadata.gz: 5f3c839257069386e2ee919af9359519db3d601d
+  data.tar.gz: c3a5348a47ffcf3823ef079e7bf59f83bd73cf7a
 SHA512:
-  metadata.gz: e3b25784f7ef65ab5cce860776558e493ae15da118be7c5c9dcc8c271953d986290cd750427eab6595ce19df3c06f21e7fd3aa8b063f3b3a5604090144223b39
-  data.tar.gz: 8a41195765ba46d1a8218a7d75f2f6acc7488470110134a489f628a4f8602cd791ef44d42e7a21afcfc9d7191597d8fb2a478e2f5da6e02fff1a905a34796815
+  metadata.gz: 7a1bd29f82318ff6391b9575701ac7a65831147b87dc7c434e7930ad77fb569e87f8485480ff1f6400cdd55ac1320a2a055179001a3d9aa0a5ac27e5a7b743f6
+  data.tar.gz: fd4800c057745f5ae23bae36dcb34655fc612cb7aa34d7cbd5cf77718c74c09f2debd1745f3c2e158ddd09ec5f219eba8f37ae5f2464af7ddf25dd06353fb1ae

data/lib/zipkin-tracer.rb

@@ -2,6 +2,7 @@ require 'finagle-thrift'
 require 'base64' #Bug in finagle. They should be requiring this: finagle-thrift-1.4.1/lib/finagle-thrift/tracer.rb:115
 require 'zipkin-tracer/trace'
 require 'zipkin-tracer/rack/zipkin-tracer'
+require 'zipkin-tracer/sidekiq/middleware'
 require 'zipkin-tracer/trace_client'
 require 'zipkin-tracer/trace_container'
 require 'zipkin-tracer/trace_generator'

data/lib/zipkin-tracer/sidekiq/middleware.rb

@@ -0,0 +1,47 @@
+module ZipkinTracer
+  module Sidekiq
+    class Middleware
+      attr_reader :config, :tracer, :traceable_workers
+
+      def initialize(config)
+        @config = Config.new(nil, config).freeze
+        @tracer = TracerFactory.new.tracer(@config)
+        @traceable_workers = config.fetch(:traceable_workers, [])
+      end
+
+      def call(worker, job, queue, &block)
+        return block.call unless traceable_worker?(worker)
+
+        trace(worker, job, queue, &block)
+      end
+
+      private
+
+      def traceable_worker?(worker)
+        traceable_workers.include?(:all) || traceable_workers.include?(worker_name(worker))
+      end
+
+      def trace(worker, job, queue, &block)
+        trace_id = TraceGenerator.new.next_trace_id
+        span_name = worker_name(worker)
+
+        result = TraceContainer.with_trace_id(trace_id) do
+          if trace_id.sampled?
+            tracer.with_new_span(trace_id, span_name) do
+              result = block.call
+            end
+          else
+            result = block.call
+          end
+        end
+
+        tracer.flush!
+        result
+      end
+
+      def worker_name(worker)
+        worker.class.to_s.to_sym
+      end
+    end
+  end
+end

data/lib/zipkin-tracer/trace.rb

@@ -89,6 +89,10 @@ module Trace
       record_tag(BinaryAnnotation::LOCAL_COMPONENT, value)
     end
 
+    def has_parent_span?
+      !@span_id.parent_id.nil?
+    end
+
     private
 
     UNKNOWN_DURATION = 0 # mark duration was not set

data/lib/zipkin-tracer/version.rb

@@ -1,3 +1,3 @@
 module ZipkinTracer
-  VERSION = '0.25.0'.freeze
+  VERSION = '0.26.0'.freeze
 end

data/lib/zipkin-tracer/zipkin_tracer_base.rb

@@ -23,7 +23,12 @@ module Trace
 
     def end_span(span)
       span.close
-      if span.annotations.any?{ |ann| ann.value == Annotation::SERVER_SEND }
+      # If in a thread not handling incoming http requests, it will not have Annotation::SERVER_SEND, so the span
+      # will never be flushed and will cause memory leak.
+      # It will have CLIENT_SEND and CLIENT_RECV if the thread sends out http requests, so use CLIENT_RECV as the sign
+      # to flush the span.
+      # If no parent span, then current span needs to flush when it ends.
+      if !span.has_parent_span? || span.annotations.any? { |ann| ann.value == Annotation::SERVER_SEND }
         flush!
         reset
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipkin-tracer
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Franklin Hu
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
+date: 2017-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -175,6 +175,7 @@ files:
 - lib/zipkin-tracer/hostname_resolver.rb
 - lib/zipkin-tracer/rack/zipkin-tracer.rb
 - lib/zipkin-tracer/rack/zipkin_env.rb
+- lib/zipkin-tracer/sidekiq/middleware.rb
 - lib/zipkin-tracer/trace.rb
 - lib/zipkin-tracer/trace_client.rb
 - lib/zipkin-tracer/trace_container.rb