jaeger-client 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6c3b896f0a1516378cf00ee5a08bc86b9766842a
-  data.tar.gz: e7f411f2dd0850fd1d4267616c6e6cdda7766847
+SHA256:
+  metadata.gz: 569f7aab000d228eac45be1f7d5831251b886ea0372c83f26d6eee58cb4aebbc
+  data.tar.gz: ce36d49763c06f2fbad18d69587c1c66c9f047bcdc24bcbdb7c1b7bc99fdb803
 SHA512:
-  metadata.gz: 2f1d3b40879729e56de34b71bab0881d9c3d3afab4f11b523392a21392bfeb992e3a602c3cc7907d5f905eafd4f5130d27e4383602b8cc98e1053c2a49f12e5c
-  data.tar.gz: e757205635c33ff2e40630c07746f0993fd234c00742ac1257ab5a914659394b45d24f3d5896f72ab7b3c2a3840383fdeb8d6790a53eff1b67506e2577175bf5
+  metadata.gz: 7c1e3bf462504c1f0b83dfe460d3001dcb45fb8dece53245f6b9d25a3065332f6a16bba3a425ffe34d74bef5ab0d67d5cd7caaafc36d9b930eab067040c88dbf
+  data.tar.gz: 0f9c0a1c60ccb748c3f50a63e01f28d2756f8485f35b4aa111544e596f19685f2200f0446962c56b17d2273c976f638ec7c00764fccd88fbbb73c5814dd8cee8

data/lib/jaeger/client.rb

@@ -4,6 +4,7 @@ $LOAD_PATH.push(File.dirname(__FILE__) + '/../../thrift/gen-rb')
 
 require 'opentracing'
 require 'jaeger/thrift/agent'
+require 'logger'
 
 require_relative 'client/tracer'
 require_relative 'client/span'
@@ -25,14 +26,16 @@ module Jaeger
                    port: 6831,
                    service_name:,
                    flush_interval: DEFAULT_FLUSH_INTERVAL,
-                   sampler: Samplers::Const.new(true))
+                   sampler: Samplers::Const.new(true),
+                   logger: Logger.new(STDOUT))
       collector = Collector.new
       sender = UdpSender.new(
         service_name: service_name,
         host: host,
         port: port,
         collector: collector,
-        flush_interval: flush_interval
+        flush_interval: flush_interval,
+        logger: logger
       )
       sender.start
       Tracer.new(collector, sender, sampler)

data/lib/jaeger/client/collector.rb

@@ -15,10 +15,10 @@ module Jaeger
         return if !context.sampled? && !context.debug?
 
         @buffer << Jaeger::Thrift::Span.new(
-          'traceIdLow' => context.trace_id,
+          'traceIdLow' => TraceId.uint64_id_to_int64(context.trace_id),
           'traceIdHigh' => 0,
-          'spanId' => context.span_id,
-          'parentSpanId' => context.parent_id,
+          'spanId' => TraceId.uint64_id_to_int64(context.span_id),
+          'parentSpanId' => TraceId.uint64_id_to_int64(context.parent_id),
           'operationName' => span.operation_name,
           'references' => build_references(span.references || []),
           'flags' => context.flags,

data/lib/jaeger/client/span_context.rb

@@ -43,15 +43,16 @@ module Jaeger
         @flags & Flags::DEBUG == Flags::DEBUG
       end
 
-      def inspect
-        to_s
+      def to_trace_id
+        @to_trace_id ||= @trace_id.to_s(16)
       end
 
-      def to_s
-        "#<SpanContext @span_id=#{span_id.to_s(16)} " \
-          "@parent_id=#{parent_id.to_s(16)} " \
-          "@trace_id=#{trace_id.to_s(16)} " \
-          "@flags=#{flags}>"
+      def to_parent_id
+        @to_parent_id ||= @parent_id.zero? ? nil : @parent_id.to_s(16)
+      end
+
+      def to_span_id
+        @to_span_id ||= @span_id.to_s(16)
       end
     end
   end

data/lib/jaeger/client/trace_id.rb

@@ -3,11 +3,25 @@
 module Jaeger
   module Client
     module TraceId
-      TRACE_ID_UPPER_BOUND = 2**63 - 1
+      MAX_64BIT_SIGNED_INT = (1 << 63) - 1
+      MAX_64BIT_UNSIGNED_INT = (1 << 64) - 1
+      TRACE_ID_UPPER_BOUND = MAX_64BIT_UNSIGNED_INT + 1
 
       def self.generate
         rand(TRACE_ID_UPPER_BOUND)
       end
+
+      def self.base16_hex_id_to_uint64(id)
+        return nil unless id
+        value = id.to_i(16)
+        value > MAX_64BIT_UNSIGNED_INT || value < 0 ? 0 : value
+      end
+
+      # Thrift defines ID fields as i64, which is signed, therefore we convert
+      # large IDs (> 2^63) to negative longs
+      def self.uint64_id_to_int64(id)
+        id > MAX_64BIT_SIGNED_INT ? id - MAX_64BIT_UNSIGNED_INT - 1 : id
+      end
     end
   end
 end

data/lib/jaeger/client/tracer.rb

@@ -167,26 +167,20 @@ module Jaeger
       def parse_context(trace)
         return nil if !trace || trace == ''
 
-        trace_arguments = trace.split(':').map { |arg| arg.to_i(16) }
+        trace_arguments = trace.split(':').map(&TraceId.method(:base16_hex_id_to_uint64))
         return nil if trace_arguments.size != 4
 
         trace_id, span_id, parent_id, flags = trace_arguments
         return nil if trace_id.zero? || span_id.zero?
 
         SpanContext.new(
-          trace_id: to_signed_int(trace_id, 64),
-          parent_id: to_signed_int(parent_id, 64),
-          span_id: to_signed_int(span_id, 64),
+          trace_id: trace_id,
+          parent_id: parent_id,
+          span_id: span_id,
           flags: flags
         )
       end
 
-      def to_signed_int(num, bits)
-        # Using two's complement
-        mask = 2**(bits - 1)
-        (num & ~mask) - (num & mask)
-      end
-
       def prepare_span_context(child_of:, references:, ignore_active_scope:)
         context =
           context_from_child_of(child_of) ||

data/lib/jaeger/client/udp_sender.rb

@@ -7,10 +7,11 @@ require 'thread'
 module Jaeger
   module Client
     class UdpSender
-      def initialize(service_name:, host:, port:, collector:, flush_interval:)
+      def initialize(service_name:, host:, port:, collector:, flush_interval:, logger:)
         @service_name = service_name
         @collector = collector
         @flush_interval = flush_interval
+        @logger = logger
 
         @tags = [
           Jaeger::Thrift::Tag.new(
@@ -67,6 +68,8 @@ module Jaeger
         )
 
         @client.emitBatch(batch)
+      rescue StandardError => error
+        @logger.error("Failure while sending a batch of spans: #{error}")
       end
     end
   end

data/lib/jaeger/client/version.rb

@@ -2,6 +2,6 @@
 
 module Jaeger
   module Client
-    VERSION = '0.6.0'.freeze
+    VERSION = '0.6.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jaeger-client
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - SaleMove TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-01 00:00:00.000000000 Z
+date: 2018-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: OpenTracing Tracer implementation for Jaeger in Ruby