zipkin-tracer 0.13.0 → 0.13.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDAzYzIxYWEzM2Y5NTM1OWJiMWQ5ODkwODVjY2U3YmFjMjkxNjY0Nw==
+    NDllODZmMGVmYTA3M2ZmN2YyODY2NTQ0MWE2OGM3Yzg1MDk2NDVjZg==
   data.tar.gz: !binary |-
-    NTJlNzYxMzZiZGJkOGU5Y2FhM2Y4OWMzNjIxNzU4NjBjYWVhMjFkNQ==
+    MTM2OTZhMzUzZTA3ZmUzZmRhNDk1NTY4ZjIyZjllNDZiYTlmMWRlYw==
 SHA512:
   metadata.gz: !binary |-
-    NTg1MGVmMTJjM2NlMWE0YTlmZmNjYjEyOWJkOWU0MWYyMjdhNjU3MWEwOTcx
-    YzU5N2ZlNzQyOTE4Yjg1MjAzOTJmN2Q2NWY1YTA4OTZmOTZmNzZlNjA5MzRk
-    NDgyMjFjNDJhNWFiMDc4ZmM2OWIxNTVhNGRiZDA1NDE5NWJlYTI=
+    M2MwMjQyMjU2NmRiZTVjZTA0MzQ4OTU5NDY1NTg1ODQ4OTFjZmY2ZDA4ZGVj
+    YzZhNmQxODg4MmY4NmNjYWMzNTg5MjMyMTY0MTA3YTQwYjBkY2I2Y2ZiOTcy
+    ZDA2MjJiMTAzNGM2Mjg3Yzg3NDFmNDhjZmM3NzQ2YjMyY2RjZjI=
   data.tar.gz: !binary |-
-    OGJjZDQwNmQwOTgwZDJlZDUzMjFmMTdjNDI1ZGIzNWRlYzA4YzE3NTUzZTg5
-    ZDE0Y2RmNGFmMjMwYzZkZjBmMzI4M2NlZmIwNGNlM2VmOTNlYWY3MTdkMGZh
-    NTIwM2EwMjQwYmU4OTQ1YmZkYjBmYWI5YTkyOTFjNTEwMjBhYmU=
+    ZDkzNzIwMzA4M2I1YjczNDg5YTJhOGIyNTcwYTZjYzBkNTVlN2UwZGI1NjVj
+    MzEwYmE3YzgwZTI4ZWI2ZGVjZTJjMTc0MTczOWI3MmFhZTM5NTY1MTVjMTlj
+    NjEwN2E5Nzg4M2E4ZWVkMmFlZjg0MDk3YTczNTRhOGZjMGVmOTU=

data/lib/zipkin-tracer/config.rb

@@ -23,11 +23,11 @@ module ZipkinTracer
     end
 
     def adapter
-      if !!@json_api_host
+      if present?(@json_api_host)
         :json
-      elsif !!@scribe_server
+      elsif present?(@scribe_server)
         :scribe
-      elsif !!@zookeeper && RUBY_PLATFORM == 'java'
+      elsif present?(@zookeeper) && RUBY_PLATFORM == 'java'
         :kafka
       else
         nil
@@ -41,5 +41,10 @@ module ZipkinTracer
       service_port: 80
     }
 
+    def present?(str)
+      return false if str.nil?
+      !!(/\A[[:space:]]*\z/ !~ str)
+    end
+
   end
 end

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.13.0"
+  VERSION = "0.13.1"
 end

data/lib/zipkin-tracer/zipkin_json_tracer.rb

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

data/lib/zipkin-tracer/zipkin_kafka_tracer.rb

@@ -16,7 +16,7 @@ module Trace
     end
 
     def flush!
-      messages = spans.values.map do |span|
+      spans.each do |span|
         buf = ''
         trans = Thrift::MemoryBufferTransport.new(buf)
         oprot = Thrift::BinaryProtocol.new(trans)

data/lib/zipkin-tracer/zipkin_scribe_tracer.rb

@@ -12,7 +12,7 @@ module Trace
 
     def flush!
       @scribe.batch do
-        messages = spans.values.map do |span|
+        messages = spans.map do |span|
           buf = ''
           trans = Thrift::MemoryBufferTransport.new(buf)
           oprot = Thrift::BinaryProtocol.new(trans)

data/lib/zipkin-tracer/zipkin_tracer_base.rb

@@ -44,15 +44,15 @@ module Trace
     THREAD_KEY = :zipkin_spans
 
     def spans
-      Thread.current[THREAD_KEY] ||= {}
+      Thread.current[THREAD_KEY] ||= []
     end
 
     def store_span(id, span)
-      spans[id.span_id.to_s] = span
+      spans.push(span)
     end
 
     def reset
-      Thread.current[THREAD_KEY] = {}
+      Thread.current[THREAD_KEY] = []
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipkin-tracer
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Franklin Hu
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday