zipkin 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 504536eebfe1f9f6ce03dd1c9bb1ef0d2c0d870f
-  data.tar.gz: 9e7638f5c9b6cfc0a1061955f3475ad1c5f352d8
+  metadata.gz: 6f92fdc7348802e3c0b140837bdb2f5d48cfe442
+  data.tar.gz: '0881fd1f33ab80865a57b2e53b2be6d059a2ff9f'
 SHA512:
-  metadata.gz: 0fff4fc9878ad37a878968c8805a755f110ac98418dcd88f4229fca5ceb41642c3f66df02a2aad9a0d1903e9dfbd824a359dff77d870a33b5de936b53fe04bfe
-  data.tar.gz: 31b4d916668c882181a08aeb1026557e42051a5ea6b7c91074085ff83ade66153ea3df616ca001ef67a48e804f114cedc45faacffa02441621c58fe477b36135
+  metadata.gz: 20dec927215cc426b259b496a679c974ea2cdcac3e22ce21c0469af8aa2bf26ffebaaf88283877d00f6b55dc20cb06dd69d25660a86057aed8755479c15c5d9d
+  data.tar.gz: a116973247a56ad090eb6f3c0820073bba313f1790e1013c217ebc02a4fb2b78f9f5c933b97723e79d6413548b0586c2a180a01a54b81ccc74d5681baa640be5

data/lib/zipkin/collector.rb

@@ -0,0 +1,73 @@
+require 'thread'
+
+module Zipkin
+  class Collector
+    def initialize(local_endpoint)
+      @buffer = Buffer.new
+      @local_endpoint = local_endpoint
+    end
+
+    def retrieve
+      @buffer.retrieve
+    end
+
+    def send_span(span, end_time)
+      finish_ts = (end_time.to_f * 1_000_000).to_i
+      start_ts = (span.start_time.to_f * 1_000_000).to_i
+      duration = finish_ts - start_ts
+      is_server = ['server', 'consumer'].include?(span.tags['span.kind'] || 'server')
+
+      @buffer << {
+        traceId: span.context.trace_id,
+        id: span.context.span_id,
+        parentId: span.context.parent_id,
+        name: span.operation_name,
+        timestamp: start_ts,
+        duration: duration,
+        annotations: [
+          {
+            timestamp: start_ts,
+            value: is_server ? 'sr' : 'cs',
+            endpoint: @local_endpoint
+          },
+          {
+            timestamp: finish_ts,
+            value: is_server ? 'ss': 'cr',
+            endpoint: @local_endpoint
+          }
+        ],
+        binaryAnnotations: build_binary_annotations(span)
+      }
+    end
+
+    private
+
+    def build_binary_annotations(span)
+      span.tags.map do |name, value|
+        {key: name, value: value.to_s}
+      end
+    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

data/lib/zipkin/endpoint.rb

@@ -1,3 +1,5 @@
+require 'socket'
+
 module Zipkin
   class Endpoint
     LOCAL_IP = Socket.ip_address_list.detect(&:ipv4_private?).ip_address

data/lib/zipkin/json_client.rb

@@ -1,33 +1,43 @@
-require 'faraday'
-require 'faraday_middleware'
-require 'sucker_punch'
+require 'net/http'
+require 'uri'
+require 'json'
 
 module Zipkin
   class JsonClient
-    def initialize(url)
-      @faraday = Faraday.new(url: url) do |faraday|
-        faraday.request :json
-        faraday.request :retry, max: 3, interval: 10, backoff_factor: 2
-        faraday.adapter Faraday.default_adapter
+    def initialize(url:, collector:, flush_interval:)
+      @collector = collector
+      @flush_interval = flush_interval
+      @spans_uri = URI.parse("#{url}/api/v1/spans")
+    end
+
+    def start
+      @thread = Thread.new do
+        loop do
+          emit_batch(@collector.retrieve)
+          sleep @flush_interval
+        end
       end
     end
 
-    def send_span(payload)
-      SpanSender.perform_async(payload: payload, faraday: @faraday)
+    def stop
+      @thread.terminate if @thread
+      emit_batch(@collector.retrieve)
     end
 
-    class SpanSender
-      include SuckerPunch::Job
-      workers 4
+    private
 
-      def perform(payload:, faraday:)
-        response = faraday.post '/api/v1/spans' do |req|
-          req.body = [payload]
-        end
+    def emit_batch(spans)
+      return if spans.empty?
 
-        if response.status != 202
-          STDERR.puts(response.body)
-        end
+      http = Net::HTTP.new(@spans_uri.host, @spans_uri.port)
+      request = Net::HTTP::Post.new(@spans_uri.request_uri, {
+        'Content-Type' => 'application/json'
+      })
+      request.body = JSON.dump(spans)
+      response = http.request(request)
+
+      if response.code != 202
+        STDERR.puts(response.body)
       end
     end
   end

data/lib/zipkin/span.rb

@@ -2,22 +2,21 @@ module Zipkin
   class Span
     attr_accessor :operation_name
 
-    attr_reader :context
+    attr_reader :context, :start_time, :tags
 
     # Creates a new {Span}
     #
     # @param context [SpanContext] the context of the span
-    # @param context [String] the operation name
-    # @param client [Faraday] faraday instace for making http requests
+    # @param operation_name [String] the operation name
+    # @param collector [Collector] the span collector
     #
     # @return [Span] a new Span
-    def initialize(context, operation_name, client, start_time: Time.now, tags: {}, local_endpoint:)
+    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
-      @local_endpoint = local_endpoint
     end
 
     # Set a tag value on this span
@@ -59,40 +58,7 @@ module Zipkin
     #
     # @param end_time [Time] custom end time, if not now
     def finish(end_time: Time.now)
-      finish_ts = (end_time.to_f * 1_000_000).to_i
-      start_ts = (@start_time.to_f * 1_000_000).to_i
-      duration = finish_ts - start_ts
-      is_server = ['server', 'consumer'].include?(@tags['span.kind'] || 'server')
-
-      @client.send_span(
-        traceId: @context.trace_id,
-        id: @context.span_id,
-        parentId: @context.parent_id,
-        name: @operation_name,
-        timestamp: start_ts,
-        duration: duration,
-        annotations: [
-          {
-            timestamp: start_ts,
-            value: is_server ? 'sr' : 'cs',
-            endpoint: @local_endpoint
-          },
-          {
-            timestamp: finish_ts,
-            value: is_server ? 'ss': 'cr',
-            endpoint: @local_endpoint
-          }
-        ],
-        binaryAnnotations: build_binary_annotations
-      )
-    end
-
-    private
-
-    def build_binary_annotations
-      @tags.map do |name, value|
-        {key: name, value: value.to_s}
-      end
+      @collector.send_span(self, end_time)
     end
   end
 end

data/lib/zipkin/span_context.rb

@@ -3,24 +3,30 @@ module Zipkin
   class SpanContext
     def self.create_parent_context
       trace_id = TraceId.generate
-      span_id = TraceId.generate
-      new(trace_id: trace_id, span_id: span_id)
+      new(trace_id: trace_id, span_id: trace_id, sampled: true)
     end
 
     def self.create_from_parent_context(span_context)
-      trace_id = span_context.trace_id
-      parent_id = span_context.span_id
-      span_id = TraceId.generate
-      new(span_id: span_id, parent_id: parent_id, trace_id: trace_id)
+      new(
+        span_id: TraceId.generate,
+        parent_id: span_context.span_id,
+        trace_id: span_context.trace_id,
+        sampled: span_context.sampled?
+      )
     end
 
     attr_reader :span_id, :parent_id, :trace_id, :baggage
 
-    def initialize(span_id:, parent_id: nil, trace_id:, baggage: {})
+    def initialize(span_id:, parent_id: nil, trace_id:, sampled:, baggage: {})
       @span_id = span_id
       @parent_id = parent_id
       @trace_id = trace_id
+      @sampled = sampled
       @baggage = baggage
     end
+
+    def sampled?
+      @sampled
+    end
   end
 end

data/lib/zipkin/tracer.rb

@@ -6,17 +6,30 @@ require_relative 'carrier'
 require_relative 'trace_id'
 require_relative 'json_client'
 require_relative 'endpoint'
+require_relative 'collector'
 
 module Zipkin
   class Tracer
-    def self.build(url:, service_name:)
-      client = JsonClient.new(url)
-      new(client, service_name)
+    DEFAULT_FLUSH_INTERVAL = 10
+
+    def self.build(url:, service_name:, flush_interval: DEFAULT_FLUSH_INTERVAL)
+      collector = Collector.new(Endpoint.local_endpoint(service_name))
+      sender = JsonClient.new(
+        url: url,
+        collector: collector,
+        flush_interval: flush_interval
+      )
+      sender.start
+      new(collector, sender)
+    end
+
+    def initialize(collector, sender)
+      @collector = collector
+      @sender = sender
     end
 
-    def initialize(client, service_name)
-      @client = client
-      @local_endpoint = Endpoint.local_endpoint(service_name)
+    def stop
+      @sender.stop
     end
 
     # Starts a new span.
@@ -37,7 +50,10 @@ module Zipkin
         else
           SpanContext.create_parent_context
         end
-      Span.new(context, operation_name, @client, start_time: start_time, tags: tags, local_endpoint: @local_endpoint)
+      Span.new(context, operation_name, @collector, {
+        start_time: start_time,
+        tags: tags
+      })
     end
 
     # Inject a SpanContext into the given carrier
@@ -47,14 +63,11 @@ module Zipkin
     # @param carrier [Carrier] A carrier object of the type dictated by the specified `format`
     def inject(span_context, format, carrier)
       case format
-      when OpenTracing::FORMAT_TEXT_MAP
-        carrier['trace-id'] = span_context.trace_id
-        carrier['parent-id'] = span_context.parent_id
-        carrier['span-id'] = span_context.span_id
       when OpenTracing::FORMAT_RACK
-        carrier['X-Trace-Id'] = span_context.trace_id
-        carrier['X-Trace-Parent-Id'] = span_context.parent_id
-        carrier['X-Trace-Span-Id'] = span_context.span_id
+        carrier['X-B3-TraceId'] = span_context.trace_id
+        carrier['X-B3-ParentSpanId'] = span_context.parent_id
+        carrier['X-B3-SpanId'] = span_context.span_id
+        carrier['X-B3-Sampled'] = span_context.sampled? ? '1' : '0'
       else
         STDERR.puts "Logasm::Tracer with format #{format} is not supported yet"
       end
@@ -67,23 +80,19 @@ module Zipkin
     # @return [SpanContext] the extracted SpanContext or nil if none could be found
     def extract(format, carrier)
       case format
-      when OpenTracing::FORMAT_TEXT_MAP
-        trace_id = carrier['trace-id']
-        parent_id = carrier['parent-id']
-        span_id = carrier['span-id']
-
-        if trace_id && span_id
-          SpanContext.new(trace_id: trace_id, parent_id: parent_id, span_id: span_id)
-        else
-          nil
-        end
       when OpenTracing::FORMAT_RACK
-        trace_id = carrier['HTTP_X_TRACE_ID']
-        parent_id = carrier['HTTP_X_TRACE_PARENT_ID']
-        span_id = carrier['HTTP_X_TRACE_SPAN_ID']
+        trace_id = carrier['HTTP_X_B3_TRACEID']
+        parent_id = carrier['HTTP_X_B3_PARENTSPANID']
+        span_id = carrier['HTTP_X_B3_SPANID']
+        sampled = carrier['HTTP_X_B3_SAMPLED'] == '1'
 
         if trace_id && span_id
-          SpanContext.new(trace_id: trace_id, parent_id: parent_id, span_id: span_id)
+          SpanContext.new(
+            trace_id: trace_id,
+            parent_id: parent_id,
+            span_id: span_id,
+            sampled: sampled
+          )
         else
           nil
         end

data/script/create_trace

@@ -38,3 +38,8 @@ outer_span.finish
 
 puts "Finishing..."
 sleep 3
+
+tracer1.stop
+tracer2.stop
+
+puts "Finished"

data/zipkin.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'zipkin'
-  spec.version       = '0.2.0'
+  spec.version       = '0.3.0'
   spec.authors       = ['SaleMove TechMovers']
   spec.email         = ['techmovers@salemove.com']
 
@@ -24,7 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
 
   spec.add_dependency 'opentracing', '~> 0.3'
-  spec.add_dependency 'faraday'
-  spec.add_dependency 'faraday_middleware'
-  spec.add_dependency 'sucker_punch', '~> 2.0'
+  spec.add_dependency 'json'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zipkin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - SaleMove TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,34 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sucker_punch
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 description: ''
 email:
 - techmovers@salemove.com
@@ -126,6 +98,7 @@ files:
 - bin/setup
 - lib/zipkin.rb
 - lib/zipkin/carrier.rb
+- lib/zipkin/collector.rb
 - lib/zipkin/endpoint.rb
 - lib/zipkin/json_client.rb
 - lib/zipkin/span.rb
@@ -154,7 +127,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 Zipkin in Ruby