lookout-zipkin-tracer 0.3.0 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODdmODRhZmY4N2E4OWZmNzc5MzliOGUzMjI2NmJlMDRjY2IwMDhhNw==
+    ZDZiZjZlOWE5OWQ0ZmE3YzY0NjUzOWY3ZGE2ZDIxNzQ2MzFlNGY1MA==
   data.tar.gz: !binary |-
-    MTAxMDgzY2QzYTZmN2QxOGRmZjNjYzhiYTQ1NzZkYWI5NmZiZDY0NQ==
+    MzJjNWU5YjE0NjM1NDY1YWNiMGNiZTcwYjU1MmZkMmYwMzU2MDA4Yw==
 SHA512:
   metadata.gz: !binary |-
-    MzJhNTdiNDQ2OGE1MDhjZWMwMzQ4M2JmMDc0OTg3NTY5ZTg1YTIwYzJiZjdh
-    MDRkYWRlYWY0NzZlYTkyYjQ4M2I2N2ZkOTUzZTRkODcxNWFhNzJlYjMzOWM1
-    MjQ4NmY1MDg5NjA1ZmFkMzE0Njc0ZWUxMTI2YjA0OWYwZjY4Mzg=
+    NGEyYWUxZjFlYzVmN2FjZGYzNzU0MTY3YTdkNDEwZjY2MDEwNzI4ZGRjNThl
+    MWY4YTYxNzU5ZDk2YjkzYjIzMzg0ZGNhMjZhOTY4YzFlMThhMzNiNzZmZjJi
+    YWE4MTVhZmQ4MjZlMTY4MzZjNjk3MDVlODdjZDYyNjQyNWI5N2M=
   data.tar.gz: !binary |-
-    NDAzNGU5ZGMwYTgyYzM2ZmIzZjIwODJkMTI3NTc5NDg1MjcxZGU4MTgwMjVh
-    MzgzZjNhYTlkZDc3MTkyYTQwYTIyYWRkNThjNmIxNWZmM2Y5NGMzMjNhYmY5
-    ZDc2YmUxYTgyZTNlYzU3NTYxYzU1ZTlkNmY5MjRmNjA1MGVhYzA=
+    YjM2N2ZiNjhhMjRlN2QzZTFlZTI3MGYxZTc4MDE4MjEzYWM5Yzc5ZmJmMjAz
+    NjBlN2ZlZWJjMGQwZmFlOWMwYWEzZTI0OTNhMTViNGZiZjRlNjI2ZmUwMTdi
+    NjNmNjI3MmEyYjE4ZDc2ZDJjMjU2NWJkMzg2Y2FjYWZiYWZiMDY=

data/lib/zipkin-tracer.rb

@@ -14,9 +14,12 @@
 require 'finagle-thrift'
 require 'finagle-thrift/trace'
 require 'scribe'
-
 require 'zipkin-tracer/careless_scribe'
 
+if RUBY_PLATFORM == 'java'
+  require 'zipkin-tracer/zipkin_kafka_tracer'
+end
+
 module ZipkinTracer extend self
 
   class RackHandler
@@ -31,32 +34,22 @@ 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
+      if config[:scribe_server]
+        scribe = config[:scribe_server] ? Scribe.new(config[:scribe_server]) : Scribe.new()
+        careless_scribe = CarelessScribe.new(scribe)
+        scribe_max_buffer = config[:scribe_max_buffer] ? config[:scribe_max_buffer] : 10
+        ::Trace.tracer = ::Trace::ZipkinTracer.new(careless_scribe, scribe_max_buffer)
+      elsif config[:zookeeper] && RUBY_PLATFORM == 'java'
+        kafkaTracer = ::Trace::ZipkinKafkaTracer.new
+        kafkaTracer.connect(config[:zookeeper])
+        ::Trace.tracer = 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.3.0"
+  VERSION = "0.5.0"
 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lookout-zipkin-tracer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Ariel Salomon, Franklin Hu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: finagle-thrift
@@ -80,20 +80,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Adds tracing instrumentation for ruby applications
 email:
 - ariel@lookout.com, franklin@twitter.com
@@ -101,9 +87,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/zipkin-tracer.rb
 - 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/lookout/zipkin
 licenses: []
 metadata: {}
@@ -123,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Ruby tracing via Zipkin