zipkin-tracer 0.9.0 → 0.9.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGI0MTlmZDJhZWVmMzRjYzA5NjRiZTJiMDljODdiNjg0MjNiZTI4Mg==
+    M2EzMTQzN2NjZGEwNGNlOTY1ZTdjNDcxMDUyNjYzYzgwZDg1MmIwZQ==
   data.tar.gz: !binary |-
-    Mjk4ZTcyZWYzNmRhMTE3MTc2OTk4YTYxMDExNTc5M2ZlMWJlNjZjZA==
+    YmM0ZDVjYWNmMDcwOGFlMjVkYjM3Yjk5MjgxY2IwYzhjMzA5OGUwNg==
 SHA512:
   metadata.gz: !binary |-
-    YzkzZWUwZjY1N2QwM2E3MGNhMjI5MTE2MTRjYzA5ZGI5MWFmOWQzMzliNjRj
-    MmRhMDlhOWFiNTU4ZTVkODI5NmI1ZTU0ZWE4MThmNTA3M2NmNDdjZjgyYTg0
-    MTczMWE4N2E1YzYyOTM5ODY0YjQ3NGRhNmQxYjg2NjZiNDVjOGQ=
+    ZmRlY2Y2OWI5ZjBiMGY4N2RhMTNhMjQ0Nzk1NWQzY2FjZDc2MWFiNzE1MGY0
+    MTNkZTZlNGE5M2NjYjk3ZmM0ZTFlNmEyOTQxNmQ5MmZiZjIzMmQzMzJkNGVj
+    YWM0ODRmOWVjY2YzNjU3MDAzZTFmZDc3ZjRkNzJhNzQ2NWU4ODU=
   data.tar.gz: !binary |-
-    NWVjNjJhMzljZDRkODVkNjc5NjU2MDU0ODRhZmQ0Yjg0OTZiZTIzMTFiNGUz
-    MTYwNTkwMzhkNzU3N2MwZGExZGI4YzNjYzdiNTdkYzI0NzBlNTUwYzAzY2Nj
-    OGFhNzliMGExYWQyZWJhYTFjMzgxODMzMDA3MTNlYWMwMTVhZDk=
+    ZjJiOWUyZTZhYmY5ZjQwNWNhZTg4NjM0OGZlNzE4MGZhNzgwNDZjOGFkMzEz
+    MWIzNDlkODE5YjMyZjM1Nzk2NjhkMjc5NzhmMWE4Y2NiODZkMGRiMTJiZGNh
+    YjhmNGVmYzM5NDkxNzQ4ZjEyZDQ4ZTdlNDYzZWQ5ZDQzNTA0NjQ=

data/lib/zipkin-tracer/careless_scribe.rb

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'scribe'
 require 'sucker_punch'
 
 

data/lib/zipkin-tracer/config.rb

@@ -25,9 +25,9 @@ module ZipkinTracer
     def adapter
       if !!@json_api_host
         :json
-      elsif !!(@scribe_server && defined?(::Scribe))
+      elsif !!@scribe_server
         :scribe
-      elsif !!(@zookeeper && RUBY_PLATFORM == 'java' && defined?(::Hermann))
+      elsif !!@zookeeper && RUBY_PLATFORM == 'java'
         :kafka
       else
         nil

data/lib/zipkin-tracer/rack/zipkin-tracer.rb

@@ -13,19 +13,10 @@
 # limitations under the License.
 require 'finagle-thrift'
 require 'finagle-thrift/trace'
-require 'scribe'
-
+require 'sucker_punch'
 require 'zipkin-tracer/config'
-require 'zipkin-tracer/careless_scribe'
-require 'zipkin-tracer/zipkin_json_tracer'
-
-if RUBY_PLATFORM == 'java'
-  require 'hermann/producer'
-  require 'zipkin-tracer/zipkin_kafka_tracer'
-end
-
 
-module ZipkinTracer extend self
+module ZipkinTracer
 
   class RackHandler
     B3_REQUIRED_HEADERS = %w[HTTP_X_B3_TRACEID HTTP_X_B3_PARENTSPANID HTTP_X_B3_SPANID HTTP_X_B3_SAMPLED]
@@ -41,10 +32,13 @@ module ZipkinTracer extend self
 
       ::Trace.tracer = case adapter
         when :json
+          require 'zipkin-tracer/zipkin_json_tracer'
           ::Trace::ZipkinJsonTracer.new(config.json_api_host, config.traces_buffer)
         when :scribe
+          require 'zipkin-tracer/careless_scribe'
           ::Trace::ZipkinTracer.new(CarelessScribe.new(config.scribe_server), config.scribe_max_buffer)
         when :kafka
+          require 'zipkin-tracer/zipkin_kafka_tracer'
           kafkaTracer = ::Trace::ZipkinKafkaTracer.new
           kafkaTracer.connect(config.zookeeper)
           kafkaTracer

data/lib/zipkin-tracer/version.rb

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

data/lib/zipkin-tracer/zipkin_json_tracer.rb

@@ -1,6 +1,6 @@
 require 'json'
 require 'faraday'
-require 'finagle-thrift'
+require 'sucker_punch'
 require 'finagle-thrift/tracer'
 
 class AsyncJsonApiClient

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipkin-tracer
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Franklin Hu
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: finagle-thrift