rubyzipkin 0.4.1 → 0.4.2

data/lib/rubyzipkin.rb

@@ -8,6 +8,7 @@ require 'rubyzipkin/headers'
 require 'rubyzipkin/metadata_logger'
 require 'rubyzipkin/tracesampler'
 require 'rubyzipkin/trace_filter'
+require 'rubyzipkin/permanent_header_filter'
 
 
 module RubyZipkin extend self
@@ -31,17 +32,21 @@ module RubyZipkin extend self
     def call(env)
       begin
         ::Trace.default_endpoint = ::Trace.default_endpoint.with_service_name(@service_name + "_#{normalized_uri(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
 
-        @status, @headers, @response = @app.call(env)
+      rescue => e
+        $stderr.puts "ZIPKIN [ERR] #{e}"
+      end
 
+      begin
+        @status, @headers, @response = @app.call(env)
         tracing_filter(trace_id, env, @headers)
       rescue => e
-        #Tracing errors shouldn't block a request.
+        # we want to do the call even if zipkin fails
+        $stderr.puts "ZIPKIN [ERR] #{e} \n\n\n #{e.backtrace}"
       end
       [@status, @headers, @response]
     end
@@ -60,6 +65,7 @@ module RubyZipkin extend self
     private
     def tracing_filter(trace_id, env, headers=nil)
       if RubyZipkin::TraceFilter.UriFilterMatches?(normalized_uri(env["PATH_INFO"]), @uri_filter_list)
+        "ZIPKIN: path matches filter. returning"
         return
       end
       @lock.synchronize do
@@ -78,9 +84,10 @@ module RubyZipkin extend self
       yield if block_given?
       ensure
         @lock.synchronize do
+
           ::Trace.record(::Trace::Annotation.new(::Trace::Annotation::SERVER_SEND, ::Trace.default_endpoint))
           add_referer(env)
-          ::Trace.pop
+          p = ::Trace.pop
       end
     end
 
@@ -99,8 +106,9 @@ module RubyZipkin extend self
     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, 2048)
+      MetadataLogger.log('HTTP_REQUEST_INPUT', content.to_s, 1024)
     end
 
     def trace_hash(content)
@@ -113,6 +121,11 @@ module RubyZipkin extend self
       end
     end
 
+    # Generates a trace ID set in Finagle's format
+    # * @param _traceId The id for this request.
+    # * @param _parentId The id for the request one step up the service stack.
+    # * @param spanId The id for this particular request
+    # * @param _sampled Should we sample this request or not? True means sample, false means don't.
     def get_or_create_trace_id(env)
 
       if env[ZipkinTraceHeader::TRACE_ID].nil? or env[ZipkinTraceHeader::TRACE_ID].to_s.empty?

data/lib/rubyzipkin/metadata_logger.rb

@@ -9,9 +9,12 @@ module RubyZipkin
     # since logging can ve quite extensive, we set a cap for the max size in bytes for a trace header
     def self.log(key, value, max_size_bytes = 512)
       if key.to_s == "action_controller.rescue.request" || key.to_s == "action_controller.rescue.response"
-        ::Trace.record(::Trace::BinaryAnnotation.new(key, value.as_json.to_s[0..max_size_bytes], "STRING", ::Trace.default_endpoint))
+        ann = ::Trace::BinaryAnnotation.new(key, value.as_json.to_s[0..max_size_bytes], "STRING", ::Trace.default_endpoint)
+        puts ann.to_s
+        ::Trace.record(ann)
       else
-        ::Trace.record(::Trace::BinaryAnnotation.new(key, value.to_s[0..max_size_bytes], "STRING", ::Trace.default_endpoint))
+        ann = ::Trace::BinaryAnnotation.new(key, value.to_s[0..max_size_bytes], "STRING", ::Trace.default_endpoint)
+        ::Trace.record(ann)
       end
     end
 

data/lib/rubyzipkin/permanent_header_filter.rb

@@ -12,7 +12,10 @@ module RubyZipkin
       "rack.session.options",
       "rack.request.cookie_hash",
       "rack.request.cookie_string",
-      "rack.request.form_vars"
+      "rack.request.form_vars",
+      "action_controller.rescue",
+      "action_controller.rescue.request",
+      "action_controller.rescue.response"
     ]
   end
 end

data/lib/rubyzipkin/trace_filter.rb

@@ -12,7 +12,7 @@ module RubyZipkin
       end
 
       keyword_blacklist.each do |key|
-        if uri.to_s.match key or uri.to
+        if uri.to_s.match(key)
           return true
         end
       end

data/lib/rubyzipkin/tracesampler.rb

@@ -10,6 +10,7 @@ module RubyZipkin
           return 1
         end
       end
+      #default at .01 Percent
       return 0.0001
     end
   end

data/lib/rubyzipkin/version.rb

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

metadata

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