jaeger-client 0.10.0 → 1.3.0

data/lib/jaeger/thrift_tag_builder.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Jaeger
+  class ThriftTagBuilder
+    FIELDS = Jaeger::Thrift::Tag::FIELDS
+    KEY = FIELDS[Jaeger::Thrift::Tag::KEY].fetch(:name)
+    VTYPE = FIELDS[Jaeger::Thrift::Tag::VTYPE].fetch(:name)
+    VLONG = FIELDS[Jaeger::Thrift::Tag::VLONG].fetch(:name)
+    VDOUBLE = FIELDS[Jaeger::Thrift::Tag::VDOUBLE].fetch(:name)
+    VBOOL = FIELDS[Jaeger::Thrift::Tag::VBOOL].fetch(:name)
+    VSTR = FIELDS[Jaeger::Thrift::Tag::VSTR].fetch(:name)
+
+    def self.build(key, value)
+      case value
+      when Integer
+        Jaeger::Thrift::Tag.new(
+          KEY => key.to_s,
+          VTYPE => Jaeger::Thrift::TagType::LONG,
+          VLONG => value
+        )
+      when Float
+        Jaeger::Thrift::Tag.new(
+          KEY => key.to_s,
+          VTYPE => Jaeger::Thrift::TagType::DOUBLE,
+          VDOUBLE => value
+        )
+      when TrueClass, FalseClass
+        Jaeger::Thrift::Tag.new(
+          KEY => key.to_s,
+          VTYPE => Jaeger::Thrift::TagType::BOOL,
+          VBOOL => value
+        )
+      else
+        Jaeger::Thrift::Tag.new(
+          KEY => key.to_s,
+          VTYPE => Jaeger::Thrift::TagType::STRING,
+          VSTR => value.to_s
+        )
+      end
+    end
+  end
+end

data/lib/jaeger/trace_id.rb

@@ -4,6 +4,7 @@ module Jaeger
   module TraceId
     MAX_64BIT_SIGNED_INT = (1 << 63) - 1
     MAX_64BIT_UNSIGNED_INT = (1 << 64) - 1
+    MAX_128BIT_UNSIGNED_INT = (1 << 128) - 1
     TRACE_ID_UPPER_BOUND = MAX_64BIT_UNSIGNED_INT + 1
 
     def self.generate
@@ -12,8 +13,16 @@ module Jaeger
 
     def self.base16_hex_id_to_uint64(id)
       return nil unless id
+
+      value = id.to_i(16)
+      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_64BIT_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.
@@ -41,7 +41,13 @@ module Jaeger
     # @param ignore_active_scope [Boolean] whether to create an implicit
     #   References#CHILD_OF reference to the ScopeManager#active.
     #
-    # @return [Span] The newly-started Span
+    # @yield [Span] If passed an optional block, start_span will yield the
+    #   newly-created span to the block. The span will be finished automatically
+    #   after the block is executed.
+    # @return [Span, Object] If passed an optional block, start_span will return
+    #  the block's return value, otherwise it returns the newly-started Span
+    #  instance, which has not been automatically registered via the
+    #  ScopeManager
     def start_span(operation_name,
                    child_of: nil,
                    references: nil,
@@ -55,7 +61,7 @@ module Jaeger
         references: references,
         ignore_active_scope: ignore_active_scope
       )
-      Span.new(
+      span = Span.new(
         context,
         operation_name,
         @reporter,
@@ -63,6 +69,16 @@ module Jaeger
         references: references,
         tags: tags.merge(sampler_tags)
       )
+
+      if block_given?
+        begin
+          yield(span)
+        ensure
+          span.finish
+        end
+      else
+        span
+      end
     end
 
     # Creates a newly started and activated Scope
@@ -87,10 +103,12 @@ module Jaeger
     #   References#CHILD_OF reference to the ScopeManager#active.
     # @param finish_on_close [Boolean] whether span should automatically be
     #   finished when Scope#close is called
-    # @yield [Scope] If an optional block is passed to start_active it will
-    #   yield the newly-started Scope. If `finish_on_close` is true then the
+    # @yield [Scope] If an optional block is passed to start_active_span it
+    #   will yield the newly-started Scope. If `finish_on_close` is true then the
     #   Span will be finished automatically after the block is executed.
-    # @return [Scope] The newly-started and activated Scope
+    # @return [Scope, Object] If passed an optional block, start_active_span
+    #   returns the block's return value, otherwise it returns the newly-started
+    #   and activated Scope
     def start_active_span(operation_name,
                           child_of: nil,
                           references: nil,
@@ -115,9 +133,9 @@ module Jaeger
         ensure
           scope.close
         end
+      else
+        scope
       end
-
-      scope
     end
 
     # Inject a SpanContext into the given carrier
@@ -157,7 +175,7 @@ module Jaeger
         [SpanContext.create_from_parent_context(context), {}]
       else
         trace_id = TraceId.generate
-        is_sampled, tags = @sampler.sample?(
+        is_sampled, tags = @sampler.sample(
           trace_id: trace_id,
           operation_name: operation_name
         )
@@ -172,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
 
@@ -189,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

@@ -5,20 +5,22 @@ require 'socket'
 
 module Jaeger
   class UdpSender
-    def initialize(host:, port:, encoder:, logger:)
+    def initialize(host:, port:, encoder:, logger:, max_packet_size: 65_000)
       @encoder = encoder
       @logger = logger
 
-      transport = Transport.new(host, port)
-      protocol = ::Thrift::CompactProtocol.new(transport)
+      transport = Transport.new(host, port, logger: logger)
+      @protocol_class = ::Thrift::CompactProtocol
+      protocol = @protocol_class.new(transport)
       @client = Jaeger::Thrift::Agent::Client.new(protocol)
+      @max_packet_size = max_packet_size
     end
 
     def send_spans(spans)
-      batch = @encoder.encode(spans)
-      @client.emitBatch(batch)
-    rescue StandardError => error
-      @logger.error("Failure while sending a batch of spans: #{error}")
+      batches = @encoder.encode_limited_size(spans, @protocol_class, @max_packet_size)
+      batches.each { |batch| @client.emitBatch(batch) }
+    rescue StandardError => e
+      @logger.error("Failure while sending a batch of spans: #{e}")
     end
   end
 end

metadata

@@ -1,85 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: jaeger-client
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 1.3.0
 platform: ruby
 authors:
 - SaleMove TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-25 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: '1.25'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.25'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.14'
 - !ruby/object:Gem::Dependency
   name: opentracing
   requirement: !ruby/object:Gem::Requirement
@@ -129,11 +157,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
+- ".rubocop_todo.yml"
 - Gemfile
 - LICENSE.txt
 - Makefile
@@ -156,6 +185,7 @@ files:
 - lib/jaeger/http_sender.rb
 - lib/jaeger/injectors.rb
 - lib/jaeger/rate_limiter.rb
+- lib/jaeger/recurring_executor.rb
 - lib/jaeger/reporters.rb
 - lib/jaeger/reporters/composite_reporter.rb
 - lib/jaeger/reporters/in_memory_reporter.rb
@@ -169,14 +199,16 @@ files:
 - lib/jaeger/samplers/per_operation.rb
 - lib/jaeger/samplers/probabilistic.rb
 - lib/jaeger/samplers/rate_limiting.rb
+- lib/jaeger/samplers/remote_controlled.rb
+- lib/jaeger/samplers/remote_controlled/instructions_fetcher.rb
 - lib/jaeger/scope.rb
 - lib/jaeger/scope_manager.rb
 - lib/jaeger/scope_manager/scope_identifier.rb
 - lib/jaeger/scope_manager/scope_stack.rb
 - lib/jaeger/span.rb
 - lib/jaeger/span/thrift_log_builder.rb
-- lib/jaeger/span/thrift_tag_builder.rb
 - lib/jaeger/span_context.rb
+- lib/jaeger/thrift_tag_builder.rb
 - lib/jaeger/trace_id.rb
 - lib/jaeger/tracer.rb
 - lib/jaeger/udp_sender.rb
@@ -201,7 +233,8 @@ files:
 homepage: https://github.com/salemove/jaeger-client-ruby
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -210,15 +243,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.4
 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

data/lib/jaeger/span/thrift_tag_builder.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module Jaeger
-  class Span
-    class ThriftTagBuilder
-      FIELDS = Jaeger::Thrift::Tag::FIELDS
-      KEY = FIELDS[Jaeger::Thrift::Tag::KEY].fetch(:name)
-      VTYPE = FIELDS[Jaeger::Thrift::Tag::VTYPE].fetch(:name)
-      VLONG = FIELDS[Jaeger::Thrift::Tag::VLONG].fetch(:name)
-      VDOUBLE = FIELDS[Jaeger::Thrift::Tag::VDOUBLE].fetch(:name)
-      VBOOL = FIELDS[Jaeger::Thrift::Tag::VBOOL].fetch(:name)
-      VSTR = FIELDS[Jaeger::Thrift::Tag::VSTR].fetch(:name)
-
-      def self.build(key, value)
-        if value.is_a?(Integer)
-          Jaeger::Thrift::Tag.new(
-            KEY => key.to_s,
-            VTYPE => Jaeger::Thrift::TagType::LONG,
-            VLONG => value
-          )
-        elsif value.is_a?(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)
-          Jaeger::Thrift::Tag.new(
-            KEY => key.to_s,
-            VTYPE => Jaeger::Thrift::TagType::BOOL,
-            VBOOL => value
-          )
-        else
-          Jaeger::Thrift::Tag.new(
-            KEY => key.to_s,
-            VTYPE => Jaeger::Thrift::TagType::STRING,
-            VSTR => value.to_s
-          )
-        end
-      end
-    end
-  end
-end