zipkin-tracer 0.17.0 → 0.18.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGI3MWNlMzU2NDUzNzdiYjg3MmEyNzFiZjIyZGQ0NmE2NzQzNjg3ZQ==
+    ZDgzMzkwZTRmN2Y5OGI1ZDkyNGU3MjU2NjBkZThhOGYyYjVmOWM3Zg==
   data.tar.gz: !binary |-
-    MjZlZDcxMGYyNTY4NDdhMWQxZWNlMDg4YzY2YTI5Y2I5M2UyNTNkOA==
+    N2JmODc5NTg2ODdiMWU2NzllNDNhOTY3OTFhMGZhZmRhOWFkOTFhYw==
 SHA512:
   metadata.gz: !binary |-
-    N2NiZjRiYTA3MmUwMTViZGFkNDZiYWFkNzRkY2U1ZmNlYjhjOTE4ZTkwYjY1
-    YzAzYjVlOGM5OGQyMWY0ZDAwYzFiN2QzNDA5MWFkMDdjMWU5Y2VlZTdjMGY3
-    YmVkNjVmYmNiNDkzZmYzM2ViYjdiNjUyOTUzMzM2MTA2MDVhYTI=
+    Y2RkNGI0M2QyYjIwNjEzNDU1NmQ0OWRlY2FhZDY1ZDI1YjA1ZjNhNWYxMWYx
+    YTAwNWRmMmY5ZDViODgzZjQyZGYwNDg1ODU0ZjQwNmE4ZTA4MDFkMGM3M2Ji
+    NmY0ZjJhYjhiMjcyY2M4NTczMzZiNjgxZDBlNTBjMGQyZmJhMGM=
   data.tar.gz: !binary |-
-    ZWRkY2VhZjNmZTM5MjY1YjJiN2FhMjM3N2I1MTQ0MDhlNzhjZmEzNDYxMzhm
-    ODYzN2JlN2YyMWRlNDVmMTgwMTlmYmU4NTQwYTJlNTRkNzBhNDUyODRlZDQ4
-    NzBlYjJiM2MxN2E3MjM1Yzg5ZTEzMTY2ZmYzNjg2YWY3MjlkM2Q=
+    YzUxNDYzNDkwZmFlZjYwOTM0MzRjMWNhYjg3MzJjYzEzYmMzYzZjOWJmMDIx
+    MTY3Y2RhNjI0ODBiNjk0NzlkYTE3MDA4NjM1YTk1NGFkYTRlMzJlZjMzNmY1
+    OTFhOTM4ODY4MDg4OWY5MDVjNGNhMTllMTVlYjk5M2ZmZDIzNGE=

data/lib/zipkin-tracer/config.rb

@@ -5,7 +5,7 @@ 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,
-      :zookeeper, :sample_rate, :logger,
+      :zookeeper, :sample_rate, :logger, :log_tracing,
       :annotate_plugin, :filter_plugin, :whitelist_plugin
 
     def initialize(app, config_hash)
@@ -18,8 +18,8 @@ module ZipkinTracer
       @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
-      @logger            = config[:logger]            || Application.logger
-      @logger_setup      = config[:logger]            # Was the logger in fact setup by the client?
+      @logger            = Application.logger
+      @log_tracing       = config[:log_tracing]       # Was the logger in fact setup by the client?
     end
 
     def adapter
@@ -27,7 +27,7 @@ module ZipkinTracer
         :json
       elsif present?(@zookeeper) && RUBY_PLATFORM == 'java'
         :kafka
-      elsif @logger_setup
+      elsif !!@log_tracing
         :logger
       else
         nil

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.17.0'.freeze
+  VERSION = '0.18.0'.freeze
 end

data/lib/zipkin-tracer/zipkin_logger_tracer.rb

@@ -1,17 +1,24 @@
 require 'zipkin-tracer/zipkin_tracer_base'
 require 'zipkin-tracer/hostname_resolver'
+require 'json'
 
 module Trace
   class ZipkinLoggerTracer < ZipkinTracerBase
+    TRACING_KEY = 'Tracing information'
 
     def initialize(options)
       @logger = options[:logger]
+      @logger_accepts_data = @logger.respond_to?(:info_with_data)
       super(options)
     end
 
     def flush!
       formatted_spans = ::ZipkinTracer::HostnameResolver.new.spans_with_ips(spans).map(&:to_h)
-      @logger.info "ZIPKIN SPANS: #{formatted_spans}"
+      if @logger_accepts_data
+        @logger.info_with_data(TRACING_KEY, formatted_spans)
+      else
+        @logger.info({ TRACING_KEY => formatted_spans }.to_json)
+      end
     end
   end
 end

metadata

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