zipkin-tracer 0.42.0 → 0.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb2d9d53fd72f39cda64ad32aa5d578c859bf2a7b711b276cda1b080470eb2c5
-  data.tar.gz: b02443c6d58d469d6201ea61e7506c5548616362b54d4c2418955e640e059a25
+  metadata.gz: 70dbbd7dfea628ace63ca5a3b71e613bd8eacfc87cb85b6e5f22886d89ed5fbf
+  data.tar.gz: 2f6ba947c19e4b91b444aa83017cb30f974d3feec5658f83a5bba26ada0b7e8f
 SHA512:
-  metadata.gz: '029f1d52918da350f097cef452dbb937dafd1fb12dcc42fd59c33985e2d15c9ef4a934a6f274d9b879ecd937638240773eceaec12b330cb3baacf1f72ec86f8b'
-  data.tar.gz: 4ef5c85dccf8d5c8ff7f4ba04cb88c33d98e11de67f5fcd56e535a2542c032abd73102ba878c0a2681dcecd7930eff5df44a33a4b61a50964153adb24ba1b15d
+  metadata.gz: a1833916f188f9750222d1caf930be26ff3a4958f74fb6ee1fcb37229e38981ed2624ed44d7925eec0d3bb54eefb0dee3668e00b760e4f20910ca7db8f13404b
+  data.tar.gz: 7c9e303402a4954ea1391dcb8b07864173b0f33822c3d359a2ccb53ca58e2f444086c31d73e86ab2b3d87ca54068015501b30d3287436ccfe67f97a3c4c35606

data/.travis.yml

@@ -1,14 +1,15 @@
 language: ruby
-dist: trusty
+dist: bionic
 jdk:
-  - oraclejdk8
+  - openjdk11
 rvm:
-  - 2.6.3
-  - 2.5.5
-  - 2.4.6
-  - 2.3.8
-  - jruby-9.1.17.0
-  - jruby-9.2.8.0
+  - 2.7
+  - 2.6
+  - 2.5
+  - 2.4
+  - 2.3
+  - jruby-9.1
+  - jruby-9.2
 deploy:
   provider: rubygems
   api_key:
@@ -17,7 +18,7 @@ deploy:
   on:
     tags: true
     repo: openzipkin/zipkin-ruby
-    condition: "$TRAVIS_RUBY_VERSION == 2.6.3"
+    condition: "$TRAVIS_RUBY_VERSION == 2.6"
 notifications:
   webhooks:
     urls:

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.43.0
+* Add the `PRODUCER` and `CONSUMER` span kinds.
+
 # 0.42.0
 * Reuse existing tracer(sender) in the TraceWrapper utility class.
 

data/lib/zipkin-tracer/trace.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'zipkin-tracer/zipkin_sender_base'
 require 'zipkin-tracer/trace_container'
 # Most of this code is copied from Finagle
@@ -165,16 +167,32 @@ module Trace
   # A span may contain many annotations
   class Span
     module Tag
-      METHOD = "http.method".freeze
-      PATH = "http.path".freeze
-      STATUS = "http.status_code".freeze
-      LOCAL_COMPONENT = "lc".freeze # TODO: Remove LOCAL_COMPONENT and related methods when no longer needed
-      ERROR = "error".freeze
+      METHOD = "http.method"
+      PATH = "http.path"
+      STATUS = "http.status_code"
+      LOCAL_COMPONENT = "lc" # TODO: Remove LOCAL_COMPONENT and related methods when no longer needed
+      ERROR = "error"
     end
 
     module Kind
-      CLIENT = "CLIENT".freeze
-      SERVER = "SERVER".freeze
+      CLIENT = "CLIENT"
+      SERVER = "SERVER"
+
+      # When present, "timestamp" is the moment a producer sent a message to a destination.
+      # "duration" represents delay sending the message, such as batching, while
+      # "remote_endpoint" indicates the destination, such as a broker.
+      #
+      # Unlike CLIENT, messaging spans never share a span ID. For example, the
+      # CONSUMER of the same message has "parent_id" set to this span's id.
+      PRODUCER = "PRODUCER"
+
+      # When present, "timestamp" is the moment a consumer received a message from an origin.
+      # "duration" represents delay consuming the message, such as from backlog,
+      # while "remote_endpoint" indicates the origin, such as a broker.
+      #
+      # Unlike SERVER, messaging spans never share a span ID. For example, the
+      # PRODUCER of this message is the "parent_id" of this span.
+      CONSUMER = "CONSUMER"
     end
 
     attr_accessor :name, :kind, :local_endpoint, :remote_endpoint, :annotations, :tags, :debug
@@ -211,7 +229,7 @@ module Trace
       h[:remoteEndpoint] = @remote_endpoint.to_h unless @remote_endpoint.nil?
       h[:annotations] = @annotations.map(&:to_h) unless @annotations.empty?
       h[:tags] = @tags unless @tags.empty?
-      h[:shared] = true if @span_id.shared
+      h[:shared] = true if @span_id.shared && @kind == Kind::SERVER
       h
     end
 

data/lib/zipkin-tracer/version.rb

@@ -1,3 +1,3 @@
 module ZipkinTracer
-  VERSION = '0.42.0'.freeze
+  VERSION = '0.43.0'.freeze
 end

data/lib/zipkin-tracer/zipkin_sender_base.rb

@@ -25,10 +25,10 @@ module Trace
       # If in a thread not handling incoming http requests, it will not have Kind::SERVER, so the span
       # will never be flushed and will cause memory leak.
       # If no parent span, then current span needs to flush when it ends.
-      if !span.has_parent_span? || span.kind == Trace::Span::Kind::SERVER
-        flush!
-        reset
-      end
+      return if span.has_parent_span? && span.kind == Trace::Span::Kind::CLIENT
+
+      flush!
+      reset
     end
 
     def start_span(trace_id, name, timestamp = Time.now)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipkin-tracer
 version: !ruby/object:Gem::Version
-  version: 0.42.0
+  version: 0.43.0
 platform: ruby
 authors:
 - Franklin Hu
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-23 00:00:00.000000000 Z
+date: 2020-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday