faraday-zipkin 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGYxYzAzNzAzZTQ3OTVhMjcyOWUyZWFlOTQ2OWE2YjgzOTlmNzBjYQ==
+    ZjRlNWZhOWZmYTFkODFjMmNmYjYzODlkZjg2NzMyZmNkYWI3Yzg2Zg==
   data.tar.gz: !binary |-
-    YmRlM2VkNzIyNmQyYWNhMzQ5M2M2N2RkN2ZlMjI0YTM5YWVhYTdmOQ==
+    ODY2ZmU5YTQxODM3OTQxZDIzMDU1ODRiNjQ1ZDlkOWI0YzYwYzc4Nw==
 SHA512:
   metadata.gz: !binary |-
-    OTdkMzY3MmJiNTQyOWVkNjZhZDA5ZGI0MDkyNWJlMGQxZTg2N2RhZmMxMDkx
-    MTJlOWUzNTlhMWIzMGFlNTcwYjJjMGQyODQ2YzM2MjRiM2RmYWFhNGNiY2Zm
-    ODg1ZjgwZmU5YmVmODU0ZWE1ZjJiMzcyYjQ3MWVhOWE5ZDIwOGQ=
+    ODhmYzU1NmUwM2MxYWExNDQ1YmFlODRiYmI5MzU2MjEwMzUyMTZlNTkwNDFl
+    N2JjOTczZjRjYTZmYTAxNDZhYjE2YzU0ZDI1MTA2NWIzMjA1OWFlZTMxMDdl
+    MWJjNDA4NTgxY2I4MWMyYWVhMWU1MzhlZWIxM2ZkNjc3N2VmODE=
   data.tar.gz: !binary |-
-    ZTZkZGQwZmU4NTRhYmRiYjdhOTJlMmQ2Nzg4MjU2ZWJhMGUyMWQ0NjI5ZjE1
-    NjYwZjhlYmM2ZjU2MmY5Mzk2YzcyMGNlMTIwYTcwN2ZjMTRmNDkwODVmNjU3
-    MGExOWI3NjcwYzkxYzkxMmMwZWRjNzhiMWVkNDNkODFmODIxZjA=
+    MTZhOWI3ZjdhNmFlZGIxYmFjMTBhODllNjVlNGUyMTA1YmVjMGY1ZTdhZDAy
+    MmI3NDBhZTk3Mjc5ODNhYjhkMGQwZTMyNTQ4N2JhYzk4ZGNlOGZiOGZiOTRm
+    MTRhYWFhMDk1NDg3YWI2MmIwODg3ZjBjNDlmNGUwOGRhYThhYjY=

data/lib/faraday/zipkin.rb

@@ -29,11 +29,17 @@ module Faraday
         endpoint = ::Trace::Endpoint.new(::Trace::Endpoint.host_to_i32(url.host), url.port, service_name)
 
         ::Trace.push(trace_id.next_id) do
+          # annotate with method (GET/POST/etc.) and uri path
+          ::Trace.set_rpc_name(env[:method].to_s.upcase)
+          ::Trace.record(::Trace::BinaryAnnotation.new("http.uri", url.path, "STRING", endpoint))
           ::Trace.record(::Trace::Annotation.new(::Trace::Annotation::CLIENT_SEND, endpoint))
           B3_HEADERS.each do |method, header|
             env[:request_headers][header] = ::Trace.id.send(method).to_s
           end
-          result = @app.call(env)
+          result = @app.call(env).on_complete do |renv|
+            # record HTTP status code on response
+            ::Trace.record(::Trace::BinaryAnnotation.new("http.status", renv[:status], "I16", endpoint))
+          end
           ::Trace.record(::Trace::Annotation.new(::Trace::Annotation::CLIENT_RECV, endpoint))
           result
         end

data/lib/faraday/zipkin/version.rb

@@ -1,5 +1,5 @@
 module Faraday
   module Zipkin
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/spec/zipkin_trace_headers_spec.rb

@@ -1,11 +1,29 @@
 describe Faraday::Zipkin::TraceHeaders do
-  let(:wrapped_app) { lambda{|env| env} }
+  # allow stubbing of on_complete and response env
+  class ResponseObject
+    attr_reader :env
+
+    def initialize(env, response_env)
+      @env = env
+      @response_env = response_env
+    end
+
+    def on_complete
+      yield @response_env
+      self
+    end
+  end
+
+  let(:response_env) { { :status => 200 } }
+  let(:wrapped_app) { lambda{|env| ResponseObject.new(env, response_env)} }
 
   let(:hostname) { 'service.example.com' }
   let(:host_ip) { 0x11223344 }
+  let(:raw_url) { "https://#{hostname}/some/path/here" }
 
   def process(body, url, headers={})
     env = {
+      :method => :post,
       :url => url,
       :body => body,
       :request_headers => Faraday::Utils::Headers.new(headers),
@@ -34,12 +52,14 @@ describe Faraday::Zipkin::TraceHeaders do
 
       it 'sets the X-B3 request headers' do
         # expect SEND then RECV
+        expect(::Trace).to receive(:set_rpc_name).with('POST')
+        expect(::Trace).to receive(:record).with(instance_of(::Trace::BinaryAnnotation)).twice # http.uri, http.status
         expect(::Trace).to receive(:record).with(have_value(::Trace::Annotation::CLIENT_SEND).and(have_endpoint(host_ip, service_name))).ordered
         expect(::Trace).to receive(:record).with(have_value(::Trace::Annotation::CLIENT_RECV).and(have_endpoint(host_ip, service_name))).ordered
 
         result = nil
         ::Trace.push(trace_id) do
-          result = process('', url)
+          result = process('', url).env
         end
         expect(result[:request_headers]['X-B3-TraceId']).to eq('0000000000000001')
         expect(result[:request_headers]['X-B3-ParentSpanId']).to eq('0000000000000003')
@@ -51,7 +71,7 @@ describe Faraday::Zipkin::TraceHeaders do
 
     context 'without tracing id' do
       it 'generates a new ID, and sets the X-B3 request headers' do
-        result = process('', url)
+        result = process('', url).env
         expect(result[:request_headers]['X-B3-TraceId']).to match(/^\h{16}$/)
         expect(result[:request_headers]['X-B3-ParentSpanId']).to match(/^\h{16}$/)
         expect(result[:request_headers]['X-B3-SpanId']).to match(/^\h{16}$/)
@@ -65,14 +85,14 @@ describe Faraday::Zipkin::TraceHeaders do
     let(:service_name) { 'service' }
 
     context 'request with string URL' do
-      let(:url) { "https://#{hostname}/some/path/here" }
+      let(:url) { raw_url }
 
       include_examples 'can make requests'
     end
 
     # in testing, Faraday v0.8.x passes a URI object rather than a string
     context 'request with pre-parsed URL' do
-      let(:url) { URI.parse("https://#{hostname}/some/path/here") }
+      let(:url) { URI.parse(raw_url) }
 
       include_examples 'can make requests'
     end
@@ -84,7 +104,7 @@ describe Faraday::Zipkin::TraceHeaders do
 
     # in testing, Faraday v0.8.x passes a URI object rather than a string
     context 'request with pre-parsed URL' do
-      let(:url) { URI.parse("https://#{hostname}/some/path/here") }
+      let(:url) { URI.parse(raw_url) }
 
       include_examples 'can make requests'
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-zipkin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ariel Salomon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday