faraday-zipkin 0.2.1 → 0.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjRlNWZhOWZmYTFkODFjMmNmYjYzODlkZjg2NzMyZmNkYWI3Yzg2Zg==
+    ZmM0ZTc5MjhmMTJkODNiYjg1MjEyODM2MDJiMGI0YmNjMDJhMjRhZg==
   data.tar.gz: !binary |-
-    ODY2ZmU5YTQxODM3OTQxZDIzMDU1ODRiNjQ1ZDlkOWI0YzYwYzc4Nw==
+    NjI3MmUxMTFkNjVjODc5NTZhOThlODVkNTg4M2U5N2I1MmFkNTc4Yw==
 SHA512:
   metadata.gz: !binary |-
-    ODhmYzU1NmUwM2MxYWExNDQ1YmFlODRiYmI5MzU2MjEwMzUyMTZlNTkwNDFl
-    N2JjOTczZjRjYTZmYTAxNDZhYjE2YzU0ZDI1MTA2NWIzMjA1OWFlZTMxMDdl
-    MWJjNDA4NTgxY2I4MWMyYWVhMWU1MzhlZWIxM2ZkNjc3N2VmODE=
+    MWNmNDA4ZGFjMWU5MzVlNDI4YjFmNDRkNzkyOGQ4NTZhY2Q0Y2IxZmQzMDZl
+    M2UyNTQ4ZTMzYWQ3MDEyNzRjMjMwYjFkODg3MGY4ZDkzYTdiNDYwM2FjMWEz
+    NzBiYTAxMjY2NzJiODhkOTk4YTM1ZDk3NzQ2MzkyZmY1ZWM4ZDQ=
   data.tar.gz: !binary |-
-    MTZhOWI3ZjdhNmFlZGIxYmFjMTBhODllNjVlNGUyMTA1YmVjMGY1ZTdhZDAy
-    MmI3NDBhZTk3Mjc5ODNhYjhkMGQwZTMyNTQ4N2JhYzk4ZGNlOGZiOGZiOTRm
-    MTRhYWFhMDk1NDg3YWI2MmIwODg3ZjBjNDlmNGUwOGRhYThhYjY=
+    NzNlNzBmZWEzNmQ5Njg1OTA1OWU1OTA4NjRiMmFmMGExZDkxN2VmMDQ3MTYx
+    ODY4MzI3YmQ0OWVjMzRmODVmY2ZiZjQ1Y2JkZDM0MTVlZDU3MTlmNjEwNGRi
+    MzQ2MzFkOTEzZDg4OGJlZTVkYTU3M2JiN2MzNDg1YjU4MWI2OGI=

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - "1.8.7"
+  - "1.9.2"
+  - "1.9.3"
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode

data/lib/faraday/zipkin.rb

@@ -21,24 +21,24 @@ module Faraday
       end
 
       def call(env)
-        trace_id = ::Trace.id
-
         # 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
         endpoint = ::Trace::Endpoint.new(::Trace::Endpoint.host_to_i32(url.host), url.port, service_name)
 
+        trace_id = ::Trace.id
         ::Trace.push(trace_id.next_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
           ::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).on_complete do |renv|
             # record HTTP status code on response
-            ::Trace.record(::Trace::BinaryAnnotation.new("http.status", renv[:status], "I16", endpoint))
+            ::Trace.record(::Trace::BinaryAnnotation.new("http.status", [renv[:status]].pack('n'), "I16", endpoint))
           end
           ::Trace.record(::Trace::Annotation.new(::Trace::Annotation::CLIENT_RECV, endpoint))
           result

data/lib/faraday/zipkin/version.rb

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

data/spec/zipkin_trace_headers_spec.rb

@@ -43,20 +43,24 @@ describe Faraday::Zipkin::TraceHeaders do
   end
 
   before(:each) {
+    ::Trace.sample_rate = 0.1 # make sure initialized
     allow(::Trace::Endpoint).to receive(:host_to_i32).with(hostname).and_return(host_ip)
   }
 
   shared_examples 'can make requests' do
+    def expect_tracing
+      # 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
+    end
+
     context 'with tracing id' do
       let(:trace_id) { ::Trace::TraceId.new(1, 2, 3, true) }
 
       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
-
+        expect_tracing
         result = nil
         ::Trace.push(trace_id) do
           result = process('', url).env
@@ -70,7 +74,10 @@ describe Faraday::Zipkin::TraceHeaders do
     end
 
     context 'without tracing id' do
+      after(:each) { ::Trace.pop }
+
       it 'generates a new ID, and sets the X-B3 request headers' do
+        expect_tracing
         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}$/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-zipkin
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ariel Salomon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -117,6 +117,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md