zipkin-tracer 0.28.0 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fd814c00e7d43bd9fbd4678181407182904b369759f480c4334060f0de76a7b
-  data.tar.gz: 207b8aba87d59166639646babb7c86d174a9880bca955e0e4a3e7d67ed40f49c
+  metadata.gz: 0d0f7baf3534a37de98d27ccd678779af53c2f52f6aa52fde0d9548cadbde6a5
+  data.tar.gz: c767d904d684b2f677c7ae07f135a721bbfa991a147a8336bc88c29300244a91
 SHA512:
-  metadata.gz: bd5ff092a5b46f170a6978cdf5e88c2239e35abafb7b7c8d00a29cf9eaa007549dc18a15eb4e3172ec3152e4a2a12d589173e42f7d7fc405384defd8505ea6b2
-  data.tar.gz: f9fece44e302cac6ede9a0023b5ab68683bef98cd300bc978998d403d9a8f528068c4f184fb3e69dcb4fae1c22bf5f47f26b7e6749bf2bba09a3c47df1445300
+  metadata.gz: 5255f87800237b75b28c0d4e67cde83baa98b83d8b3123ad451775b482bcd63b8d776bd0299b232791e8f430fbdb0606daa2daa57903bb84ca203c0805c4ad7d
+  data.tar.gz: bb5edfd77651c8cd6707de0a1858c9849c1b367c49c28f1fd37cdf3c21d59bec3f42d8e3262cf1f9ef688bca55075dcc629ab393eaa91f574fa71dab6c921ec6

data/lib/zipkin-tracer/application.rb

@@ -11,8 +11,19 @@ module ZipkinTracer
       false
     end
 
+    def self.get_route(env)
+      return nil unless defined?(Rails)
+      req = Rack::Request.new(env)
+      # Returns a string like /some/path/:id
+      Rails.application.routes.router.recognize(req) do |route|
+        return route.path.spec.to_s
+      end
+    rescue
+      nil
+    end
+
     def self.logger
-      if defined?(Rails) # If we happen to be inside a Rails app, use its logger
+      if defined?(Rails.logger) # If we happen to be inside a Rails app, use its logger
         Rails.logger
       else
         Logger.new(STDOUT)

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

@@ -30,7 +30,7 @@ module ZipkinTracer
         if !trace_id.sampled? || !routable_request?(env)
           @app.call(env)
         else
-          @tracer.with_new_span(trace_id, env[REQUEST_METHOD].to_s.downcase) do |span|
+          @tracer.with_new_span(trace_id, span_name(env)) do |span|
             trace!(span, zipkin_env) { @app.call(env) }
           end
         end
@@ -40,7 +40,15 @@ module ZipkinTracer
     private
 
     def routable_request?(env)
-      Application.routable_request?(env[PATH_INFO],  env[REQUEST_METHOD])
+      Application.routable_request?(env[PATH_INFO], env[REQUEST_METHOD])
+    end
+
+    def route(env)
+      Application.get_route(env)
+    end
+
+    def span_name(env)
+      "#{env[REQUEST_METHOD].to_s.downcase} #{route(env)}".strip
     end
 
     def annotate_plugin(span, env, status, response_headers, response_body)

data/lib/zipkin-tracer/version.rb

@@ -1,3 +1,3 @@
 module ZipkinTracer
-  VERSION = '0.28.0'.freeze
+  VERSION = '0.29.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipkin-tracer
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.29.0
 platform: ruby
 authors:
 - Franklin Hu
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2018-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -207,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Ruby tracing via Zipkin