request-tracer 0.6.2 → 0.6.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTVmNmM4MmI3MjA5OWNlN2E5MzExYWQzMDZiMThlZWMxMWMyYTk3MA==
+    OGUzZDkyNTRiMGFjNTkzZGVhMzE3ZmRmMWFjNGRmZjM4NmQyNDBhZg==
   data.tar.gz: !binary |-
-    NmIwNjM3MzZhYTg1NjdhMTEzOGNlYTdjZWE5MzFlY2VhYjU2N2M4Nw==
+    MzgyYTEzMmM0OTYyYTk1NDViYzc2NzExYWUyYTBlYmYwYWE5ZDM4NA==
 SHA512:
   metadata.gz: !binary |-
-    MmFiY2MwNTg4NzhlZDI0NjFkNzI3MGM1MWI2OTY5NzQzNzM4NTJiZGI1ZDJi
-    OTVjZDhlMDcwZTJjYTNiOTc0MTkxZGQ2MTdjZWRmYTQ3NmFlN2MxNDAxY2Mw
-    OWJlMDdmYWYyYmRmMDI0ZDM2M2E4ZTkyNWE3MzE0YmMwZmFiODg=
+    ZWY4MDVjMjRlZTI2MTMxMTYzOTA5ZTdhYTM1ZTIzZmZlYzBiMTlhNWYyMzMz
+    YTc0Zjg2MzFhZjQwNjE1MzYyYjM3MTc2M2I2Mjg3YjRjOTkzN2Y2MWQ0MmZl
+    NjMxZDY1OGQ1MzcyMTZhNmYzNjNhMzcxOThiYmRhY2QwNDgwNDA=
   data.tar.gz: !binary |-
-    YjkxOTY0NmVkNGQzOWMxOGI0ZjBhMjAxNzc4MDFjMmU0YTZlNDlkMzYwZDNj
-    ZWM1NjIyMzJiNThkNjIzNmUyYTU4ZTAwOWY3MjMwMzYzOGIwMGFlODU3YTMy
-    ZjZmZjMzYzA2NTgyN2YwNzE5NzQ1NTRlN2M3ZjM5NjZjMmU5YWQ=
+    ZDZkZmI5NTcxNjNiYzI2ZjcwY2I2Y2VlZGE1ZjI2YTZhNDJmNTkxM2UxZTU4
+    MmZlZDAxYzRlNDMyNmQ5ZTc2NzAzMDY4ODcxNDE3MDVhMmQxZWFkYjRjZTBk
+    MGRjNjhhNjYxNmEyNjgwMDEzYjczZjIyNWFhZTliMzQ4NDQ2OTU=

data/lib/request_tracer/integration/base.rb

@@ -1,9 +1,10 @@
 module RequestTracer
   module Integration
     module Base
+      HEADER_REGEX = /HTTP_X_B3_(.*)/
       def extract_fields_from_headers(header_hash)
         header_hash.map do |k,v|
-          special_header = /HTTP_X_B3_(.*)/.match(k)
+          special_header = HEADER_REGEX.match(k)
           special_header && [B3_REQUIRED_FIELDS_FROM_SHORT_NAMES[special_header[1].downcase], v]
         end.compact.to_h
       end

data/lib/request_tracer/integration/sidekiq_handler.rb

@@ -25,8 +25,10 @@ module RequestTracer
 
       class ClientMiddleware
         def call(worker_class, job, queue, redis_pool)
-          job['trace'] = Trace.latest.to_h
-          yield
+          Trace.record do |trace|
+            job['trace'] = trace.to_h
+            yield
+          end
         end
       end
     end

data/lib/request_tracer/trace.rb

@@ -94,7 +94,7 @@ module RequestTracer
     end
 
     def push(trace_info)
-      (yield ; return) unless trace_info
+      return yield unless trace_info
       trace = if trace_info.include?("trace_id") && trace_info.include?("span_id")
         TraceId.create(trace_info)
       else

data/lib/request_tracer/version.rb

@@ -1,3 +1,3 @@
 module RequestTracer
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/spec/lib/request_tracer/integration/sidekiq_handler_spec.rb

@@ -71,10 +71,14 @@ describe RequestTracer::Integration::SidekiqHandler do
       end
     end
     context "when there is an existing trace" do
-      before { RequestTracer::Trace.push trace.to_h }
-      it "passes the trace from the main process to the worker and records the worker" do
+      let(:subtrace) { trace.next_id }
+      before do
+        RequestTracer::Trace.push trace.to_h
+        allow(RequestTracer::Trace).to receive(:record).and_yield(subtrace)
+      end
+      it "passes a sub-trace from the main process to the worker and pushes this on the trace stack in the worker" do
         TraceableJob.perform_async('foo')
-        expect(result_checker.traces).to eq([trace.to_h])
+        expect(result_checker.traces).to eq([subtrace.to_h])
       end
     end
     it "calls the job with the originally given parameters" do
@@ -91,7 +95,7 @@ describe RequestTracer::Integration::SidekiqHandler do
     end
     context "when there is an existing trace" do
       before { RequestTracer::Trace.push trace.to_h }
-      it "passes the trace from the main process to the worker and records the worker" do
+      it "does not pass the trace from the main process to the worker and records the worker" do
         TraceableJob.perform_async('foo')
         expect(result_checker.traces).to eq([{}])
       end
@@ -106,7 +110,7 @@ describe RequestTracer::Integration::SidekiqHandler do
     end
     context "when there is an existing trace" do
       before { RequestTracer::Trace.push trace.to_h }
-      it "passes the trace from the main process to the worker and records the worker" do
+      it "does not pass the trace from the main process to the worker and records the worker" do
         TraceableJob.perform_async('foo')
         expect(result_checker.traces).to eq([{}])
       end

data/spec/lib/request_tracer/trace_spec.rb

@@ -51,9 +51,17 @@ describe RequestTracer::Trace do
     def push(&blk)
       described_class.push(previous_trace_hash, &blk)
     end
+    shared_examples "returning the block value" do
+      let(:block_value) { rand(1000) }
+      it 'returns the value from the block' do
+        returned = push {|t| block_value }
+        expect(returned).to eq(block_value)
+      end
+    end
     context 'when trace_hash contains a previous trace' do
       let(:previous_trace) { described_class.create}
       let(:previous_trace_hash) { previous_trace.to_h }
+      it_behaves_like "returning the block value"
       it 'keeps the span_id' do
         push do |t|
           expect(t.span_id).to eq(previous_trace.span_id)
@@ -72,6 +80,7 @@ describe RequestTracer::Trace do
     end
     context 'when no previous trace exists' do
       let(:previous_trace_hash) { {} }
+      it_behaves_like "returning the block value"
       it 'creates a new span_id' do
         push do |t|
           expect(t.span_id.i64.to_s).to match /[0-9a-z]+/i
@@ -88,5 +97,9 @@ describe RequestTracer::Trace do
         end
       end
     end
+    context 'when called with nil' do
+      let(:previous_trace_hash) { nil }
+      it_behaves_like "returning the block value"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: request-tracer
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Martin Mauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client