zipkin-tracer 0.13.1 → 0.13.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDllODZmMGVmYTA3M2ZmN2YyODY2NTQ0MWE2OGM3Yzg1MDk2NDVjZg==
+    MmY0OTE5MGZkYzk3ZDhjNjUyMzk0MjA4MWNkZDhjMWZjNDQxNDMyMw==
   data.tar.gz: !binary |-
-    MTM2OTZhMzUzZTA3ZmUzZmRhNDk1NTY4ZjIyZjllNDZiYTlmMWRlYw==
+    YTlhNjFhYzc5Nzg0NDVhMDMwMTRiY2MzNDcxMzVjOGM2NDVjNGM2YQ==
 SHA512:
   metadata.gz: !binary |-
-    M2MwMjQyMjU2NmRiZTVjZTA0MzQ4OTU5NDY1NTg1ODQ4OTFjZmY2ZDA4ZGVj
-    YzZhNmQxODg4MmY4NmNjYWMzNTg5MjMyMTY0MTA3YTQwYjBkY2I2Y2ZiOTcy
-    ZDA2MjJiMTAzNGM2Mjg3Yzg3NDFmNDhjZmM3NzQ2YjMyY2RjZjI=
+    ZDZiNDI1OTRhNzYyYmFiZWMwNmYwZWM3MzdlOGVjNDVlMDU3OWVlMzg4MGY1
+    ZWVmMzQwZDFiMzkwMGY1YzY3Yzg4NzI4YmFlMWEyNjg0OWQyNjU4NTgzODNh
+    YWNhN2NjZjMzMTMwZjI0NzYzYTYxNjgxMTNmODNmYjhkZDAzNWE=
   data.tar.gz: !binary |-
-    ZDkzNzIwMzA4M2I1YjczNDg5YTJhOGIyNTcwYTZjYzBkNTVlN2UwZGI1NjVj
-    MzEwYmE3YzgwZTI4ZWI2ZGVjZTJjMTc0MTczOWI3MmFhZTM5NTY1MTVjMTlj
-    NjEwN2E5Nzg4M2E4ZWVkMmFlZjg0MDk3YTczNTRhOGZjMGVmOTU=
+    YmZkMjYxNDRiMTY0N2Y0NDRhOTMxNjZiYWNjMjFhMTY1MGJiMjVhZDdiNDI0
+    MGNiMjFiNTI1M2Q1YzU1NjhhZTE5YWVlZDBjZTg3MWNiMDc4OGM4YjdlZTVi
+    Y2NhN2VjYmMzNDE1MTM5OTljOTgxNDAxNGQ0ZTlhNWM1YWFhODc=

data/lib/zipkin-tracer/faraday/zipkin-tracer.rb

@@ -35,12 +35,7 @@ module ZipkinTracer
     end
 
     private
-    SERVER_ADDRESS = 'sa'.freeze
     SERVER_ADDRESS_SPECIAL_VALUE = '1'.freeze
-    STRING_TYPE = 'STRING'.freeze
-    BOOLEAN_TYPE = 'BOOL'.freeze
-    URI_KEY = 'http.uri'.freeze
-    STATUS_KEY = 'http.status'.freeze
 
     def trace!(env, trace_id)
       response = nil
@@ -50,14 +45,14 @@ module ZipkinTracer
       remote_endpoint = Trace::Endpoint.remote_endpoint(url, @service_name, local_endpoint.ip_format) # The endpoint we are calling.
       @tracer.with_new_span(trace_id, env[:method].to_s.downcase) do |span|
         # annotate with method (GET/POST/etc.) and uri path
-        span.record(Trace::BinaryAnnotation.new(URI_KEY, url.path, STRING_TYPE, local_endpoint))
-        span.record(Trace::BinaryAnnotation.new(SERVER_ADDRESS, SERVER_ADDRESS_SPECIAL_VALUE, BOOLEAN_TYPE, remote_endpoint))
-        span.record(Trace::Annotation.new(Trace::Annotation::CLIENT_SEND, local_endpoint))
+        span.record_tag(Trace::BinaryAnnotation::URI, url.path, Trace::BinaryAnnotation::Type::STRING, local_endpoint)
+        span.record_tag(Trace::BinaryAnnotation::SERVER_ADDRESS, SERVER_ADDRESS_SPECIAL_VALUE, Trace::BinaryAnnotation::Type::BOOL, remote_endpoint)
+        span.record(Trace::Annotation::CLIENT_SEND, local_endpoint)
         response = @app.call(env).on_complete do |renv|
           # record HTTP status code on response
-          span.record(Trace::BinaryAnnotation.new(STATUS_KEY, renv[:status].to_s, STRING_TYPE, local_endpoint))
+          span.record_tag(Trace::BinaryAnnotation::STATUS, renv[:status].to_s, Trace::BinaryAnnotation::Type::STRING, local_endpoint)
         end
-        span.record(Trace::Annotation.new(Trace::Annotation::CLIENT_RECV, local_endpoint))
+        span.record(Trace::Annotation::CLIENT_RECV, local_endpoint)
       end
       response
     end

data/lib/zipkin-tracer/rack/zipkin-tracer.rb

@@ -55,19 +55,19 @@ module ZipkinTracer
       synchronize do
         #if called by a service, the caller already added the information
         trace_request_information(span, zipkin_env.env) unless zipkin_env.called_with_zipkin_headers?
-        span.record(Trace::Annotation.new(Trace::Annotation::SERVER_RECV, Trace.default_endpoint))
-        span.record(Trace::Annotation.new('whitelisted', Trace.default_endpoint)) if zipkin_env.force_sample?
+        span.record(Trace::Annotation::SERVER_RECV)
+        span.record('whitelisted') if zipkin_env.force_sample?
       end
       status, headers, body = yield
     ensure
       synchronize do
         annotate_plugin(zipkin_env.env, status, headers, body)
-        span.record(Trace::Annotation.new(Trace::Annotation::SERVER_SEND, Trace.default_endpoint))
+        span.record(Trace::Annotation::SERVER_SEND)
       end
     end
 
     def trace_request_information(span, env)
-      span.record(Trace::BinaryAnnotation.new('http.uri', env['PATH_INFO'], 'STRING', Trace.default_endpoint))
+      span.record_tag(Trace::BinaryAnnotation::URI, env['PATH_INFO'])
     end
 
     def synchronize(&block)

data/lib/zipkin-tracer/trace.rb

@@ -32,16 +32,6 @@ module Trace
       @duration = to_microseconds(Time.now) - @timestamp
     end
 
-    # We record information into spans, then we send these spans to zipkin
-    def record(annotation)
-      case annotation
-      when BinaryAnnotation
-        binary_annotations << annotation
-      when Annotation
-        annotations << annotation
-      end
-    end
-
     def to_h
       {
         name: @name,
@@ -56,6 +46,19 @@ module Trace
       }
     end
 
+    # We record information into spans, then we send these spans to zipkin
+    def record(value, endpoint = Trace.default_endpoint)
+      annotations << Trace::Annotation.new(value, endpoint)
+    end
+
+    def record_tag(key, value, type = Trace::BinaryAnnotation::Type::STRING, endpoint = Trace.default_endpoint)
+      binary_annotations << Trace::BinaryAnnotation.new(key, value, type, endpoint)
+    end
+
+    def record_local_component(value)
+      record_tag(BinaryAnnotation::LOCAL_COMPONENT, value)
+    end
+
     private
 
     UNKNOWN_DURATION = 0 # mark duration was not set
@@ -78,6 +81,11 @@ module Trace
 
   # This class is defined in finagle-thrift. We are adding extra methods here
   class BinaryAnnotation
+    SERVER_ADDRESS = 'sa'.freeze
+    URI = 'http.uri'.freeze
+    STATUS = 'http.status'.freeze
+    LOCAL_COMPONENT = 'lc'.freeze
+
     def to_h
       {
         key: @key,

data/lib/zipkin-tracer/trace_client.rb

@@ -1,8 +1,10 @@
 module ZipkinTracer
-  class TraceClient
-    LOCAL_COMPONENT = 'lc'.freeze
-    STRING_TYPE = 'STRING'.freeze
+  class NullSpan
+    def method_missing(name, *args)
+    end
+  end
 
+  class TraceClient
     def self.local_component_span(local_component_value, &block)
       client = self.new
       client.trace(local_component_value, &block)
@@ -13,27 +15,18 @@ module ZipkinTracer
 
       @trace_id = Trace.id.next_id
       result = nil
-      Trace.with_trace_id(@trace_id) do
-        Trace.tracer.with_new_span(@trace_id, LOCAL_COMPONENT) do |span|
-          @span = span
-          result = block.call(self)
-          record_local_component local_component_value
+      if @trace_id.sampled?
+        Trace.with_trace_id(@trace_id) do
+          Trace.tracer.with_new_span(@trace_id, Trace::BinaryAnnotation::LOCAL_COMPONENT) do |span|
+            result = block.call(span)
+            span.record_local_component local_component_value
+          end
         end
+      else
+        result = block.call(NullSpan.new)
       end
       result
     end
 
-    def record(key)
-      @span.record(Trace::Annotation.new(key, Trace.default_endpoint)) if @trace_id.sampled?
-    end
-
-    def record_tag(key, value)
-      @span.record(Trace::BinaryAnnotation.new(key, value, STRING_TYPE, Trace.default_endpoint)) if @trace_id.sampled?
-    end
-
-    def record_local_component(value)
-      record_tag(LOCAL_COMPONENT, value)
-    end
-
   end
 end

data/lib/zipkin-tracer/version.rb

@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 module ZipkinTracer
-  VERSION = "0.13.1"
+  VERSION = "0.13.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipkin-tracer
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Franklin Hu
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday