ruby-zipkin 0.2.2 → 0.2.5

data/lib/ruby-zipkin/version.rb

@@ -1,3 +1,3 @@
 module RubyZipkin
-  VERSION = "0.2.2"
+  VERSION = "0.2.5"
 end

data/lib/ruby-zipkin.rb

@@ -20,31 +20,28 @@ module RubyZipkin extend self
     end
 
     def call(env)
-      ::Trace.default_endpoint = ::Trace.default_endpoint.with_service_name(@service_name).with_port(@service_port)
-      ::Trace.sample_rate = 0.1
+
+      ::Trace.default_endpoint = ::Trace.default_endpoint.with_service_name(@service_name).with_port(@scribe_port)
+      ::Trace.sample_rate = 1
 
       env[ZipkinTraceHeader::PARENT_SPAN_ID] = @spanid
       env[ZipkinTraceHeader::TRACE_ID] = @tid
 
-      begin
-        tracing_filter(get_or_create_trace_id(env), env)
-      rescue => trace_error
-        puts trace_error.message, trace_error.backtrace
-      end
-
       @status, @headers, @response = @app.call(env)
+      tracing_filter(get_or_create_trace_id(env), env, @headers)
       [@status, @headers, @response]
     end
 
     private
-    def tracing_filter(trace_id, env)
+    def tracing_filter(trace_id, env, headers=nil)
       @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))
         ::Trace.record(::Trace::Annotation.new(::Trace::Annotation::SERVER_RECV, ::Trace.default_endpoint))
-        ::Trace.record(::Trace::Annotation.new(@service_name, ::Trace.default_endpoint))
-        trace_rack_request(env)
+        trace_hash(env)
+        trace_hash(headers)
       end
       yield if block_given?
       ensure
@@ -54,31 +51,31 @@ module RubyZipkin extend self
       end
     end
 
-    def trace_rack_request(env)
-      env.each do |k,v|
-        MetadataLogger.log(k.to_s, v.to_s)
+    def trace_hash(content)
+      if content
+        content.each do |k,v|
+          MetadataLogger.log(k.to_s, v.to_s)
+        end
       end
     end
 
     def get_or_create_trace_id(env)
-      if env.has_key?(ZipkinTraceHeader::TRACE_ID)
-        @tid = env[ZipkinTraceHeader::TRACE_ID]
-      else
+      if env[ZipkinTraceHeader::TRACE_ID].nil? or env[ZipkinTraceHeader::TRACE_ID].to_s.empty?
         @tid = Trace.generate_id
-      end
+        @parentspan = nil
 
-      if env.has_key?(ZipkinTraceHeader::SPAN_ID)
-        @spanid = env[ZipkinTraceHeader::SPAN_ID]
+        env[ZipkinTraceHeader::TRACE_ID] = @tid
       else
-        @spanid = Trace.generate_id
-      end
+        @tid = env[ZipkinTraceHeader::TRACE_ID]
 
-      if env.has_key?(ZipkinTraceHeader::PARENT_SPAN_ID)
-        @parentspan = env[ZipkinTraceHeader::PARENT_SPAN_ID]
-      else
-        @parentspan = nil
+        if !env[ZipkinTraceHeader::SPAN_ID].nil? and !env[ZipkinTraceHeader::SPAN_ID].to_s.empty?
+          @parentspan = env[ZipkinTraceHeader::SPAN_ID]
+        end
       end
 
+      @spanid = Trace.generate_id
+      env[ZipkinTraceHeader::SPAN_ID] = @spanid
+
       # from Finagle source: flags are 0 = none , 1 = debug
       Trace::TraceId.new @tid, @parentspan, @spanid, true, 0
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-zipkin
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Ivan Marcin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-25 00:00:00 Z
+date: 2013-09-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: finagle-thrift