request-tracer 0.5.4 → 0.5.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MmQ3Njk0NWZiZjljMzgzZGFjMWIyY2I5MzBjZThjYjQ0OTAwODFkOQ==
-  data.tar.gz: !binary |-
-    ZTZkMWQwMmJhNzM1MjAxNTIyMmE4ZTgzYTA1NDZlMjM5M2UwNzMwZQ==
+SHA1:
+  metadata.gz: 568a644828b5c78478ff4347ca98b3203953db48
+  data.tar.gz: 9c78a78c1c80c8b212755c6f8588d02f26380a54
 SHA512:
-  metadata.gz: !binary |-
-    MTNmZGZiNWZmNDE3OTJlN2U5N2ZlNThlOTZmMjdiMjZhYmUwZTg3NTZhZjY0
-    YzU3ZGM4OGY2NWI3MWIzMTZlNWZhZGY3M2U1ZTRmMTBlZjQ3YzhjNjk1NDFm
-    NDhkNmU4MTM2NGIxZTZjZTMzMGYxMTUwYTQzYmRmMTMxZTFkYjM=
-  data.tar.gz: !binary |-
-    MDRkZTViNGE3ZTAyOGY2YTRjNjA3NzY3MGUwYTA3Nzg0MTM5YTJhZTAwYjZk
-    NmUxNTBmMzNiOTZjMDIzY2Y3YTQ1ZmJhOWI5OTA3OGRlYWFmNDM3NDUyMjQ4
-    MThkNWI0NTQ2OGE5OTlhZDAzZDVkYzIzM2IwMThmYjg4NjE5NTU=
+  metadata.gz: 0f15bd2e483b3497bf50e2662523cf72f63f1d32dd26ea044d56395200d33f1551ab0b28638ef51f2b5dd83cfc1f7afce25257378fb39a533ff4c3e64b6d0539
+  data.tar.gz: 996680db6d55f1c75c3c02ec2f3655ba9774645b8e934f96edb3df84ed813dfe7092bcdd3c4e0ffb12945c1f0ed0fc32046b9676dd307dd297db7d67abbea2ec

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper.rb

data/lib/request_tracer/integration/rack_handler.rb

@@ -9,7 +9,7 @@ module RequestTracer
         @tracer = config[:tracer] || Trace
       end
       def call(env)
-        @tracer.record(extract_fields_from_headers(env)) do
+        @tracer.push(extract_fields_from_headers(env)) do
           @app.call(env)
         end
       end

data/lib/request_tracer/integration/rest_client_handler.rb

@@ -8,7 +8,9 @@ module RequestTracer
       def activate
         require 'rest-client'
         RestClient.add_before_execution_proc do |req, params|
-          extract_headers_from_fields(Trace.latest).each {|h, v| req[h] = v}
+          Trace.record do |trace|
+            extract_headers_from_fields(trace).each {|h, v| req[h] = v}
+          end
         end
       end
     end

data/lib/request_tracer/trace.rb

@@ -48,6 +48,9 @@ module RequestTracer
         span_id = Trace.generate_id
         self.new(h["trace_id"] || span_id, h["span_id"], Trace.generate_id)
       end
+      def self.create(h)
+        self.new(h["trace_id"], h["parent_span_id"], h["span_id"])
+      end
       def initialize(trace_id, parent_id, span_id)
         @trace_id = SpanId.from_value(trace_id)
         @parent_id = parent_id && SpanId.from_value(parent_id)
@@ -73,21 +76,31 @@ module RequestTracer
       end
     end
 
+    def create
+      span_id = generate_id
+      trace_id = TraceId.new(span_id, nil, span_id)
+      stack.push(trace_id)
+      trace_id
+    end
 
     def latest
-      if stack.empty?
-        span_id = generate_id
-        trace_id = TraceId.new(span_id, nil, span_id)
-        stack.push(trace_id)
-      end
       stack.last
     end
 
+    def latest_or_create
+      latest || create
+    end
+
     def push(trace_info)
-      stack.push(TraceId.spawn_from_hash(trace_info))
+      trace = if trace_info.include?("trace_id") && trace_info.include?("span_id")
+        TraceId.create(trace_info)
+      else
+        TraceId.spawn_from_hash(trace_info)
+      end
+      stack.push(trace)
       if block_given?
         begin
-          yield
+          yield trace
         ensure
           pop
         end
@@ -98,6 +111,10 @@ module RequestTracer
       stack.pop
     end
 
+    def clear
+      stack.clear
+    end
+
     def unwind
       if block_given?
         begin
@@ -109,12 +126,8 @@ module RequestTracer
       end
     end
 
-    def record(annotation, &block)
-      tracer.record(latest, annotation, &block)
-    end
-
-    def set_rpc_name(name)
-      tracer.set_rpc_name(latest, name) unless stack.empty?
+    def record(annotation = nil, &block)
+      tracer.record(latest.next_id, annotation, &block)
     end
 
     def tracer=(tracer)
@@ -150,9 +163,9 @@ module RequestTracer
   end
 
   class DefaultTracer
-    def record(*args, &block)
-      Trace.push(args[1].to_h) do
-        block.call
+    def record(latest_trace, annotation, &block)
+      Trace.push(latest_trace.to_h) do |trace|
+        block.call(trace)
       end
     end
   end

data/lib/request_tracer/version.rb

@@ -1,3 +1,3 @@
 module RequestTracer
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

data/lib/request_tracer.rb

@@ -14,4 +14,11 @@ module RequestTracer
       integration_module.activate
     end
   end
+  def self.annotate(annotation)
+
+  end
+
+  def self.record(annotation=nil, &blk)
+
+  end
 end

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

@@ -22,7 +22,7 @@ describe RequestTracer::Integration::RackHandler do
   end
 
   before do
-    allow(tracer).to receive(:record) {|&block| block.call }
+    allow(tracer).to receive(:push) {|&block| block.call }
   end
 
   shared_examples_for 'traces the request' do
@@ -33,7 +33,7 @@ describe RequestTracer::Integration::RackHandler do
       get '/'
       expect(last_response.status).to eq(200)
       expect(last_response.body).to eq('hello')
-      expect(tracer).to have_received(:record).with(extract_fields_from_headers(trace_headers))
+      expect(tracer).to have_received(:push).with(extract_fields_from_headers(trace_headers))
     end
   end
 

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

@@ -1,23 +1,26 @@
-require 'rack/mock'
 require 'rack/test'
-require 'spec_helper'
 require 'request_tracer/trace'
-require 'logger'
+require 'request_tracer/integration/rest_client_handler'
 require 'webmock/rspec'
-require 'rest-client'
 
 describe RequestTracer::Integration::RestClientHandler do
   include RequestTracer::Integration::Base
   RequestTracer.integrate_with(:rest_client)
   before(:all) { WebMock.disable_net_connect! }
+
+  let(:trace) { RequestTracer::Trace.create }
+
   before do
+    RequestTracer::Trace.clear
     stub_request(:any, "www.example.com")
+    allow(RequestTracer::Trace).to receive(:record).and_yield(trace)
+    RestClient.get("www.example.com")
   end
 
-  let(:trace) { RequestTracer::Trace.latest }
-  it "should have set the headers on the outgoing call" do
-    RestClient.get("www.example.com")
-    expect(WebMock).to have_requested(:get, "www.example.com").
-      with(headers: extract_headers_from_fields(trace.to_h))
+  context "when no previous trace existed on the stack" do
+    it "sets fresh trace headers on the outgoing call" do
+      expect(WebMock).to have_requested(:get, "www.example.com").
+        with(headers: extract_headers_from_fields(trace.to_h))
+    end
   end
 end

metadata

@@ -1,181 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: request-tracer
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Martin Mauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.6'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: geminabox
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This is a tracer that hooks into several components to allow tracing
@@ -186,9 +186,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gemrelease
-- .gitignore
-- .travis.yml
+- ".gemrelease"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE
@@ -217,17 +218,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Traces requests using the Zipkin HTTP headers