hanami-events-cloud_pubsub 2.6.1 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 530af9e648eba440c829ae5dbd74a0995be1e6ed06b30739af8c4262d4b0392e
-  data.tar.gz: d40192fb6bb29dfd2cdee06d7fab0e0af4c1a1098bdc4c0feaf0f1261bd5ff2b
+  metadata.gz: 85ed69df79fc8f4c3197cc63e2c70afcc30532dd1dd61de56b40d816ef512633
+  data.tar.gz: 8b2cd963546a1a051fbb1fdef5c34d69c81c93b928ad7465481fe2e26e0b6415
 SHA512:
-  metadata.gz: 04a959376690935554a47591152c1b52403f966a506cf120e7fe48d3df6f0f1b677af558c1d063a3cee36cc2f4eace9897a1980a7e6b86daeeb8dccfdc3da334
-  data.tar.gz: d13ad1e5f311a89005a3a9b7be6ab50558c42ae11e5f27a60328a4b56dbfdc707250b785008bced841bfce7cf1b09c8277a047ea2bceba1075bf78604b5298fd
+  metadata.gz: 3c10ba39f6b0c6f3f4ffbd7a5073019821e0ecbdfd30be769a9aee8c61a0d38ff0c9dc3ad5047f1c7ca9aaabf57320a3e9e2d1a682524329eb5991d68bc801fb
+  data.tar.gz: 9e5855ad6001ab46e7acafb27929f2d3ffdc0f341e31a22752f0e9bb9e0a9e1d24669fc73288481ee17e174018acadb78048f957e5c8a2028d1eb9963dcb7c6e

data/.tool-versions

@@ -1 +1 @@
-ruby 2.6.6
+ruby 2.7.1

data/.travis.yml

@@ -9,8 +9,9 @@ env:
     - CC_TEST_REPORTER_ID=7ab310950456b913cd7e947f6671e3e9c16822f33bd8c572dadcc14593fe4fb5
     - COVERAGE=true
 rvm:
-  - 2.4
+  - 2.5
   - 2.6
+  - 2.7
 before_install:
   - gem install bundler -v 1.16.1
 before_script:

data/Gemfile.lock

@@ -8,9 +8,9 @@ GIT
 PATH
   remote: .
   specs:
-    hanami-events-cloud_pubsub (2.6.1)
+    hanami-events-cloud_pubsub (2.8.1)
       dry-configurable (>= 0.8)
-      google-cloud-pubsub (>= 0.38.1, < 1.4)
+      google-cloud-pubsub (>= 0.38.1, < 1.7)
       hanami-cli (~> 0.2)
       hanami-events (~> 0.2.0)
       rack
@@ -40,10 +40,10 @@ GEM
     google-cloud-core (1.5.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.3.1)
+    google-cloud-env (1.3.2)
       faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.0.0)
-    google-cloud-pubsub (1.3.1)
+    google-cloud-errors (1.0.1)
+    google-cloud-pubsub (1.6.1)
       concurrent-ruby (~> 1.1)
       google-cloud-core (~> 1.2)
       google-gax (~> 1.8)
@@ -56,7 +56,7 @@ GEM
       googleauth (~> 0.9)
       grpc (~> 1.24)
       rly (~> 0.2.3)
-    google-protobuf (3.11.4)
+    google-protobuf (3.12.2)
     googleapis-common-protos (1.3.10)
       google-protobuf (~> 3.11)
       googleapis-common-protos-types (>= 1.0.5, < 2.0)
@@ -97,7 +97,7 @@ GEM
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.4)
+    public_suffix (4.0.5)
     rack (2.2.2)
     rainbow (3.0.0)
     rake (13.0.1)

data/hanami-events-cloud_pubsub.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'dry-configurable', '>= 0.8'
-  spec.add_dependency 'google-cloud-pubsub', '>= 0.38.1', '< 1.4'
+  spec.add_dependency 'google-cloud-pubsub', '>= 0.38.1', '< 1.7'
   spec.add_dependency 'hanami-cli', '~> 0.2'
   spec.add_dependency 'hanami-events', '~> 0.2.0'
   spec.add_dependency 'rack'

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

@@ -28,13 +28,13 @@ module Hanami
         #
         # @param event [Symbol, String] the event name
         # @param payload [Hash] the event data
-        def broadcast(name, payload)
+        def broadcast(name, payload, **message_opts)
           event_name = namespaced(name)
           topic = topic_for event_name
           payload = serializer.serialize(payload)
           attributes = { id: SecureRandom.uuid, event_name: event_name }
 
-          topic.publish_async(payload, attributes) do |result|
+          topic.publish_async(payload, **attributes, **message_opts) do |result|
             logger.info "Published event #{result.inspect}"
           end
         end
@@ -97,11 +97,15 @@ module Hanami
 
         # rubocop:disable Metrics/LineLength
         def topic_for(name)
-          @topic_registry[name.to_s] ||= begin
-            @pubsub.find_topic(name) ||
-              (Hanami::Events::CloudPubsub.auto_create_topics && @pubsub.create_topic(name)) ||
-              raise(::Hanami::Events::CloudPubsub::Errors::TopicNotFoundError, "no topic named: #{name}")
-          end
+          return @topic_registry[name.to_s] if @topic_registry[name.to_s]
+
+          topic = @pubsub.find_topic(name) ||
+                  (Hanami::Events::CloudPubsub.auto_create_topics && @pubsub.create_topic(name)) ||
+                  raise(::Hanami::Events::CloudPubsub::Errors::TopicNotFoundError, "no topic named: #{name}")
+
+          topic.enable_message_ordering!
+
+          @topic_registry[name.to_s] = topic
         end
         # rubocop:enable Metrics/LineLength
 

data/lib/hanami/events/cloud_pubsub.rb

@@ -6,7 +6,6 @@ require 'hanami/events/cloud_pubsub/version'
 require 'hanami/events/cloud_pubsub/middleware/stack'
 require 'hanami/events/cloud_pubsub/middleware/logging'
 require 'hanami/events/cloud_pubsub/middleware/auto_retry'
-require 'hanami/events/cloud_pubsub/middleware/prometheus'
 require 'hanami/events/cloud_pubsub/runner'
 require 'hanami/events/cloud_pubsub/errors'
 require 'google/cloud/pubsub'
@@ -63,7 +62,13 @@ module Hanami
         Middleware::AutoRetry.new
       )
 
-      middleware_stack.prepend(Middleware::Prometheus) if defined?(::Prometheus::Client)
+      begin
+        require 'prometheus/client'
+        require 'hanami/events/cloud_pubsub/middleware/prometheus'
+        middleware_stack.prepend(Middleware::Prometheus.new)
+      rescue LoadError
+        # ok
+      end
 
       setting :middleware, middleware_stack
 

data/lib/hanami/events/cloud_pubsub/middleware/auto_retry.rb

@@ -14,10 +14,10 @@ module Hanami
             @max_attempts = max_attempts
           end
 
-          def call(message, args = {})
+          def call(message, **args)
             succeeded = false
             failed = false
-            yield(args)
+            yield(**args)
             succeeded = true
           rescue StandardError => e
             failed = true

data/lib/hanami/events/cloud_pubsub/middleware/logging.rb

@@ -10,9 +10,9 @@ module Hanami
             @logger = logger
           end
 
-          def call(msg, opts = {})
+          def call(msg, **opts)
             started_at = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-            yield(opts)
+            yield(**opts)
           ensure
             ended_at = Process.clock_gettime(Process::CLOCK_MONOTONIC)
             seconds = ended_at - started_at

data/lib/hanami/events/cloud_pubsub/middleware/prometheus.rb

@@ -12,18 +12,28 @@ module Hanami
             require 'prometheus/client'
             prometheus = ::Prometheus::Client.registry
             @events_counter = prometheus.counter(
-              :pubsub_events,
+              :received_pubsub_events,
               docstring: 'A counter of received pubsub events',
-              labels: %i[event_name subscription]
+              labels: %i[event_name subscription status]
             )
           end
 
-          def call(msg, opts = {})
-            yield(opts)
+          def call(msg, **opts)
+            status = :running
+
+            begin
+              ret = yield(**opts)
+              status = :succeeded
+              ret
+            rescue StandardError
+              status = :failed
+              raise
+            end
           ensure
             sub = msg.subscription.subscriber.subscription_name
             event_name = msg.attributes['event_name']
-            events_counter.increment(labels: { event_name: event_name, subscription: sub })
+            labels = { event_name: event_name, subscription: sub, status: status }
+            events_counter.increment(labels: labels)
           end
         end
       end

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

@@ -3,7 +3,7 @@
 module Hanami
   module Events
     module CloudPubsub
-      VERSION = '2.6.1'
+      VERSION = '2.8.1'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-events-cloud_pubsub
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.8.1
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2020-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -33,7 +33,7 @@ dependencies:
         version: 0.38.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: 0.38.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Google Cloud Pub/Sub adapter for the hanami-events gem