faraday-zipkin 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzUwZDc2ZDFjODFlODBmNjA1ZjZmMWQ0ODdlMDYyNWFhN2U2NGUwMw==
+    MjJkNWExZDIwMmE4NDZlYzY4YmViNWFmNDIyZTJiYTVhMThkZWVlMw==
   data.tar.gz: !binary |-
-    MDcxYTc2ODYwMTMzZDg5NzJiYzBjM2MzOTQzN2M0NGE2MDQzNTA1Mw==
+    Yzg0MTAyNDU0YmQ0NGJkMGI5NzUxMWFiZjQ3NzdhNWFjNGRiYzk0Nw==
 SHA512:
   metadata.gz: !binary |-
-    YTc4YTMxNDM0ZjQ3YWUzYmQ5ZGM2NmM2ZTA1NjEwMjZjMjEyZGZiMmM1ZDMy
-    MDFkZjY5OTcwMDBiOGMwMTQwZTRhYjU0MDM2NTJmZGZjMjQzYzRiNjliOTM1
-    YjZiN2YxNDFiOTAzOGE4MjFlNGJkZmZhMzVhMjY0YjQyYWZjMTY=
+    ODQ3ZDI4ZDM4NjQwMTQ0NWViOGNlOGJjZGMxZTFlYmMzMjI2NWI1YmQxNjlk
+    OGQ4NTE3Y2JlMmI2Y2ExODU4YzAwZGM5YWFjMjNjYzcyYjA4MThlMmE3YjRk
+    YzgwYjZkZDQ2ZDM2NGY3NWUyMWI3MzI2YmVhOTkwNmFiMmZkMjI=
   data.tar.gz: !binary |-
-    NWFkNjUyZjc0MzFhMGQxNDQ1MGM3OWMyNjE5ZmRiYTEyMGJiMzk3MzgwMmM5
-    ZWZmZjE5NDAzMmI0ZGYyYWMwMTM4YzI5NTUyNzY2NTBlYmQ4NGNkMTM1OGI0
-    YzJlNTA1NjQyMDg1MDY4NzdiMmU4ZTk5NjE4ZGYxZWI2ODczMGY=
+    NmRhZGRlN2U4OGVmMTM2NDEyYWZiOTA3NGUyMzFkNGUzZTQ3OWRmZGYxYWMy
+    ODU0ODllNjhhMjM0NGNlM2VmNjZkZjkwMzUyNDMxZTEyOTI5YWU1ZDA3OGE2
+    ZGYwYTI1NWZmMTU0MmE5MjBjYWRiMDQ4NTRmYjZhNjJhMTdjZDQ=

data/lib/faraday/zipkin.rb

@@ -21,7 +21,10 @@ module Faraday
 
       def call(env)
         trace_id = ::Trace.id
-        host = URI.parse(env[:url]).host
+
+        # handle either a URI object (passed by Faraday v0.8.x in testing), or something string-izable
+        host = env[:url].respond_to?(:host) ? env[:url].host : URI.parse(env[:url].to_s).host
+
         ::Trace.push(trace_id.next_id) do
           ::Trace.record(::Trace::Annotation.new(::Trace::Annotation::CLIENT_SEND, host))
           B3_HEADERS.each do |method, header|

data/lib/faraday/zipkin/version.rb

@@ -1,5 +1,5 @@
 module Faraday
   module Zipkin
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/spec/zipkin_trace_headers_spec.rb

@@ -2,9 +2,9 @@ describe Faraday::Zipkin::TraceHeaders do
   let(:middleware) { described_class.new(lambda{|env| env}) }
   let(:hostname) { 'service.example.com' }
 
-  def process(body, headers={})
+  def process(body, url, headers={})
     env = {
-      :url => "https://#{hostname}/some/path/here",
+      :url => url,
       :body => body,
       :request_headers => Faraday::Utils::Headers.new(headers),
     }
@@ -16,7 +16,7 @@ describe Faraday::Zipkin::TraceHeaders do
     match { |actual| actual.value == v && actual.host == h }
   end
 
-  context 'request' do
+  shared_examples 'can make requests' do
     context 'with tracing id' do
       let(:trace_id) { ::Trace::TraceId.new(1, 2, 3, true) }
 
@@ -27,7 +27,7 @@ describe Faraday::Zipkin::TraceHeaders do
 
         result = nil
         ::Trace.push(trace_id) do
-          result = process('')
+          result = process('', url)
         end
         expect(result[:request_headers]['X-B3-TraceId']).to eq('0000000000000001')
         expect(result[:request_headers]['X-B3-ParentSpanId']).to eq('0000000000000003')
@@ -39,7 +39,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('')
+        result = process('', url)
         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}$/)
@@ -47,4 +47,17 @@ describe Faraday::Zipkin::TraceHeaders do
       end
     end
   end
+
+  context 'request with string URL' do
+    let(:url) { "https://#{hostname}/some/path/here" }
+
+    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") }
+
+    include_examples 'can make requests'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-zipkin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ariel Salomon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday