active_publisher 0.4.0.pre1-java → 1.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cff30c85dcba8fd2b09a4b1585c6da7a4031313
-  data.tar.gz: 7bc9d9c9a575a483e9ed3356d16a4c3ab5d6ed34
+  metadata.gz: 5af4607ffab1b83be825a72a22726e442ed1c3d5
+  data.tar.gz: 91c291269e965f25e2123177e6271f2fb7b13d92
 SHA512:
-  metadata.gz: a9f9242c0321f8dda565ce2921bc0eb7116a95a22faba6064a026b9737c471f09699912c9aa3696f964731f53ab029277c2b0e02c831ffe2798564ce8b0e0c6a
-  data.tar.gz: 488fb34a4eebf61759233601cb6cd8c0646362b720d0c126a958f2147e9ad00a4aca451f0784703d727604def1f29f0e923a7829f63cf1df07058fc9f955e5f2
+  metadata.gz: b5664f916eb23f5bd21aa9eaa58473639ace753bddf92d3f1441e5ae8e41dc98b6307bb442baa827ef2e1dc38e009133177c123151623ece55faf8e7c70d01a6
+  data.tar.gz: 7fa2ba9612e32d4c2cc021ba419000ed4fe3c7ef9c43ffca73fbd78430b960a530b2f6c7d4dd38e52fee8a6f4a0ba9b5c1cbe909235d644c6973e83c1ec99cfe

data/.travis.yml

@@ -1,9 +1,7 @@
 language: ruby
 rvm:
- - 2.2
  - 2.3
  - 2.4
- - jruby-1.7
  - jruby-9.1.12.0
 services:
  - rabbitmq

data/active_publisher.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
     spec.add_dependency 'bunny', '~> 2.1'
   end
 
+  spec.add_dependency 'activesupport', '>= 3.2'
   spec.add_dependency 'multi_op_queue', '>= 0.1.2'
 
   spec.add_development_dependency "bundler"

data/lib/active_publisher/async/in_memory_adapter/async_queue.rb

@@ -2,30 +2,48 @@ module ActivePublisher
   module Async
     module InMemoryAdapter
       class AsyncQueue
+        # These strategies are used to determine what to do with messages when the queue is full.
+        # :raise - Raise an error and drop the message.
+        # :drop - Silently drop the message.
+        # :wait - Wait for space in the queue to become available.
+        BACK_PRESSURE_STRATEGIES = [:raise, :drop, :wait].freeze
+
         include ::ActivePublisher::Logging
 
-        attr_accessor :drop_messages_when_queue_full,
+        attr_accessor :back_pressure_strategy,
           :max_queue_size,
           :supervisor_interval
 
         attr_reader :consumer, :queue, :supervisor
 
-        def initialize(drop_messages_when_queue_full, max_queue_size, supervisor_interval)
-          @drop_messages_when_queue_full = drop_messages_when_queue_full
+        def initialize(back_pressure_strategy, max_queue_size, supervisor_interval)
+          self.back_pressure_strategy = back_pressure_strategy
           @max_queue_size = max_queue_size
           @supervisor_interval = supervisor_interval
           @queue = ::MultiOpQueue::Queue.new
           create_and_supervise_consumer!
         end
 
-        def push(message)
-          # default of 1_000_000 messages
-          if queue.size > max_queue_size
-            # Drop messages if the queue is full and we were configured to do so
-            return if drop_messages_when_queue_full
+        def back_pressure_strategy=(strategy)
+          fail ::ArgumentError, "Invalid back pressure strategy: #{strategy}" unless BACK_PRESSURE_STRATEGIES.include?(strategy)
+          @back_pressure_strategy = strategy
+        end
 
-            # By default we will raise an error to push the responsibility onto the caller
-            fail ::ActivePublisher::Async::InMemoryAdapter::UnableToPersistMessageError, "Queue is full, messages will be dropped."
+        def push(message)
+          if queue.size >= max_queue_size
+            case back_pressure_strategy
+            when :drop
+              ::ActiveSupport::Notifications.instrument "message_dropped.active_publisher"
+              return
+            when :raise
+              ::ActiveSupport::Notifications.instrument "message_dropped.active_publisher"
+              fail ::ActivePublisher::Async::InMemoryAdapter::UnableToPersistMessageError, "Queue is full, messages will be dropped."
+            when :wait
+              ::ActiveSupport::Notifications.instrument "wait_for_async_queue.active_publisher" do
+                # This is a really crappy way to wait
+                sleep 0.01 until queue.size < max_queue_size
+              end
+            end
           end
 
           queue.push(message)
@@ -49,6 +67,9 @@ module ActivePublisher
                 @consumer = ::ActivePublisher::Async::InMemoryAdapter::ConsumerThread.new(queue)
               end
 
+              # Notify the current queue size.
+              ::ActiveSupport::Notifications.instrument "async_queue_size.active_publisher", queue.size
+
               # Pause before checking the consumer again.
               sleep supervisor_interval
             end

data/lib/active_publisher/async/in_memory_adapter/consumer_thread.rb

@@ -86,25 +86,27 @@ module ActivePublisher
         end
 
         def publish_all(channel, exchange_name, messages)
-          exchange = channel.topic(exchange_name)
-          potentially_retry = []
-          loop do
-            break if messages.empty?
-            message = messages.shift
-
-            fail ActivePublisher::UnknownMessageClassError, "bulk publish messages must be ActivePublisher::Message" unless message.is_a?(ActivePublisher::Message)
-            fail ActivePublisher::ExchangeMismatchError, "bulk publish messages must match publish_all exchange_name" if message.exchange_name != exchange_name
-
-            begin
-              options = ::ActivePublisher.publishing_options(message.route, message.options || {})
-              exchange.publish(message.payload, options)
-              potentially_retry << message
-            rescue
-              messages << message
-              raise
+          ::ActiveSupport::Notifications.instrument "message_published.active_publisher", :message_count => messages.size do
+            exchange = channel.topic(exchange_name)
+            potentially_retry = []
+            loop do
+              break if messages.empty?
+              message = messages.shift
+
+              fail ActivePublisher::UnknownMessageClassError, "bulk publish messages must be ActivePublisher::Message" unless message.is_a?(ActivePublisher::Message)
+              fail ActivePublisher::ExchangeMismatchError, "bulk publish messages must match publish_all exchange_name" if message.exchange_name != exchange_name
+
+              begin
+                options = ::ActivePublisher.publishing_options(message.route, message.options || {})
+                exchange.publish(message.payload, options)
+                potentially_retry << message
+              rescue
+                messages << message
+                raise
+              end
             end
+            wait_for_confirms(channel, messages, potentially_retry)
           end
-          wait_for_confirms(channel, messages, potentially_retry)
         end
 
         def wait_for_confirms(channel, messages, potentially_retry)

data/lib/active_publisher/async/in_memory_adapter.rb

@@ -18,11 +18,11 @@ module ActivePublisher
 
         attr_reader :async_queue
 
-        def initialize(drop_messages_when_queue_full = false, max_queue_size = 1_000_000, supervisor_interval = 0.2)
+        def initialize(back_pressure_strategy = :raise, max_queue_size = 100_000, supervisor_interval = 0.2)
           logger.info "Starting in-memory publisher adapter"
 
           @async_queue = ::ActivePublisher::Async::InMemoryAdapter::AsyncQueue.new(
-            drop_messages_when_queue_full,
+            back_pressure_strategy,
             max_queue_size,
             supervisor_interval
           )

data/lib/active_publisher/version.rb

@@ -1,3 +1,3 @@
 module ActivePublisher
-  VERSION = "0.4.0.pre1"
+  VERSION = "1.0.0"
 end

data/lib/active_publisher.rb

@@ -3,6 +3,7 @@ if ::RUBY_PLATFORM == "java"
 else
   require "bunny"
 end
+require "active_support"
 require "thread"
 
 require "active_publisher/logging"
@@ -34,7 +35,9 @@ module ActivePublisher
   # @param [Hash] options hash to set message parameters (e.g. headers)
   def self.publish(route, payload, exchange_name, options = {})
     with_exchange(exchange_name) do |exchange|
-      exchange.publish(payload, publishing_options(route, options))
+      ::ActiveSupport::Notifications.instrument "message_published.active_publisher" do
+        exchange.publish(payload, publishing_options(route, options))
+      end
     end
   end
 
@@ -48,7 +51,9 @@ module ActivePublisher
         fail ActivePublisher::ExchangeMismatchError, "bulk publish messages must match publish_all exchange_name" if message.exchange_name != exchange_name
 
         begin
-          exchange.publish(message.payload, publishing_options(message.route, message.options || {}))
+          ::ActiveSupport::Notifications.instrument "message_published.active_publisher" do
+            exchange.publish(message.payload, publishing_options(message.route, message.options || {}))
+          end
         rescue
           messages << message
           raise

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_publisher
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre1
+  version: 1.0.0
 platform: java
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -28,6 +28,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  name: activesupport
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -145,13 +159,14 @@ 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.12
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
-summary: Aims to make publishing work across MRI and jRuby painless and add some nice features like automatially publishing lifecycle events for ActiveRecord models.
+summary: Aims to make publishing work across MRI and jRuby painless and add some nice
+  features like automatially publishing lifecycle events for ActiveRecord models.
 test_files: []