zipkin-tracer 0.34.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba81449b69065fcd0ffcca18f0750e49826896cc8321c3a18d2e6df22a25cd27
-  data.tar.gz: 861e0bfb101b56935c0488c34d3db34154226b2625067c3db7b88e8bb168bfeb
+  metadata.gz: 3145da3d93716701cfe338e782717243946ec9d7b8337a4f67f4680dd2b3b06c
+  data.tar.gz: 857aa5010bbf1eaa5de81bf4bbfb17ba008c3e986e417740cdee6491e327fd7a
 SHA512:
-  metadata.gz: 5f136b2d49f70678fdbb768707418ec099c46e5dceef84efb83d063f057927e1cdd2ff7e750ea3f31a3b0a0a5a02869996131d24b35108ef178711a53f91bc7a
-  data.tar.gz: 78dfc19eee7a3f4b9b77ef8a980783cf2fc79e3087d406c7e89ac1e915cacd941f44b295f40921ca1966ccafa6688b71e5d94b1ef8a4969c4312bd5c408fd44c
+  metadata.gz: '085a771261ce989e0412d80080607872fd440e814877be5d2095c6a1d4d8fb8da7654583e52e940dece17406b425d26e76cced98419d866b5acd6970641d5f70'
+  data.tar.gz: 3d1041e44ae618d3886f47169b871b827e1246e37d6c7536207ea1eaf0b5120da8a1e56d878610b7f27c38beac26f2567a551f675d70325012122899ac6d128b

data/lib/zipkin-tracer/config.rb

@@ -8,7 +8,7 @@ module ZipkinTracer
     attr_reader :service_name, :json_api_host,
       :zookeeper, :sample_rate, :logger, :log_tracing,
       :annotate_plugin, :filter_plugin, :whitelist_plugin,
-      :sampled_as_boolean, :record_on_server_receive,
+      :sampled_as_boolean,
       :kafka_producer, :kafka_topic, :trace_id_128bit
 
     def initialize(app, config_hash)
@@ -39,8 +39,6 @@ module ZipkinTracer
       if @sampled_as_boolean
         @logger && @logger.warn("Using a boolean in the Sampled header is deprecated. Consider setting sampled_as_boolean to false")
       end
-      # Record the given tags on server receive, even if the zipkin headers were present in the incoming request?
-      @record_on_server_receive = parse_tags(config[:record_on_server_receive])
 
       # When set to true, high 8-bytes will be prepended to trace_id.
       # The upper 4-bytes are epoch seconds and the lower 4-bytes are random.
@@ -74,14 +72,6 @@ module ZipkinTracer
       trace_id_128bit: false
     }
 
-    def parse_tags(tag_names)
-      return {} unless present?(tag_names)
-      names = tag_names.split(",").map(&:strip)
-      (ZipkinTracer::RackHandler::DEFAULT_SERVER_RECV_TAGS.keys & names).each_with_object({}) do |name, tags|
-        tags[name] = ZipkinTracer::RackHandler::DEFAULT_SERVER_RECV_TAGS[name]
-      end
-    end
-
     def present?(str)
       return false if str.nil?
       !!(/\A[[:space:]]*\z/ !~ str)

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

@@ -27,8 +27,7 @@ module ZipkinTracer
 
     def response_call(datum)
       if span = datum[:span]
-        status = response_status(datum)
-        record_response_tags(span, status) if status
+        span.record_status(response_status(datum))
         Trace.tracer.end_span(span)
       end
 
@@ -37,8 +36,6 @@ module ZipkinTracer
 
     private
 
-    STATUS_ERROR_REGEXP = /\A(4.*|5.*)\z/.freeze
-
     def b3_headers
       {
         trace_id: 'X-B3-TraceId',
@@ -61,11 +58,6 @@ module ZipkinTracer
       datum[:response] && datum[:response][:status] && datum[:response][:status].to_s
     end
 
-    def record_response_tags(span, status)
-      span.record_tag(Trace::Span::Tag::STATUS, status)
-      span.record_tag(Trace::Span::Tag::ERROR, status) if STATUS_ERROR_REGEXP.match(status)
-    end
-
     def trace!(datum, trace_id)
       method = datum[:method].to_s
       url_string = Excon::Utils::request_uri(datum)

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

@@ -25,8 +25,6 @@ module ZipkinTracer
 
     private
 
-    STATUS_ERROR_REGEXP = /\A(4.*|5.*)\z/.freeze
-
     def b3_headers
       {
         trace_id: 'X-B3-TraceId',
@@ -51,7 +49,7 @@ module ZipkinTracer
         span.record_tag(Trace::Span::Tag::METHOD, method.upcase)
         span.record_tag(Trace::Span::Tag::PATH, url.path)
         response = @app.call(env).on_complete do |renv|
-          record_response_tags(span, renv[:status].to_s)
+          span.record_status(renv[:status])
         end
       end
       response
@@ -70,10 +68,5 @@ module ZipkinTracer
       span.record_tag(Trace::Span::Tag::ERROR, msg)
     end
 
-    def record_response_tags(span, status)
-      span.record_tag(Trace::Span::Tag::STATUS, status)
-      span.record_tag(Trace::Span::Tag::ERROR, status) if STATUS_ERROR_REGEXP.match(status)
-    end
-
   end
 end

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

@@ -11,10 +11,6 @@ module ZipkinTracer
     PATH_INFO = Rack::PATH_INFO rescue 'PATH_INFO'.freeze
     REQUEST_METHOD = Rack::REQUEST_METHOD rescue 'REQUEST_METHOD'.freeze
 
-    DEFAULT_SERVER_RECV_TAGS = {
-     Trace::Span::Tag::PATH => PATH_INFO
-    }.freeze
-
     def initialize(app, config = nil)
       @app = app
       @config = Config.new(app, config).freeze
@@ -37,6 +33,11 @@ module ZipkinTracer
 
     private
 
+    SERVER_RECV_TAGS = {
+      Trace::Span::Tag::PATH => PATH_INFO,
+      Trace::Span::Tag::METHOD => REQUEST_METHOD
+    }.freeze
+
     def span_name(env)
       "#{env[REQUEST_METHOD].to_s.downcase} #{Application.route(env)}".strip
     end
@@ -46,23 +47,17 @@ module ZipkinTracer
     end
 
     def trace!(span, zipkin_env, &block)
-      trace_request_information(span, zipkin_env)
-      span.kind = Trace::Span::Kind::SERVER
       status, headers, body = yield
     ensure
+      trace_server_information(span, zipkin_env, status)
+
       annotate_plugin(span, zipkin_env.env, status, headers, body)
     end
 
-    def trace_request_information(span, zipkin_env)
-      tags = if !@config.record_on_server_receive.empty?
-        # if the user specified tags to record on server receive, use these no matter what
-        @config.record_on_server_receive
-      elsif !zipkin_env.called_with_zipkin_headers?
-        # if the request comes from a non zipkin-enabled source record the default tags
-        DEFAULT_SERVER_RECV_TAGS
-      end
-      return if tags.nil?
-      tags.each { |annotation_key, env_key| span.record_tag(annotation_key, zipkin_env.env[env_key]) }
+    def trace_server_information(span, zipkin_env, status)
+      span.kind = Trace::Span::Kind::SERVER
+      span.record_status(status)
+      SERVER_RECV_TAGS.each { |annotation_key, env_key| span.record_tag(annotation_key, zipkin_env.env[env_key]) }
     end
   end
 end

data/lib/zipkin-tracer/trace.rb

@@ -221,7 +221,7 @@ module Trace
     end
 
     def record_tag(key, value)
-      @tags[key] = value
+      @tags[key] = value.to_s
     end
 
     def record_local_component(value)
@@ -232,6 +232,15 @@ module Trace
       !@span_id.parent_id.nil?
     end
 
+    STATUS_ERROR_REGEXP = /\A(4.*|5.*)\z/.freeze
+
+    def record_status(status)
+      return if status.nil?
+      status = status.to_s
+      record_tag(Tag::STATUS, status)
+      record_tag(Tag::ERROR, status) if STATUS_ERROR_REGEXP.match(status)
+    end
+
     private
 
     UNKNOWN_DURATION = 0 # mark duration was not set

data/lib/zipkin-tracer/version.rb

@@ -1,3 +1,3 @@
 module ZipkinTracer
-  VERSION = '0.34.0'.freeze
+  VERSION = '0.35.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipkin-tracer
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Franklin Hu
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2019-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday