rubyzipkin 0.3.11 → 0.3.12

data/lib/rubyzipkin/trace_filter.rb

@@ -20,6 +20,19 @@ module RubyZipkin
       return false
     end
 
+    # Matcher to get a custom sample rate for a specific URI paths.
+    # returns the sample rate or nil
+    def self.UriSamplingMatches?(uri, uri_hash = {})
+
+      uri_hash.each do |key, value|
+        if uri.to_s.match key
+          return value
+        end
+      end
+
+      return nil
+    end
+
     # Filter a string based on a keyword blacklist
     # Meant to define if a key should be traced or not.
     def self.KeywordFilterMatches?(keyword, keyword_blacklist = [])

data/lib/rubyzipkin/version.rb

@@ -1,3 +1,3 @@
 module RubyZipkin
-  VERSION = "0.3.11"
+  VERSION = "0.3.12"
 end

data/lib/rubyzipkin.rb

@@ -14,7 +14,7 @@ module RubyZipkin extend self
 
   class RackHandler
 
-    def initialize(app, service_name, scribe_server, scribe_port, uri_filter_list = [], http_header_filter_list = [], scribe_max_buffer = 10, sampling_rate = 0.01, uri_sample_filter_list = {})
+    def initialize(app, service_name, scribe_server, scribe_port, uri_filter_list = [], http_header_filter_list = [], uri_sample_filter_list = {}, sampling_rate = 0.01, scribe_max_buffer = 10 )
       @app = app
       @lock = Mutex.new
 
@@ -23,6 +23,7 @@ module RubyZipkin extend self
       @sample_rate = sampling_rate
       @uri_filter_list = uri_filter_list
       @http_header_filter_list = http_header_filter_list
+      @uri_sample_filter_list = uri_sample_filter_list
       @scribe = Scribe.new("#{scribe_server}:#{scribe_port}")
       ::Trace.tracer = ::Trace::ZipkinTracer.new(Scriber.new(@scribe), scribe_max_buffer)
     end
@@ -30,7 +31,9 @@ module RubyZipkin extend self
     def call(env)
       begin
         ::Trace.default_endpoint = ::Trace.default_endpoint.with_service_name(@service_name + "_#{normalized_uri(env['PATH_INFO'])}")
-        ::Trace.sample_rate = @sampling_rate
+
+        set_sample_rate(env)
+
         env[ZipkinTraceHeader::PARENT_SPAN_ID] = @spanid
         env[ZipkinTraceHeader::TRACE_ID] = @tid
         @status, @headers, @response = @app.call(env)
@@ -43,6 +46,17 @@ module RubyZipkin extend self
       [@status, @headers, @response]
     end
 
+    private
+    def set_sample_rate(env)
+      custom_sample_rate =RubyZipkin::TraceFilter.UriSamplingMatches?(normalized_uri(env["PATH_INFO"]), @uri_sample_filter_list)
+
+      if custom_sample_rate
+        ::Trace.sample_rate = custom_sample_rate
+      else
+        ::Trace.sample_rate = @sample_rate
+      end
+    end
+
     private
     def tracing_filter(trace_id, env, headers=nil)
       if RubyZipkin::TraceFilter.UriFilterMatches?(normalized_uri(env["PATH_INFO"]), @uri_filter_list)
@@ -115,12 +129,11 @@ module RubyZipkin extend self
       @spanid = Trace.generate_id
       env[ZipkinTraceHeader::SPAN_ID] = @spanid
 
-      # from Finagle source: flags are 0 = none , 1 = debug
-      Trace::TraceId.new @tid, @parentspan, @spanid, true, ::TRACE::Flags::DEBUG
+      Trace::TraceId.new @tid, @parentspan, @spanid, true
     end
 
     def get_or_create_trace_id2(env)
-      ::Trace::TraceId.new(::Trace.generate_id, nil, ::Trace.generate_id, true, ::Trace::Flags::DEBUG)
+      ::Trace::TraceId.new(::Trace.generate_id, nil, ::Trace.generate_id, true)
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyzipkin
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 3
-  - 11
-  version: 0.3.11
+  - 12
+  version: 0.3.12
 platform: ruby
 authors: 
 - Ivan Marcin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-11-05 00:00:00 Z
+date: 2013-11-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: scribe