faraday-zipkin 0.2.3 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2QxNTk2MzUxOTIwZTBkNTI0OTJmNzAxNzYzOTJmNTQ2MTgwZWE4Ng==
+    ZjJlYjkyOTE2Yjg2ZDMzYTE4MGU4MWRmM2FkYWY3NThmOGNlOWVlYQ==
   data.tar.gz: !binary |-
-    NjZhNTUyYWY0YmQyOTZjNDM5ZTVhNDE2MzRmZTYxYWE1Yzc3MDhjYQ==
+    OTFhNTYzY2ViYzMyMzViNzExNmFjMjdmYTk5MTExYzJkODc0ZmYzMA==
 SHA512:
   metadata.gz: !binary |-
-    NWI5NDExYTlmYWNmOWU5NGVkMzhjM2M2MGUxZjk3ZGFkYjRlYjE2YjFmOWY3
-    OTdiZDBjNjA4M2U3ZTczNTUyMzkzZjBiYmIzYmU0M2VmYzI3Y2JlMGRlMDgx
-    ZmZkZTRkNjk0M2RkMzUzMmZiNTU4MmVmYTQ0MWY3MTY4Y2Q4YWQ=
+    MmUwNjNjZDRhMGU2OTUxNzg1ZWY0NmFiMmMzNTJkNmU3NThhMWU0MDYyYTdm
+    OWViNGFiODc5N2ZkMzI1YjQ3OWRiNjcxMWE1NWEwYTRkZmFmNDZlZjQ1ZDRm
+    ZGVhNTkwNDkxYjc2ZjZjZWMzNzE4Yzg5MWJjZWM0NTliYjBhNDQ=
   data.tar.gz: !binary |-
-    MGRlZmU0ZWU5N2VjNWRkYzcyMmZhZjQyMjk1NTc0MmU4MTczOGYxMTYwNTcw
-    NDc4MmZhZWUwZGZjZjIyMGQ2YTA4NTRjNzkxMDRmNTY2ZTk3NzRlN2I1Nzdl
-    OWNjMjAyMDQ2N2RkYmJjNmFhOGRjNzVmZWI4ZjZjYjFhMjhmNmE=
+    OWFhNzhmNmU3ZTQ2NjYwMzFlODM3YmI1MGRmY2ZkNjE5YzQyNjJmMjA5ODdm
+    Mzg2NTJiOGM3NmQ0ZTYzZGI4ZWE2YmNlYWNiMDg2N2Q1NWIyNWYxYjU5NDMw
+    NmRmM2IzNzk4N2JhMDU2YmNkYWU1YWFmMDg2NDUzZTdlOTY5ZWQ=

data/CHANGELOG

@@ -1,10 +1,10 @@
 
+v0.3.0 - Upgrade to finagle-thrift v1.3.1
+
 Supporting finagle-thrift v1.2.0
-v0.1.0 initial implementation of client trace code
+v0.2.3 minor gem cleanup, travis support; fix raise on DNS
+v0.2.2 fix serialization of response code
+v0.2.1 add annotation for http uri, method, response code
 v0.2.0 added the optional service_name parameter, annotate correctly
- v0.2.1 add annotation for http uri, method, response code
- v0.2.2 fix serialization of response code
- v0.2.3 minor gem cleanup, travis support; fix raise on DNS
 
-TODO:
-v0.3.0 - Upgrade to finagle-thrift v1.3.0
+v0.1.0 initial implementation of client trace code

data/faraday-zipkin.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "faraday", ">= 0.8"
   spec.add_dependency "thrift", "~> 0.9.0"
-  spec.add_dependency "finagle-thrift", "~> 1.2.0"
+  spec.add_dependency "finagle-thrift", "~> 1.3.1"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/faraday-zipkin/trace_headers.rb

@@ -10,7 +10,8 @@ module Faraday
         :trace_id => "X-B3-TraceId",
         :parent_id => "X-B3-ParentSpanId",
         :span_id => "X-B3-SpanId",
-        :sampled => "X-B3-Sampled"
+        :sampled => "X-B3-Sampled",
+        :flags => "X-B3-Flags"
       }.freeze
 
       def initialize(app, service_name=nil)
@@ -24,8 +25,9 @@ module Faraday
         service_name = @service_name || url.host.split('.').first # default to url-derived service name
         endpoint = ::Trace::Endpoint.new(host_ip_for(url.host), url.port, service_name)
 
-        trace_id = ::Trace.id
-        ::Trace.push(trace_id.next_id) do
+        ::Trace.unwind do
+          trace_id = ::Trace.id
+          ::Trace.push(trace_id.next_id)
           B3_HEADERS.each do |method, header|
             env[:request_headers][header] = ::Trace.id.send(method).to_s
           end

data/lib/faraday-zipkin/version.rb

@@ -1,5 +1,5 @@
 module Faraday
   module Zipkin
-    VERSION = "0.2.3"
+    VERSION = "0.3.0"
   end
 end

data/spec/zipkin_trace_headers_spec.rb

@@ -62,7 +62,7 @@ describe Faraday::Zipkin::TraceHeaders do
     HEX_REGEX = RUBY_VERSION >= "1.9.2" ? '\h' : '[0-9a-fA-F]'
 
     context 'with tracing id' do
-      let(:trace_id) { ::Trace::TraceId.new(1, 2, 3, true) }
+      let(:trace_id) { ::Trace::TraceId.new(1, 2, 3, true, ::Trace::Flags::DEBUG) }
 
       it 'sets the X-B3 request headers' do
         expect_tracing
@@ -75,6 +75,7 @@ describe Faraday::Zipkin::TraceHeaders do
         expect(result[:request_headers]['X-B3-SpanId']).not_to eq('0000000000000003')
         expect(result[:request_headers]['X-B3-SpanId']).to match(/^#{HEX_REGEX}{16}$/)
         expect(result[:request_headers]['X-B3-Sampled']).to eq('true')
+        expect(result[:request_headers]['X-B3-Flags']).to eq('1')
       end
     end
 
@@ -88,6 +89,7 @@ describe Faraday::Zipkin::TraceHeaders do
         expect(result[:request_headers]['X-B3-ParentSpanId']).to match(/^#{HEX_REGEX}{16}$/)
         expect(result[:request_headers]['X-B3-SpanId']).to match(/^#{HEX_REGEX}{16}$/)
         expect(result[:request_headers]['X-B3-Sampled']).to match(/(true|false)/)
+        expect(result[:request_headers]['X-B3-Flags']).to eq('0')
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-zipkin
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Ariel Salomon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement