harness-action_subscriber 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '04483ecd6328ff52f81134722162f4fd666ec7009caca930140cee966b22f667'
-  data.tar.gz: 2464d449ec0d22076c8d0ffa245890a23d1c34c894194b23d42d4af8a6a72d01
+  metadata.gz: 29d9a5850e5d8449c06fdfcd62ed49b1bfc09a6c035001a92ddff725c95dc90c
+  data.tar.gz: 8bd9a77bb53af785515f43e953af8b9b92c2932ef51a3e581b0bce81b8d0c1e3
 SHA512:
-  metadata.gz: eda2427b07a8dc80b40325f8b799c6bbe8b19ee95f6d161023666b286ffdfc484a4d1aabe3d0b7ee22db608dd8f43374c1ea104dab84da8f6b71e985071b277f
-  data.tar.gz: 4569346b1aeb5396027003936479c6cdff06a2907f41846d570b833ef8d87af9b78d32e529b63d88dc6b1464552e75392b6004503895ecd232048bb740ea0ea3
+  metadata.gz: b8c19330c8015172e9877cc44fcf77207e0ae30167b0a2722855ec54015a328769bd183fd67c03956ec49d82082887020bc5dcbdbafb2c865f4eb3944012a3c8
+  data.tar.gz: eaad275b309775d6cd75df3f4e39f7827bd54a7bfc107c1438012a1662629a6a3961c05d68edb77f079d486b88f0f2d0957f5f05574d45a55bbc5a28e22188be

data/harness-action_subscriber.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
 
   spec.add_runtime_dependency "activesupport", ">= 3.2"

data/lib/harness/action_subscriber.rb

@@ -3,43 +3,62 @@ require "harness/action_subscriber/version"
 require "harness"
 require "active_support"
 
-::ActiveSupport::Notifications.subscribe "message_acked.action_subscriber" do |*args|
-  event = ::ActiveSupport::Notifications::Event.new(*args)
-  event_name = event.payload[:queue].gsub(".", "-")
-  ::Harness.increment "action_subscriber.messages_acked.#{event_name}"
-  ::Harness.timing "action_subscriber.ack_duration.#{event_name}", event.duration
-end
+module Harness
+  module ActionSubscriber
+    UNBLOCKED_METRIC = ["action_subscriber", ENV["SERVICE_NAME"], "connection", "unblocked"].reject(&:nil?).join(".").freeze
+    REASON_IS_MISSING = "reason_for_blocking_is_missing"
 
-::ActiveSupport::Notifications.subscribe "message_nacked.action_subscriber" do |*args|
-  event = ::ActiveSupport::Notifications::Event.new(*args)
-  event_name = event.payload[:queue].gsub(".", "-")
-  ::Harness.increment "action_subscriber.messages_nacked.#{event_name}"
-  ::Harness.timing "action_subscriber.nack_duration.#{event_name}", event.duration
-end
+    ::ActiveSupport::Notifications.subscribe "connection_blocked.action_subscriber" do |_, _, _, _, params|
+      reason = params.fetch(:reason) || REASON_IS_MISSING
+      blocked_metric = ["action_subscriber", ENV["SERVICE_NAME"], "connection", "blocked", reason.gsub(/\W/, "_")].
+        reject(&:nil?).join(".")
 
-::ActiveSupport::Notifications.subscribe "message_rejected.action_subscriber" do |*args|
-  event = ::ActiveSupport::Notifications::Event.new(*args)
-  event_name = event.payload[:queue].gsub(".", "-")
-  ::Harness.increment "action_subscriber.messages_rejected.#{event_name}"
-  ::Harness.timing "action_subscriber.reject_duration.#{event_name}", event.duration
-end
+      ::Harness.increment blocked_metric
+    end
 
-::ActiveSupport::Notifications.subscribe "popped_event.action_subscriber" do |*args|
-  event = ::ActiveSupport::Notifications::Event.new(*args)
-  event_name = event.payload[:queue].gsub '.', '-'
-  ::Harness.increment "action_subscriber.popped_event.#{event_name}"
-  ::Harness.gauge "action_subscriber.popped_event_bytes.#{event_name}", event.payload[:payload_size]
-end
+    ::ActiveSupport::Notifications.subscribe "connection_unblocked.action_subscriber" do
+      ::Harness.increment UNBLOCKED_METRIC
+    end
 
-::ActiveSupport::Notifications.subscribe "received_event.action_subscriber" do |*args|
-  event = ::ActiveSupport::Notifications::Event.new(*args)
-  event_name = event.payload[:queue].gsub '.', '-'
-  ::Harness.increment "action_subscriber.received_event.#{event_name}"
-  ::Harness.gauge "action_subscriber.received_event_bytes.#{event_name}", event.payload[:payload_size]
-end
+    ::ActiveSupport::Notifications.subscribe "message_acked.action_subscriber" do |*args|
+      event = ::ActiveSupport::Notifications::Event.new(*args)
+      event_name = event.payload[:queue].gsub(".", "-")
+      ::Harness.increment "action_subscriber.messages_acked.#{event_name}"
+      ::Harness.timing "action_subscriber.ack_duration.#{event_name}", event.duration
+    end
+
+    ::ActiveSupport::Notifications.subscribe "message_nacked.action_subscriber" do |*args|
+      event = ::ActiveSupport::Notifications::Event.new(*args)
+      event_name = event.payload[:queue].gsub(".", "-")
+      ::Harness.increment "action_subscriber.messages_nacked.#{event_name}"
+      ::Harness.timing "action_subscriber.nack_duration.#{event_name}", event.duration
+    end
+
+    ::ActiveSupport::Notifications.subscribe "message_rejected.action_subscriber" do |*args|
+      event = ::ActiveSupport::Notifications::Event.new(*args)
+      event_name = event.payload[:queue].gsub(".", "-")
+      ::Harness.increment "action_subscriber.messages_rejected.#{event_name}"
+      ::Harness.timing "action_subscriber.reject_duration.#{event_name}", event.duration
+    end
+
+    ::ActiveSupport::Notifications.subscribe "popped_event.action_subscriber" do |*args|
+      event = ::ActiveSupport::Notifications::Event.new(*args)
+      event_name = event.payload[:queue].gsub '.', '-'
+      ::Harness.increment "action_subscriber.popped_event.#{event_name}"
+      ::Harness.gauge "action_subscriber.popped_event_bytes.#{event_name}", event.payload[:payload_size]
+    end
+
+    ::ActiveSupport::Notifications.subscribe "received_event.action_subscriber" do |*args|
+      event = ::ActiveSupport::Notifications::Event.new(*args)
+      event_name = event.payload[:queue].gsub '.', '-'
+      ::Harness.increment "action_subscriber.received_event.#{event_name}"
+      ::Harness.gauge "action_subscriber.received_event_bytes.#{event_name}", event.payload[:payload_size]
+    end
 
-::ActiveSupport::Notifications.subscribe "process_event.action_subscriber" do |*args|
-  event = ::ActiveSupport::Notifications::Event.new(*args)
-  event_name = event.payload[:queue].gsub '.', '-'
-  ::Harness.timing "action_subscriber.process_event.#{event_name}", event.duration
+    ::ActiveSupport::Notifications.subscribe "process_event.action_subscriber" do |*args|
+      event = ::ActiveSupport::Notifications::Event.new(*args)
+      event_name = event.payload[:queue].gsub '.', '-'
+      ::Harness.timing "action_subscriber.process_event.#{event_name}", event.duration
+    end
+  end
 end

data/lib/harness/action_subscriber/version.rb

@@ -1,5 +1,5 @@
 module Harness
   module ActionSubscriber
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/harness/action_subscriber_spec.rb

@@ -13,6 +13,28 @@ describe ::Harness::ActionSubscriber do
     expect(Harness::ActionSubscriber::VERSION).not_to be nil
   end
 
+  describe "connection_blocked.action_subscriber" do
+    before { ::ENV["SERVICE_NAME"] = "my_app" }
+    after { ::ENV.delete("SERVICE_NAME") }
+
+    it "increments the connection blocked count" do
+      expect(collector).to receive(:increment).with("action_subscriber.my_app.connection.blocked.low_on_memory")
+      ::ActiveSupport::Notifications.instrument("connection_blocked.action_subscriber", :reason => "low on memory")
+    end
+
+    it "uses a default reason when missing" do
+      expect(collector).to receive(:increment).with("action_subscriber.my_app.connection.blocked.reason_for_blocking_is_missing")
+      ::ActiveSupport::Notifications.instrument("connection_blocked.action_subscriber", :reason => nil)
+    end
+  end
+
+  describe "connection_unblocked.action_subscriber" do
+    it "increments the connection unblocked count" do
+      expect(collector).to receive(:increment).with("action_subscriber.connection.unblocked")
+      ::ActiveSupport::Notifications.instrument("connection_unblocked.action_subscriber")
+    end
+  end
+
   describe "message_acked.action_subscriber" do
     it "increments the message_acked counter" do
       expect(collector).to receive(:increment).with("action_subscriber.messages_acked.abacus-amigo-user-created")

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: harness-action_subscriber
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - mmmries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2020-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement