zipkin-tracer 0.32.3 → 0.32.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52e56ec6a1e629c901452ef3109f5e3f02352b6d4a65c3f1bc1b72ebec4037c7
-  data.tar.gz: 06fecb15b5b1f40266989317e189feab78a810acef2dda4addfd683d02cc1560
+  metadata.gz: c3d88ef693423edc75cf6fcddfd3197bf653a6629ee36febbeaeda1eafa08ff4
+  data.tar.gz: c1e83e93144a84a8eaa632dbc50f90e32ee15414614faf3cda15d08f4a06dd18
 SHA512:
-  metadata.gz: b9230146ede933bbb7753b71b53215acb6f0f78eccb41a3d354d1f8a18798721eaa76b08eb55c8278f6707435f16aa8e93e9fbf31931146625a3d5139b8ccc4c
-  data.tar.gz: 97c3c18b738903252f078f7a5af4ce19a41c3b97184cf3a7a2ecae5e54b01dc6c11fe2ec0535bb6a91301486f7062f341c630176ebaa82dd6a6b57885e848990
+  metadata.gz: 1904ec28b08c0be932e19a6f46275cd48d515bc9002739cfc0d799e89da40eba8f3c0f983f6594ac4c38e2f8a7f19880ae03b2aadd7750cb83545a98c4db78d9
+  data.tar.gz: fd5c944ce0bfc2024f04562373dbe0185e6da0df9e07392bea5ba9ec197e641126bca4e3e133f9eee1b1abcee4c909ebfc8ea8a7e8eec1c07e2e6a4c68e22e5b

data/lib/zipkin-tracer/config.rb

@@ -5,7 +5,7 @@ require 'zipkin-tracer/rack/zipkin-tracer'
 module ZipkinTracer
   # Configuration of this gem. It reads the configuration and provides default values
   class Config
-    attr_reader :service_name, :service_port, :json_api_host,
+    attr_reader :service_name, :json_api_host,
       :zookeeper, :sample_rate, :logger, :log_tracing,
       :annotate_plugin, :filter_plugin, :whitelist_plugin,
       :sampled_as_boolean, :record_on_server_receive,
@@ -15,8 +15,6 @@ module ZipkinTracer
       config = config_hash || Application.config(app)
       # The name of the current service
       @service_name      = config[:service_name]
-      # The port where the current service is running
-      @service_port      = config[:service_port]      || DEFAULTS[:service_port]
       # The address of the Zipkin server which we will send traces to
       @json_api_host     = config[:json_api_host]
       # Zookeeper information
@@ -74,7 +72,6 @@ module ZipkinTracer
 
     DEFAULTS = {
       sample_rate: 0.1,
-      service_port: 80,
       sampled_as_boolean: true,
       trace_id_128bit: false
     }

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

@@ -40,7 +40,7 @@ module ZipkinTracer
 
     private
 
-    SERVER_ADDRESS_SPECIAL_VALUE = '1'.freeze
+    SERVER_ADDRESS_SPECIAL_VALUE = true
     STATUS_ERROR_REGEXP = /\A(4.*|5.*)\z/.freeze
 
     def b3_headers

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

@@ -25,7 +25,7 @@ module ZipkinTracer
 
     private
 
-    SERVER_ADDRESS_SPECIAL_VALUE = '1'.freeze
+    SERVER_ADDRESS_SPECIAL_VALUE = true
     STATUS_ERROR_REGEXP = /\A(4.*|5.*)\z/.freeze
 
 

data/lib/zipkin-tracer/trace.rb

@@ -235,7 +235,8 @@ module Trace
     end
 
     def record_tag(key, value, type = Trace::BinaryAnnotation::Type::STRING, endpoint = Trace.default_endpoint)
-      binary_annotations << Trace::BinaryAnnotation.new(key, value.to_s, type, endpoint)
+      value = value.to_s if type == Trace::BinaryAnnotation::Type::STRING
+      binary_annotations << Trace::BinaryAnnotation.new(key, value, type, endpoint)
     end
 
     def record_local_component(value)
@@ -274,9 +275,9 @@ module Trace
       signed_i32
     end
 
-    def self.local_endpoint(service_port, service_name, ip_format)
+    def self.local_endpoint(service_name, ip_format)
       hostname = Socket.gethostname
-      Endpoint.new(hostname, service_port, service_name, ip_format)
+      Endpoint.new(hostname, nil, service_name, ip_format)
     end
 
     def self.remote_endpoint(url, remote_service_name, ip_format)
@@ -285,11 +286,12 @@ module Trace
     end
 
     def to_h
-      {
+      hsh = {
         ipv4: ipv4,
-        port: port,
         serviceName: service_name
       }
+      hsh[:port] = port if port
+      hsh
     end
 
   end

data/lib/zipkin-tracer/tracer_factory.rb

@@ -28,7 +28,6 @@ module ZipkinTracer
       # 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(
-        config.service_port,
         service_name(config.service_name),
         ip_format
       )

data/lib/zipkin-tracer/version.rb

@@ -1,3 +1,3 @@
 module ZipkinTracer
-  VERSION = '0.32.3'.freeze
+  VERSION = '0.32.4'.freeze
 end

metadata

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