hanami-events-cloud_pubsub 3.1.1 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49a7d1c90e1e14b61aed89764e006780686f58394810ed4f58ae2be580325fed
-  data.tar.gz: 9839accaae0d4057c2b2acdeb8a88f35958343510f05d16edd97fc41c523bfe4
+  metadata.gz: cedb970c9a8160f1d3b1e1c41dd87b5bfb8d35cb29872694af944110f681b7fc
+  data.tar.gz: 277273b17749ba058a545f1caadc3819688964c9fccaaf34a1774b7445f4b86f
 SHA512:
-  metadata.gz: 1fcf93deb007707ebb82693a764cffa7d866056a28c56dd0c74b653ee80a29ca4e9ab71e6e9f35a6c883bfa45c7f87572eff63902ce27139807fc53345c72d65
-  data.tar.gz: 3ea0abe9e5bbab02d93c6ad649c29a7e091abdb22cfae66b50fcbee1735cc044966280664ef69475f47bcf1ac254c1406f8fed855ee38f87939a2baf0c83b51a
+  metadata.gz: 2f76c43c7a07b590e9c9f6b7e8839d5ab37266c4b353099bfc1a872308db646c5a4421a3185c13e20d55a80e7a67242fac975824b29de4f0afee51a6af1e2d6f
+  data.tar.gz: af41acad939eabcf399b7f7936b54a99f173a00da497991929de64ebb00dbd3b0da8f48f917dfc1f8b818227671744631b6d6e260c4706c4a901086d479d1f1f

data/lib/hanami/events/adapter/cloud_pubsub.rb

@@ -54,7 +54,7 @@ module Hanami
         # @param id [String] A unique identifier for the subscriber
         # @param subscriber_opts [String] Additional options for the subscriber
         # @param block [Block] to execute when event is broadcasted
-        def subscribe(name, id:, **subscriber_opts, &block)
+        def subscribe(name, id:, auto_ack: true, **subscriber_opts, &block)
           event_name = namespaced(name)
           namespaced_id = namespaced(id)
 
@@ -64,7 +64,7 @@ module Hanami
           @subscribers << sub
           topic = topic_for event_name
 
-          register_listener(event_name, topic, namespaced_id, subscriber_opts)
+          register_listener(event_name, topic, namespaced_id, auto_ack, subscriber_opts)
         end
 
         def flush_messages
@@ -76,7 +76,7 @@ module Hanami
 
         attr_reader :logger
 
-        def register_listener(event_name, topic, subscriber_id, subscriber_opts)
+        def register_listener(event_name, topic, subscriber_id, auto_ack, subscriber_opts)
           listener = ::Hanami::Events::CloudPubsub::Listener.new(
             subscriber_id: subscriber_id,
             event_name: event_name,
@@ -84,7 +84,8 @@ module Hanami
             logger: logger,
             topic: topic,
             subscriber_opts: subscriber_opts,
-            dead_letter_topic: dead_letter_topic
+            dead_letter_topic: dead_letter_topic,
+            auto_ack: auto_ack
           )
 
           @listeners << listener

data/lib/hanami/events/cloud_pubsub.rb

@@ -7,7 +7,6 @@ require 'hanami/events/cloud_pubsub/middleware/stack'
 require 'hanami/events/cloud_pubsub/middleware/logging'
 require 'hanami/events/cloud_pubsub/runner'
 require 'hanami/events/cloud_pubsub/errors'
-require 'google/cloud/pubsub'
 require 'dry-configurable'
 
 module Hanami
@@ -97,6 +96,7 @@ module Hanami
       end
 
       def self.finalize_settings!
+        require 'google/cloud/pubsub'
         conf_hash = config.pubsub
         conf_hash.each { |key, val| Google::Cloud::Pubsub.configure[key] = val }
       end

data/lib/hanami/events/cloud_pubsub/cli.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require 'hanami/cli'
-require 'hanami/events/cloud_pubsub'
-require 'hanami/events/cloud_pubsub/health_check_server'
 
 module Hanami
   module Events
@@ -55,6 +53,7 @@ module Hanami
             end
 
             def start_server
+              require 'hanami/events/cloud_pubsub/health_check_server'
               server = HealthCheckServer.new(runner, logger)
               on_shutdown = proc { @event_queue << proc { shutdown } }
               server.run_in_background(on_shutdown: on_shutdown)
@@ -77,6 +76,7 @@ module Hanami
             def start_runner
               logger.debug 'Running in emulator mode' if @emulator
               logger.info "Starting worker (pid: #{Process.pid})"
+              GC.compact if GC.respond_to?(:compact)
               runner.start
             end
 
@@ -86,13 +86,14 @@ module Hanami
             end
 
             def build_runner
+              require 'hanami/events/cloud_pubsub'
               Hanami::Components.resolve 'events'
               events = Hanami::Components['events']
               @runner = Runner.new(logger: logger, adapter: events.adapter)
             end
 
             def logger
-              CloudPubsub.logger
+              Hanami::Events::CloudPubsub.logger
             end
 
             def setup_signal_handlers

data/lib/hanami/events/cloud_pubsub/health_check_server.rb

@@ -54,7 +54,6 @@ module Hanami
 
           Rack::Builder.new do |builder|
             builder.use Rack::Deflater
-            require 'pry'
             builder.use Yabeda::Prometheus::Exporter if defined?(Yabeda::Prometheus::Exporter)
 
             builder.run health_endpoint_app

data/lib/hanami/events/cloud_pubsub/integration.rb

@@ -33,11 +33,10 @@ module Hanami
                   conf.cloud_pubsub.each { |blk| blk.call(config) }
                 end
 
-                ::Hanami::Events.initialize(
-                  :cloud_pubsub,
-                  pubsub: Google::Cloud::Pubsub.new,
-                  logger: Hanami::Components['logger']
-                )
+                require 'google/cloud/pubsub'
+
+                opts = { pubsub: Google::Cloud::Pubsub.new, logger: Hanami::Components['logger'] }
+                ::Hanami::Events.initialize(:cloud_pubsub, **opts)
               end
             end
           end

data/lib/hanami/events/cloud_pubsub/listener.rb

@@ -26,6 +26,7 @@ module Hanami
                        subscriber_id:,
                        subscriber_opts: {},
                        middleware: CloudPubsub.config.middleware,
+                       auto_ack: true,
                        dead_letter_topic: nil)
           @topic = topic
           @logger = logger
@@ -35,12 +36,13 @@ module Hanami
           @input_subscriber_opts = subscriber_opts
           @middleware = middleware
           @dead_letter_topic = dead_letter_topic
+          @auto_ack = auto_ack
         end
         # rubocop:enable Metrics/ParameterLists
 
         def register
           subscription = subscription_for(subscriber_id)
-          apply_retry_options(subscription)
+          apply_subscription_options(subscription)
           listener = subscription.listen(**subscriber_options) { |m| handle_message(m) }
           logger.debug("Registered listener for #{subscriber_id} with: #{subscriber_options}")
 
@@ -86,7 +88,7 @@ module Hanami
 
         def run_handler(message)
           middleware.invoke(message) { handler.call(message) }
-          message.ack!
+          message.ack! if @auto_ack
         rescue StandardError => e
           run_error_handlers(e, message.message_id.to_s)
           message.nack! if CloudPubsub.config.auto_retry.enabled
@@ -133,21 +135,38 @@ module Hanami
           }
         end
 
-        def apply_retry_options(sub)
-          retry_policy = build_retry_policy
+        def apply_subscription_options(sub)
+          apply_deadline_options(sub)
+          apply_retry_options(sub)
+          apply_dead_letter_options(sub)
+        rescue StandardError => e
+          run_error_handlers(e, nil)
+        end
+
+        def apply_deadline_options(sub)
+          sub.deadline = subscriber_options[:deadline] if sub.deadline != subscriber_options[:deadline]
+        rescue StandardError => e
+          run_error_handlers(e, nil)
+        end
+
+        def apply_dead_letter_options(sub)
           attempts = CloudPubsub.config.auto_retry.max_attempts
 
-          sub.retry_policy = retry_policy if sub.retry_policy&.to_grpc != retry_policy&.to_grpc
           sub.dead_letter_topic = dead_letter_topic if sub.dead_letter_topic&.name != dead_letter_topic&.name
           sub.dead_letter_max_delivery_attempts = attempts if sub.dead_letter_topic&.name != dead_letter_topic&.name
+        rescue StandardError => e
+          run_error_handlers(e, nil)
+        end
 
-          sub
+        def apply_retry_options(sub)
+          retry_policy = build_retry_policy
+          sub.retry_policy = retry_policy if sub.retry_policy&.to_grpc != retry_policy&.to_grpc
         rescue StandardError => e
           run_error_handlers(e, nil)
         end
 
         def build_retry_policy
-          return unless CloudPubsub.config.auto_retry.enabled
+          return unless Hanami::Events::CloudPubsub.config.auto_retry.enabled
 
           Google::Cloud::PubSub::RetryPolicy.new(
             minimum_backoff: CloudPubsub.config.auto_retry.minimum_backoff,

data/lib/hanami/events/cloud_pubsub/version.rb

@@ -3,7 +3,7 @@
 module Hanami
   module Events
     module CloudPubsub
-      VERSION = '3.1.1'
+      VERSION = '3.2.1'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-events-cloud_pubsub
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.1
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-26 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable