RubyGems - rubyzipkin - Versions diffs - 0.4.5 → 0.4.6 - Mend

rubyzipkin 0.4.5 → 0.4.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

data/lib/rubyzipkin.rb CHANGED

@@ -1,7 +1,6 @@
 require 'finagle-thrift'
 require 'finagle-thrift/trace'
 require 'scribe'
 require 'rubyzipkin/version'
 require 'rubyzipkin/scriber'
 require 'rubyzipkin/headers'
@@ -27,73 +26,91 @@ module RubyZipkin extend self
       @uri_sample_filter_list = uri_sample_filter_list
       @scribe = Scribe.new("#{scribe_server}:#{scribe_port}")
       @redis_config = redis_config
-      @sampled_ids = []
+      @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)
+        if $redis.nil?
+          $redis = redis_from_config(@redis_config) if File.exist?(@redis_config)
+        end
       rescue => e
-        $stderr.puts "No Redis instance"
+        $stderr.puts "ZIPKIN [ERR] Redis instance could not be configured (nil)"
       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
+    def call(env)
+      if $redis.nil?
+        return
       end
-    end
-    def call(env)
       begin
         ::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
-        env[ZipkinTraceHeader::TRACE_ID] = @tid
       rescue => e
         $stderr.puts "ZIPKIN [ERR] #{e}"
       end
       begin
-        @status, @headers, @response = @app.call(env)
-        redis_sampling
-        tracing_filter(trace_id, env, @headers)
+        status, headers, response = @app.call(env)
+        redis_sampling(headers)
+        tracing_filter(trace_id, env, headers, status)
       rescue => e
         # we want to do the call even if zipkin fails
         $stderr.puts "ZIPKIN [ERR] #{e} \n\n\n #{e.backtrace}"
       end
-      [@status, @headers, @response]
+      [status, headers, response]
+    end
+    # Return the current set of IDS to be unsampled
+    # as selected from redis.
+    def redis_sampled_ids
+      @sampled_ids.to_s
     end
-    private
+    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, :thread_safe => true)
+        instance.select(config['db']) if config['db']
+        instance
+      end
+    end
+    private :redis_from_config
     def get_ids_from_redis
-      if @redis and (Time.now - $redis_check_time) > 1 #5 minutes
-        @sampled_ids = []
-        keys = Redis::Safe.instance(:default).get("zipkin_trace_keys")
+      if $redis and (Time.now - $redis_check_time) > 600 # seconds
+        @sampled_ids = {}
-        # Lookup in trace keys only if som keys have been found
-        unless keys.nil?
-          keys.each { |i| @sampled_ids.push( i.split('_')[1] ) }
+        # ID's will be set as a sorted map of GUIDS from flexd's admin page
+        key = $redis.get("zipkin_traced_dguids")
+        unless key.nil?
+          begin
+            @sampled_ids = JSON.parse(key)
+          rescue => e
+            puts "ZIPKIN [ERR] unable to parse key set from redis keys:  #{e.message}"
+          end
         end
         $redis_check_time = Time.now
       end
     end
+    private :get_ids_from_redis
-    private
-    def redis_sampling
+    def redis_sampling(headers)
       get_ids_from_redis
-      if @headers[ZipkinTraceHeader::LOOKOUT_SAMPLE] and @sampled_ids.include?(@headers[ZipkinTraceHeader::LOOKOUT_SAMPLE])
-         ::Trace.sample_rate = 1.0
-      end
+      ::Trace.sample_rate = 1.0 if id_in_sample_set?(headers)
     end
+    private :redis_sampling
+    def id_in_sample_set?(headers)
+      headers[ZipkinTraceHeader::LOOKOUT_SAMPLE] and @sampled_ids.keys.include?(headers[ZipkinTraceHeader::LOOKOUT_SAMPLE])
+    end
+    private :id_in_sample_set?
-    private
     def set_sample_rate(env)
       custom_sample_rate =RubyZipkin::TraceFilter.UriSamplingMatches?(normalized_uri(env["PATH_INFO"]), @uri_sample_filter_list)
@@ -103,19 +120,19 @@ module RubyZipkin extend self
         ::Trace.sample_rate = @sample_rate
       end
     end
+    private :set_sample_rate
-    private
-    def tracing_filter(trace_id, env, headers=nil)
+    def tracing_filter(trace_id, env, headers=nil, status='')
       if RubyZipkin::TraceFilter.UriFilterMatches?(normalized_uri(env["PATH_INFO"]), @uri_filter_list)
-        "ZIPKIN: path matches filter. returning"
         return
       end
       @lock.synchronize do
         ::Trace.push(trace_id)
-        set_trace_caption(env)
+        set_trace_caption(env, status)
         ::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::BinaryAnnotation.new("http.status", status.to_s, "STRING", ::Trace.default_endpoint))
         ::Trace.record(::Trace::Annotation.new(::Trace::Annotation::SERVER_RECV, ::Trace.default_endpoint))
         add_referer(env)
@@ -132,6 +149,7 @@ module RubyZipkin extend self
           p = ::Trace.pop
       end
     end
+    private :tracing_filter
     def add_referer(env)
       if env['HTTP_REFERER']
@@ -156,12 +174,11 @@ module RubyZipkin extend self
       end
     end
-    def set_trace_caption(env)
-      ::Trace.set_rpc_name("#{env['REQUEST_METHOD']} - #{@status.to_s} - #{uri_summary(env['PATH_INFO'])}")
+    def set_trace_caption(env, status)
+      ::Trace.set_rpc_name("#{env['REQUEST_METHOD']} - #{status.to_s} - #{uri_summary(env['PATH_INFO'])}")
     end
     def trace_post_data(content)
       # Slightly large size cap to the request input to accomodate larger JSON bodies.
       MetadataLogger.log('HTTP_REQUEST_INPUT', content.to_s, 1024)
     end
@@ -198,7 +215,7 @@ module RubyZipkin extend self
       @spanid = Trace.generate_id
-      # Save into headers
+      # Save into HTTP headers
       env[ZipkinTraceHeader::TRACE_ID] = @trace_id
       env[ZipkinTraceHeader::SPAN_ID] = @spanid
       env[ZipkinTraceHeader::PARENT_SPAN_ID] = @parentspan

data/lib/rubyzipkin/version.rb CHANGED

@@ -1,3 +1,3 @@
 module RubyZipkin
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

metadata CHANGED

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rubyzipkin
 version: !ruby/object:Gem::Version
-  hash: 5
+  hash: 3
   prerelease:
   segments:
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors:
 - Ivan Marcin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00 Z
+date: 2014-02-14 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scribe