zipkin-tracer 0.10.0 → 0.10.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzUzN2QzOWMyMzczNmIxNGRhMzU0YWIzNzU4NWNkZWU3NjY0YTcxOA==
+    ZTkwMjRjNjFiYzM3NmIyZTE5YmNiN2FiZWI0MDU2ODAxZjllMDJiZg==
   data.tar.gz: !binary |-
-    MDBkMTNiNmU5N2E0NGIwY2ZiZmI1MTYzMTFiYTU5ODkxNmI5NDMxYQ==
+    MzYyNjU3NmQyNjNhMzM3ZWNmY2IxZmViNzljM2IyODMyZDYwZGU5ZQ==
 SHA512:
   metadata.gz: !binary |-
-    MjY1NmFkODBiYzgyZWE4MTA5ZjQwOWU2MDRlZDIyYmZmYmMyZjA0MGNiOWE2
-    ZWQ4MTBiOGU4N2RmNGRhYmE0MjI3MGIyMjg0MjE1OWE4NzM5NWY1MDBlYmQ2
-    NzhlZTc1NGZiNjM3ZGQzYTg2ZDU5NmY1M2Q3YmZkNWNmZjgwODQ=
+    ZDcwZDYxNTFkNTQ0ODk5MjcxYjY3MTUxNDNkNWFhMTRmNzU4YzMzZDQ1YjE5
+    NDhiZjFiODg4YjQ0YzU2ODZlNDEwZWNiMTgzN2JmNmI5MTQzMGMxMWM1OTRl
+    ZWVmODk4ODRmZWYwNTcyYjliZjkwMWNhMzEwNzdmZTJmYTg2MDE=
   data.tar.gz: !binary |-
-    NmRjYmYyZWM4OGEzYmMyMTUzYzE5MzNjOGQxZDkyZTRiYTgxYzkyYzg3MTIy
-    YWRiYzkwYmIxYmM3MmIzZmFkZmJlMmZmOTBiM2FjZWFjNjA0ZGMwY2ZhNmI4
-    ZjVmNzU4ZGUwYzczZmNkM2U0M2ZmNjQxZDRkZDI2YTY3MmVlOTU=
+    NmE1NTI0Njc3MTVlMjdmODkyNGY2ZTczNzk3MTZmMzllYmQ5ZTZjOWMzMjQz
+    MzY1NjRlNzZkMDViMTA4NzM1OTZmMjQ4ZTZkNTRmNGFiYjBlYzBkNjc0N2I4
+    OTdlNTBhODIwM2I5ZjNkYmE0NWQyYWMzMzMxYjQ0NzExODc2YmQ=

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

@@ -20,31 +20,47 @@ module ZipkinTracer
     end
 
     def call(env)
-      # handle either a URI object (passed by Faraday v0.8.x in testing), or something string-izable
-      url = env[:url].respond_to?(:host) ? env[:url] : URI.parse(env[:url].to_s)
-      local_endpoint = Trace.default_endpoint # The rack middleware set this up for us.
-      remote_endpoint = callee_endpoint(url, local_endpoint.ip_format) # The endpoint we are calling.
-      response = nil
       trace_id = Trace.id.next_id
       with_trace_id(trace_id) do
         B3_HEADERS.each do |method, header|
           env[:request_headers][header] = trace_id.send(method).to_s
         end
-        # annotate with method (GET/POST/etc.) and uri path
-        @tracer.set_rpc_name(trace_id, env[:method].to_s.downcase)
-        @tracer.record(trace_id, Trace::BinaryAnnotation.new('http.uri', url.path, 'STRING', local_endpoint))
-        @tracer.record(trace_id, Trace::BinaryAnnotation.new('sa', '1', 'BOOL', remote_endpoint))
-        @tracer.record(trace_id, Trace::Annotation.new(Trace::Annotation::CLIENT_SEND, local_endpoint))
-        response = @app.call(env).on_complete do |renv|
-          # record HTTP status code on response
-          @tracer.record(trace_id, Trace::BinaryAnnotation.new('http.status', renv[:status].to_s, 'STRING', local_endpoint))
+        if trace_id.sampled?
+          trace!(env, trace_id)
+        else
+          @app.call(env)
         end
-        @tracer.record(trace_id, Trace::Annotation.new(Trace::Annotation::CLIENT_RECV, local_endpoint))
       end
-      response
     end
 
     private
+    SERVER_ADDRESS = 'sa'
+    SERVER_ADDRESS_SPECIAL_VALUE = '1'
+    STRING_TYPE = 'STRING'
+    BOOLEAN_TYPE = 'BOOL'
+    URI_KEY = 'http.uri'
+    STATUS_KEY = 'http.status'
+    UNKNOWN_URL = 'unknown'
+
+
+    def trace!(env, trace_id)
+      response = nil
+      # handle either a URI object (passed by Faraday v0.8.x in testing), or something string-izable
+      url = env[:url].respond_to?(:host) ? env[:url] : URI.parse(env[:url].to_s)
+      local_endpoint = Trace.default_endpoint # The rack middleware set this up for us.
+      remote_endpoint = callee_endpoint(url, local_endpoint.ip_format) # The endpoint we are calling.
+      # annotate with method (GET/POST/etc.) and uri path
+      @tracer.set_rpc_name(trace_id, env[:method].to_s.downcase)
+      @tracer.record(trace_id, Trace::BinaryAnnotation.new(URI_KEY, url.path, STRING_TYPE, local_endpoint))
+      @tracer.record(trace_id, Trace::BinaryAnnotation.new(SERVER_ADDRESS, SERVER_ADDRESS_SPECIAL_VALUE, BOOLEAN_TYPE, remote_endpoint))
+      @tracer.record(trace_id, Trace::Annotation.new(Trace::Annotation::CLIENT_SEND, local_endpoint))
+      response = @app.call(env).on_complete do |renv|
+        # record HTTP status code on response
+        @tracer.record(trace_id, Trace::BinaryAnnotation.new(STATUS_KEY, renv[:status].to_s, STRING_TYPE, local_endpoint))
+      end
+      @tracer.record(trace_id, Trace::Annotation.new(Trace::Annotation::CLIENT_RECV, local_endpoint))
+      response
+    end
 
     def with_trace_id(trace_id, &block)
       Trace.push(trace_id)
@@ -54,7 +70,7 @@ module ZipkinTracer
     end
 
     def callee_endpoint(url, ip_format)
-      service_name = @service_name || url.host.split('.').first || 'unknown' # default to url-derived service name
+      service_name = @service_name || url.host.split('.').first || UNKNOWN_URL # default to url-derived service name
       Trace::Endpoint.make_endpoint(url.host, url.port, service_name, ip_format)
     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.10.0"
+  VERSION = "0.10.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipkin-tracer
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Franklin Hu
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2016-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: finagle-thrift