zipkin-tracer 0.15.1 → 0.16.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTVjNWU2YmZkZmYxNDhhYzFjMmZmYTFkOWZhOGIwZWNiNjE4NDliNA==
+    ZjYzMGY3YjgxYmZjMjdkMjU1Y2MyZDcxOTI2MDBjZjM3Y2ZlMmI5ZA==
   data.tar.gz: !binary |-
-    ZDhiYTFhOWZiY2JlNzUwNmU5YTMxYWRkZjY4OWQ4MzdhYzhhMTVhNA==
+    NGRmYmRjZTA1MGJlMmE5ZWU3MzE5ZmI3MTFkN2EwNDAxNDVmZWFhNQ==
 SHA512:
   metadata.gz: !binary |-
-    YWRjNjFlMTgyYjk3Zjk5OTg2ZTZhOWM4YzE1ZjdiYTE4MWE2YTg5ZGJkMzU3
-    NWVjNDJhMGQzOWYzYzBhZjEzYWQ0MjJkZGNhM2E2YTc0Yzk5YjYzYzZlNzYy
-    MmVhZmI0NTVkODBkYTgzNTRmOGZkZmY5NmVmMDdjYWJkNGZlOTg=
+    ZTgxNDgxNjg5NGYwMWM1YWIzNzQ0MDViY2IzMmE5ODRlNjgyMDkyNmJmZWIw
+    NjBhNDg5NDA4Njg1NTI1YjU2ODcyZTM4YmZhNTBjMTUwOWZhNDE2NjcyN2Jm
+    YzEwMmJkNWQ2NTg3NTdkM2YzZjFhZmE1M2JmY2ZiZjY5OTczNmU=
   data.tar.gz: !binary |-
-    NzlhMTg2NjNjMDMxNjgxMWE1ODY1NGU0Y2IwY2E2YTk1NGY2NDZmYTk0NWZl
-    YzQxNDA5MDRhZmQ0ZTIxYzM3YjE1Mzg4MTQyZDQwYzFhZGNhM2QzM2I1YjE5
-    YjQ0MDBkNTZlYjM1YTZjYzIxMmRhMDZhZGU5NDM3NWFmY2E4NjA=
+    MDRkODlhMGEzYWE0M2M1YmI1OTNkMTg4MDJjOWI5ZWRjNDIwNTY3ZWUwNzc4
+    OGE1YmQ3YTBhNTRlMzE4ZmE4YmI2NDNhMzIwNGQ1MzVkMDA1YTdiNDEwODYw
+    MzllMTFhYTI3ZGNiYjdmNDhkZmQzMzZlY2VhM2FhNjY1YzUyYmQ=

data/lib/zipkin-tracer/config.rb

@@ -5,15 +5,14 @@ module ZipkinTracer
   # Configuration of this gem. It reads the configuration and provides default values
   class Config
     attr_reader :service_name, :service_port, :json_api_host,
-      :scribe_server, :zookeeper, :sample_rate, :annotate_plugin,
-      :filter_plugin, :whitelist_plugin, :logger
+      :zookeeper, :sample_rate, :logger,
+      :annotate_plugin, :filter_plugin, :whitelist_plugin
 
     def initialize(app, config_hash)
       config = config_hash || Application.config(app)
       @service_name      = config[:service_name]
       @service_port      = config[:service_port]      || DEFAULTS[:service_port]
       @json_api_host     = config[:json_api_host]
-      @scribe_server     = config[:scribe_server]
       @zookeeper         = config[:zookeeper]
       @sample_rate       = config[:sample_rate]       || DEFAULTS[:sample_rate]
       @annotate_plugin   = config[:annotate_plugin]   # call for trace annotation
@@ -26,8 +25,6 @@ module ZipkinTracer
     def adapter
       if present?(@json_api_host)
         :json
-      elsif present?(@scribe_server)
-        :scribe
       elsif present?(@zookeeper) && RUBY_PLATFORM == 'java'
         :kafka
       elsif @logger_setup

data/lib/zipkin-tracer/tracer_factory.rb

@@ -8,9 +8,6 @@ module ZipkinTracer
           require 'zipkin-tracer/zipkin_json_tracer'
           options = { json_api_host: config.json_api_host, logger: config.logger }
           Trace::ZipkinJsonTracer.new(options)
-        when :scribe
-          require 'zipkin-tracer/zipkin_scribe_tracer'
-          Trace::ScribeTracer.new(scribe_server: config.scribe_server)
         when :kafka
           require 'zipkin-tracer/zipkin_kafka_tracer'
           Trace::ZipkinKafkaTracer.new(zookeepers: config.zookeeper)
@@ -24,7 +21,7 @@ module ZipkinTracer
       Trace.tracer = tracer
 
       # TODO: move this to the TracerBase and kill scribe tracer
-      ip_format = config.adapter == :json ? :string : :i32
+      ip_format = config.adapter == :kafka ? :i32 : :string
       Trace.default_endpoint = Trace::Endpoint.local_endpoint(
         config.service_port,
         service_name(config.service_name),

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.15.1'.freeze
+  VERSION = '0.16.0'.freeze
 end

data/lib/zipkin-tracer/zipkin_json_tracer.rb

@@ -31,7 +31,7 @@ module Trace
     end
 
     def flush!
-      AsyncJsonApiClient.new.async.perform(@json_api_host, spans.dup)
+      AsyncJsonApiClient.perform_async(@json_api_host, spans.dup)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipkin-tracer
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Franklin Hu
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-27 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -63,14 +63,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -141,34 +141,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.22'
-- !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
@@ -183,7 +155,6 @@ extra_rdoc_files: []
 files:
 - lib/zipkin-tracer.rb
 - lib/zipkin-tracer/application.rb
-- lib/zipkin-tracer/careless_scribe.rb
 - lib/zipkin-tracer/config.rb
 - lib/zipkin-tracer/faraday/zipkin-tracer.rb
 - lib/zipkin-tracer/hostname_resolver.rb
@@ -196,7 +167,6 @@ files:
 - lib/zipkin-tracer/zipkin_kafka_tracer.rb
 - lib/zipkin-tracer/zipkin_logger_tracer.rb
 - lib/zipkin-tracer/zipkin_null_tracer.rb
-- lib/zipkin-tracer/zipkin_scribe_tracer.rb
 - lib/zipkin-tracer/zipkin_tracer_base.rb
 homepage: https://github.com/openzipkin/zipkin-tracer
 licenses: []

data/lib/zipkin-tracer/careless_scribe.rb

@@ -1,68 +0,0 @@
-# Copyright 2012 Twitter Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'scribe'
-require 'finagle-thrift' #depends on the thift gem
-require 'sucker_punch'
-
-module ScribeThrift
-  # This is here just for the monkey patching
-  class Client
-    # This method in the original class was both sending and receiving logs.
-    # The original class: https://github.com/twitter/scribe/blob/master/vendor/gen-rb/scribe.rb
-    # Receiving logs may take even several seconds, depending on the buffering of the collector.
-    # We are just sending and forgetting here, we do not really care about the result
-    def Log(messages)
-      send_Log(messages)
-      0 # 0 means success , the original code called recv_Log()
-    end
-  end
-end
-
-# SuckerPunch creates a queue and a thread pool to work on jobs on the queue
-# calling perform adds the code to the queue
-class AsyncScribe
-  include SuckerPunch::Job
-
-  PROTOCOL_TIMEOUT = 10  # If the timeout is low, the protocol will lose spans when collector is not fast enough
-  CATEGORY = 'ruby'       # Thrift-client already uses this as default, seems to not affect anything
-  ADD_NEWLINES_TO_MESSAGES = true  # True is the default in Thrift-client, seems a necessary internal hack
-
-  def perform(server_address, *args)
-    # May seem wasteful to open a new connection per each span but the way the scribe is done
-    # it is difficult to ensure there will be no threading issues unless we create here the connection
-    scribe = Scribe.new(server_address, CATEGORY, ADD_NEWLINES_TO_MESSAGES, timeout: PROTOCOL_TIMEOUT)
-    scribe.log(*args)
-  rescue ThriftClient::NoServersAvailable, Thrift::Exception
-    # I couldn't care less
-  end
-end
-
-# Scribe which rescue thrift errors to avoid them to raise to the client
-class CarelessScribe
-  def initialize(scribe_server_address)
-    @server_address = scribe_server_address
-  end
-
-  def log(*args)
-    AsyncScribe.new.async.perform(@server_address, *args)
-  end
-
-  def batch(&block)
-    yield   #We just yield here
-    # the block finagle-thrift-1.4.1/lib/finagle-thrift/tracer.rb flush! method will call log also.
-  rescue ThriftClient::NoServersAvailable, Thrift::Exception
-    # I couldn't care less
-  end
-end

data/lib/zipkin-tracer/zipkin_scribe_tracer.rb

@@ -1,30 +0,0 @@
-require 'zipkin-tracer/zipkin_tracer_base'
-require 'zipkin-tracer/careless_scribe'
-require 'zipkin-tracer/hostname_resolver'
-
-
-module Trace
-  class ScribeTracer < ZipkinTracerBase
-    TRACER_CATEGORY = "zipkin".freeze
-
-    def initialize(options)
-      @scribe = CarelessScribe.new(options[:scribe_server])
-      super(options)
-    end
-
-    def flush!
-      resolved_spans = ::ZipkinTracer::HostnameResolver.new.spans_with_ips(spans)
-      @scribe.batch do
-        messages = resolved_spans.map do |span|
-          buf = ''
-          trans = Thrift::MemoryBufferTransport.new(buf)
-          oprot = Thrift::BinaryProtocol.new(trans)
-          span.to_thrift.write(oprot)
-          Base64.encode64(buf).gsub("\n", "")
-        end
-        @scribe.log(messages, TRACER_CATEGORY)
-      end
-      reset
-    end
-  end
-end