jaeger-client 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ac7f048b966685822762e51884cf5122cc437d6
-  data.tar.gz: 7986fccb2c4c683e74777803639e4da546227dac
+  metadata.gz: dc47584b45bef088c9871ca1a40a73ebbc04bad8
+  data.tar.gz: '03990b88b5c512ef7278be81980e1ba8e23b9b8d'
 SHA512:
-  metadata.gz: 7978af583df71b1c50b76b60e9208d558f12f7a1f21876e9f55982a7d9e6f7ef14757457fb8a41a1a59a4865e7583e3f4b54c7b442e17135b1fc902dfd9e5206
-  data.tar.gz: b75781a93c93856c017d06b78e9c7119416752ab66a38b992b0de14e224823e74c7baff484bc8553d67c8722500dc70b98e10943e91088238d5c8c5b6ac70804
+  metadata.gz: 8c8b9cd13c3fd71a6b83ce793ae55d4ddfc59e0169c2c1f0ef75390df37eedd4fc5f9c34c24654d2f4c2bd86e13aee6f4eca3c043f0ad6b17bbca898a771c3bd
+  data.tar.gz: 26098a8331acd51cbbcf345ae510158cd96ab4e37c55857cf5db4b327bef6634eba46f7ae35b59a03e45e34093b16db0692c1d0698d5d2da32189e981c04d51f

data/jaeger-client.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'jaeger-client'
-  spec.version       = '0.1.0'
+  spec.version       = '0.2.0'
   spec.authors       = ['SaleMove TechMovers']
   spec.email         = ['techmovers@salemove.com']
 

data/lib/jaeger/client.rb

@@ -8,12 +8,23 @@ require_relative 'client/span_context'
 require_relative 'client/carrier'
 require_relative 'client/trace_id'
 require_relative 'client/udp_sender'
+require_relative 'client/collector'
 
 module Jaeger
   module Client
-    def self.build(host: '127.0.0.1', port: 6831, service_name:)
-      client = UdpSender.new(service_name, host, port)
-      Tracer.new(client, service_name)
+    DEFAULT_FLUSH_INTERVAL = 10
+
+    def self.build(host: '127.0.0.1', port: 6831, service_name:, flush_interval: DEFAULT_FLUSH_INTERVAL)
+      collector = Collector.new
+      sender = UdpSender.new(
+        service_name: service_name,
+        host: host,
+        port: port,
+        collector: collector,
+        flush_interval: flush_interval
+      )
+      sender.start
+      Tracer.new(collector, sender)
     end
   end
 end

data/lib/jaeger/client/collector.rb

@@ -0,0 +1,86 @@
+require 'thread'
+
+module Jaeger
+  module Client
+    class Collector
+      def initialize
+        @buffer = Buffer.new
+      end
+
+      def send_span(span, end_time)
+        context = span.context
+        start_ts, duration = build_timestamps(span, end_time)
+
+        @buffer << Jaeger::Thrift::Span.new(
+          'traceIdLow' => context.trace_id,
+          'traceIdHigh' => context.trace_id,
+          'spanId' => context.span_id,
+          'parentSpanId' => context.parent_id || 0,
+          'operationName' => span.operation_name,
+          'references' => [],
+          'flags' => context.flags,
+          'startTime' => start_ts,
+          'duration' => duration,
+          'tags' => build_tags(span.tags),
+          'logs' => build_logs(span.logs)
+        )
+      end
+
+      def retrieve
+        @buffer.retrieve
+      end
+
+      private
+
+      def build_tags(tags)
+        tags.map {|name, value| build_tag(name, value)}
+      end
+
+      def build_logs(logs)
+        logs.map do |timestamp:, fields:|
+          Jaeger::Thrift::Log.new(
+            'timestamp' => (timestamp.to_f * 1_000_000).to_i,
+            'fields' => fields.map {|name, value| build_tag(name, value)}
+          )
+        end
+      end
+
+      def build_tag(name, value)
+        Jaeger::Thrift::Tag.new(
+          'key' => name.to_s,
+          'vType' => Jaeger::Thrift::TagType::STRING,
+          'vStr' => value.to_s
+        )
+      end
+
+      def build_timestamps(span, end_time)
+        start_ts = (span.start_time.to_f * 1_000_000).to_i
+        end_ts = (end_time.to_f * 1_000_000).to_i
+        duration = end_ts - start_ts
+        [start_ts, duration]
+      end
+
+      class Buffer
+        def initialize
+          @buffer = []
+          @mutex = Mutex.new
+        end
+
+        def <<(element)
+          @mutex.synchronize do
+            @buffer << element
+            true
+          end
+        end
+
+        def retrieve
+          @mutex.synchronize do
+            elements = @buffer.dup
+            @buffer.clear
+            elements
+          end
+        end
+      end
+    end
+  end
+end

data/lib/jaeger/client/span.rb

@@ -9,13 +9,13 @@ module Jaeger
       #
       # @param context [SpanContext] the context of the span
       # @param context [String] the operation name
-      # @param client [UdpSender] span emitter
+      # @param collector [Collector] span collector
       #
       # @return [Span] a new Span
-      def initialize(context, operation_name, client, start_time: Time.now, tags: {})
+      def initialize(context, operation_name, collector, start_time: Time.now, tags: {})
         @context = context
         @operation_name = operation_name
-        @client = client
+        @collector = collector
         @start_time = start_time
         @tags = tags
         @logs = []
@@ -59,7 +59,7 @@ module Jaeger
       #
       # @param end_time [Time] custom end time, if not now
       def finish(end_time: Time.now)
-        @client.send_span(self, end_time)
+        @collector.send_span(self, end_time)
       end
 
       private

data/lib/jaeger/client/tracer.rb

@@ -1,8 +1,13 @@
 module Jaeger
   module Client
     class Tracer
-      def initialize(client, service_name)
-        @client = client
+      def initialize(collector, sender)
+        @collector = collector
+        @sender = sender
+      end
+
+      def stop
+        @sender.stop
       end
 
       # Starts a new span.
@@ -23,7 +28,7 @@ module Jaeger
           else
             SpanContext.create_parent_context
           end
-        Span.new(context, operation_name, @client, start_time: start_time, tags: tags)
+        Span.new(context, operation_name, @collector, start_time: start_time, tags: tags)
       end
 
       # Inject a SpanContext into the given carrier
@@ -68,13 +73,10 @@ module Jaeger
         return nil if !trace || trace == ''
         trace_id, span_id, parent_id, _flags = trace.split(':')
 
-        parent_id = parent_id.to_i
-        parent_id = nil if parent_id == 0
-
-        trace_id = trace_id.to_i
-        span_id = span_id.to_i
+        parent_id = parent_id
+        parent_id = nil if parent_id == ''
 
-        if trace_id != 0 && span_id != 0
+        if trace_id != '' && span_id != ''
           SpanContext.new(trace_id: trace_id, parent_id: parent_id, span_id: span_id)
         else
           nil

data/lib/jaeger/client/udp_sender.rb

@@ -1,130 +1,50 @@
+require_relative './udp_sender/transport'
 require 'jaeger/thrift/agent'
 require 'thread'
 
 module Jaeger
   module Client
     class UdpSender
-      def initialize(service_name, host, port)
+      def initialize(service_name:, host:, port:, collector:, flush_interval:)
         @service_name = service_name
+        @collector = collector
+        @flush_interval = flush_interval
 
-        emitter = SocketEmitter.new(host, port)
-        emitter.start
-        transport = Transport.new(emitter)
+        transport = Transport.new(host, port)
         protocol = ::Thrift::CompactProtocol.new(transport)
-
         @client = Jaeger::Thrift::Agent::Client.new(protocol)
       end
 
-      def send_span(span, end_time)
-        context = span.context
-        start_ts, duration = build_timestamps(span, end_time)
+      def start
+        # Sending spans in a separate thread to avoid blocking the main thread.
+        @thread = Thread.new do
+          loop do
+            emit_batch(@collector.retrieve)
+            sleep @flush_interval
+          end
+        end
+      end
+
+      def stop
+        @thread.terminate if @thread
+        emit_batch(@collector.retrieve)
+      end
+
+      private
+
+      def emit_batch(thrift_spans)
+        return if thrift_spans.empty?
 
-        thrift_span = Jaeger::Thrift::Span.new(
-          'traceIdLow' => context.trace_id,
-          'traceIdHigh' => context.trace_id,
-          'spanId' => context.span_id,
-          'parentSpanId' => context.parent_id || 0,
-          'operationName' => span.operation_name,
-          'references' => [],
-          'flags' => context.flags,
-          'startTime' => start_ts,
-          'duration' => duration,
-          'tags' => build_tags(span.tags),
-          'logs' => build_logs(span.logs)
-        )
         batch = Jaeger::Thrift::Batch.new(
           'process' => Jaeger::Thrift::Process.new(
             'serviceName' => @service_name,
             'tags' => [],
           ),
-          'spans' => [thrift_span]
+          'spans' => thrift_spans
         )
 
         @client.emitBatch(batch)
       end
-
-      private
-
-      def build_tags(tags)
-        tags.map {|name, value| build_tag(name, value)}
-      end
-
-      def build_logs(logs)
-        logs.map do |timestamp:, fields:|
-          Jaeger::Thrift::Log.new(
-            'timestamp' => (timestamp.to_f * 1_000_000).to_i,
-            'fields' => fields.map {|name, value| build_tag(name, value)}
-          )
-        end
-      end
-
-      def build_tag(name, value)
-        Jaeger::Thrift::Tag.new(
-          'key' => name.to_s,
-          'vType' => Jaeger::Thrift::TagType::STRING,
-          'vStr' => value.to_s
-        )
-      end
-
-      def build_timestamps(span, end_time)
-        start_ts = (span.start_time.to_f * 1_000_000).to_i
-        end_ts = (end_time.to_f * 1_000_000).to_i
-        duration = end_ts - start_ts
-        [start_ts, duration]
-      end
-
-      class Transport
-        def initialize(emitter)
-          @emitter = emitter
-          @buffer = ::Thrift::MemoryBufferTransport.new
-        end
-
-        def write(str)
-          @buffer.write(str)
-        end
-
-        def flush
-          @emitter.emit(@buffer.read(@buffer.available))
-          @buffer.reset_buffer
-        end
-
-        def open; end
-        def close; end
-      end
-
-      class SocketEmitter
-        FLAGS = 0
-
-        def initialize(host, port)
-          @socket = UDPSocket.new
-          @socket.connect(host, port)
-          @encoded_spans = Queue.new
-        end
-
-        def emit(encoded_spans)
-          @encoded_spans << encoded_spans
-        end
-
-        def start
-          # Sending spans in a separate thread to avoid blocking the main thread.
-          Thread.new do
-            while encoded_span = @encoded_spans.pop
-              send_bytes(encoded_span)
-            end
-          end
-        end
-
-        private
-
-        def send_bytes(bytes)
-          @socket.send(bytes, FLAGS)
-          @socket.flush
-        rescue Errno::ECONNREFUSED
-          warn 'Unable to connect to Jaeger Agent'
-        rescue => e
-          warn "Unable to send spans: #{e.message}"
-        end
-      end
     end
   end
 end

data/lib/jaeger/client/udp_sender/transport.rb

@@ -0,0 +1,38 @@
+module Jaeger
+  module Client
+    class UdpSender
+      class Transport
+        FLAGS = 0
+
+        def initialize(host, port)
+          @socket = UDPSocket.new
+          @socket.connect(host, port)
+          @buffer = ::Thrift::MemoryBufferTransport.new
+        end
+
+        def write(str)
+          @buffer.write(str)
+        end
+
+        def flush
+          data = @buffer.read(@buffer.available)
+          send_bytes(data)
+        end
+
+        def open; end
+        def close; end
+
+        private
+
+        def send_bytes(bytes)
+          @socket.send(bytes, FLAGS)
+          @socket.flush
+        rescue Errno::ECONNREFUSED
+          warn 'Unable to connect to Jaeger Agent'
+        rescue => e
+          warn "Unable to send spans: #{e.message}"
+        end
+      end
+    end
+  end
+end

data/script/create_trace

@@ -8,8 +8,8 @@ require 'jaeger/client'
 host = ENV['JAEGER_HOST'] || '127.0.0.1'
 port = ENV['JAEGER_HOST'] || 6831
 
-tracer1 = Jaeger::Client.build(host: host, port: port.to_i, service_name: 'test-service')
-tracer2 = Jaeger::Client.build(host: host, port: port.to_i, service_name: 'downstream-service')
+tracer1 = Jaeger::Client.build(host: host, port: port.to_i, service_name: 'test-service', flush_interval: 1)
+tracer2 = Jaeger::Client.build(host: host, port: port.to_i, service_name: 'downstream-service', flush_interval: 1)
 
 outer_span = tracer1.start_span('receive request', tags: {
   'span.kind' => 'server'
@@ -39,5 +39,8 @@ inner_span.finish
 sleep 0.1 # doing something with fetched info
 outer_span.finish
 
-puts "Finishing..."
-sleep 3
+tracer1.stop
+tracer2.stop
+
+puts "Finished"
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jaeger-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - SaleMove TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-22 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,11 +99,13 @@ files:
 - jaeger-client.gemspec
 - lib/jaeger/client.rb
 - lib/jaeger/client/carrier.rb
+- lib/jaeger/client/collector.rb
 - lib/jaeger/client/span.rb
 - lib/jaeger/client/span_context.rb
 - lib/jaeger/client/trace_id.rb
 - lib/jaeger/client/tracer.rb
 - lib/jaeger/client/udp_sender.rb
+- lib/jaeger/client/udp_sender/transport.rb
 - script/create_trace
 - thrift/agent.thrift
 - thrift/gen-rb/jaeger/thrift/agent.rb
@@ -140,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: OpenTracing Tracer implementation for Jaeger in Ruby