zipkin-tracer 0.35.0 → 0.35.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3145da3d93716701cfe338e782717243946ec9d7b8337a4f67f4680dd2b3b06c
-  data.tar.gz: 857aa5010bbf1eaa5de81bf4bbfb17ba008c3e986e417740cdee6491e327fd7a
+  metadata.gz: '09555ccde6ee7aa47e75a36c70445a2611bab1218b518c399bfad8d76d341063'
+  data.tar.gz: 8235afc71c8685567466a11d28ce2bda7596b5e4784f51e266db1c85f085914c
 SHA512:
-  metadata.gz: '085a771261ce989e0412d80080607872fd440e814877be5d2095c6a1d4d8fb8da7654583e52e940dece17406b425d26e76cced98419d866b5acd6970641d5f70'
-  data.tar.gz: 3d1041e44ae618d3886f47169b871b827e1246e37d6c7536207ea1eaf0b5120da8a1e56d878610b7f27c38beac26f2567a551f675d70325012122899ac6d128b
+  metadata.gz: 897ad8d5b52dacfdd982f36440b07db9a478489c9396f6b92144a848d75a987af0e20f246e348348d3ef7fce9500aca6f1f698e144c7fc64ad80843d9ef1a36e
+  data.tar.gz: 97dd7106d21aff8dfa9147b02cfd2b9224bda862216c0909dce21708ada1464580d46bc024e5656634d9f63dffcba22703c3b073ebd7562349943d81fa8fce49

data/lib/zipkin-tracer/application.rb

@@ -4,7 +4,7 @@ module ZipkinTracer
     # Determines if our framework knows whether the request will be routed to a controller
     def self.routable_request?(env)
       return true unless defined?(Rails) # If not running on a Rails app, we can't verify if it is invalid
-      path_info = env[ZipkinTracer::RackHandler::PATH_INFO]
+      path_info = env[ZipkinTracer::RackHandler::PATH_INFO] || ""
       http_method = env[ZipkinTracer::RackHandler::REQUEST_METHOD]
       Rails.application.routes.recognize_path(path_info, method: http_method)
       true

data/lib/zipkin-tracer/config.rb

@@ -48,6 +48,10 @@ module ZipkinTracer
 
       Trace.sample_rate = @sample_rate
       Trace.trace_id_128bit = @trace_id_128bit
+
+      Trace.default_endpoint = Trace::Endpoint.local_endpoint(
+        domain_service_name(@service_name)
+      )
     end
 
     def adapter
@@ -66,6 +70,12 @@ module ZipkinTracer
 
     private
 
+    # Use the Domain environment variable to extract the service name, otherwise use the default config name
+    # TODO: move to the config object
+    def domain_service_name(default_name)
+      ENV["DOMAIN"].to_s.empty? ? default_name : ENV["DOMAIN"].split('.').first
+    end
+
     DEFAULTS = {
       sample_rate: 0.1,
       sampled_as_boolean: true,

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

@@ -47,7 +47,7 @@ module ZipkinTracer
     end
 
     def remote_endpoint(url, service_name)
-      Trace::Endpoint.remote_endpoint(url, service_name, Trace.default_endpoint.ip_format) # The endpoint we are calling.
+      Trace::Endpoint.remote_endpoint(url, service_name) # The endpoint we are calling.
     end
 
     def service_name(datum, default)

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

@@ -40,7 +40,7 @@ module ZipkinTracer
       # handle either a URI object (passed by Faraday v0.8.x in testing), or something string-izable
       method = env[:method].to_s
       url = env[:url].respond_to?(:host) ? env[:url] : URI.parse(env[:url].to_s)
-      remote_endpoint = Trace::Endpoint.remote_endpoint(url, @service_name, Trace.default_endpoint.ip_format) # The endpoint we are calling.
+      remote_endpoint = Trace::Endpoint.remote_endpoint(url, @service_name) # The endpoint we are calling.
       Trace.tracer.with_new_span(trace_id, method.downcase) do |span|
         @span = span # So we can record on exceptions
         # annotate with method (GET/POST/etc.) and uri path

data/lib/zipkin-tracer/hostname_resolver.rb

@@ -5,13 +5,14 @@ module ZipkinTracer
   # Resolving hostnames is a very expensive operation. We want to store them raw in the main thread
   # and resolve them in a different thread where we do not affect execution times.
   class HostnameResolver
-    def spans_with_ips(spans)
-      host_to_ip = hosts_to_ipv4(spans)
+    def spans_with_ips(spans, ip_format)
+      hosts = unique_hosts(spans)
+      resolved_hosts = resolve(hosts, ip_format)
 
       each_endpoint(spans) do |endpoint|
         hostname = endpoint.ipv4
         unless resolved_ip_address?(hostname.to_s)
-          endpoint.ipv4 = host_to_ip[hostname]
+          endpoint.ipv4 = resolved_hosts[hostname]
         end
       end
     end
@@ -19,6 +20,8 @@ module ZipkinTracer
     private
     LOCALHOST = '127.0.0.1'.freeze
     LOCALHOST_I32 = 0x7f000001.freeze
+    MAX_I32 = ((2 ** 31) - 1)
+    MASK = (2 ** 32) - 1
     IP_FIELD = 3
 
     def resolved_ip_address?(ip_string)
@@ -37,31 +40,42 @@ module ZipkinTracer
     end
 
     # Using this to resolve only once per host
-    def hosts_to_ipv4(spans)
+    def unique_hosts(spans)
       hosts = []
       each_endpoint(spans) do |endpoint|
         hosts.push(endpoint)
       end
-      hosts.uniq!
-      resolve(hosts)
+      hosts.uniq
     end
 
-    def resolve(hosts)
+    def resolve(hosts, ip_format)
       hosts.inject({}) do |host_map, host|
         hostname = host.ipv4  # This field has been temporarly used to store the hostname.
-        ip_format = host.ip_format
-        host_map[hostname]  = host_to_ip(hostname, ip_format)
+        host_map[hostname]  = host_to_format(hostname, ip_format)
         host_map
       end
     end
 
-    def host_to_ip(hostname, ip_format)
+    def host_to_format(hostname, ip_format)
       begin
-        ip_format == :string ? Socket.getaddrinfo(hostname, nil, :INET).first[IP_FIELD] : Trace::Endpoint.host_to_i32(hostname)
+        ip_format == :string ? Socket.getaddrinfo(hostname, nil, :INET).first[IP_FIELD] : host_to_i32(hostname)
       rescue
         ip_format == :string ? LOCALHOST : LOCALHOST_I32
       end
     end
-  end
 
+    def host_to_i32(host)
+      unsigned_i32 = Socket.getaddrinfo(host, nil)[0][3].split(".").map do |i|
+        i.to_i
+      end.inject(0) { |a,e| (a << 8) + e }
+
+      signed_i32 = if unsigned_i32 > MAX_I32
+        -1 * ((unsigned_i32 ^ MASK) + 1)
+      else
+        unsigned_i32
+      end
+
+      signed_i32
+    end
+  end
 end

data/lib/zipkin-tracer/trace.rb

@@ -250,33 +250,17 @@ module Trace
     end
   end
 
-  class Endpoint < Struct.new(:ipv4, :port, :service_name, :ip_format)
-    MAX_I32 = ((2 ** 31) - 1)
-    MASK = (2 ** 32) - 1
+  class Endpoint < Struct.new(:ipv4, :port, :service_name)
     UNKNOWN_URL = 'unknown'.freeze
 
-    def self.host_to_i32(host)
-      unsigned_i32 = Socket.getaddrinfo(host, nil)[0][3].split(".").map do |i|
-        i.to_i
-      end.inject(0) { |a,e| (a << 8) + e }
-
-      signed_i32 = if unsigned_i32 > MAX_I32
-        -1 * ((unsigned_i32 ^ MASK) + 1)
-      else
-        unsigned_i32
-      end
-
-      signed_i32
-    end
-
-    def self.local_endpoint(service_name, ip_format)
+    def self.local_endpoint(service_name)
       hostname = Socket.gethostname
-      Endpoint.new(hostname, nil, service_name, ip_format)
+      Endpoint.new(hostname, nil, service_name)
     end
 
-    def self.remote_endpoint(url, remote_service_name, ip_format)
+    def self.remote_endpoint(url, remote_service_name)
       service_name = remote_service_name || url.host.split('.').first || UNKNOWN_URL # default to url-derived service name
-      Endpoint.new(url.host, url.port, service_name, ip_format)
+      Endpoint.new(url.host, url.port, service_name)
     end
 
     def to_h

data/lib/zipkin-tracer/tracer_factory.rb

@@ -25,19 +25,8 @@ module ZipkinTracer
       end
       Trace.tracer = tracer
 
-      # TODO: move this to the TracerBase and kill scribe tracer
-      ip_format = [:kafka, :kafka_producer].include?(config.adapter) ? :i32 : :string
-      Trace.default_endpoint = Trace::Endpoint.local_endpoint(
-        service_name(config.service_name),
-        ip_format
-      )
       tracer
     end
 
-    # Use the Domain environment variable to extract the service name, otherwise use the default config name
-    # TODO: move to the config object
-    def service_name(default_name)
-      ENV["DOMAIN"].to_s.empty? ? default_name : ENV["DOMAIN"].split('.').first
-    end
   end
 end

data/lib/zipkin-tracer/version.rb

@@ -1,3 +1,3 @@
 module ZipkinTracer
-  VERSION = '0.35.0'.freeze
+  VERSION = '0.35.1'.freeze
 end

data/lib/zipkin-tracer/zipkin_json_tracer.rb

@@ -8,7 +8,8 @@ class AsyncJsonApiClient
   SPANS_PATH = '/api/v2/spans'
 
   def perform(json_api_host, spans)
-    spans_with_ips = ::ZipkinTracer::HostnameResolver.new.spans_with_ips(spans).map(&:to_h)
+    spans_with_ips =
+      ::ZipkinTracer::HostnameResolver.new.spans_with_ips(spans, ZipkinJsonTracer::IP_FORMAT).map(&:to_h)
     resp = Faraday.new(json_api_host).post do |req|
       req.url SPANS_PATH
       req.headers['Content-Type'] = 'application/json'
@@ -27,6 +28,7 @@ module Trace
   # This class sends information to the Zipkin API.
   # The API accepts a JSON representation of a list of spans
   class ZipkinJsonTracer < ZipkinTracerBase
+    IP_FORMAT = :string
 
     def initialize(options)
       SuckerPunch.logger = options[:logger]

data/lib/zipkin-tracer/zipkin_kafka_tracer.rb

@@ -14,6 +14,7 @@ module Trace
   # Spans are encoded using Thrift
   class ZipkinKafkaTracer < ZipkinTracerBase
     DEFAULT_KAFKA_TOPIC = "zipkin".freeze
+    IP_FORMAT = :i32
 
     def initialize(options = {})
       @topic  = options[:topic] || DEFAULT_KAFKA_TOPIC
@@ -29,7 +30,7 @@ module Trace
     end
 
     def flush!
-      resolved_spans = ::ZipkinTracer::HostnameResolver.new.spans_with_ips(spans)
+      resolved_spans = ::ZipkinTracer::HostnameResolver.new.spans_with_ips(spans, IP_FORMAT)
       resolved_spans.each do |span|
         buf = ''
         trans = Thrift::MemoryBufferTransport.new(buf)

data/lib/zipkin-tracer/zipkin_logger_tracer.rb

@@ -5,6 +5,7 @@ require 'json'
 module Trace
   class ZipkinLoggerTracer < ZipkinTracerBase
     TRACING_KEY = 'Tracing information'
+    IP_FORMAT = :string
 
     def initialize(options)
       @logger = options[:logger]
@@ -13,7 +14,7 @@ module Trace
     end
 
     def flush!
-      formatted_spans = ::ZipkinTracer::HostnameResolver.new.spans_with_ips(spans).map(&:to_h)
+      formatted_spans = ::ZipkinTracer::HostnameResolver.new.spans_with_ips(spans, IP_FORMAT).map(&:to_h)
       if @logger_accepts_data
         @logger.info_with_data(TRACING_KEY, formatted_spans)
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipkin-tracer
 version: !ruby/object:Gem::Version
-  version: 0.35.0
+  version: 0.35.1
 platform: ruby
 authors:
 - Franklin Hu
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-30 00:00:00.000000000 Z
+date: 2019-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday