lhc 8.1.0 → 8.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '059dd1e79e371a3df375a6a565b4797c11bf71da'
-  data.tar.gz: b2a5925b099b34812d6cb1aef256290d0cace0e5
+  metadata.gz: b44be8ec6523410f4c54ef36a395e1087030257a
+  data.tar.gz: 27f513d349a857372dba50b22b70bd36b9c5766d
 SHA512:
-  metadata.gz: aff5120baa514889103791b6681e4776bbf8e5055db5c8b126fae5580487f72da833d3a472fd15b8c930807a1500d58e4a1c3c7c7c332ed47b8f9d460d2ac36d
-  data.tar.gz: a9959d2b3c84fd4125fe682eb172d6e06b81c225758931a0b493a7dadfa6a6b0faf4460e6a5ae7424482351a4fc8596312b22d6cabffe74e3de5952d16472303
+  metadata.gz: f37ea9b11ecb0385761daefbe496be873c3a171c7f89ef04ce4e47e547e7cd5ed355905372d1f90dffe8cf24871a229260614a1001354c4b9eb4603a9df5dc1b
+  data.tar.gz: afca207fb2293a769242ad8ee9d80b5b9db4625cbe7ab6962c0128f15b2db0f0fa6141ace620d6d3c4bc1b59f35d16e47b40cb6c90357f071de91142bd2c2986

data/lib/lhc/interceptors/zipkin.rb

@@ -11,13 +11,16 @@ class LHC::Zipkin < LHC::Interceptor
   def before_request
     return unless dependencies?
     ZipkinTracer::TraceContainer.with_trace_id(trace_id) do
+      # add headers even if the current trace_id should not be sampled
       B3_HEADERS.each { |method, header| request.headers[header] = trace_id.send(method).to_s }
+      # only sample the current call if we're instructed to do so
       start_trace! if ::Trace.tracer && trace_id.sampled?
     end
   end
 
   def after_response
-    return unless dependencies?
+    # only sample the current call if we're instructed to do so
+    return unless dependencies? && trace_id.sampled?
     end_trace!
   end
 
@@ -39,6 +42,7 @@ class LHC::Zipkin < LHC::Interceptor
     @trace_id ||= ZipkinTracer::TraceGenerator.new.next_trace_id
   end
 
+  # register a new span with zipkin tracer
   def span
     @span ||= ::Trace.tracer.start_span(trace_id, url.path)
   end

data/lib/lhc/version.rb

@@ -1,3 +1,3 @@
 module LHC
-  VERSION ||= '8.1.0'
+  VERSION ||= '8.1.1'
 end

data/spec/interceptors/zipkin/distributed_tracing_spec.rb

@@ -13,7 +13,7 @@ describe LHC::Zipkin do
         trace_id: 'trace_id',
         parent_id: 'parent_id',
         span_id: 'span_id',
-        sampled: 'sampled',
+        sampled: true,
         flags: 'flags'
       )
     end
@@ -23,7 +23,7 @@ describe LHC::Zipkin do
       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-Sampled']).to eq('true')
       expect(headers['X-B3-Flags']).to eq('flags')
     end
   end
@@ -49,4 +49,60 @@ describe LHC::Zipkin do
       expect(headers['X-B3-Flags']).to be_nil
     end
   end
+
+  describe 'creating new spans' do
+    context 'sampled? is false' do
+      before(:all) do
+        ::ZipkinTracer::TraceContainer.setup_mock(
+          trace_id: 'trace_id',
+          parent_id: 'parent_id',
+          span_id: 'span_id',
+          sampled: false,
+          flags: 'flags'
+        )
+      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('false')
+        expect(headers['X-B3-Flags']).to eq('flags')
+      end
+
+      it 'does not register a new span' do
+        # ensure no span was registered, by checking no call on span
+        expect_any_instance_of(described_class).not_to receive(:span).and_call_original
+        LHC.get(:local)
+      end
+    end
+
+    context 'sampled? is true' do
+      before(:all) do
+        ::ZipkinTracer::TraceContainer.setup_mock(
+          trace_id: 'trace_id',
+          parent_id: 'parent_id',
+          span_id: 'span_id',
+          sampled: true,
+          flags: 'flags'
+        )
+      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('true')
+        expect(headers['X-B3-Flags']).to eq('flags')
+      end
+
+      it 'does register a new span' do
+        # ensure a span was registered, by checking call on span
+        expect_any_instance_of(described_class).to receive(:span).at_least(1).times.and_call_original
+        LHC.get(:local)
+      end
+    end
+  end
 end

data/spec/support/zipkin_mock.rb

@@ -42,7 +42,7 @@ module ZipkinTracer
     end
 
     def sampled
-      'sampled'
+      ZipkinTracer::TraceContainer.current.sampled
     end
 
     def flags
@@ -50,7 +50,7 @@ module ZipkinTracer
     end
 
     def sampled?
-      true
+      ZipkinTracer::TraceContainer.current.sampled
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhc
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 8.1.1
 platform: ruby
 authors:
 - https://github.com/local-ch/lhc/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus