zipkin 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7dab2beecf1b862caceca696f39c800ed9a337a
-  data.tar.gz: d5047d7b504e42a2d4357f991e651e9dc70fd9f3
+  metadata.gz: 253ec789b0311c2a35709b958e1f5fd3e026b043
+  data.tar.gz: 0367fc35f6be4d5da713bc72bddd425ee0fefca4
 SHA512:
-  metadata.gz: 42534373a551f427b6be03b32ca2709e7fae389b36a9d93c224ab7e3b4b1db04459a2ad5046a12dcf5e1cf7d3a3e0dbb8c2fbc8d61d72d9d2181cf61a7011e16
-  data.tar.gz: cd4a6a54266e0972a6ab0af9314bb929de8624bb9af13db6f2a25d433ad4cb89d1c282c0aed41378fa89b6a27c763508c3b49763376302df5d8792ce3203cedd
+  metadata.gz: 3a2a52800b14c3976e9e8ca384fc697fc153d6f1ded256fc698ae22c39d7f2bf991400c518440286c72836743b6db6f42b707e2ba20e364c1a3bb0e7ab7b6da6
+  data.tar.gz: 5c2afbb1f91211202b65b4be3f0ca5a228a0180669a442d376a527c63d62a008d9a776cdbc085013068331ba6de4fc9425d51bfeaf9efd1d16c6080b4751fea7

data/.rubocop.yml

@@ -9,6 +9,12 @@ Style/IfUnlessModifier:
 RSpec/NestedGroups:
   Max: 4
 
+RSpec/ExampleLength:
+  Enabled: no
+
+RSpec/MultipleExpectations:
+  Enabled: no
+
 Metrics/BlockLength:
   Enabled: no
 

data/lib/zipkin/collector.rb

@@ -1,5 +1,8 @@
 require 'thread'
 
+require_relative './collector/timestamp'
+require_relative './collector/log_annotations'
+
 module Zipkin
   class Collector
     def initialize(local_endpoint)
@@ -12,8 +15,8 @@ module Zipkin
     end
 
     def send_span(span, end_time)
-      finish_ts = (end_time.to_f * 1_000_000).to_i
-      start_ts = (span.start_time.to_f * 1_000_000).to_i
+      finish_ts = Timestamp.create(end_time)
+      start_ts = Timestamp.create(span.start_time)
       duration = finish_ts - start_ts
       is_server = %w[server consumer].include?(span.tags['span.kind'] || 'server')
 
@@ -24,7 +27,7 @@ module Zipkin
         name: span.operation_name,
         timestamp: start_ts,
         duration: duration,
-        annotations: [
+        annotations: LogAnnotations.build(span, @local_endpoint) + [
           {
             timestamp: start_ts,
             value: is_server ? 'sr' : 'cs',

data/lib/zipkin/collector/log_annotations.rb

@@ -0,0 +1,26 @@
+module Zipkin
+  class Collector
+    module LogAnnotations
+      def self.build(span, endpoint)
+        span.logs.map do |log|
+          {
+            timestamp: Timestamp.create(log.fetch(:timestamp)),
+            value: format_log_value(log),
+            endpoint: endpoint
+          }
+        end
+      end
+
+      def self.format_log_value(log)
+        if log.keys == %i[event timestamp]
+          log.fetch(:event)
+        else
+          log
+            .reject { |key, _value| key == :timestamp }
+            .map { |key, value| "#{key}=#{value}" }
+            .join(' ')
+        end
+      end
+    end
+  end
+end

data/lib/zipkin/collector/timestamp.rb

@@ -0,0 +1,9 @@
+module Zipkin
+  class Collector
+    module Timestamp
+      def self.create(time)
+        (time.to_f * 1_000_000).to_i
+      end
+    end
+  end
+end

data/lib/zipkin/span.rb

@@ -2,7 +2,7 @@ module Zipkin
   class Span
     attr_accessor :operation_name
 
-    attr_reader :context, :start_time, :tags
+    attr_reader :context, :start_time, :tags, :logs
 
     # Creates a new {Span}
     #
@@ -17,6 +17,7 @@ module Zipkin
       @collector = collector
       @start_time = start_time
       @tags = tags
+      @logs = []
     end
 
     # Set a tag value on this span
@@ -47,14 +48,10 @@ module Zipkin
 
     # Add a log entry to this span
     #
-    # @param event [String] event name for the log
-    # @param timestamp [Time] time of the log
-    # @param fields [Hash] Additional information to log
-    #
     # @deprecated Use {#log_kv} instead.
-    def log(event: nil, timestamp: Time.now, **fields)
+    def log(*args)
       warn 'Span#log is deprecated. Please use Span#log_kv instead.'
-      nil
+      log_kv(*args)
     end
 
     # Add a log entry to this span
@@ -62,6 +59,7 @@ module Zipkin
     # @param timestamp [Time] time of the log
     # @param fields [Hash] Additional information to log
     def log_kv(timestamp: Time.now, **fields)
+      @logs << fields.merge(timestamp: timestamp)
       nil
     end
 

data/script/create_trace

@@ -33,6 +33,8 @@ downstream_span = tracer2.start_span(
   child_of: inner_span,
   tags: { 'span.kind' => 'server' }
 )
+downstream_span.log_kv(event: 'custom-event')
+downstream_span.log_kv(foo: 'bar', baz: 'buz')
 sleep 0.5
 downstream_span.finish
 

data/zipkin.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'zipkin'
-  spec.version       = '1.1.0'
+  spec.version       = '1.2.0'
   spec.authors       = ['SaleMove TechMovers']
   spec.email         = ['techmovers@salemove.com']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zipkin
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - SaleMove TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2018-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,6 +128,8 @@ files:
 - lib/zipkin.rb
 - lib/zipkin/carrier.rb
 - lib/zipkin/collector.rb
+- lib/zipkin/collector/log_annotations.rb
+- lib/zipkin/collector/timestamp.rb
 - lib/zipkin/endpoint.rb
 - lib/zipkin/json_client.rb
 - lib/zipkin/span.rb