zipkin-tracer 0.7.3 → 0.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjUyNDUwMDA3Y2YxZjFmZWU2ZmIzYTViMjc5OGRkNjdlM2I0ZWQwZQ==
+    ZmU3ZjM4OTBmOGM0NWRmMjkwNjkzZWY1MmE1ZWM5MWY4OTQ5OGQ3Yw==
   data.tar.gz: !binary |-
-    ZTVkYTUwYjkyMzVkM2NhZTNjYWQ2NDYyODVmN2I3NTMyMzE1Yjc4NQ==
+    MzI1NmFiNTEzOGYwYTVlMzk4MDljZDIxYzE5ZGQxY2RmZTc3ZjdiMA==
 SHA512:
   metadata.gz: !binary |-
-    MTE0YjZkMmVjMDc4ZmNmYWMwNzNkOTEzMzE5Yzk2ZmI3NDlhZmJhNjQyNWE4
-    YjBlYzVkYmUxMmQwNGEzYzcxMWQzNWQzZDc2M2MwYzgyZTNhMTgwMjAyNWQ0
-    OGM1NGYyNTM0ZGQ2MzIxMDRhOTU1NTY5NWVkZjlkYzU1N2UzNjg=
+    YjNlYTFjZDcyY2IwZDMxMjUwMjNhNzZhZGJmNjk4ODA0ZGIwNWQ2N2NlZDZm
+    ODViMmM1MmM5OWNhNmFlZjIwNzgxOTY4MDhiNjFkMTkxMGVjN2Q0OTQ1MjAx
+    YWM1YzY4Zjg0YjRhODI0NTUxZTdhZDdiMDY3YmRlZmE2MmU0MjU=
   data.tar.gz: !binary |-
-    OTZkZjljOTAxMDA4YzFkM2YxNzhjZmVkMWZlYWU3ZDY4ZGFiODhkZTAwNTM3
-    ZTc5NzA3NjdjYjhlZGMyNGUwZTZjZjJmYzNjYTQ5MjVkNTU2ZTRkZDNkNDRh
-    ODNiNzgzNTJiMDVkZjlkNTZiNGEzMjczMGZiZjFiN2JlNTk2Yzk=
+    NDEzMGRmNTBhZWRmYTc0YTc3NDllODkxMDExMWYzODQzMTgwZjg2MTAyNWQz
+    ZjFjYjVjMDAyNGI5NDM3NmNmZTQ4YWUyYmZkYTllYWMwZGNjZjBjZjdhYjgw
+    Nzc1MjM4MjkyY2RmNGFjOGE0OGRhMmFlODhjZmQ4ZGYwNzczYTg=

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

@@ -21,9 +21,9 @@ module ZipkinTracer
     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)
-      service_name = @service_name || url.host.split('.').first # default to url-derived service name
+      local_endpoint = ::Trace.default_endpoint # The rack middleware set this up for us.
+      remote_endpoint = callee_endpoint(url)  # The endpoint we are calling.
 
-      endpoint = ::Trace::Endpoint.new(host_ip_for(url.host), url.port, service_name)
       response = nil
       begin
         trace_id = ::Trace.id
@@ -33,13 +33,14 @@ module ZipkinTracer
         end
         # annotate with method (GET/POST/etc.) and uri path
         ::Trace.set_rpc_name(env[:method].to_s.downcase)
-        record(::Trace::BinaryAnnotation.new("http.uri", url.path, "STRING", endpoint))
-        record(::Trace::Annotation.new(::Trace::Annotation::CLIENT_SEND, endpoint))
+        record(::Trace::BinaryAnnotation.new("http.uri", url.path, "STRING", local_endpoint))
+        record(::Trace::BinaryAnnotation.new("sa", "1", "BOOL", remote_endpoint))
+        record(::Trace::Annotation.new(::Trace::Annotation::CLIENT_SEND, local_endpoint))
         response = @app.call(env).on_complete do |renv|
           # record HTTP status code on response
-          record(::Trace::BinaryAnnotation.new("http.status", renv[:status].to_s, "STRING", endpoint))
+          record(::Trace::BinaryAnnotation.new("http.status", renv[:status].to_s, "STRING", local_endpoint))
         end
-        record(::Trace::Annotation.new(::Trace::Annotation::CLIENT_RECV, endpoint))
+        record(::Trace::Annotation.new(::Trace::Annotation::CLIENT_RECV, local_endpoint))
       ensure
         ::Trace.pop
       end
@@ -54,6 +55,11 @@ module ZipkinTracer
       #TODO: if this class some day accepts a config hash, add a logger
     end
 
+    def callee_endpoint(url)
+      service_name = @service_name || url.host.split('.').first || 'unknown' # default to url-derived service name
+      ::Trace::Endpoint.new(host_ip_for(url.host), url.port, service_name)
+    end
+
     # get host IP for specified hostname, catching exceptions
     def host_ip_for(hostname)
       ::Trace::Endpoint.host_to_i32(hostname)

data/lib/zipkin-tracer/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipkin-tracer
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Franklin Hu
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: finagle-thrift