ruby-zipkin 0.2.6 → 0.2.7

data/lib/ruby-zipkin/trace_filter.rb

@@ -8,7 +8,6 @@ module RubyZipkin
     def self.UriFilterMatches?(uri, keyword_blacklist = [])
       #exclude static content requests
       if uri.to_s.match(/.*(\.svg)|(\.ttf)|(\.ott)|(\.woff)/)
-        puts "zipkin uri #{uri} matches!"
         return true
       end
 
@@ -22,7 +21,6 @@ module RubyZipkin
       #exclude static content requests
       keyword_blacklist.each do |blacklisted|
         if keyword.to_s.match(/.*(#{blacklisted}).*/)
-          puts "zipkin keyword #{keyword} matches #{keyword}!"
           return true
         end
       end

data/lib/ruby-zipkin/version.rb

@@ -1,3 +1,3 @@
 module RubyZipkin
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/lib/ruby-zipkin.rb

@@ -26,14 +26,24 @@ module RubyZipkin extend self
 
     def call(env)
       begin
-        ::Trace.default_endpoint = ::Trace.default_endpoint.with_service_name(@service_name)
+        ::Trace.default_endpoint = ::Trace.default_endpoint.with_service_name(@service_name + "_#{normalized_uri(env['PATH_INFO'])}")
         ::Trace.sample_rate = 0.1
         env[ZipkinTraceHeader::PARENT_SPAN_ID] = @spanid
         env[ZipkinTraceHeader::TRACE_ID] = @tid
+
+        # the debug trace
+        #id = ::Trace::TraceId.new(@tid, nil, ::Trace.generate_id, true, ::Trace::Flags::DEBUG)
+        #::Trace.push(id)
+        #::Trace.set_rpc_name("debug")
+        #::Trace.record(::Trace::BinaryAnnotation.new("http.uri", '/debug', "STRING", ::Trace.default_endpoint))
+
         @status, @headers, @response = @app.call(env)
         tracing_filter(get_or_create_trace_id2(env), env, @headers)
+
+        #::Trace.pop
       rescue => e
         #Tracing errors shouldn't block a request.
+        Rails.logger.info "Zipkin error: #{e} \n #{e.backtrace}"
         puts "Zipkin error: #{e} \n #{e.backtrace}"
       end
       [@status, @headers, @response]
@@ -41,32 +51,53 @@ module RubyZipkin extend self
 
     private
     def tracing_filter(trace_id, env, headers=nil)
-      if RubyZipkin::TraceFilter.UriFilterMatches?(env["PATH_INFO"], @uri_filter_list)
-        puts "ZIPKIN URI FILTER MATCHED. NOT LOGGING"
+      if RubyZipkin::TraceFilter.UriFilterMatches?(normalized_uri(env["PATH_INFO"]), @uri_filter_list)
         return
       end
       @lock.synchronize do
         puts "zipkin trace id #{trace_id}"
         ::Trace.push(trace_id)
-        ::Trace.set_rpc_name(env["PATH_INFO"])
-        ::Trace.record(::Trace::BinaryAnnotation.new("http.uri", env["PATH_INFO"], "STRING", ::Trace.default_endpoint))
+
+        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.status", @status.to_s, "STRING", ::Trace.default_endpoint))
         ::Trace.record(::Trace::Annotation.new(::Trace::Annotation::SERVER_RECV, ::Trace.default_endpoint))
-        trace_hash(env)
+
+        add_referer(env)
         trace_hash(headers)
-        puts 'zipkin traced in'
+        trace_hash(env)
+        trace_post_data(env["rack.input"].read)
       end
       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
-          puts 'zipking trace out'
       end
     end
 
+    def add_referer(env)
+      if env['HTTP_REFERER']
+        ::Trace.record(::Trace::BinaryAnnotation.new("http.referer", env['HTTP_REFERER'], "STRING", ::Trace.default_endpoint))
+      end
+    end
+
+    def normalized_uri(path)
+      path.gsub(/\/\d+/, '/:id')
+    end
+
+    def set_trace_caption(env)
+      ::Trace.set_rpc_name("#{env['REQUEST_METHOD']} - #{@status.to_s} - #{normalized_uri(env['PATH_INFO'])}")
+    end
+
+    def trace_post_data(content)
+      MetadataLogger.log('HTTP_REQUEST INPUT', content.to_s)
+    end
+
     def trace_hash(content)
       if content
-        content.each do |k,v|
+        content.sort.map do |k,v|
           unless RubyZipkin::TraceFilter.KeywordFilterMatches?(k.to_s, @http_header_filter_list)
             MetadataLogger.log(k.to_s, v)
           end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-zipkin
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Ivan Marcin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-02 00:00:00 Z
+date: 2013-10-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: finagle-thrift