nsa 0.2.1 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 86ff263225b7d77e1d87aa520fb425173097effd
-  data.tar.gz: 723e3953685a9dc67a6c09dbda7e137e5f52a2cc
+SHA256:
+  metadata.gz: abd4fef5644f8f3c61e7aa019dcdc65a9b7b5438aef6627d6217547c8aba5ba6
+  data.tar.gz: b5c9663cdb0e4bcb08dc187bee2be634c44634da57b3e4b5492844c668480cc5
 SHA512:
-  metadata.gz: 41a998fa86f209cc2803eee4f233e7c94ff39e465cf920f37c09cb76245091fa04d15b6023f592e64a9a4abc7c30de322c06dbc603753473a30f1d41ba4f7330
-  data.tar.gz: 99da7edeabcc395718a7470c24003ed7dd79fef900f138b6ae88b9938b0aa49b8e30ba06be83e9fe46db8a3f5c4b2147eff6fc8d6d2fd9c5cedf341e776f4812
+  metadata.gz: 6c862df27c47bf19b7ca6441eb227cb4d66e81109bf07735730f55dbafa2fee389a69784331894496fce61f8df4fb6404e138496e862d65055fdd652b24a201a
+  data.tar.gz: 5d589a6580a300497f2bd98e1bc7733363e1a6cad6420834360d5b578f82617a4330bedc410a83dfae5067a40b4a1c6bff2c23ca9a0f322016a9fc37117aee37

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+/tags
+*.gem

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 2.2.2
-before_install: gem install bundler -v 1.10.6
+  - 2.6.5
+before_install: gem install bundler -v 2.1.4

data/lib/nsa/statsd/publisher.rb

@@ -23,18 +23,20 @@ module NSA
       end
 
       def statsd_time(key, sample_rate = nil, &block)
-        __statsd_publish(:time, key, nil, sample_rate, &block)
+        start = Time.now
+        result = block.call unless block.nil?
+        statsd_timing(key, ((Time.now - start) * 1000).round, sample_rate)
+        result
       end
 
       def statsd_timing(key, value = 1, sample_rate = nil)
         __statsd_publish(:timing, key, value, sample_rate)
       end
 
-      def __statsd_publish(stat_type, key, value = nil, sample_rate = nil, &block)
+      def __statsd_publish(stat_type, key, value = nil, sample_rate = nil)
         payload = { :key => key }
         payload.merge!({ :value => value }) if value
         payload.merge!({ :sample_rate => sample_rate }) if sample_rate
-        payload.merge!({ :block => block }) if block_given?
 
         ::ActiveSupport::Notifications.instrument("#{stat_type}.statsd", payload)
       end

data/lib/nsa/statsd/subscriber.rb

@@ -21,14 +21,13 @@ module NSA
 
         key_name = payload[:key]
         sample_rate = payload.fetch(:sample_rate, 1)
-        block = payload[:block]
 
         case action.to_sym
         when :count, :timing, :set, :gauge then
           value = payload.fetch(:value) { 1 }
-          backend.__send__(action, key_name, value, sample_rate, &block)
-        when :increment, :decrement, :time then
-          backend.__send__(action, key_name, sample_rate, &block)
+          backend.__send__(action, key_name, value, sample_rate)
+        when :increment, :decrement then
+          backend.__send__(action, key_name, sample_rate)
         end
       end
 

data/lib/nsa/version.rb

@@ -1,3 +1,3 @@
 module NSA
-  VERSION = "0.2.1"
+  VERSION = "0.2.8"
 end

data/nsa.gemspec

@@ -9,23 +9,24 @@ Gem::Specification.new do |spec|
   spec.authors       = ["BJ Neilsen"]
   spec.email         = ["bj.neilsen@gmail.com"]
 
-  spec.summary       = %q{Listen to your Rails ActiveSupport::Notifications and deliver to a Statsd backend.}
-  spec.description   = spec.summary
-  spec.homepage      = "https://www.github.com/localshred/nsa"
+  spec.summary       = %q{Publish Rails application metrics to statsd}
+  spec.description   = %q{Listen to your Rails ActiveSupport::Notifications and deliver to a Statsd compatible backend}
+  spec.homepage      = "https://github.com/localshred/nsa"
+  spec.licenses      = ["MIT"]
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", "~> 4.2.0"
-  spec.add_dependency "concurrent-ruby", "~> 1.0.0"
-  spec.add_dependency "sidekiq", ">= 3.5.0"
-  spec.add_dependency "statsd-ruby", "~> 1.2.0"
+  spec.add_dependency "activesupport", "< 7", ">= 4.2"
+  spec.add_dependency "concurrent-ruby", "~> 1.0", ">= 1.0.2"
+  spec.add_dependency "sidekiq", ">= 3.5"
+  spec.add_dependency "statsd-ruby", "~> 1.4", ">= 1.4.0"
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "mocha"
-  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "mocha", "~> 1.11"
+  spec.add_development_dependency "byebug", "~> 10"
 end

metadata

@@ -1,85 +1,103 @@
 --- !ruby/object:Gem::Specification
 name: nsa
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.8
 platform: ruby
 authors:
 - BJ Neilsen
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: statsd-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -98,46 +116,46 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
 description: Listen to your Rails ActiveSupport::Notifications and deliver to a Statsd
-  backend.
+  compatible backend
 email:
 - bj.neilsen@gmail.com
 executables: []
@@ -164,11 +182,11 @@ files:
 - lib/nsa/statsd/subscriber.rb
 - lib/nsa/version.rb
 - nsa.gemspec
-- tags
-homepage: https://www.github.com/localshred/nsa
-licenses: []
+homepage: https://github.com/localshred/nsa
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -183,10 +201,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
-summary: Listen to your Rails ActiveSupport::Notifications and deliver to a Statsd
-  backend.
+summary: Publish Rails application metrics to statsd
 test_files: []

data/tags

@@ -1,63 +0,0 @@
-!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
-!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
-!_TAG_PROGRAM_AUTHOR	Darren Hiebert	/dhiebert@users.sourceforge.net/
-!_TAG_PROGRAM_NAME	Exuberant Ctags	//
-!_TAG_PROGRAM_URL	http://ctags.sourceforge.net	/official site/
-!_TAG_PROGRAM_VERSION	5.8	//
-ActionController	lib/nsa/collectors/action_controller.rb	/^    module ActionController$/;"	m	class:NSA.Collectors
-ActiveRecord	lib/nsa/collectors/active_record.rb	/^    module ActiveRecord$/;"	m	class:NSA.Collectors
-ActiveSupportCache	lib/nsa/collectors/active_support_cache.rb	/^    module ActiveSupportCache$/;"	m	class:NSA.Collectors
-CACHE_TYPES	lib/nsa/collectors/active_support_cache.rb	/^      CACHE_TYPES = {$/;"	c
-COLLECTOR_TYPES	lib/nsa/statsd_informant.rb	/^    COLLECTOR_TYPES = ::Hash.new(::NSA::Collectors::Null).merge({$/;"	c
-Collectors	lib/nsa/collectors/action_controller.rb	/^  module Collectors$/;"	m	class:NSA
-Collectors	lib/nsa/collectors/active_record.rb	/^  module Collectors$/;"	m	class:NSA
-Collectors	lib/nsa/collectors/active_support_cache.rb	/^  module Collectors$/;"	m	class:NSA
-Collectors	lib/nsa/collectors/null.rb	/^  module Collectors$/;"	m	class:NSA
-Collectors	lib/nsa/collectors/sidekiq.rb	/^  module Collectors$/;"	m	class:NSA
-EMPTY_MATCH_RESULT	lib/nsa/collectors/active_record.rb	/^      EMPTY_MATCH_RESULT = []$/;"	c
-EXPECTED_RESPONDABLE_METHODS	lib/nsa/statsd/subscriber.rb	/^      EXPECTED_RESPONDABLE_METHODS = %i( count decrement gauge increment set time timing ).freeze$/;"	c
-LoadError	lib/nsa/collectors/sidekiq.rb	/^      rescue ::LoadError => exception$/;"	c
-MATCHERS	lib/nsa/collectors/active_record.rb	/^      MATCHERS = [$/;"	c
-NSA	lib/nsa.rb	/^module NSA$/;"	m
-NSA	lib/nsa/collectors/action_controller.rb	/^module NSA$/;"	m
-NSA	lib/nsa/collectors/active_record.rb	/^module NSA$/;"	m
-NSA	lib/nsa/collectors/active_support_cache.rb	/^module NSA$/;"	m
-NSA	lib/nsa/collectors/null.rb	/^module NSA$/;"	m
-NSA	lib/nsa/collectors/sidekiq.rb	/^module NSA$/;"	m
-NSA	lib/nsa/statsd/publisher.rb	/^module NSA$/;"	m
-NSA	lib/nsa/statsd/subscriber.rb	/^module NSA$/;"	m
-NSA	lib/nsa/statsd_informant.rb	/^module NSA$/;"	m
-NSA	lib/nsa/version.rb	/^module NSA$/;"	m
-Null	lib/nsa/collectors/null.rb	/^    module Null$/;"	m	class:NSA.Collectors
-Publisher	lib/nsa/statsd/publisher.rb	/^    module Publisher$/;"	m	class:NSA.Statsd
-Sidekiq	lib/nsa/collectors/sidekiq.rb	/^    class Sidekiq$/;"	c	class:NSA.Collectors
-Statsd	lib/nsa/statsd/publisher.rb	/^  module Statsd$/;"	m	class:NSA
-Statsd	lib/nsa/statsd/subscriber.rb	/^  module Statsd$/;"	m	class:NSA
-StatsdInformant	lib/nsa/statsd_informant.rb	/^  module StatsdInformant$/;"	m	class:NSA
-Subscriber	lib/nsa/statsd/subscriber.rb	/^    module Subscriber$/;"	m	class:NSA.Statsd
-VERSION	lib/nsa/version.rb	/^  VERSION = "0.1.4"$/;"	c
-__send_event_to_statsd	lib/nsa/statsd/subscriber.rb	/^      def __send_event_to_statsd(backend, name, start, finish, id, payload)$/;"	f	class:NSA.Statsd.Subscriber
-__statsd_publish	lib/nsa/statsd/publisher.rb	/^      def __statsd_publish(stat_type, key, value = nil, sample_rate = nil, &block)$/;"	f	class:NSA.Statsd.Publisher
-backend_valid?	lib/nsa/statsd/subscriber.rb	/^      def backend_valid?(backend)$/;"	f	class:NSA.Statsd.Subscriber
-call	lib/nsa/collectors/sidekiq.rb	/^      def call(worker, message, queue_name)$/;"	f	class:NSA.Collectors.Sidekiq
-collect	lib/nsa/collectors/action_controller.rb	/^      def self.collect(key_prefix)$/;"	F	class:NSA.Collectors.ActionController
-collect	lib/nsa/collectors/active_record.rb	/^      def self.collect(key_prefix)$/;"	F	class:NSA.Collectors.ActiveRecord
-collect	lib/nsa/collectors/active_support_cache.rb	/^      def self.collect(key_prefix)$/;"	F	class:NSA.Collectors.ActiveSupportCache
-collect	lib/nsa/collectors/null.rb	/^      def self.collect(*_)$/;"	F	class:NSA.Collectors.Null
-collect	lib/nsa/collectors/sidekiq.rb	/^      def self.collect(key_prefix)$/;"	F	class:NSA.Collectors.Sidekiq
-collect	lib/nsa/statsd_informant.rb	/^    def self.collect(collector, key_prefix)$/;"	F	class:NSA.StatsdInformant
-inform_statsd	lib/nsa.rb	/^  def self.inform_statsd(backend)$/;"	F	class:NSA
-initialize	lib/nsa/collectors/sidekiq.rb	/^      def initialize(key_prefix)$/;"	f	class:NSA.Collectors.Sidekiq
-listen	lib/nsa/statsd_informant.rb	/^    def self.listen(backend)$/;"	F	class:NSA.StatsdInformant
-make_key	lib/nsa/collectors/sidekiq.rb	/^      def make_key(*args)$/;"	f	class:NSA.Collectors.Sidekiq
-match_query	lib/nsa/collectors/active_record.rb	/^      def self.match_query(sql)$/;"	F	class:NSA.Collectors
-publish_overall_stats	lib/nsa/collectors/sidekiq.rb	/^      def publish_overall_stats$/;"	f	class:NSA.Collectors.Sidekiq
-publish_queue_size_and_latency	lib/nsa/collectors/sidekiq.rb	/^      def publish_queue_size_and_latency(queue_name)$/;"	f	class:NSA.Collectors.Sidekiq
-statsd_count	lib/nsa/statsd/publisher.rb	/^      def statsd_count(key, value = 1, sample_rate = nil)$/;"	f	class:NSA.Statsd.Publisher
-statsd_decrement	lib/nsa/statsd/publisher.rb	/^      def statsd_decrement(key, sample_rate = nil)$/;"	f	class:NSA.Statsd.Publisher
-statsd_gauge	lib/nsa/statsd/publisher.rb	/^      def statsd_gauge(key, value = 1, sample_rate = nil)$/;"	f	class:NSA.Statsd.Publisher
-statsd_increment	lib/nsa/statsd/publisher.rb	/^      def statsd_increment(key, sample_rate = nil)$/;"	f	class:NSA.Statsd.Publisher
-statsd_set	lib/nsa/statsd/publisher.rb	/^      def statsd_set(key, value = 1, sample_rate = nil)$/;"	f	class:NSA.Statsd.Publisher
-statsd_subscribe	lib/nsa/statsd/subscriber.rb	/^      def statsd_subscribe(backend)$/;"	f	class:NSA.Statsd.Subscriber
-statsd_time	lib/nsa/statsd/publisher.rb	/^      def statsd_time(key, sample_rate = nil, &block)$/;"	f	class:NSA.Statsd.Publisher
-statsd_timing	lib/nsa/statsd/publisher.rb	/^      def statsd_timing(key, value = 1, sample_rate = nil)$/;"	f	class:NSA.Statsd.Publisher