zipkin-tracer 0.6.2 → 0.6.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Njc0MTkxM2JmYzI5OTZkMTdlY2JmNWM4ODZjMDI0YTc3ZWM4YmQ1OQ==
+    MzRlNmRmNWM4ZDlhMGVkNTZhZmUzMDQwNjA5MGZkODI2NTlhZmM3Yw==
   data.tar.gz: !binary |-
-    NzE3YmI4ZTBjNDlmMWE2ZDFhMjJmOTQ5NDNkOGRkMDgzMDI2MmUyZQ==
+    Yzc4ZGJmOWQ3YjdmZDFjMDJlMGZlM2QxZTU5NzFiZDMxNDgyNTU5ZQ==
 SHA512:
   metadata.gz: !binary |-
-    NDAwZjFlOTY1YmJiZTIzODRjZGZlODMxNWFmMzczNGU4Yjc1ZDkyM2QzNDFm
-    NDM3N2E3ZDhmNGU0NDRmYjY1ZDFhOTAxMWUyMjgxOGYwMTRhMTQ4NWNiNDJl
-    Y2Y0ZTAyMTk4YTMyMDg0ZTcyMTVkNzk2MjRiNGY0MDFmZmU2ZGI=
+    MDk0OTBhZjg2ZmZhZDY2YmE5MDE2YWViNDI5MDkxZjQzOWJlOGU3YmNjZmJj
+    YTc4M2QyMzIyZTI4NTJhZmZkNDgyNDBjYTI1ODBkYzFjYTVhMDU5NjQ5NzZj
+    ZjExYzVjMTFhNDdkZjVjNjIxZTBkZWRiOWM3N2JiZWUzZTEwNWI=
   data.tar.gz: !binary |-
-    NWQxYjRjZmNlMzQzMzdhNDBlNmQ5MDdiNzM5MjJlZjE0MzVkYWExNDcxMzEy
-    NTY0YzgyNTU4ODllNGI1MTZmNzFlNWQ1ZGUwN2Q2NDMwY2MyN2I1ZmU1YzVh
-    MWI3NTgwZmU0ZTVkMDQyMWRjNDc1OWNmMzYwNzE2YWZkZTVmMDQ=
+    ZmZkMDIwMjcxMGQwNDRkZTZhNjczNzA0OGFiNzliZjUxZjRiMDM5NTkwM2Fj
+    YmQzNDc3YzFhOTEwZDZkZGVmMjJiNGYzMmMwMGIyNDcxMGE2OTRkMmEyMDEz
+    NWE3N2UyNjIwM2ZhMzQzYjQ1OTBhOTVlMGM2MzA4Y2VlYTY0ZWE=

data/lib/zipkin-tracer/config.rb

@@ -8,7 +8,7 @@ module ZipkinTracer
     def initialize(app, config_hash)
       config = config_hash || app_config(app)
       @service_name      = config[:service_name]
-      @service_port      = config[:service_port]
+      @service_port      = config[:service_port]      || DEFAULTS[:service_port]
       @scribe_server     = config[:scribe_server]
       @zookeeper         = config[:zookeeper]
       @sample_rate       = config[:sample_rate]       || DEFAULTS[:sample_rate]
@@ -39,7 +39,8 @@ module ZipkinTracer
 
     DEFAULTS = {
       scribe_max_buffer: 10,
-      sample_rate: 0.1
+      sample_rate: 0.1,
+      service_port: 80
     }
 
     def app_config(app)

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

@@ -22,26 +22,28 @@ module ZipkinTracer
       # 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(host_ip_for(url.host), url.port, service_name)
 
-      ::Trace.unwind do
+      endpoint = ::Trace::Endpoint.new(host_ip_for(url.host), url.port, service_name)
+      response = nil
+      begin
         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
-
         # annotate with method (GET/POST/etc.) and uri path
         ::Trace.set_rpc_name(env[:method].to_s.upcase)
         record(::Trace::BinaryAnnotation.new("http.uri", url.path, "STRING", endpoint))
         record(::Trace::Annotation.new(::Trace::Annotation::CLIENT_SEND, endpoint))
-        result = @app.call(env).on_complete do |renv|
+        response = @app.call(env).on_complete do |renv|
           # record HTTP status code on response
-          record(::Trace::BinaryAnnotation.new("http.status", [renv[:status]].pack('n'), "I16", endpoint))
+          record(::Trace::BinaryAnnotation.new("http.status", renv[:status].to_s, "STRING", endpoint))
         end
         record(::Trace::Annotation.new(::Trace::Annotation::CLIENT_RECV, endpoint))
-        result
+      ensure
+        ::Trace.pop
       end
+      response
     end
 
     private

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.6.2"
+  VERSION = "0.6.3"
 end
 

metadata

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