ruby-zipkin 0.2.907 → 0.2.909

data/lib/ruby-zipkin.rb

@@ -6,18 +6,22 @@ require 'ruby-zipkin/headers'
 require 'ruby-zipkin/metadata_logger'
 require 'ruby-zipkin/tracesampler'
 require 'ruby-zipkin/trace_filter'
-require 'base64'
+
 
 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)
+    def initialize(app, service_name, scribe_server, scribe_port, uri_filter_list = [], http_header_filter_list = [], scribe_max_buffer = 10, uri_sample_filter_list = {} , sampling_rate = 0.01)
       @app = app
       @lock = Mutex.new
+
+      puts "sampling rate = #{sampling_rate}"
+      puts "uri_sample_filter_list = #{uri_sample_filter_list}"
+
       @service_name = service_name
       @scribe_port = scribe_port
-      @sample_rate = 1
+      @sample_rate = sampling_rate
       @uri_filter_list = uri_filter_list
       @http_header_filter_list = http_header_filter_list
       @scribe = Scribe.new("#{scribe_server}:#{scribe_port}")
@@ -27,7 +31,7 @@ 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 = 1
+        ::Trace.sample_rate = @sampling_rate
         env[ZipkinTraceHeader::PARENT_SPAN_ID] = @spanid
         env[ZipkinTraceHeader::TRACE_ID] = @tid
         @status, @headers, @response = @app.call(env)
@@ -113,7 +117,7 @@ module RubyZipkin extend self
       env[ZipkinTraceHeader::SPAN_ID] = @spanid
 
       # from Finagle source: flags are 0 = none , 1 = debug
-      Trace::TraceId.new @tid, @parentspan, @spanid, true, ::TRACE::Flags::empty
+      Trace::TraceId.new @tid, @parentspan, @spanid, true, ::TRACE::Flags::DEBUG
     end
 
     def get_or_create_trace_id2(env)

data/lib/ruby-zipkin/trace_filter.rb

@@ -11,8 +11,13 @@ module RubyZipkin
         return true
       end
 
-      #check the uri against the blacklist
-      return KeywordFilterMatches?(uri, keyword_blacklist)
+      keyword_blacklist.each do |key|
+        if uri.to_s.match key
+          return true
+        end
+      end
+
+      return false
     end
 
     # Filter a string based on a keyword blacklist

data/lib/ruby-zipkin/version.rb

@@ -1,3 +1,3 @@
 module RubyZipkin
-  VERSION = "0.2.907"
+  VERSION = "0.2.909"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-zipkin
 version: !ruby/object:Gem::Version 
-  hash: 1793
+  hash: 1805
   prerelease: 
   segments: 
   - 0
   - 2
-  - 907
-  version: 0.2.907
+  - 909
+  version: 0.2.909
 platform: ruby
 authors: 
 - Ivan Marcin
@@ -15,38 +15,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-23 00:00:00 Z
+date: 2013-11-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: finagle-thrift
+  name: scribe
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 31
         segments: 
-        - 1
-        - 3
         - 0
-        version: 1.3.0
+        - 2
+        - 4
+        version: 0.2.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: scribe
+  name: finagle-thrift
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 25
         segments: 
-        - 0
-        - 2
-        - 4
-        version: 0.2.4
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
   type: :runtime
   version_requirements: *id002
 description: Track rack header requests on zipkin