jaeger-client 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 042e36b2c3502fb1fe7f8c0d42bd1e5130a3adc2d1bce002c466fc0374c4d6c6
-  data.tar.gz: a95a574d111ecdd1625bd760603dba7b766b748608a77ddba6c4ada33a94e4aa
+  metadata.gz: c9acf3d6450f30aa6ddf02e5a47bf62fe6d2802445b376c251dc420b4405da36
+  data.tar.gz: e2f0af41bae0a213f37fabe7b156d5cdbd2bf594b83ade21f3308d9d495d677c
 SHA512:
-  metadata.gz: 6d63a549e13b8ca7779860c6f5dab455894690efe49ad2d6c5beb85ddf0775bbedf5c4030ba8fa6e2062cf5cf627507cc49c46e1faa0ee886edfaff480b578d0
-  data.tar.gz: af363f9831e2219053d260a9d120cebfc6bec8fa90d5b236351051a48c70203531a62a63783b9cf99417449e9762197462177c57f8f183340db5bd7755582af9
+  metadata.gz: '018ba85f2a2474b9869aade057869105070fb8595cea550971574913e8d72023c1ce186e7a56d421eb819ce312c60edec9570dde18441b34c6b24228ecc31cf7'
+  data.tar.gz: b173b4ffebafd6f685cdf1c1fdb1ddd2205ab54b664b86e318c8f8dd74c415fecec8cb8150d8fbb79a4c83e3ca2bc8e93a59a757626c5a11106a33b095005c64

data/.github/workflows/ci.yml

@@ -0,0 +1,31 @@
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.7.2', '3.0']
+
+    services:
+      postgres:
+        image: docker
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run tests
+      run: bundle exec rake
+    - name: Run crossdock
+      run: make crossdock

data/.rubocop.yml

@@ -3,6 +3,9 @@ require: rubocop-rspec
 AllCops:
   Exclude:
     - 'thrift/**/*'
+    - 'vendor/bundle/**/*'
+  NewCops: enable
+  TargetRubyVersion: '2.7'
 
 Style/Documentation:
   Enabled: no
@@ -19,6 +22,9 @@ RSpec/ExampleLength:
 RSpec/MultipleExpectations:
   Enabled: no
 
+RSpec/MultipleMemoizedHelpers:
+  Enabled: no
+
 RSpec/MessageSpies:
   Enabled: no
 
@@ -46,7 +52,7 @@ Style/FrozenStringLiteralComment:
   Include:
     - 'lib/**/*'
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
 
 Style/SingleLineMethods:

data/README.md

@@ -1,7 +1,7 @@
 Jaeger::Client
 ================
 [![Gem Version](https://badge.fury.io/rb/jaeger-client.svg)](https://rubygems.org/gems/jaeger-client)
-[![Build Status](https://travis-ci.org/salemove/jaeger-client-ruby.svg)](https://travis-ci.org/salemove/jaeger-client-ruby)
+[![Build Status](https://github.com/salemove/jaeger-client-ruby/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/salemove/jaeger-client-ruby/actions/workflows/ci.yml?query=branch%3Amaster)
 
 OpenTracing Tracer implementation for Jaeger in Ruby
 
@@ -26,6 +26,9 @@ OpenTracing.start_active_span('span name') do
     # do something else
   end
 end
+
+# don't kill the program too soon, allow time for the background reporter to send the traces
+sleep 2
 ```
 
 See [opentracing-ruby](https://github.com/opentracing/opentracing-ruby) for more examples.

data/crossdock/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.5-alpine
+FROM ruby:2.7-alpine
 
 ENV APP_HOME /app
 
@@ -12,6 +12,8 @@ ADD Gemfile Gemfile.lock jaeger-client.gemspec $APP_HOME/
 ADD lib/jaeger/client/version.rb $APP_HOME/lib/jaeger/client/
 ADD crossdock/Gemfile crossdock/Gemfile.lock $APP_HOME/crossdock/
 
+RUN gem install bundler -v $(tail -n 1 $APP_HOME/Gemfile.lock | awk '{$1=$1};1')
+
 RUN apk add --no-cache --virtual .app-builddeps build-base \
   && cd $APP_HOME && bundle install \
   && cd $APP_HOME/crossdock && bundle install \

data/crossdock/Gemfile.lock

@@ -1,26 +1,28 @@
 PATH
   remote: ..
   specs:
-    jaeger-client (0.7.1)
+    jaeger-client (1.1.0)
       opentracing (~> 0.3)
       thrift
 
 GEM
   remote: https://rubygems.org/
   specs:
-    mustermann (1.0.3)
-    opentracing (0.4.3)
-    rack (2.0.6)
-    rack-protection (2.0.4)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    opentracing (0.5.0)
+    rack (2.2.3)
+    rack-protection (2.1.0)
       rack
-    sinatra (2.0.4)
+    ruby2_keywords (0.0.4)
+    sinatra (2.1.0)
       mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.4)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
       tilt (~> 2.0)
-    thrift (0.11.0.0)
-    tilt (2.0.9)
-    webrick (1.4.2)
+    thrift (0.14.0)
+    tilt (2.0.10)
+    webrick (1.4.4)
 
 PLATFORMS
   ruby
@@ -32,4 +34,4 @@ DEPENDENCIES
   webrick (~> 1.4.2)
 
 BUNDLED WITH
-   1.16.2
+   2.2.15

data/crossdock/jaeger-docker-compose.yml

@@ -3,46 +3,51 @@ version: '2'
 services:
     jaeger-collector:
       image: jaegertracing/jaeger-collector
-      command: ["--cassandra.keyspace=jaeger_v1_dc1", "--cassandra.servers=cassandra", "--collector.zipkin.http-port=9411"]
+      command: ["--es.num-shards=1", "--es.num-replicas=0", "--es.server-urls=http://elasticsearch:9200", "--collector.zipkin.host-port=:9411"]
       ports:
         - "14269"
         - "14268:14268"
-        - "14267"
         - "14250"
         - "9411:9411"
+      environment:
+        - SPAN_STORAGE_TYPE=elasticsearch
+        - LOG_LEVEL=debug
       restart: on-failure
       depends_on:
-        - cassandra-schema
+        - elasticsearch
 
     jaeger-query:
       image: jaegertracing/jaeger-query
-      command: ["--cassandra.keyspace=jaeger_v1_dc1", "--cassandra.servers=cassandra"]
+      command: ["--es.num-shards=1", "--es.num-replicas=0", "--es.server-urls=http://elasticsearch:9200"]
       ports:
         - "16686:16686"
         - "16687"
+      environment:
+        - SPAN_STORAGE_TYPE=elasticsearch
+        - LOG_LEVEL=debug
       restart: on-failure
       depends_on:
-        - cassandra-schema
+        - elasticsearch
 
     jaeger-agent:
       image: jaegertracing/jaeger-agent
-      # FIXME temporarily switching back to tchannel
-      # https://github.com/jaegertracing/jaeger/issues/1229
-      command: ["--reporter.tchannel.host-port=jaeger-collector:14267"]
+      command: ["--reporter.grpc.host-port=jaeger-collector:14250", "--reporter.grpc.retry.max=1000"]
       ports:
         - "5775:5775/udp"
         - "6831:6831/udp"
         - "6832:6832/udp"
         - "5778:5778"
+      environment:
+        - LOG_LEVEL=debug
       restart: on-failure
       depends_on:
         - jaeger-collector
 
-    cassandra:
-      image: cassandra:3.9
+    elasticsearch:
+      image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.3
+      environment:
+        - discovery.type=single-node
+      ports:
+        - "9200:9200/tcp"
 
-    cassandra-schema:
-      image: jaegertracing/jaeger-cassandra-schema
-      depends_on:
-        - cassandra
 

data/crossdock/server

@@ -36,9 +36,10 @@ class HttpServer < Sinatra::Application
       transport = downstream['transport']
 
       response[:downstream] =
-        if transport == 'HTTP'
+        case transport
+        when 'HTTP'
           call_downstream_http(downstream, server_span)
-        elsif transport == 'DUMMY'
+        when 'DUMMY'
           { notImplementedError: 'Dummy has not been implemented' }
         else
           { notImplementedError: "Unrecognized transport received: #{transport}" }
@@ -69,9 +70,10 @@ class HttpServer < Sinatra::Application
       transport = downstream['transport']
 
       response[:downstream] =
-        if transport == 'HTTP'
+        case transport
+        when 'HTTP'
           call_downstream_http(downstream, server_span)
-        elsif transport == 'DUMMY'
+        when 'DUMMY'
           { notImplementedError: 'Dummy has not been implemented' }
         else
           { notImplementedError: "Unrecognized transport received: #{transport}" }

data/jaeger-client.gemspec

@@ -20,13 +20,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = ['>= 2.7', '< 3.1']
+
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.54.0'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.24.0'
+  spec.add_development_dependency 'rubocop', '~> 1.13'
+  spec.add_development_dependency 'rubocop-rake', '~> 0.5.1'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.3'
   spec.add_development_dependency 'timecop', '~> 0.9'
-  spec.add_development_dependency 'webmock', '~> 3.4.2'
+  spec.add_development_dependency 'webmock', '~> 3.4'
 
   spec.add_dependency 'opentracing', '~> 0.3'
   spec.add_dependency 'thrift'

data/lib/jaeger/client/version.rb

@@ -2,6 +2,6 @@
 
 module Jaeger
   module Client
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.2.0'
   end
 end

data/lib/jaeger/client.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.push(File.dirname(__FILE__) + '/../../thrift/gen-rb')
+$LOAD_PATH.push("#{File.dirname(__FILE__)}/../../thrift/gen-rb")
 
 require 'opentracing'
 require 'jaeger/thrift/agent'
@@ -43,18 +43,18 @@ module Jaeger
 
     DEFAULT_FLUSH_INTERVAL = 10
 
-    def self.build(host: '127.0.0.1',
+    def self.build(service_name:,
+                   host: '127.0.0.1',
                    port: 6831,
-                   service_name:,
                    flush_interval: DEFAULT_FLUSH_INTERVAL,
                    sampler: Samplers::Const.new(true),
-                   logger: Logger.new(STDOUT),
+                   logger: Logger.new($stdout),
                    sender: nil,
                    reporter: nil,
                    injectors: {},
                    extractors: {},
                    tags: {})
-      encoder = Encoders::ThriftEncoder.new(service_name: service_name, tags: tags)
+      encoder = Encoders::ThriftEncoder.new(service_name: service_name, tags: tags, logger: logger)
 
       if sender
         warn '[DEPRECATION] Passing `sender` directly to Jaeger::Client.build is deprecated.' \

data/lib/jaeger/encoders/thrift_encoder.rb

@@ -3,8 +3,9 @@
 module Jaeger
   module Encoders
     class ThriftEncoder
-      def initialize(service_name:, tags: {})
+      def initialize(service_name:, logger:, tags: {})
         @service_name = service_name
+        @logger = logger
         @tags = prepare_tags(tags)
         @process = Jaeger::Thrift::Process.new('serviceName' => @service_name, 'tags' => @tags)
       end
@@ -16,15 +17,27 @@ module Jaeger
       def encode_limited_size(spans, protocol_class, max_message_length)
         batches = []
         current_batch = []
-        transport.flush
+        current_batch_size = 0
+
+        max_spans_length = calculate_max_spans_length(protocol_class, max_message_length)
+
         spans.each do |span|
           encoded_span = encode_span(span)
-          if aggregated_span_size(encoded_span, protocol_class) > max_message_length && !current_batch.empty?
+          span_size = message_size(encoded_span, protocol_class)
+
+          if span_size > max_spans_length
+            @logger.warn("Skip span #{span.operation_name} with size #{span_size}")
+            next
+          end
+
+          if (current_batch_size + span_size) > max_spans_length
             batches << encode_batch(current_batch)
             current_batch = []
-            transport.flush
+            current_batch_size = 0
           end
+
           current_batch << encoded_span
+          current_batch_size += span_size
         end
         batches << encode_batch(current_batch) unless current_batch.empty?
         batches
@@ -59,8 +72,8 @@ module Jaeger
         references.map do |ref|
           Jaeger::Thrift::SpanRef.new(
             'refType' => span_ref_type(ref.type),
-            'traceIdLow' => TraceId.uint64_id_to_int64(ref.context.trace_id),
-            'traceIdHigh' => 0,
+            'traceIdLow' => TraceId.uint64_id_to_int64(trace_id_to_low(ref.context.trace_id)),
+            'traceIdHigh' => TraceId.uint64_id_to_int64(trace_id_to_high(ref.context.trace_id)),
             'spanId' => TraceId.uint64_id_to_int64(ref.context.span_id)
           )
         end
@@ -87,7 +100,7 @@ module Jaeger
 
       def prepare_tags(tags)
         with_default_tags = tags.dup
-        with_default_tags['jaeger.version'] = 'Ruby-' + Jaeger::Client::VERSION
+        with_default_tags['jaeger.version'] = "Ruby-#{Jaeger::Client::VERSION}"
         with_default_tags['hostname'] ||= Socket.gethostname
 
         unless with_default_tags['ip']
@@ -128,14 +141,32 @@ module Jaeger
         def close; end
       end
 
-      def aggregated_span_size(span, protocol_class)
-        @protocol ||= protocol_class.new(transport)
-        span.write(@protocol)
+      def message_size(message, protocol_class)
+        transport = DummyTransport.new
+        protocol = protocol_class.new(transport)
+        message.write(protocol)
         transport.size
       end
 
-      def transport
-        @transport ||= DummyTransport.new
+      # Compact protocol have dynamic size of list header
+      # https://erikvanoosten.github.io/thrift-missing-specification/#_list_and_set_2
+      BATCH_SPANS_SIZE_WINDOW = 4
+
+      def empty_batch_size_cache
+        @empty_batch_size_cache ||= {}
+      end
+
+      def caclulate_empty_batch_size(protocol_class)
+        empty_batch_size_cache[protocol_class] ||=
+          message_size(encode_batch([]), protocol_class) + BATCH_SPANS_SIZE_WINDOW
+      end
+
+      def calculate_max_spans_length(protocol_class, max_message_length)
+        empty_batch_size = caclulate_empty_batch_size(protocol_class)
+        max_spans_length = max_message_length - empty_batch_size
+        return max_spans_length if max_spans_length.positive?
+
+        raise "Batch header have size #{empty_batch_size}, but limit #{max_message_length}"
       end
     end
   end

data/lib/jaeger/extractors.rb

@@ -66,11 +66,11 @@ module Jaeger
 
     class B3RackCodec
       class Keys
-        TRACE_ID = 'HTTP_X_B3_TRACEID'.freeze
-        SPAN_ID = 'HTTP_X_B3_SPANID'.freeze
-        PARENT_SPAN_ID = 'HTTP_X_B3_PARENTSPANID'.freeze
-        FLAGS = 'HTTP_X_B3_FLAGS'.freeze
-        SAMPLED = 'HTTP_X_B3_SAMPLED'.freeze
+        TRACE_ID = 'HTTP_X_B3_TRACEID'
+        SPAN_ID = 'HTTP_X_B3_SPANID'
+        PARENT_SPAN_ID = 'HTTP_X_B3_PARENTSPANID'
+        FLAGS = 'HTTP_X_B3_FLAGS'
+        SAMPLED = 'HTTP_X_B3_SAMPLED'
       end.freeze
 
       def self.extract(carrier)
@@ -80,11 +80,11 @@ module Jaeger
 
     class B3TextMapCodec
       class Keys
-        TRACE_ID = 'x-b3-traceid'.freeze
-        SPAN_ID = 'x-b3-spanid'.freeze
-        PARENT_SPAN_ID = 'x-b3-parentspanid'.freeze
-        FLAGS = 'x-b3-flags'.freeze
-        SAMPLED = 'x-b3-sampled'.freeze
+        TRACE_ID = 'x-b3-traceid'
+        SPAN_ID = 'x-b3-spanid'
+        PARENT_SPAN_ID = 'x-b3-parentspanid'
+        FLAGS = 'x-b3-flags'
+        SAMPLED = 'x-b3-sampled'
       end.freeze
 
       def self.extract(carrier)
@@ -129,10 +129,10 @@ module Jaeger
 
     class TraceContextRackCodec
       # Internal regex used to identify the TraceContext version
-      VERSION_PATTERN = /^([0-9a-fA-F]{2})-(.+)$/
+      VERSION_PATTERN = /^([0-9a-fA-F]{2})-(.+)$/.freeze
 
       # Internal regex used to parse fields in version 0
-      HEADER_V0_PATTERN = /^([0-9a-fA-F]{32})-([0-9a-fA-F]{16})(-([0-9a-fA-F]{2}))?$/
+      HEADER_V0_PATTERN = /^([0-9a-fA-F]{32})-([0-9a-fA-F]{16})(-([0-9a-fA-F]{2}))?$/.freeze
 
       def self.extract(carrier)
         header_value = carrier['HTTP_TRACEPARENT']

data/lib/jaeger/http_sender.rb

@@ -4,7 +4,7 @@ require 'logger'
 
 module Jaeger
   class HttpSender
-    def initialize(url:, headers: {}, encoder:, logger: Logger.new(STDOUT))
+    def initialize(url:, encoder:, headers: {}, logger: Logger.new($stdout))
       @encoder = encoder
       @logger = logger
 
@@ -21,8 +21,8 @@ module Jaeger
       batch = @encoder.encode(spans)
       @transport.write(@serializer.serialize(batch))
       @transport.flush
-    rescue StandardError => error
-      @logger.error("Failure while sending a batch of spans: #{error}")
+    rescue StandardError => e
+      @logger.error("Failure while sending a batch of spans: #{e}")
     end
   end
 end

data/lib/jaeger/recurring_executor.rb

@@ -24,7 +24,7 @@ module Jaeger
     end
 
     def running?
-      @thread && @thread.alive?
+      @thread&.alive?
     end
 
     def stop

data/lib/jaeger/samplers/guaranteed_throughput_probabilistic.rb

@@ -30,16 +30,16 @@ module Jaeger
         is_updated
       end
 
-      def sample(*args)
-        is_sampled, probabilistic_tags = @probabilistic_sampler.sample(*args)
+      def sample(...)
+        is_sampled, probabilistic_tags = @probabilistic_sampler.sample(...)
         if is_sampled
           # We still call lower_bound_sampler to update the rate limiter budget
-          @lower_bound_sampler.sample(*args)
+          @lower_bound_sampler.sample(...)
 
           return [is_sampled, probabilistic_tags]
         end
 
-        is_sampled, _tags = @lower_bound_sampler.sample(*args)
+        is_sampled, _tags = @lower_bound_sampler.sample(...)
         [is_sampled, @lower_bound_tags]
       end
     end

data/lib/jaeger/samplers/per_operation.rb

@@ -32,9 +32,7 @@ module Jaeger
           @default_sampler = Probabilistic.new(rate: @default_sampling_probability)
         end
 
-        is_updated = update_operation_strategies(strategies) || is_updated
-
-        is_updated
+        update_operation_strategies(strategies) || is_updated
       end
 
       def sample(opts)

data/lib/jaeger/samplers/probabilistic.rb

@@ -30,7 +30,9 @@ module Jaeger
         true
       end
 
-      def sample(trace_id:, **)
+      def sample(opts)
+        trace_id = opts.fetch(:trace_id)
+
         [@boundary >= trace_id, @tags]
       end
     end

data/lib/jaeger/samplers/remote_controlled.rb

@@ -6,7 +6,7 @@ module Jaeger
   module Samplers
     class RemoteControlled
       DEFAULT_REFRESH_INTERVAL = 60
-      DEFAULT_SAMPLING_HOST = 'localhost'.freeze
+      DEFAULT_SAMPLING_HOST = 'localhost'
       DEFAULT_SAMPLING_PORT = 5778
 
       attr_reader :sampler

data/lib/jaeger/scope.rb

@@ -23,6 +23,7 @@ module Jaeger
     # updating the ScopeManager#active in the process.
     def close
       raise "Tried to close already closed span: #{inspect}" if @closed
+
       @closed = true
 
       @span.finish if @finish_on_close

data/lib/jaeger/scope_manager.rb

@@ -27,6 +27,7 @@ module Jaeger
     #  returned instance.
     def activate(span, finish_on_close: true)
       return active if active && active.span == span
+
       scope = Scope.new(span, @scope_stack, finish_on_close: finish_on_close)
       @scope_stack.push(scope)
       scope

data/lib/jaeger/span.rb

@@ -34,7 +34,7 @@ module Jaeger
     # a String, Numeric, or Boolean it will be encoded with to_s
     def set_tag(key, value)
       if key == 'sampling.priority'
-        if value.to_i > 0
+        if value.to_i.positive?
           return self if @context.debug?
 
           @context.flags = @context.flags | SpanContext::Flags::SAMPLED | SpanContext::Flags::DEBUG
@@ -71,9 +71,9 @@ module Jaeger
     # Add a log entry to this span
     #
     # @deprecated Use {#log_kv} instead.
-    def log(*args)
+    def log(...)
       warn 'Span#log is deprecated. Please use Span#log_kv instead.'
-      log_kv(*args)
+      log_kv(...)
     end
 
     # Add a log entry to this span

data/lib/jaeger/span_context.rb

@@ -19,10 +19,10 @@ module Jaeger
       )
     end
 
-    attr_reader :span_id, :parent_id, :trace_id, :baggage, :flags
-    attr_writer :flags
+    attr_accessor :flags
+    attr_reader :span_id, :parent_id, :trace_id, :baggage
 
-    def initialize(span_id:, parent_id: 0, trace_id:, flags:, baggage: {})
+    def initialize(span_id:, trace_id:, flags:, parent_id: 0, baggage: {})
       @span_id = span_id
       @parent_id = parent_id
       @trace_id = trace_id

data/lib/jaeger/thrift_tag_builder.rb

@@ -11,19 +11,20 @@ module Jaeger
     VSTR = FIELDS[Jaeger::Thrift::Tag::VSTR].fetch(:name)
 
     def self.build(key, value)
-      if value.is_a?(Integer)
+      case value
+      when Integer
         Jaeger::Thrift::Tag.new(
           KEY => key.to_s,
           VTYPE => Jaeger::Thrift::TagType::LONG,
           VLONG => value
         )
-      elsif value.is_a?(Float)
+      when Float
         Jaeger::Thrift::Tag.new(
           KEY => key.to_s,
           VTYPE => Jaeger::Thrift::TagType::DOUBLE,
           VDOUBLE => value
         )
-      elsif value.is_a?(TrueClass) || value.is_a?(FalseClass)
+      when TrueClass, FalseClass
         Jaeger::Thrift::Tag.new(
           KEY => key.to_s,
           VTYPE => Jaeger::Thrift::TagType::BOOL,

data/lib/jaeger/trace_id.rb

@@ -15,14 +15,14 @@ module Jaeger
       return nil unless id
 
       value = id.to_i(16)
-      value > MAX_64BIT_UNSIGNED_INT || value < 0 ? 0 : value
+      value > MAX_64BIT_UNSIGNED_INT || value.negative? ? 0 : value
     end
 
     def self.base16_hex_id_to_uint128(id)
       return nil unless id
 
       value = id.to_i(16)
-      value > MAX_128BIT_UNSIGNED_INT || value < 0 ? 0 : value
+      value > MAX_128BIT_UNSIGNED_INT || value.negative? ? 0 : value
     end
 
     # Thrift defines ID fields as i64, which is signed, therefore we convert

data/lib/jaeger/tracer.rb

@@ -19,7 +19,7 @@ module Jaeger
     #   Scope#active is nil.
     def active_span
       scope = scope_manager.active
-      scope.span if scope
+      scope&.span
     end
 
     # Starts a new span.
@@ -190,6 +190,7 @@ module Jaeger
 
     def context_from_child_of(child_of)
       return nil unless child_of
+
       child_of.respond_to?(:context) ? child_of.context : child_of
     end
 
@@ -207,7 +208,7 @@ module Jaeger
       return if ignore_active_scope
 
       active_scope = @scope_manager.active
-      active_scope.span.context if active_scope
+      active_scope&.span&.context
     end
   end
 end

data/lib/jaeger/udp_sender/transport.rb

@@ -5,10 +5,11 @@ module Jaeger
     class Transport
       FLAGS = 0
 
-      def initialize(host, port)
+      def initialize(host, port, logger:)
         @socket = UDPSocket.new
         @host = host
         @port = port
+        @logger = logger
         @buffer = ::Thrift::MemoryBufferTransport.new
       end
 
@@ -31,9 +32,9 @@ module Jaeger
         @socket.send(bytes, FLAGS, @host, @port)
         @socket.flush
       rescue Errno::ECONNREFUSED
-        warn 'Unable to connect to Jaeger Agent'
+        @logger.warn 'Unable to connect to Jaeger Agent'
       rescue StandardError => e
-        warn "Unable to send spans: #{e.message}"
+        @logger.warn "Unable to send spans: #{e.message}"
       end
     end
   end

data/lib/jaeger/udp_sender.rb

@@ -9,7 +9,7 @@ module Jaeger
       @encoder = encoder
       @logger = logger
 
-      transport = Transport.new(host, port)
+      transport = Transport.new(host, port, logger: logger)
       @protocol_class = ::Thrift::CompactProtocol
       protocol = @protocol_class.new(transport)
       @client = Jaeger::Thrift::Agent::Client.new(protocol)
@@ -19,8 +19,8 @@ module Jaeger
     def send_spans(spans)
       batches = @encoder.encode_limited_size(spans, @protocol_class, @max_packet_size)
       batches.each { |batch| @client.emitBatch(batch) }
-    rescue StandardError => error
-      @logger.error("Failure while sending a batch of spans: #{error}")
+    rescue StandardError => e
+      @logger.error("Failure while sending a batch of spans: #{e}")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jaeger-client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - SaleMove TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2021-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: opentracing
   requirement: !ruby/object:Gem::Requirement
@@ -143,11 +157,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - Makefile
@@ -227,14 +241,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: OpenTracing Tracer implementation for Jaeger in Ruby

data/.travis.yml

@@ -1,14 +0,0 @@
-sudo: false
-
-language: ruby
-rvm:
-  - 2.5.0
-
-services:
-  - docker
-
-before_install: gem install bundler -v 1.17.2
-
-script:
-  - bundle exec rake
-  - make crossdock