zipkin-tracer 0.2.1 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDI4NGMyZGY4OTA0Y2JjZmRjNmI5OGQ4NTViY2U4ZDIxZGFlN2QwNA==
+    N2EwMjEwNDA2OGNiMzBhNjE3NDBiNGVhNGNmZjI5NTZiYjhhMzg4Zg==
   data.tar.gz: !binary |-
-    OTUyMTAyNTM2ZmQwNGM2ZWM3MGFjM2NiZDdmZjUzMjU3ZjZiMjhkOA==
+    Y2U3MjJmZmFjNTdhMTJiMDE5NzY4N2E1MjRlODUwODNiYzFmMmZlOQ==
 SHA512:
   metadata.gz: !binary |-
-    MzMxMWNlYjM5OTY2NDdiZTM2OGMxMGExYzhiMjZhNTk2YWQ5YjY2YWNjNjk3
-    ZTEwMGUzOTBkZjlmN2NhMDQ4YzU3Y2NjYjVkMjYwYTRlMTI2NzZiNzFkMTY2
-    ODYzZWQxYTM1Y2FlZjZiMjY2ZjczODU0ZTVjMWIwYzQxNmQ1YTU=
+    YWJmNzNiZjg0NGJhNzFjZWQ5NTFiNjE2ODlmYjU5ZWM5NDBkZmI0YjJiYzRi
+    OGUxMzU5Mjk3NTk2MmQyYzU1Y2IwZGQ3ZDhiYjUwNDViNWUzMDEyZWU3NTIz
+    YTdiNTkyOTY2Nzg0OTU1NmU1NGM0ZGYwNDAxODNmOWE3MzE1MWY=
   data.tar.gz: !binary |-
-    NjZhMjQyNzlmMTg1MDQ3YjQ4YmM0OWFmNWI0OTc4OGExNGIxMGVhMDE4YmJj
-    NjczYzNjNTI3ZjBjMTU5NGU2Njg2NGY2YmJkZTg0ZDBiZjE2NGIwZTNlMjI4
-    NDRmN2VhYWI0ZDhlM2E3Mjk5OWE2Y2IwZDA0ZWYxNmM0Yzk1NDI=
+    ZjMxM2MzZGQ2MzhkNzc3YTAyZWQxYjQyNzFjN2FjYmRiYzk3ODE0NzUwZmNl
+    MDI5MDgzNmFlMTgxMGYyMzU3Mzk3ZWQ4Y2Q1YWMxZDZmNDE3OWE0ZTkwYjhk
+    YWFjYjA3YzM5NDNhYmUxM2M4MTViMWFjMmQwNThhMmY5ZjljMmI=

data/lib/zipkin-tracer.rb

@@ -17,6 +17,11 @@ require 'scribe'
 
 require 'zipkin-tracer/careless_scribe'
 
+if RUBY_PLATFORM == 'java'
+  require 'hermann/producer'
+  require 'zipkin-tracer/zipkin_kafka_tracer'
+end
+
 module ZipkinTracer extend self
 
   class RackHandler
@@ -31,32 +36,20 @@ module ZipkinTracer extend self
       @service_name = config[:service_name]
       @service_port = config[:service_port]
 
-      scribe =
-        if config[:scribe_server] then
-          Scribe.new(config[:scribe_server])
-        else
-          Scribe.new()
-        end
-
-      scribe_max_buffer =
-        if config[:scribe_max_buffer] then
-          config[:scribe_max_buffer]
-        else
-          10
-        end
-
-      @sample_rate =
-        if config[:sample_rate] then
-          config[:sample_rate]
-        else
-          0.1
-        end
+      ::Trace.tracer = if config[:scribe_server] && defined?(::Scribe)
+        scribe = config[:scribe_server] ? Scribe.new(config[:scribe_server]) : Scribe.new()
+        scribe_max_buffer = config[:scribe_max_buffer] ? config[:scribe_max_buffer] : 10
+        ::Trace::ZipkinTracer.new(CarelessScribe.new(scribe), scribe_max_buffer)
+      elsif config[:zookeeper] && RUBY_PLATFORM == 'java' && defined?(::Hermann)
+        kafkaTracer = ::Trace::ZipkinKafkaTracer.new
+        kafkaTracer.connect(config[:zookeeper])
+        kafkaTracer
+      end
 
+      @sample_rate = config[:sample_rate] ? config[:sample_rate] : 0.1
       @annotate_plugin = config[:annotate_plugin]     # call for trace annotation
       @filter_plugin = config[:filter_plugin]         # skip tracing if returns false
       @whitelist_plugin = config[:whitelist_plugin]   # force sampling if returns true
-
-      ::Trace.tracer = ::Trace::ZipkinTracer.new(CarelessScribe.new(scribe), scribe_max_buffer)
     end
 
     def call(env)

data/lib/zipkin-tracer/version.rb

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

data/lib/zipkin-tracer/zipkin_kafka_tracer.rb

@@ -0,0 +1,65 @@
+require 'finagle-thrift'
+require 'finagle-thrift/tracer'
+require 'hermann/producer'
+require 'hermann/discovery/zookeeper'
+
+module Trace
+  class ZipkinKafkaTracer < Tracer
+    TRACER_CATEGORY     = "zipkin".freeze
+    DEFAULT_KAFKA_TOPIC = "zipkin_kafka".freeze
+
+    def initialize(opts={})
+      @logger = opts[:logger]
+      @topic  = opts[:topic] || DEFAULT_KAFKA_TOPIC
+      reset
+    end
+
+    # need to connect after initialization
+    def connect(zookeepers)
+      broker_ids = Hermann::Discovery::Zookeeper.new(zookeepers).get_brokers
+      @producer  = Hermann::Producer.new(nil, broker_ids)
+    end
+
+    def record(id, annotation)
+      return unless id.sampled?
+      span = get_span_for_id(id)
+
+      case annotation
+      when BinaryAnnotation
+        span.binary_annotations << annotation
+      when Annotation
+        span.annotations << annotation
+      end
+
+      flush!
+    end
+
+    def set_rpc_name(id, name)
+      return unless id.sampled?
+      span = get_span_for_id(id)
+      span.name = name.to_s
+    end
+
+    private
+      def reset
+        @spans = {}
+      end
+
+      def get_span_for_id(id)
+        key = id.span_id.to_s
+        @spans[key] ||= begin
+          Span.new("", id)
+        end
+      end
+
+      def flush!
+        messages = @spans.values.map do |span|
+          buf = ''
+          trans = Thrift::MemoryBufferTransport.new(buf)
+          oprot = Thrift::BinaryProtocol.new(trans)
+          span.to_thrift.write(oprot)
+          @producer.push(buf, :topic => @topic).value!
+        end
+      end
+  end
+end

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: zipkin-tracer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Franklin Hu
 - R Tyler Croy
+- James Way
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -96,7 +97,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -109,16 +110,46 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hermann
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.25'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.25'
+- !ruby/object:Gem::Dependency
+  name: scribe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.4
 description: Adds tracing instrumentation for ruby applications
 email:
 - franklin@twitter.com
 - tyler@monkeypox.org
+- jamescway@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/zipkin-tracer/careless_scribe.rb
 - lib/zipkin-tracer/version.rb
+- lib/zipkin-tracer/zipkin_kafka_tracer.rb
 - lib/zipkin-tracer.rb
 homepage: https://github.com/openzipkin/zipkin-tracer
 licenses: []