action_subscriber 5.1.3.pre2-java → 5.1.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a8825a5aee9ef249779a75bbddaf90debf489a6afe2aea23af9638a5582e34cf
-  data.tar.gz: f488f680b5711d9cc2fee713dffc971d719b743fa4329031f73a57ea3547e46a
+SHA1:
+  metadata.gz: 5c9565dc4ed32426228f63f4a74e7478ce4dcb74
+  data.tar.gz: eb2893c3584ba9d237328939064299405b94819e
 SHA512:
-  metadata.gz: dd3f1a35eddd3e826bd3887ef97fe9bd0380f32d994bd44db5e3c2bdf1f20af76391abbdadc785edd4135ee6258301707940028770b53fba1bd1e3086364c3f8
-  data.tar.gz: 771048790b48ef9fcdb7caa17724e28a7ae72a79d97ed65920c85883094a4f368dad21f1dbf9d371d2e709f31c53f5ebf961df8c11eae973a9e642f282025820
+  metadata.gz: 2b2c463f546b4fa3a979c0d6c55c4982f8abd7c4c253bcf9263fa62c96662ef5f8abe36483bd239bc4e7bee8314977261804ef5db9b93ac04f6c00d013960f4f
+  data.tar.gz: 3de474dfb99966ace57d9d9797860b627c8d4f85055c46b2f709c4b546843260c82d451fa824e9bb80b7d56243d073bc9fd2d4b8795baca00e0377a1edb1ef57

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
  - 2.3.3
  - jruby-9.0.5.0
  - jruby-9.1.7.0
+ - jruby-9.1.12.0
  - jruby-head
 services:
  - rabbitmq

data/lib/action_subscriber/middleware/env.rb

@@ -3,6 +3,10 @@ require "securerandom"
 module ActionSubscriber
   module Middleware
     class Env
+      ACK_INSTRUMENT_KEY = "message_acked.action_subscriber".freeze
+      NACK_INSTRUMENT_KEY = "message_nacked.action_subscriber".freeze
+      REJECT_INSTRUMENT_KEY = "message_rejected.action_subscriber".freeze
+
       attr_accessor :payload
 
       attr_reader :action,
@@ -38,7 +42,7 @@ module ActionSubscriber
         @has_been_nacked = false
         @has_been_rejected = false
         @headers = properties.fetch(:headers, {})
-        @message_id = properties.fetch(:message_id, ::SecureRandom.hex(3))
+        @message_id = properties[:message_id].presence || ::SecureRandom.hex(3)
         @queue = properties.fetch(:queue)
         @routing_key = properties.fetch(:routing_key)
         @subscriber = subscriber
@@ -50,7 +54,9 @@ module ActionSubscriber
         return true if @has_been_acked
         acknowledge_multiple_messages = false
         @has_been_acked = true
-        @channel.ack(@delivery_tag, acknowledge_multiple_messages)
+        instrument_for(ACK_INSTRUMENT_KEY) do
+          @channel.ack(@delivery_tag, acknowledge_multiple_messages)
+        end
         true
       end
 
@@ -65,7 +71,9 @@ module ActionSubscriber
         nack_multiple_messages = false
         requeue_message = true
         @has_been_nacked = true
-        @channel.nack(@delivery_tag, nack_multiple_messages, requeue_message)
+        instrument_for(NACK_INSTRUMENT_KEY) do
+          @channel.nack(@delivery_tag, nack_multiple_messages, requeue_message)
+        end
         true
       end
 
@@ -74,7 +82,9 @@ module ActionSubscriber
         return true if @has_been_rejected
         requeue_message = true
         @has_been_rejected = true
-        @channel.reject(@delivery_tag, requeue_message)
+        instrument_for(REJECT_INSTRUMENT_KEY) do
+          @channel.reject(@delivery_tag, requeue_message)
+        end
         true
       end
 
@@ -107,6 +117,12 @@ module ActionSubscriber
         @has_been_acked || @has_been_nacked || @has_been_rejected
       end
 
+      def instrument_for(instrumentation_key)
+        ::ActiveSupport::Notifications.instrument(instrumentation_key, :subscriber => subscriber.to_s, :routing_key => routing_key, :queue => queue) do
+          yield
+        end
+      end
+
       def uses_acknowledgements?
         @uses_acknowledgements
       end

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "5.1.3.pre2"
+  VERSION = "5.1.4"
 end

data/spec/lib/action_subscriber/middleware/env_spec.rb

@@ -30,6 +30,33 @@ describe ActionSubscriber::Middleware::Env do
       expect(channel).to receive(:ack).with(properties[:delivery_tag], false)
       subject.acknowledge
     end
+
+    it "instruments an acknowedgement" do
+      expect(channel).to receive(:ack).with(properties[:delivery_tag], false)
+      duration = nil
+      work = lambda { |_name, start, finish, _id, _payload|  duration = finish - start }
+      with_instrumentation_subscription("message_acked.action_subscriber", work) do
+        subject.acknowledge
+      end
+      expect(duration).to_not be_nil
+    end
+  end
+
+  describe "#nack" do
+    it "sends a nack to rabbitmq" do
+      expect(channel).to receive(:nack).with(properties[:delivery_tag], false, true)
+      subject.nack
+    end
+
+    it "instruments a nack" do
+      expect(channel).to receive(:nack).with(properties[:delivery_tag], false, true)
+      duration = nil
+      work = lambda { |_name, start, finish, _id, _payload|  duration = finish - start }
+      with_instrumentation_subscription("message_nacked.action_subscriber", work) do |c|
+        subject.nack
+      end
+      expect(duration).to_not be_nil
+    end
   end
 
   describe "#reject" do
@@ -37,6 +64,16 @@ describe ActionSubscriber::Middleware::Env do
       expect(channel).to receive(:reject).with(properties[:delivery_tag], true)
       subject.reject
     end
+
+    it "instruments a rejection" do
+      expect(channel).to receive(:reject).with(properties[:delivery_tag], true)
+      duration = nil
+      work = lambda { |_name, start, finish, _id, _payload|  duration = finish - start }
+      with_instrumentation_subscription("message_rejected.action_subscriber", work) do
+        subject.reject
+      end
+      expect(duration).to_not be_nil
+    end
   end
 
   describe "#to_hash" do

data/spec/spec_helper.rb

@@ -51,3 +51,15 @@ def verify_expectation_within(number_of_seconds, check_every = 0.02)
     end
   end
 end
+
+# This helper method allows us to verify a subscription is cleaned up after every test.
+# Its arguments are the instrumentation key and a proc that contains the work to be
+# performed for each notification.
+def with_instrumentation_subscription(instrumentation_key, work)
+  subscription = ::ActiveSupport::Notifications.subscribe(instrumentation_key) do |name, start, finish, id, payload|
+    work.call(name, start, finish, id, payload)
+  end
+  yield
+ensure
+  ::ActiveSupport::Notifications.unsubscribe(subscription)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 5.1.3.pre2
+  version: 5.1.4
 platform: java
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2019-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -292,12 +292,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14.1
 signing_key:
 specification_version: 4
 summary: ActionSubscriber is a DSL that allows a rails app to consume messages from