zipkin-tracer 0.33.0 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0da9730b55f7aa56b8b1080b4de79c731e6e09997e1c8ed958f0954d9f9acd70
-  data.tar.gz: 5a780069dfa04fe86a86fd805c89f00db11ba5af1f29057625b90d6aa03adf87
+  metadata.gz: ba81449b69065fcd0ffcca18f0750e49826896cc8321c3a18d2e6df22a25cd27
+  data.tar.gz: 861e0bfb101b56935c0488c34d3db34154226b2625067c3db7b88e8bb168bfeb
 SHA512:
-  metadata.gz: 95aab26491cde2e63b9d1e8a304b0edbac6658ee524143b202e53486a5f5552e738749fd16b274b74e7fc894c0d8bc30097e5bca2a5a26441815df662c389b3d
-  data.tar.gz: 8826d81412e97b9f0dd1c551bebd959b56782a690a76779d7da81169259c6bcad14cb8a5674c92d7fc6384ef55f5db932aad6d601628339c056439279632f5c7
+  metadata.gz: 5f136b2d49f70678fdbb768707418ec099c46e5dceef84efb83d063f057927e1cdd2ff7e750ea3f31a3b0a0a5a02869996131d24b35108ef178711a53f91bc7a
+  data.tar.gz: 78dfc19eee7a3f4b9b77ef8a980783cf2fc79e3087d406c7e89ac1e915cacd941f44b295f40921ca1966ccafa6688b71e5d94b1ef8a4969c4312bd5c408fd44c

data/lib/zipkin-tracer/application.rb

@@ -1,17 +1,18 @@
 module ZipkinTracer
-
   # Useful methods on the Application we are instrumenting
   class Application
-    # If the request is not valid for this service, we do not what to trace it.
-    def self.routable_request?(path_info, http_method)
+    # Determines if our framework knows whether the request will be routed to a controller
+    def self.routable_request?(env)
       return true unless defined?(Rails) # If not running on a Rails app, we can't verify if it is invalid
+      path_info = env[ZipkinTracer::RackHandler::PATH_INFO]
+      http_method = env[ZipkinTracer::RackHandler::REQUEST_METHOD]
       Rails.application.routes.recognize_path(path_info, method: http_method)
       true
     rescue ActionController::RoutingError
       false
     end
 
-    def self.get_route(env)
+    def self.route(env)
       return nil unless defined?(Rails)
       stub_env = {
         "PATH_INFO" => env[ZipkinTracer::RackHandler::PATH_INFO],
@@ -27,7 +28,7 @@ module ZipkinTracer
     end
 
     def self.logger
-      if defined?(Rails.logger) # If we happen to be inside a Rails app, use its logger
+      if defined?(Rails.logger)
         Rails.logger
       else
         Logger.new(STDOUT)

data/lib/zipkin-tracer/config.rb

@@ -26,8 +26,6 @@ module ZipkinTracer
       @sample_rate       = config[:sample_rate]       || DEFAULTS[:sample_rate]
       # A block of code which can be called to do extra annotations of traces
       @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
       # A block of code which can be called to skip traces. Skip tracing if returns false
       @filter_plugin     = config[:filter_plugin]
       # A block of code which can be called to force sampling. Forces sampling if returns true

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

@@ -37,7 +37,6 @@ module ZipkinTracer
 
     private
 
-    SERVER_ADDRESS_SPECIAL_VALUE = true
     STATUS_ERROR_REGEXP = /\A(4.*|5.*)\z/.freeze
 
     def b3_headers

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

@@ -25,10 +25,8 @@ module ZipkinTracer
 
     private
 
-    SERVER_ADDRESS_SPECIAL_VALUE = true
     STATUS_ERROR_REGEXP = /\A(4.*|5.*)\z/.freeze
 
-
     def b3_headers
       {
         trace_id: 'X-B3-TraceId',

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

@@ -25,7 +25,7 @@ module ZipkinTracer
       zipkin_env = ZipkinEnv.new(env, @config)
       trace_id = zipkin_env.trace_id
       TraceContainer.with_trace_id(trace_id) do
-        if !trace_id.sampled? || !routable_request?(env)
+        if !trace_id.sampled?
           @app.call(env)
         else
           @tracer.with_new_span(trace_id, span_name(env)) do |span|
@@ -37,16 +37,8 @@ module ZipkinTracer
 
     private
 
-    def routable_request?(env)
-      Application.routable_request?(env[PATH_INFO], env[REQUEST_METHOD])
-    end
-
-    def route(env)
-      Application.get_route(env)
-    end
-
     def span_name(env)
-      "#{env[REQUEST_METHOD].to_s.downcase} #{route(env)}".strip
+      "#{env[REQUEST_METHOD].to_s.downcase} #{Application.route(env)}".strip
     end
 
     def annotate_plugin(span, env, status, response_headers, response_body)
@@ -56,7 +48,6 @@ module ZipkinTracer
     def trace!(span, zipkin_env, &block)
       trace_request_information(span, zipkin_env)
       span.kind = Trace::Span::Kind::SERVER
-      span.record('whitelisted') if zipkin_env.force_sample?
       status, headers, body = yield
     ensure
       annotate_plugin(span, zipkin_env.env, status, headers, body)

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

@@ -20,10 +20,6 @@ module ZipkinTracer
       @called_with_zipkin_headers ||= B3_REQUIRED_HEADERS.all? { |key| @env.key?(key) }
     end
 
-    def force_sample?
-      @force_sample ||= @config.whitelist_plugin && @config.whitelist_plugin.call(@env)
-    end
-
     private
 
     B3_REQUIRED_HEADERS = %w(HTTP_X_B3_TRACEID HTTP_X_B3_SPANID).freeze
@@ -61,15 +57,24 @@ module ZipkinTracer
     end
 
     def sampled_header_value(parent_trace_sampled)
-      if parent_trace_sampled  # A service upstream decided this goes in all the way
+      if parent_trace_sampled # A service upstream decided this goes in all the way
         parent_trace_sampled
       else
-        new_sampled_header_value(force_sample? || current_trace_sampled? && !filtered?)
+        new_sampled_header_value(force_sample? || current_trace_sampled? && !filtered? && routable_request?)
       end
     end
 
+    def force_sample?
+      @config.whitelist_plugin && @config.whitelist_plugin.call(@env)
+    end
+
     def filtered?
       @config.filter_plugin && !@config.filter_plugin.call(@env)
     end
+
+    def routable_request?
+      Application.routable_request?(@env)
+    end
+
   end
 end

data/lib/zipkin-tracer/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipkin-tracer
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.34.0
 platform: ruby
 authors:
 - Franklin Hu
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2019-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -199,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="