datadog-notifications 0.6.0 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d0e1c30e83693a9e33832f3ed942f453c757f3dee361aea4bbc7172057c0d5c
-  data.tar.gz: 0f566306936e2f0e7bf0a2d70ed4f21825ec709fc3675405d1117acc0de3c634
+  metadata.gz: 22dc145596f1b9ff7ce13aa1d288721b1b91b2b7de2a3ca79eefcc0d9608735b
+  data.tar.gz: 0470ffefc29242921d54223a46459f9324c55cc4d8ccf970deb7989dcc0576d8
 SHA512:
-  metadata.gz: c48e6b3b027fa4f80d610952cd417793b8f0a7a3570343dfea6712d65fd8872f414dc5421c19bdd6c1a8c4d31f756ed4cc6e5b4864f0d455a4a6d3c33bc68644
-  data.tar.gz: b0774629b619d7866cc6fbb5b67f21d268aabc8114d42d2ca9ea3f347fe5a6aa6dad6e35e7c6be71f7fece846f194157c5e85472360b6754d0073477c5805d2b
+  metadata.gz: 3f4692ee83c9af8255074edf39e3957bc98bc0ff514d595f83a52e0c704488088b81c0f51e72c10a40c2ca66f59e9776b5d134fc79cb1f4e70cb7eb4079da2e2
+  data.tar.gz: 75624cd42572dd722293c4432f6b456b1a5ad42e977e5d98cf1932c804d9d95b1316779019ffedab6383fd2d8ee3930771715d22bd73cffad3201236ac7dc2e2

data/.rubocop.yml

@@ -1,8 +1,8 @@
 inherit_from:
-  - https://bitbucket.org/bsm/misc/raw/master/rubocop/default.yml
+  - https://gitlab.com/bsm/misc/raw/master/rubocop/default.yml
 
 AllCops:
-  TargetRubyVersion: "2.3"
+  TargetRubyVersion: "2.5"
 
 Naming/FileName:
   Exclude:

data/.travis.yml

@@ -1,7 +1,8 @@
 cache: bundler
 language: ruby
+before_install:
+  - gem install bundler
 rvm:
+  - 2.7
   - 2.6
   - 2.5
-  - 2.4
-  - 2.3

data/Gemfile.lock

@@ -1,97 +1,109 @@
 PATH
   remote: .
   specs:
-    datadog-notifications (0.6.0)
+    datadog-notifications (0.6.5)
       activesupport
-      dogstatsd-ruby (~> 4.0)
+      dogstatsd-ruby (>= 4.2, < 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
-      arel (>= 9.0)
-    activesupport (5.2.2)
+    activemodel (6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activerecord (6.0.3.1)
+      activemodel (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
+      zeitwerk (~> 2.2, >= 2.2.2)
     ast (2.4.0)
-    axiom-types (0.1.1)
-      descendants_tracker (~> 0.0.4)
-      ice_nine (~> 0.11.0)
-      thread_safe (~> 0.3, >= 0.3.1)
-    builder (3.2.3)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.1.4)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
+    builder (3.2.4)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
-    dogstatsd-ruby (4.0.0)
-    equalizer (0.0.11)
-    grape (1.2.2)
+    dogstatsd-ruby (4.8.1)
+    dry-configurable (0.11.5)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.4, >= 0.4.7)
+      dry-equalizer (~> 0.2)
+    dry-container (0.7.2)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1, >= 0.1.3)
+    dry-core (0.4.9)
+      concurrent-ruby (~> 1.0)
+    dry-equalizer (0.3.0)
+    dry-inflector (0.2.0)
+    dry-logic (1.0.6)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.2)
+      dry-equalizer (~> 0.2)
+    dry-types (1.4.0)
+      concurrent-ruby (~> 1.0)
+      dry-container (~> 0.3)
+      dry-core (~> 0.4, >= 0.4.4)
+      dry-equalizer (~> 0.3)
+      dry-inflector (~> 0.1, >= 0.1.2)
+      dry-logic (~> 1.0, >= 1.0.2)
+    grape (1.3.3)
       activesupport
       builder
+      dry-types (>= 1.1)
       mustermann-grape (~> 1.0.0)
       rack (>= 1.3.0)
       rack-accept
-      virtus (>= 1.0.0)
-    i18n (1.5.2)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
-    ice_nine (0.11.2)
-    jaro_winkler (1.5.2)
-    minitest (5.11.3)
-    mustermann (1.0.3)
-    mustermann-grape (1.0.0)
-      mustermann (~> 1.0.0)
-    parallel (1.12.1)
-    parser (2.5.3.0)
+    minitest (5.14.1)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    mustermann-grape (1.0.1)
+      mustermann (>= 1.0.0)
+    parallel (1.19.1)
+    parser (2.7.1.3)
       ast (~> 2.4.0)
-    powerpack (0.1.2)
-    rack (2.0.6)
+    rack (2.2.2)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
-    rake (12.3.2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rake (13.0.1)
+    regexp_parser (1.7.0)
+    rexml (3.2.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.62.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    rubocop (0.85.0)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
-    ruby-progressbar (1.10.0)
-    sqlite3 (1.3.13)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.0.3)
+      parser (>= 2.7.0.1)
+    ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
+    sqlite3 (1.4.2)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    unicode-display_width (1.4.1)
-    virtus (1.0.5)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
+    unicode-display_width (1.7.0)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -108,4 +120,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/datadog-notifications.gemspec

@@ -14,17 +14,17 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   s.test_files    = s.files.grep(%r{^(spec)/})
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 2.3'
+  s.required_ruby_version = '>= 2.5'
 
-  s.add_runtime_dependency('activesupport')
-  s.add_runtime_dependency('dogstatsd-ruby', '~> 4.0')
+  s.add_runtime_dependency 'activesupport'
+  s.add_runtime_dependency 'dogstatsd-ruby', '>= 4.2', '< 5.0'
 
-  s.add_development_dependency('activerecord')
-  s.add_development_dependency('bundler')
-  s.add_development_dependency('grape', '>= 1.0.2')
-  s.add_development_dependency('rack-test')
-  s.add_development_dependency('rake')
-  s.add_development_dependency('rspec')
-  s.add_development_dependency('rubocop')
-  s.add_development_dependency('sqlite3')
+  s.add_development_dependency 'activerecord'
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'grape', '>= 1.0.2'
+  s.add_development_dependency 'rack-test'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'sqlite3'
 end

data/lib/datadog/notifications/config.rb

@@ -5,8 +5,8 @@ module Datadog
 
       def initialize
         @hostname    = ENV['INSTRUMENTATION_HOSTNAME'] || Socket.gethostname
-        @statsd_host = ENV['STATSD_HOST'] || ::Datadog::Statsd::Connection::DEFAULT_HOST
-        @statsd_port = (ENV['STATSD_PORT'] || ::Datadog::Statsd::Connection::DEFAULT_PORT).to_i
+        @statsd_host = ENV['STATSD_HOST']
+        @statsd_port = ENV['STATSD_PORT']
         @socket_path = ENV['SOCKET_PATH']
         @reporter    = Datadog::Notifications::Reporter
         @tags        = []
@@ -14,22 +14,21 @@ module Datadog
       end
 
       # Use a plugin
-      def use(klass, opts={})
-        @plugins.push klass.new(opts)
+      def use(klass, **opts)
+        @plugins.push klass.new(**opts)
       end
 
       protected
 
       def connect!
         env = ENV['RAILS_ENV'] || ENV['RACK_ENV']
-        tags.push("env:#{env}")       if env && tags.none? {|t| t =~ /^env\:/ }
+        tags.push("env:#{env}")       if env && tags.none? {|t| t =~ /^env:/ }
 
         enable_hostname = hostname && hostname != 'false'
-        tags.push("host:#{hostname}") if enable_hostname && tags.none? {|t| t =~ /^host\:/ }
+        tags.push("host:#{hostname}") if enable_hostname && tags.none? {|t| t =~ /^host:/ }
 
         reporter.new statsd_host, statsd_port, namespace: namespace, tags: tags, socket_path: socket_path
       end
-
     end
   end
 end

data/lib/datadog/notifications/plugins/action_controller.rb

@@ -1,16 +1,15 @@
 module Datadog::Notifications::Plugins
   class ActionController < Base
-
     attr_reader :metric_name
 
     # Options:
     #
     # *<tt>:metric_name</tt> - the metric name, defaults to "rails.request"
     # *<tt>:tags</tt> - additional tags
-    def initialize(opts={})
+    def initialize(metric_name: 'rails.request', **opts)
       super
-      @metric_name = opts[:metric_name] || 'rails.request'
 
+      @metric_name = metric_name
       Datadog::Notifications.subscribe 'process_action.action_controller' do |reporter, event|
         record reporter, event
       end
@@ -34,6 +33,5 @@ module Datadog::Notifications::Plugins
         reporter.timing "#{metric_name}.time.view", payload[:view_runtime], tags: tags
       end
     end
-
   end
 end

data/lib/datadog/notifications/plugins/active_job.rb

@@ -1,16 +1,15 @@
 module Datadog::Notifications::Plugins
   class ActiveJob < Base
-
     attr_reader :metric_name
 
     # Options:
     #
     # *<tt>:metric_name</tt> - the metric name, defaults to "activejob.perform"
     # *<tt>:tags</tt>        - additional tags
-    def initialize(opts={})
+    def initialize(metric_name: 'activejob.perform', **opts)
       super
-      @metric_name = opts[:metric_name] || 'activejob.perform'
 
+      @metric_name = metric_name
       Datadog::Notifications.subscribe 'perform.active_job' do |reporter, event|
         record reporter, event
       end
@@ -28,6 +27,5 @@ module Datadog::Notifications::Plugins
         reporter.timing "#{metric_name}.time", event.duration, tags: tags
       end
     end
-
   end
 end

data/lib/datadog/notifications/plugins/active_record.rb

@@ -1,6 +1,5 @@
 module Datadog::Notifications::Plugins
   class ActiveRecord < Base
-
     attr_reader :metric_name
 
     # Options:
@@ -9,9 +8,10 @@ module Datadog::Notifications::Plugins
     # *<tt>:include_schema</tt>   - record schema queries, off by default
     # *<tt>:include_generic</tt>  - record general (nameless) queries, off by default
     # *<tt>:tags</tt>             - additional tags
-    def initialize(opts={})
+    def initialize(metric_name: 'activerecord.sql', **opts)
       super
-      @metric_name     = opts[:metric_name] || 'activerecord.sql'
+
+      @metric_name     = metric_name
       @include_schema  = opts[:include_schema] == true
       @include_generic = opts[:include_generic] == true
       @include_raw     = opts[:include_raw] == true
@@ -38,6 +38,5 @@ module Datadog::Notifications::Plugins
         reporter.timing "#{metric_name}.time", event.duration, tags: tags
       end
     end
-
   end
 end

data/lib/datadog/notifications/plugins/base.rb

@@ -5,9 +5,8 @@ module Datadog::Notifications::Plugins
     # Options:
     #
     # *<tt>:tags</tt> - additional tags
-    def initialize(opts={})
-      @tags = opts[:tags] || []
+    def initialize(tags: [], **_opts)
+      @tags = tags
     end
-
   end
 end

data/lib/datadog/notifications/plugins/grape.rb

@@ -1,5 +1,6 @@
 module Datadog::Notifications::Plugins
   class Grape < Base
+    DEFAULT_EXCEPTION_HANDLER = ->(e) { Grape.exception_status(e) }
 
     def self.exception_status(err)
       err.respond_to?(:status) ? err.status : 500
@@ -12,10 +13,11 @@ module Datadog::Notifications::Plugins
     # *<tt>:metric_name</tt> - the metric name, defaults to "grape.request"
     # *<tt>:exception_handler</tt> - a custom exception handler proc which accepts an exception object and returns a status
     # *<tt>:tags</tt> - additional tags
-    def initialize(opts={})
+    def initialize(metric_name: 'grape.request', exception_handler: DEFAULT_EXCEPTION_HANDLER, **opts)
       super
-      @metric_name = opts[:metric_name] || 'grape.request'
-      @exception_handler = opts[:exception_handler] || ->(e) { self.class.exception_status(e) }
+
+      @metric_name = metric_name
+      @exception_handler = exception_handler
 
       Datadog::Notifications.subscribe 'endpoint_run.grape' do |reporter, event|
         record reporter, event
@@ -33,7 +35,7 @@ module Datadog::Notifications::Plugins
       status = exception_handler.call(payload[:exception_object]) if payload[:exception_object]
 
       path = extract_path(endpoint)
-      path.gsub!(%r{[^\w\/\-]+}, '_')
+      path.gsub!(%r{[^\w/\-]+}, '_')
 
       tags = self.tags + %W[method:#{method} status:#{status}]
       tags.push "path:#{path}" if path
@@ -54,11 +56,10 @@ module Datadog::Notifications::Plugins
       return endpoint.request.path unless route
 
       path = endpoint.route.path.dup
-      path.sub!(/\(\.\:format\)$/, '')
+      path.sub!(/\(\.:format\)$/, '')
       path.sub!(':version/', '') if endpoint.version
       path.gsub!(/:(\w+)/) {|m| m[1..-1].upcase }
       path
     end
-
   end
 end

data/lib/datadog/notifications/plugins/grpc.rb

@@ -1,6 +1,5 @@
 module Datadog::Notifications::Plugins
   class GRPC < Base
-
     # Options:
     #
     # *<tt>:metric_name</tt> - the metric name, defaults to 'grpc.request'
@@ -10,10 +9,10 @@ module Datadog::Notifications::Plugins
     # Notification payload should have :service (service name, string) and :action (service action/method name, string) keys.
     #
     # Compatible instrumentation is implemented in grpcx gem: https://github.com/bsm/grpcx (>= 0.2.0)
-    def initialize(opts={})
+    def initialize(metric_name: 'grpc.request', **opts)
       super
-      @metric_name = opts[:metric_name] || 'grpc.request'
 
+      @metric_name = metric_name
       Datadog::Notifications.subscribe 'process_action.grpc' do |reporter, event|
         record reporter, event
       end
@@ -34,6 +33,5 @@ module Datadog::Notifications::Plugins
         reporter.timing "#{@metric_name}.time", event.duration, tags: tags
       end
     end
-
   end
 end

data/lib/datadog/notifications/version.rb

@@ -1,5 +1,5 @@
 module Datadog
   class Notifications
-    VERSION = '0.6.0'.freeze
+    VERSION = '0.6.5'.freeze
   end
 end

data/spec/datadog/notifications/config_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Datadog::Notifications::Config do
-
   it 'should be connect!' do
     subject.reporter = Mock::Reporter
     subject.hostname = 'test.host'
@@ -32,5 +31,4 @@ describe Datadog::Notifications::Config do
     expect(subject.plugins.size).to eq(1)
     expect(subject.plugins.first).to be_instance_of(Datadog::Notifications::Plugins::ActionController)
   end
-
 end

data/spec/datadog/notifications/plugins/active_record_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Datadog::Notifications::Plugins::ActiveRecord do
-
   it 'should send an increment and timing event for each query' do
     Post.all.to_a
     expect(buffered).to eq [
@@ -17,5 +16,4 @@ describe Datadog::Notifications::Plugins::ActiveRecord do
       'activerecord.sql.time:333|ms|#custom:tag,env:test,host:test.host,query:post.load',
     ]
   end
-
 end

data/spec/datadog/notifications/plugins/grape_spec.rb

@@ -14,7 +14,6 @@ describe Datadog::Notifications::Plugins::Grape do
     end
 
     Class.new(Grape::API) do
-
       rescue_from unauthorized do |_e|
         error!({ message: 'unauthorized', error: '401 Unauthorized' }, 401)
       end
@@ -96,5 +95,4 @@ describe Datadog::Notifications::Plugins::Grape do
 
     expect(buffered).to eq([])
   end
-
 end

data/spec/datadog/notifications_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Datadog::Notifications do
-
   subject { described_class.instance }
   after   { ActiveSupport::Notifications.unsubscribe(subscription) }
 
@@ -29,5 +28,4 @@ describe Datadog::Notifications do
       'web.render.time:333|ms|#custom:tag,env:test,host:test.host,status:200,method:GET',
     ])
   end
-
 end

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ require 'sqlite3'
 
 ### Active-record test preparation
 
-ActiveRecord::Base.configurations['test'] = { 'adapter' => 'sqlite3', 'database' => ':memory:' }
+ActiveRecord::Base.configurations = { 'test' => { 'adapter' => 'sqlite3', 'database' => ':memory:' } }
 ActiveRecord::Base.establish_connection(:test)
 ActiveRecord::Base.connection.create_table :posts do |t|
   t.string :title
@@ -22,8 +22,8 @@ end
 
 module Mock
   class Reporter < Datadog::Notifications::Reporter
-    def timing(stat, _ms, opts={})
-      super(stat, 333, opts)
+    def timing(stat, _millis, **opts)
+      super(stat, 333, **opts)
     end
 
     def send_stat(message)
@@ -36,7 +36,7 @@ module Mock
   end
 
   class Instrumentable
-    def initialize(opts={})
+    def initialize(**opts)
       @opts = opts
     end
 
@@ -71,13 +71,13 @@ Datadog::Notifications.configure do |c|
 
   c.use Datadog::Notifications::Plugins::ActiveRecord
   c.use Datadog::Notifications::Plugins::Grape,
-    tags: ['more:tags'],
-    metric_name: 'api.request',
-    exception_handler: lambda {|e|
-      if e.message.include?('unauthorized')
-        401
-      else
-        Datadog::Notifications::Plugins::Grape.exception_status(e)
-      end
-    }
+        tags: ['more:tags'],
+        metric_name: 'api.request',
+        exception_handler: lambda {|e|
+          if e.message.include?('unauthorized')
+            401
+          else
+            Datadog::Notifications::Plugins::Grape.exception_status(e)
+          end
+        }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-notifications
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.5
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-14 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,16 +28,22 @@ dependencies:
   name: dogstatsd-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -196,14 +202,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Generic ActiveSupport::Notifications Datadog handler