lhc 6.6.0.zipkin.pre → 6.6.0.zipkin.pre.01

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ec061c1dd54c6c48e6d3053eeaa5cfde466cbf9
-  data.tar.gz: 9b01c8475dd3c7002f4fb7f1a23c1e2eb5711566
+  metadata.gz: 2b6394b6bd8236ce4d4e08466c9cd9e66fea9530
+  data.tar.gz: 7bb72782b609582d68d0dca748cd08f0245cebae
 SHA512:
-  metadata.gz: 3332b1305c96357cb69617ae27945b2a09f1621a5733e96d8366d4d07dbebf35fe428937e1e5ca34567f3a3007ff7ae649302afd946f37b7b77138933ec84637
-  data.tar.gz: bbbebb1d677c39e8f875b25bc494833043cacfa7b15013928153678f10ebf9d0b7dcf0083e12087ba5775c58da98870bd9f8f096970fab65a9057b7ea413c3f4
+  metadata.gz: 1b4b679cc13ea4b2434b43f5f1a4272f42584cad6b09c3b488d3c5ac6af997bd277742a2bcb2271e189247ede1a661745c4127cff286cfe82ce25e7b7b656631
+  data.tar.gz: a03ac4c46ea0ec3eca544d0ee5595cf13ca9188f12d920aef23fd6c41afc7c861efb70f844a477879bb3af4826876a3f6642b6a7f8a51dce9c19b3bd6c0744f9

data/lib/lhc.rb

@@ -112,6 +112,8 @@ module LHC
     'lhc/response'
   autoload :Rollbar,
     'lhc/interceptors/rollbar'
+  autoload :ZipkinDistributedTracing,
+    'lhc/interceptors/zipkin_distributed_tracing'
 
   require 'lhc/railtie' if defined?(Rails)
 end

data/lib/lhc/interceptors/{zipkin.rb → zipkin_distributed_tracing.rb}

@@ -1,10 +1,11 @@
-class LHC::Zipkin < LHC::Interceptor
+class LHC::ZipkinDistributedTracing < LHC::Interceptor
 
   def before_request(request)
     return unless defined?(ZipkinTracer::TraceContainer)
     container = ZipkinTracer::TraceContainer.current
     request.headers['X-B3-TraceId'] = container.trace_id.to_s
     request.headers['X-B3-ParentSpanId'] = container.parent_id.to_s if container.parent_id
+    request.headers['X-B3-SpanId'] = container.span_id.to_s
     request.headers['X-B3-Sampled'] = container.sampled
     request.headers['X-B3-Flags'] = container.flags
   end

data/lib/lhc/version.rb

@@ -1,3 +1,3 @@
 module LHC
-  VERSION ||= "6.6.0.zipkin.pre"
+  VERSION ||= "6.6.0.zipkin.pre.01"
 end

data/spec/interceptors/zipkin/distributed_tracing_spec.rb

@@ -0,0 +1,29 @@
+require 'rails_helper'
+
+describe LHC::ZipkinDistributedTracing do
+  before(:all) do
+    # defined in spec/support/zipkin.rb
+    ::ZipkinTracer::TraceContainer.setup_mock(
+      trace_id: 'trace_id',
+      parent_id: 'parent_id',
+      span_id: 'span_id',
+      sampled: 'sampled',
+      flags: 'flags'
+    )
+  end
+
+  before(:each) do
+    LHC.config.interceptors = [described_class]
+    LHC.config.endpoint(:local, 'http://local.ch')
+    stub_request(:get, 'http://local.ch').to_return(status: 200, body: 'The Website')
+  end
+
+  it 'adds the proper X-B3 headers' do
+    headers = LHC.get(:local).request.headers
+    expect(headers['X-B3-TraceId']).to eq('trace_id')
+    expect(headers['X-B3-ParentSpanId']).to eq('parent_id')
+    expect(headers['X-B3-SpanId']).to eq('span_id')
+    expect(headers['X-B3-Sampled']).to eq('sampled')
+    expect(headers['X-B3-Flags']).to eq('flags')
+  end
+end

data/spec/support/zipkin.rb

@@ -0,0 +1,20 @@
+module ZipkinTracer
+  class TraceContainer
+    attr_reader :trace_id, :parent_id, :span_id, :sampled, :flags
+    class << self
+      attr_accessor :current
+
+      def setup_mock(trace_id:, parent_id:, span_id:, sampled:, flags:)
+        @current = new(trace_id: trace_id, parent_id: parent_id, span_id: span_id, sampled: sampled, flags: flags)
+      end
+    end
+
+    def initialize(trace_id:, parent_id:, span_id:, sampled:, flags:)
+      @trace_id = trace_id
+      @parent_id = parent_id
+      @span_id = span_id
+      @sampled = sampled
+      @flags = flags
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhc
 version: !ruby/object:Gem::Version
-  version: 6.6.0.zipkin.pre
+  version: 6.6.0.zipkin.pre.01
 platform: ruby
 authors:
 - https://github.com/local-ch/lhc/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2017-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -207,7 +207,7 @@ files:
 - lib/lhc/interceptors/monitoring.rb
 - lib/lhc/interceptors/prometheus.rb
 - lib/lhc/interceptors/rollbar.rb
-- lib/lhc/interceptors/zipkin.rb
+- lib/lhc/interceptors/zipkin_distributed_tracing.rb
 - lib/lhc/railtie.rb
 - lib/lhc/request.rb
 - lib/lhc/response.rb
@@ -295,6 +295,7 @@ files:
 - spec/interceptors/response_competition_spec.rb
 - spec/interceptors/return_response_spec.rb
 - spec/interceptors/rollbar/main_spec.rb
+- spec/interceptors/zipkin/distributed_tracing_spec.rb
 - spec/rails_helper.rb
 - spec/request/encoding_spec.rb
 - spec/request/error_handling_spec.rb
@@ -319,6 +320,7 @@ files:
 - spec/support/fixtures/json/localina_content_ad.json
 - spec/support/load_json.rb
 - spec/support/reset_config.rb
+- spec/support/zipkin.rb
 - spec/timeouts/no_signal_spec.rb
 - spec/timeouts/timings_spec.rb
 homepage: https://github.com/local-ch/lhc
@@ -424,6 +426,7 @@ test_files:
 - spec/interceptors/response_competition_spec.rb
 - spec/interceptors/return_response_spec.rb
 - spec/interceptors/rollbar/main_spec.rb
+- spec/interceptors/zipkin/distributed_tracing_spec.rb
 - spec/rails_helper.rb
 - spec/request/encoding_spec.rb
 - spec/request/error_handling_spec.rb
@@ -448,5 +451,6 @@ test_files:
 - spec/support/fixtures/json/localina_content_ad.json
 - spec/support/load_json.rb
 - spec/support/reset_config.rb
+- spec/support/zipkin.rb
 - spec/timeouts/no_signal_spec.rb
 - spec/timeouts/timings_spec.rb