rubyzipkin 0.4.2 → 0.4.3

data/lib/rubyzipkin.rb

@@ -15,7 +15,7 @@ module RubyZipkin extend self
 
   class RackHandler
 
-    def initialize(app, service_name, scribe_server, scribe_port, uri_filter_list = [], http_header_filter_list = [], uri_sample_filter_list = {}, sampling_rate = 0.0001, scribe_max_buffer = 50 )
+    def initialize(app, service_name, scribe_server, scribe_port, uri_filter_list = [], http_header_filter_list = [], uri_sample_filter_list = {}, sampling_rate = 0.0001, scribe_max_buffer = 50, redis_config = 'config/redis.yml')
       @app = app
       @lock = Mutex.new
 
@@ -26,12 +26,30 @@ module RubyZipkin extend self
       @http_header_filter_list = http_header_filter_list
       @uri_sample_filter_list = uri_sample_filter_list
       @scribe = Scribe.new("#{scribe_server}:#{scribe_port}")
+      @redis_config = redis_config
+      @sampled_ids = []
+      $redis_check_time = Time.now
       ::Trace.tracer = ::Trace::ZipkinTracer.new(Scriber.new(@scribe), scribe_max_buffer)
+
+      begin
+        @redis = redis_from_config(redis_config) if File.exists?(@redis_config)
+      rescue => e
+        $stderr.puts "No Redis instance"
+      end
+    end
+
+    def redis_from_config(file_name)
+      config = YAML.load_file(file_name)['production']
+      if config && (host = config['host']) && (port = config['port'])
+        instance = Redis.new(:host => host, :port => port, :logger => Rails.logger, :thread_safe => true)
+        instance.select(config['db']) if config['db']
+        instance
+      end
     end
 
     def call(env)
       begin
-        ::Trace.default_endpoint = ::Trace.default_endpoint.with_service_name(@service_name + "_#{normalized_uri(env['PATH_INFO'])}")
+        ::Trace.default_endpoint = ::Trace.default_endpoint.with_service_name(@service_name + "/#{top_level_path(env['PATH_INFO'])}")
         set_sample_rate(env)
         trace_id = get_or_create_trace_id(env)
         env[ZipkinTraceHeader::PARENT_SPAN_ID] = @spanid
@@ -43,6 +61,7 @@ module RubyZipkin extend self
 
       begin
         @status, @headers, @response = @app.call(env)
+        redis_sampling
         tracing_filter(trace_id, env, @headers)
       rescue => e
         # we want to do the call even if zipkin fails
@@ -51,6 +70,24 @@ module RubyZipkin extend self
       [@status, @headers, @response]
     end
 
+    private
+    def get_ids_from_redis
+      if @redis and (Time.now - $redis_check_time) > 1 #5 minutes
+        @sampled_ids = []
+        keys = Redis::Safe.instance(:default).keys("zipkin*")
+        keys.each { |i| @sampled_ids.push( i.split('_')[1] ) }
+        $redis_check_time = Time.now
+      end
+    end
+
+    private
+    def redis_sampling
+      get_ids_from_redis
+      if @headers[ZipkinTraceHeader::LOOKOUT_SAMPLE] and @sampled_ids.include?(@headers[ZipkinTraceHeader::LOOKOUT_SAMPLE])
+         ::Trace.sample_rate = 1.0
+      end
+    end
+
     private
     def set_sample_rate(env)
       custom_sample_rate =RubyZipkin::TraceFilter.UriSamplingMatches?(normalized_uri(env["PATH_INFO"]), @uri_sample_filter_list)
@@ -72,7 +109,7 @@ module RubyZipkin extend self
         ::Trace.push(trace_id)
 
         set_trace_caption(env)
-        ::Trace.record(::Trace::BinaryAnnotation.new("http.uri", normalized_uri(env["PATH_INFO"]), "STRING", ::Trace.default_endpoint))
+        ::Trace.record(::Trace::BinaryAnnotation.new("http.uri", top_level_path(env["PATH_INFO"]), "STRING", ::Trace.default_endpoint))
         ::Trace.record(::Trace::BinaryAnnotation.new("http.status", @status.to_s, "STRING", ::Trace.default_endpoint))
         ::Trace.record(::Trace::Annotation.new(::Trace::Annotation::SERVER_RECV, ::Trace.default_endpoint))
 
@@ -101,8 +138,21 @@ module RubyZipkin extend self
       path.gsub(/\/\d+/, '/:id')
     end
 
+    def top_level_path(path)
+      path.split('/')[1]
+    end
+
+    def uri_summary(path)
+      suffix = path.match /\w+$/
+      if suffix.to_s.length > 10
+        normalized_uri(path.gsub(/\w+$/,''))
+      else
+        normalized_uri(path)
+      end
+    end
+
     def set_trace_caption(env)
-      ::Trace.set_rpc_name("#{env['REQUEST_METHOD']} - #{@status.to_s} - #{normalized_uri(env['PATH_INFO'])}")
+      ::Trace.set_rpc_name("#{env['REQUEST_METHOD']} - #{@status.to_s} - #{uri_summary(env['PATH_INFO'])}")
     end
 
     def trace_post_data(content)

data/lib/rubyzipkin/headers.rb

@@ -7,5 +7,6 @@ module RubyZipkin
     TRACE_SAMPLED   = "X-B3-SAMPLED"
     TRACE_FLAGS     = "X-B3-FLAGS"
     FORCE_SAMPLE    = "X-B3-FORCE-SAMPLE"
+    LOOKOUT_SAMPLE  = "X-LOOKOUT-DGUID"
   end
 end

data/lib/rubyzipkin/permanent_header_filter.rb

@@ -15,7 +15,8 @@ module RubyZipkin
       "rack.request.form_vars",
       "action_controller.rescue",
       "action_controller.rescue.request",
-      "action_controller.rescue.response"
+      "action_controller.rescue.response",
+      "gon", #rails internationalization
     ]
   end
 end

data/lib/rubyzipkin/version.rb

@@ -1,3 +1,3 @@
 module RubyZipkin
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyzipkin
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Ivan Marcin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-12-17 00:00:00 Z
+date: 2014-01-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: scribe