mercury_amqp 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 662c5f22f87cb89428b04038aeb9f9ae5b7c0413
-  data.tar.gz: 53b76308c6e8374a29ce82391071c1f8a74f90b0
+  metadata.gz: 141403cd276f3d2a983a66c0cafbf79ba4c2326f
+  data.tar.gz: 89911705adad454ece304fce82bfb8135d172d4e
 SHA512:
-  metadata.gz: bfa5327510adb7c6a64e7e6dccd714d954efd977e1547db8ec89fb884276f1a1ccfe0b36f5ee1b81b253643154762f7e763e804379b1f26b5cbfd08fc9336dfe
-  data.tar.gz: cbe6ec96f716a9034cfb13d89d666ef65b80a01e6a3a062e3a846f591ff98ef565099a46387b1999cb6c9dafb53b2082426bd82681d71ecdff24cdafb1c04134
+  metadata.gz: ce0b2c4e559f687a749d9484634c88e85f777aa52fa21dbd69519e91e0c1537e388c9927a14ab9cef14f906e8480bc614a5003b6f45ce159ddb9dae80c3d544f
+  data.tar.gz: 1e2be3340a8bfa0ee9db21adccbad1997532f357472d71da08af205020d100d090ca10dd2765549fd715132fd2b34785314ac46517a069315a0b2a5381eef041

data/README.md

@@ -105,15 +105,6 @@ arbitrary encoding. The receiving client receives the exact same
 string as the message content (assuming the serialized message fails to
 parse as JSON).
 
-### Logatron integration
-
-Mercury depends on the
-[`logatron`][logatron] gem and propagates
-logatron's request ID (`Logatron.msg_id`) through the AMQP header
-`X-Ascent-Log-Id`. This enables a log aggregation service to find the
-logs associated with a particular incoming request, even though the
-log entries may be scattered across various services.
-
 ### Thread safety
 
 Mercury is not threadsafe. All calls to a particular instance must be made from the
@@ -423,7 +414,6 @@ is being intentionally ignored.
 
 [amqp]: https://github.com/ruby-amqp/amqp
 [em]: https://github.com/eventmachine/eventmachine
-[logatron]: https://github.com/indigobio/logatron
 [em_defer]: http://www.rubydoc.info/github/eventmachine/eventmachine/EventMachine.defer
 [fiber_defer]: https://github.com/indigobio/abstractivator/blob/master/lib/abstractivator/fiber_defer.rb
-[default_exchange]: https://www.rabbitmq.com/tutorials/amqp-concepts.html
+[default_exchange]: https://www.rabbitmq.com/tutorials/amqp-concepts.html

data/lib/mercury/mercury.rb

@@ -1,8 +1,9 @@
 require 'amqp'
 require 'securerandom'
+require 'logger'
 require 'mercury/wire_serializer'
 require 'mercury/received_message'
-require 'logatron/logatron'
+require 'active_support/core_ext/enumerable'
 
 class Mercury
   ORIGINAL_TAG_HEADER = 'Original-Tag'.freeze
@@ -10,7 +11,7 @@ class Mercury
 
   attr_reader :amqp, :channel, :logger
 
-  def self.open(logger: Logatron, **kws, &k)
+  def self.open(logger: Logger.new(STDOUT), **kws, &k)
     new(logger: logger, **kws, &k)
     nil
   end
@@ -94,7 +95,7 @@ class Mercury
   private :publish_internal
 
   def self.publish_opts(tag, headers)
-    { routing_key: tag, persistent: true, headers: Logatron.http_headers.merge(headers) }
+    { routing_key: tag, persistent: true, headers: headers }
   end
 
   def start_listener(source_name, handler, tag_filter: nil, &k)
@@ -159,8 +160,6 @@ class Mercury
 
   private
 
-  LOGATRAON_MSG_ID_HEADER = 'X-Ascent-Log-Id'.freeze
-
   # In AMQP, queue consumers ack requests after handling them. Unacked messages
   # are automatically returned to the queue, guaranteeing they are eventually handled.
   # Services often ack one request while publishing related messages. Ideally, these
@@ -214,9 +213,7 @@ class Mercury
   end
 
   def make_received_message(payload, metadata, work_queue_name: nil)
-    msg = ReceivedMessage.new(read(payload), metadata, self, work_queue_name: work_queue_name)
-    Logatron.msg_id = msg.headers[LOGATRAON_MSG_ID_HEADER]
-    msg
+    ReceivedMessage.new(read(payload), metadata, self, work_queue_name: work_queue_name)
   end
 
   def existence_check(k, &check)

data/lib/mercury/sync.rb

@@ -4,14 +4,14 @@ require 'bunny'
 class Mercury
   class Sync
     class << self
-      def publish(source_name, msg, tag: '', amqp_opts: {}, wait_for_publisher_confirms: true)
+      def publish(source_name, msg, tag: '', headers: {}, amqp_opts: {}, wait_for_publisher_confirms: true)
         conn = Bunny.new(amqp_opts)
         conn.start
         ch = conn.create_channel
 
         ch.confirm_select if wait_for_publisher_confirms # see http://rubybunny.info/articles/extensions.html and Mercury#enable_publisher_confirms
         ex = ch.topic(source_name, Mercury.source_opts)
-        ex.publish(WireSerializer.new.write(msg), **Mercury.publish_opts(tag, {}))
+        ex.publish(WireSerializer.new.write(msg), **Mercury.publish_opts(tag, headers))
         if wait_for_publisher_confirms
           ch.wait_for_confirms or raise 'failed to confirm publication'
         end

data/mercury_amqp.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'mercury_amqp'
-  spec.version       = '0.7.0'
+  spec.version       = '0.8.0'
   spec.authors       = ['Peter Winton']
   spec.email         = ['wintonpc@gmail.com']
   spec.summary       = 'AMQP-backed messaging layer'
@@ -29,6 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'amqp', '~> 1.5'
   spec.add_runtime_dependency 'bunny', '~> 2.1'
   spec.add_runtime_dependency 'binding_of_caller', '~> 0.7'
-  spec.add_runtime_dependency 'logatron', '~> 0'
   spec.add_runtime_dependency 'activesupport', '> 4.0', '< 6.0'
 end

data/spec/lib/mercury/cps_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 require 'mercury/cps'
 
-Cps = Mercury::Cps
-
 describe Cps do
   include Cps::Methods
 

data/spec/lib/mercury/mercury_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'mercury'
+require 'logger'
 
 describe Mercury do
   include MercuryFakeSpec
@@ -10,6 +11,7 @@ describe Mercury do
   let!(:sent) { { 'a' => 1 } }
   let!(:source) { 'test-exchange' }
   let!(:queue) { 'test-queue' }
+  let(:nullogger) { Logger.new(File::NULL) }
 
   describe '::open' do
     it 'opens a mercury instance' do
@@ -82,7 +84,7 @@ describe Mercury do
   # end
 
   it 'raises an error when the connection breaks' do
-    expect { em { Mercury.open { done } } }.to raise_error /Lost connection/
+    expect { em { Mercury.open(logger: nullogger) { done } } }.to raise_error /Lost connection/
     expect(EM.reactor_running?).to be false   # make sure we're not triggering EventMachine cleanup bugs
   end
 
@@ -137,7 +139,7 @@ describe Mercury do
   it 'raises when an error occurs' do
     expect do
       em do
-        Mercury.open do |m|
+        Mercury.open(logger: nullogger) do |m|
           ch = m.instance_variable_get(:@channel)
           ch.acknowledge(42) # force a channel error
         end
@@ -153,7 +155,7 @@ describe Mercury do
             @mercury.publish(source, 'hello')
           end
         end
-        Mercury.open(on_error: handler) do |m|
+        Mercury.open(logger: nullogger, on_error: handler) do |m|
           @mercury = m
           ch = m.instance_variable_get(:@channel)
           ch.acknowledge(42) # force a channel error

data/spec/lib/mercury/monadic_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 require 'mercury'
 require 'mercury/monadic'
 require 'securerandom'
-require 'logatron/logatron'
 
 describe Mercury::Monadic do
   include Cps::Methods
@@ -164,24 +163,6 @@ describe Mercury::Monadic do
     end
   end
 
-  it 'propagates logatron headers' do
-    real_msg_id = SecureRandom.uuid
-    Logatron.msg_id = real_msg_id
-    test_with_mercury do |m|
-      msgs = []
-      seql do
-        and_then { m.start_listener(source, &msgs.method(:push)) }
-        and_lift { EM.next_tick { Logatron.msg_id = 'fake_msg_id' } } # we want this to happen right after publishing but before getting the response
-        and_then { m.publish(source, msg) }
-        and_then { wait_until { msgs.size == 1 } }
-        and_lift do
-          expect(msgs[0].headers['X-Ascent-Log-Id']).to eql real_msg_id
-          expect(Logatron.msg_id).to eql real_msg_id
-        end
-      end
-    end
-  end
-
   itt 'uses AMQP-style tag filters' do
     test_with_mercury do |m|
       successes = []

data/spec/lib/mercury/sync_spec.rb

@@ -6,6 +6,7 @@ describe Mercury::Sync do
   include Cps::Methods
   let!(:source) { 'test-exchange1' }
   let!(:queue) { 'test-queue1' }
+  let(:headers) { {'X-Domain-Variable' => 'value'} }
   describe '::publish' do
     %w{with without}.each do |w|
       it "publishes synchronously (#{w} publisher confirms)" do
@@ -15,11 +16,12 @@ describe Mercury::Sync do
         test_with_mercury(wait_for_publisher_confirms: use_publisher_confirms) do |m|
           seql do
             and_then { m.start_listener(source, received.method(:push)) }
-            and_lift { Mercury::Sync.publish(source, sent) }
+            and_lift { Mercury::Sync.publish(source, sent, headers: headers) }
             and_then { wait_until { received.any? } }
             and_lift do
               expect(received.size).to eql 1
               expect(received[0].content).to eql sent
+              expect(received[0].headers).to eql headers
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mercury_amqp
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Peter Winton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,20 +164,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: logatron
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement