freddy 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 248f2df9adc1e449f26a74a81b3522927490b3a1
-  data.tar.gz: f5d96272b3eb00f34381d2e1f33544e021f8a96f
+  metadata.gz: 7d6c4c4eb4caea3505466f173e26a0126546f318
+  data.tar.gz: 3693ce26d92ec11e83affdb10174be3b70459978
 SHA512:
-  metadata.gz: aef0dfd64fdc75715a966ee45c3c8dcad85e67d6f5fc57204d419129ced83b50dec1ca40b452255a22cbc132d5ee9a3c7eae773919bbb02901b2d7e9c386b335
-  data.tar.gz: 6ac1bb9c5e418a79ccda0588a6922c4aab50b44575ab6fde230953c784f138c7533b52ef2b47b6ed339c5f087103a5c8cf9b139637309b6e2bdb8aafb490439d
+  metadata.gz: 10f7e439c2d80225c91242602e7647bd79bf658e04583d2fabfd5497f2ac8c67a180b6312e127bceec771b5fc33fba6bbd056d4c591429408ea5adc5aa87c45d
+  data.tar.gz: 34ffb7ee253e88cc7cfbbcf831d9e7e342dc64eef70ea85300e620fcf20621867339808cb2915164ff653e007e08df8ae63de3092c974553ea91cbe2a078634c

data/Gemfile

@@ -4,6 +4,6 @@ gem 'rspec'
 gem 'pry'
 gem 'codeclimate-test-reporter'
 gem 'hamster', '~> 3.0'
-gem 'logasm-tracer', '0.2.0'
+gem 'logasm-tracer', '0.2.2'
 
 gemspec

data/freddy.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   else
     spec.name          = "freddy"
   end
-  spec.version       = '1.3.0'
+  spec.version       = '1.3.1'
   spec.authors       = ["Salemove TechMovers"]
   spec.email         = ["techmovers@salemove.com"]
   spec.description   = %q{Messaging API}

data/lib/freddy/delivery.rb

@@ -24,7 +24,7 @@ class Freddy
     def build_trace(operation_name, tags: {}, force_follows_from: false)
       carrier = TraceCarrier.new(@metadata)
       parent =
-        if carrier.has_required_fields? && expecting_response? && !force_follows_from
+        if expecting_response? && !force_follows_from
           OpenTracing.global_tracer.extract(OpenTracing::FORMAT_TEXT_MAP, carrier)
         else
           nil

data/lib/freddy/trace_carrier.rb

@@ -22,9 +22,5 @@ class Freddy
           .map {|key, value| [key.sub(/x-trace-/, ''), value]}
       ].each(&block)
     end
-
-    def has_required_fields?
-      self['trace-id'] && self['parent-id'] && self['span-id']
-    end
   end
 end

data/spec/integration/logging_spec.rb

@@ -14,6 +14,7 @@ describe 'Logging with Logasm::Tracer' do
 
     before do
       freddy.respond_to(destination) do |payload, msg_handler|
+        sleep 0.1 # emulate some processing
         msg_handler.success({})
       end
     end
@@ -49,6 +50,7 @@ describe 'Logging with Logasm::Tracer' do
 
     before do
       freddy.respond_to(destination) do |payload, msg_handler|
+        sleep 0.1 # emulate some processing
         msg_handler.success({
           trace_initiator: {},
           current_receiver: freddy.deliver_with_response(destination2, {})
@@ -56,6 +58,7 @@ describe 'Logging with Logasm::Tracer' do
       end
 
       freddy2.respond_to(destination2) do |payload, msg_handler|
+        sleep 0.1 # emulate some processing
         msg_handler.success({})
       end
     end

data/spec/integration/tracing_spec.rb

@@ -8,38 +8,6 @@ describe 'Tracing' do
   before { OpenTracing.global_tracer = tracer }
   after { OpenTracing.global_tracer = nil }
 
-  context 'when receiving an untraced request' do
-    let(:freddy) { Freddy.build(logger, config) }
-    let(:destination) { random_destination }
-
-    before do
-      freddy.respond_to(destination) do |payload, msg_handler|
-        msg_handler.success({
-          trace_id: Freddy.trace.context.trace_id,
-          parent_id: Freddy.trace.context.parent_id,
-          span_id: Freddy.trace.context.span_id
-        })
-      end
-    end
-
-    after { freddy.close }
-
-    it 'has generated trace_id' do
-      response = freddy.deliver_with_response(destination, {})
-      expect(response.fetch(:trace_id)).to_not be_nil
-    end
-
-    it 'has no parent_id' do
-      response = freddy.deliver_with_response(destination, {})
-      expect(response.fetch(:parent_id)).to be_nil
-    end
-
-    it 'has generated span_id' do
-      response = freddy.deliver_with_response(destination, {})
-      expect(response.fetch(:span_id)).to_not be_nil
-    end
-  end
-
   context 'when receiving a traced request' do
     let(:freddy) { Freddy.build(logger, config) }
     let(:freddy2) { Freddy.build(logger, config) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freddy
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Salemove TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler