zipkin-tracer 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb8ef5f845682934bc73ad116a028733ab81bcc1
-  data.tar.gz: 570ff6ded9e9d11210bb93767e4d571f38a345fa
+  metadata.gz: 056a3c8673074ba57da8f43ba8c894bfc64a8c60
+  data.tar.gz: 1c460f925e75c449a4453336a7a3fca17fd04068
 SHA512:
-  metadata.gz: 573bf758e6a9d94d9072ea6d7ff83578f8dc950e4a6fd3ed3f3e38be0be3f9ac7a6de697d1d5efbf5ef8563aa19caed039074ed740b0cae932ab2769b6111403
-  data.tar.gz: d642e53af9d6d989baeffa83f50933c74828e91de673482cbf28a81b29ee9c1b4f8054d0494aac38a3f9e133f76d8b2698cb967e335bfa3fe68025eb7a84f85e
+  metadata.gz: e3b25784f7ef65ab5cce860776558e493ae15da118be7c5c9dcc8c271953d986290cd750427eab6595ce19df3c06f21e7fd3aa8b063f3b3a5604090144223b39
+  data.tar.gz: 8a41195765ba46d1a8218a7d75f2f6acc7488470110134a489f628a4f8602cd791ef44d42e7a21afcfc9d7191597d8fb2a478e2f5da6e02fff1a905a34796815

data/lib/zipkin-tracer.rb

@@ -1,3 +1,4 @@
+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'

data/lib/zipkin-tracer/config.rb

@@ -8,7 +8,8 @@ module ZipkinTracer
     attr_reader :service_name, :service_port, :json_api_host,
       :zookeeper, :sample_rate, :logger, :log_tracing,
       :annotate_plugin, :filter_plugin, :whitelist_plugin,
-      :sampled_as_boolean, :record_on_server_receive
+      :sampled_as_boolean, :record_on_server_receive,
+      :kafka_producer, :kafka_topic
 
     def initialize(app, config_hash)
       config = config_hash || Application.config(app)
@@ -20,6 +21,9 @@ module ZipkinTracer
       @json_api_host     = config[:json_api_host]
       # Zookeeper information
       @zookeeper         = config[:zookeeper]
+      # Kafka producer information
+      @kafka_producer    = config[:producer]
+      @kafka_topic       = config[:topic] if present?(config[:topic])
       # Percentage of traces which by default this service traces (as float, 1.0 means 100%)
       @sample_rate       = config[:sample_rate]       || DEFAULTS[:sample_rate]
       # A block of code which can be called to do extra annotations of traces
@@ -50,6 +54,8 @@ module ZipkinTracer
         :json
       elsif present?(@zookeeper) && RUBY_PLATFORM == 'java'
         :kafka
+      elsif @kafka_producer && @kafka_producer.respond_to?(:push)
+        :kafka_producer
       elsif !!@log_tracing
         :logger
       else

data/lib/zipkin-tracer/tracer_factory.rb

@@ -11,6 +11,11 @@ module ZipkinTracer
         when :kafka
           require 'zipkin-tracer/zipkin_kafka_tracer'
           Trace::ZipkinKafkaTracer.new(zookeepers: config.zookeeper)
+        when :kafka_producer
+          require 'zipkin-tracer/zipkin_kafka_tracer'
+          options = { producer: config.kafka_producer }
+          options[:topic] = config.kafka_topic unless config.kafka_topic.nil?
+          Trace::ZipkinKafkaTracer.new(options)
         when :logger
           require 'zipkin-tracer/zipkin_logger_tracer'
           Trace::ZipkinLoggerTracer.new(logger: config.logger)
@@ -21,7 +26,7 @@ module ZipkinTracer
       Trace.tracer = tracer
 
       # TODO: move this to the TracerBase and kill scribe tracer
-      ip_format = config.adapter == :kafka ? :i32 : :string
+      ip_format = [:kafka, :kafka_producer].include?(config.adapter) ? :i32 : :string
       Trace.default_endpoint = Trace::Endpoint.local_endpoint(
         config.service_port,
         service_name(config.service_name),

data/lib/zipkin-tracer/version.rb

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

data/lib/zipkin-tracer/zipkin_kafka_tracer.rb

@@ -12,7 +12,7 @@ module Trace
   # This class sends information to Zipkin through Kafka.
   # Spans are encoded using Thrift
   class ZipkinKafkaTracer < ZipkinTracerBase
-    DEFAULT_KAFKA_TOPIC = "zipkin_kafka".freeze
+    DEFAULT_KAFKA_TOPIC = "zipkin".freeze
 
     def initialize(options = {})
       @topic  = options[:topic] || DEFAULT_KAFKA_TOPIC
@@ -26,6 +26,7 @@ module Trace
       end
       super(options)
     end
+    
     def flush!
       resolved_spans = ::ZipkinTracer::HostnameResolver.new.spans_with_ips(spans)
       resolved_spans.each do |span|
@@ -33,7 +34,6 @@ module Trace
         trans = Thrift::MemoryBufferTransport.new(buf)
         oprot = Thrift::BinaryProtocol.new(trans)
         span.to_thrift.write(oprot)
-
         retval = @producer.push(buf, topic: @topic)
 
         # If @producer#push returns a promise/promise-like object, block until it

metadata

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