hanami-events-cloud_pubsub 3.0.7 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9761e02377d807f35d3c4e005d4948237bf89204ba7d7dc619d46e91d7bca38
-  data.tar.gz: fade5b3c8657111ab4e485ad5b03bb584b69d4557cd2416d5e0c358bcf5dc3f4
+  metadata.gz: 1b625cc3f94218143ebafd31a854fdefb3e4b3ab5d54aa66385784f6560265c8
+  data.tar.gz: e7eb0b9995c66e2c4610b9eba4913a4ff94e8c89981302b4f736ccc9cdddf6aa
 SHA512:
-  metadata.gz: c89ad6a21c559f77c671b10cd7da95bbd7fbf09a5b0489615e46338677cac4cab129faa2b8e8d69faf6f762cda00d9b0bbf261dd82998634ebc7702e55c4ddb3
-  data.tar.gz: 0c785630df1938f248a4c5fc2f5ad5470ea8f75e872dada244dcc0229bedebbf8214ee98cbe28c5b745ba8037ce8d40ea48bafea028dc2e30329e01e6f7d623c
+  metadata.gz: f3e44b4a055f90493bfafe9cbeb8243ddc2bba0c6eb693f5b29c664f2675546a5415387519fbe9075a110304aa3d8136b8da9b0ce0dddfa793a155fa39aeca98
+  data.tar.gz: e7107a4d84b881d2522b04002f07395783912d83a3653673650b2947a1e500cf47b4d8282adaaf0aabacbcfb3572a6780e828ff994ffcdffe160805dd30272ec

data/Gemfile

@@ -11,7 +11,7 @@ RUBY_MAJOR = RUBY_VERSION[0].to_i
 
 gem 'hanami-events', github: 'hanami/events'
 gem 'pry'
+gem 'request_id', '~> 0.4.3'
 gem 'rubocop'
 gem 'simplecov', require: false
-gem 'request_id', '~> 0.4.3'
 gem 'webrick' if RUBY_MAJOR > 2

data/README.md

@@ -119,12 +119,12 @@ end
 ```
 
 
-# Prometheus Integration
+# Yabeda Prometheus Integration
 
-If you have the `prometheus-client` gem installed, a `/metrics` endpoint will
+If you have the `yabeda-prometheus` gem installed, a `/metrics` endpoint will
 be available on the health check server which can be scraped.
 
-All you need to do to activate this is to make sure to `require 'prometheus/client'`.
+All you need to do to activate this is to make sure to `require 'yabeda/prometheus'`.
 
 # Testing
 

data/hanami-events-cloud_pubsub.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rack'
 
   spec.add_development_dependency 'bundler', '~> 2.1'
-  spec.add_development_dependency 'prometheus-client'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'yabeda-prometheus-mmap'
 end

data/lib/hanami/events/cloud_pubsub.rb

@@ -60,12 +60,13 @@ module Hanami
         Middleware::Logging.new
       )
 
-      begin
-        require 'prometheus/client'
-        require 'hanami/events/cloud_pubsub/middleware/prometheus'
-        middleware_stack.prepend(Middleware::Prometheus.new)
-      rescue LoadError
-        # ok
+      if defined?(Yabeda::Prometheus::Exporter)
+        begin
+          require 'hanami/events/cloud_pubsub/middleware/prometheus'
+          middleware_stack.prepend(Middleware::Prometheus.new)
+        rescue LoadError
+          # ok
+        end
       end
 
       setting :middleware, middleware_stack

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

@@ -6,9 +6,13 @@ module Hanami
       # Errors
       module Errors
         class Error < StandardError; end
+
         class TopicNotFoundError < Error; end
+
         class SubscriptionNotFoundError < Error; end
+
         class SubscriptionTopicNameMismatch < Error; end
+
         class NoSubscriberError < Error; end
       end
     end

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

@@ -54,10 +54,9 @@ module Hanami
 
           Rack::Builder.new do |builder|
             builder.use Rack::Deflater
-            if defined?(::Prometheus::Client)
-              require 'prometheus/middleware/exporter'
-              builder.use ::Prometheus::Middleware::Exporter
-            end
+            require 'pry'
+            builder.use Yabeda::Prometheus::Exporter if defined?(Yabeda::Prometheus::Exporter)
+
             builder.run health_endpoint_app
           end
         end

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

@@ -6,15 +6,11 @@ module Hanami
       module Middleware
         # Middleware used for logging useful information about an event
         class Prometheus
-          attr_reader :events_counter
-
-          def initialize
-            require 'prometheus/client'
-            prometheus = ::Prometheus::Client.registry
-            @events_counter = prometheus.counter(
+          Yabeda.configure do
+            counter(
               :received_pubsub_events,
-              docstring: 'A counter of received pubsub events',
-              labels: %i[event_name subscription status]
+              tags: %i[event_name subscription status],
+              comment: 'A counter of received pubsub events'
             )
           end
 
@@ -22,7 +18,7 @@ module Hanami
             status = :running
 
             begin
-              ret = yield(**opts)
+              ret = yield(**opts) if block_given?
               status = :succeeded
               ret
             rescue StandardError
@@ -30,10 +26,18 @@ module Hanami
               raise
             end
           ensure
+            record_metrics(msg, status)
+          end
+
+          private
+
+          def record_metrics(msg, status)
             sub = msg.subscription.subscriber.subscription_name
             event_name = msg.attributes['event_name']
             labels = { event_name: event_name, subscription: sub, status: status }
-            events_counter.increment(labels: labels)
+            Yabeda.received_pubsub_events.increment(labels, by: 1)
+          rescue StandardError
+            # ok
           end
         end
       end

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

@@ -3,7 +3,7 @@
 module Hanami
   module Events
     module CloudPubsub
-      VERSION = '3.0.7'
+      VERSION = '3.1.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-events-cloud_pubsub
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.1.0
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-05 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -115,47 +115,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: prometheus-client
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: yabeda-prometheus-mmap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: Makes it easy to use Cloud Pub/Sub with Hanami
 email:
 - i.kerseymer@gmail.com
@@ -187,7 +187,6 @@ files:
 - lib/hanami/events/cloud_pubsub.rb
 - lib/hanami/events/cloud_pubsub/cli.rb
 - lib/hanami/events/cloud_pubsub/errors.rb
-- lib/hanami/events/cloud_pubsub/handler.rb
 - lib/hanami/events/cloud_pubsub/health_check_server.rb
 - lib/hanami/events/cloud_pubsub/integration.rb
 - lib/hanami/events/cloud_pubsub/listener.rb