datadog-notifications 0.5.3 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fad10b73b565812d444474c765e3f8e1054776e7f35205ca0b3e1d81e79413ad
-  data.tar.gz: db63472562524db432806070e6c6c64f32fbf848eed7fd775761fb7fe0189cbe
+  metadata.gz: c2373f5f441b07227d05a8b6835726b0ce9df3eaf7b3329019814ad2b389dc0f
+  data.tar.gz: 52973ed82c2720bc02da8c6337de4efa242ac91f5021dad4913cef1842203b45
 SHA512:
-  metadata.gz: 7f872dfd2ea075f5e2562f81ff149a7e5434d603cbda8013d1faf323fa33800543fb48c5ef5434fe40f51b4bf3ef6baa71437dd73947dcf0131a3acd96da0000
-  data.tar.gz: b650ab31ce04c9383e88b4eda57cfd7d3d907ebd5b62a0e44ae8258b820131fbf721bbc3fd10927299bb328786e0f6580e42c17ff80d9dbb8b0bb356e70bbac5
+  metadata.gz: c0603c9150fbd6ec40ed62c0b4ea1261e81b869c803a34531bdca51f19df41379fb908d3c2ddfa3661e458e3ae34f9ba01305ce4e4d9dba3cfab972334a29284
+  data.tar.gz: 8c5902469f500ffe2dbe7c245fdbb530d97e7b4f3f50123aa91d0e80c9ebb56c68e93d91cee25b2cfdaad5bdf94a8fa2057e5dac6e8a3339ca207f89d5a919c6

data/.gitignore

@@ -14,3 +14,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.rubocop-*

data/.rake_tasks~

@@ -0,0 +1,9 @@
+build
+clean
+clobber
+install
+install:local
+release[remote]
+rubocop
+rubocop:auto_correct
+spec

data/.rubocop.yml

@@ -1,70 +1,10 @@
+inherit_from:
+  - https://gitlab.com/bsm/misc/raw/master/rubocop/default.yml
+
+AllCops:
+  TargetRubyVersion: "2.5"
+
 Naming/FileName:
   Exclude:
     - "lib/datadog-notifications.rb"
     - "datadog-notifications.gemspec"
-
-Metrics/AbcSize:
-  Enabled: false
-Metrics/BlockLength:
-  Exclude:
-    - "**/*_spec.rb"
-Metrics/ClassLength:
-  Max: 1500
-Metrics/CyclomaticComplexity:
-  Enabled: false
-Metrics/PerceivedComplexity:
-  Enabled: false
-Metrics/LineLength:
-  Max: 160
-Metrics/MethodLength:
-  Max: 20
-Metrics/ModuleLength:
-  Exclude:
-    - "**/*_spec.rb"
-
-Layout/AlignHash:
-  EnforcedHashRocketStyle: table
-Layout/AlignParameters:
-  EnforcedStyle: with_fixed_indentation
-Layout/EmptyLinesAroundBlockBody:
-  Exclude:
-    - "**/*_spec.rb"
-Layout/EmptyLinesAroundClassBody:
-  Enabled: false
-Layout/IndentArray:
-  EnforcedStyle: consistent
-Layout/MultilineOperationIndentation:
-  Enabled: false
-Layout/SpaceAroundEqualsInParameterDefault:
-  EnforcedStyle: no_space
-Layout/SpaceInsideBlockBraces:
-  SpaceBeforeBlockParameters: false
-
-Style/BlockDelimiters:
-  Enabled: false
-Style/ClassAndModuleChildren:
-  Enabled: false
-Style/Documentation:
-  Enabled: false
-Style/FrozenStringLiteralComment:
-  Enabled: false
-Style/HashSyntax:
-  EnforcedStyle: ruby19_no_mixed_keys
-Style/MultilineIfModifier:
-  Enabled: false
-Style/NumericLiterals:
-  Enabled: false
-Style/Semicolon:
-  AllowAsExpressionSeparator: true
-Style/SingleLineBlockParams:
-  Enabled: false
-Style/StringLiterals:
-  Enabled: false
-Style/SymbolArray:
-  Enabled: true
-Style/TrailingCommaInArguments:
-  EnforcedStyleForMultiline: consistent_comma
-Style/TrailingCommaInArrayLiteral:
-  EnforcedStyleForMultiline: consistent_comma
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: consistent_comma

data/.travis.yml

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

data/Gemfile.lock

@@ -1,97 +1,107 @@
 PATH
   remote: .
   specs:
-    datadog-notifications (0.5.3)
+    datadog-notifications (0.6.3)
       activesupport
-      dogstatsd-ruby (~> 3.1)
+      dogstatsd-ruby (>= 4.2, < 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.1)
-      activesupport (= 5.2.1)
-    activerecord (5.2.1)
-      activemodel (= 5.2.1)
-      activesupport (= 5.2.1)
-      arel (>= 9.0)
-    activesupport (5.2.1)
+    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.0.5)
-    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 (3.3.0)
-    equalizer (0.0.11)
-    grape (1.1.0)
+    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.1.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    ice_nine (0.11.2)
-    jaro_winkler (1.5.1)
-    minitest (5.11.3)
-    mustermann (1.0.3)
-    mustermann-grape (1.0.0)
-      mustermann (~> 1.0.0)
-    parallel (1.12.1)
-    parser (2.5.1.2)
+    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.5)
+    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.1)
-    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.1)
+    rake (13.0.1)
+    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.59.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    rubocop (0.84.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)
+      rexml
+      rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    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.0)
-    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
@@ -100,7 +110,7 @@ DEPENDENCIES
   activerecord
   bundler
   datadog-notifications!
-  grape (>= 0.16)
+  grape (>= 1.0.2)
   rack-test
   rake
   rspec
@@ -108,4 +118,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.16.4
+   2.1.2

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
   warn e.message
-  warn "Run `bundle install` to install missing gems"
+  warn 'Run `bundle install` to install missing gems'
   exit e.status_code
 end
 

data/datadog-notifications.gemspec

@@ -3,27 +3,28 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'datadog/notifications/version'
 
 Gem::Specification.new do |s|
-  s.name          = "datadog-notifications"
+  s.name          = 'datadog-notifications'
   s.version       = Datadog::Notifications::VERSION.dup
-  s.authors       = ["Dimitrij Denissenko"]
-  s.email         = ["dimitrij@blacksquaremedia.com"]
+  s.authors       = ['Dimitrij Denissenko']
+  s.email         = ['dimitrij@blacksquaremedia.com']
   s.description   = 'Datadog instrumentation for ActiveSupport::Notifications'
   s.summary       = 'Generic ActiveSupport::Notifications Datadog handler'
-  s.homepage      = "https://github.com/bsm/datadog-notifications"
+  s.homepage      = 'https://github.com/bsm/datadog-notifications'
 
   s.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   s.test_files    = s.files.grep(%r{^(spec)/})
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
+  s.required_ruby_version = '>= 2.5'
 
-  s.add_runtime_dependency('activesupport')
-  s.add_runtime_dependency('dogstatsd-ruby', "~> 3.1")
+  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', ">= 0.16")
-  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.rb

@@ -1 +1 @@
-require "datadog/notifications"
+require 'datadog/notifications'

data/lib/datadog/notifications.rb

@@ -34,7 +34,7 @@ module Datadog
         warn "#{name} cannot be reconfigured once it has subscribed to notifications, called from: #{caller(2..2).first}"
         return
       end
-      block.call instance.config if block
+      block&.call instance.config
     end
 
     # You can subscribe to events exactly as with ActiveSupport::Notifications, but there will be an

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::DEFAULT_HOST
-        @statsd_port = (ENV['STATSD_PORT'] || ::Datadog::Statsd::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,8 +14,8 @@ 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
@@ -29,7 +29,6 @@ module Datadog
 
         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
@@ -26,10 +26,10 @@ module Datadog::Notifications::Plugins
     def record(reporter, event)
       payload = event.payload
       name    = payload[:name]
-      return if (name.nil? || name == "SQL") && !@include_generic
-      return if name == "SCHEMA" && !@include_schema
+      return if (name.nil? || name == 'SQL') && !@include_generic
+      return if name == 'SCHEMA' && !@include_schema
 
-      name = name.downcase.split(/\W/).join(".") if name
+      name = name.downcase.split(/\W/).join('.') if name
       tags = self.tags.dup
       tags.push "query:#{name}" if name
 
@@ -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,6 +1,5 @@
 module Datadog::Notifications::Plugins
   class Grape < Base
-
     def self.exception_status(err)
       err.respond_to?(:status) ? err.status : 500
     end
@@ -12,10 +11,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:, **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 || ->(e) { self.class.exception_status(e) }
 
       Datadog::Notifications.subscribe 'endpoint_run.grape' do |reporter, event|
         record reporter, event
@@ -55,10 +55,9 @@ module Datadog::Notifications::Plugins
 
       path = endpoint.route.path.dup
       path.sub!(/\(\.\:format\)$/, '')
-      path.sub!(":version/", "") if endpoint.version
+      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,19 +1,18 @@
 module Datadog::Notifications::Plugins
   class GRPC < Base
-
     # Options:
     #
     # *<tt>:metric_name</tt> - the metric name, defaults to 'grpc.request'
     # *<tt>:tags</tt> - additional tags
     #
     # It expects ActiveSupport instrumented notifications named 'process_action.grpc'.
-    # Each such notification should have an :action key with gRPC action (method) name.
+    # 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
-    def initialize(opts={})
+    # Compatible instrumentation is implemented in grpcx gem: https://github.com/bsm/grpcx (>= 0.2.0)
+    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
@@ -23,16 +22,16 @@ module Datadog::Notifications::Plugins
 
     def record(reporter, event)
       payload = event.payload
+      service = payload[:service]
       action  = payload[:action]
       status  = payload[:exception] ? 'error' : 'ok'
 
-      tags = self.tags + %W[action:#{action} status:#{status}]
+      tags = self.tags + %W[service:#{service} action:#{action} status:#{status}]
 
       reporter.batch do
         reporter.increment @metric_name, tags: tags
         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.5.3'.freeze
+    VERSION = '0.6.3'.freeze
   end
 end

data/spec/datadog/notifications/config_spec.rb

@@ -1,26 +1,25 @@
 require 'spec_helper'
 
 describe Datadog::Notifications::Config do
-
   it 'should be connect!' do
     subject.reporter = Mock::Reporter
-    subject.hostname = "test.host"
-    subject.tags = ["custom:tag"]
+    subject.hostname = 'test.host'
+    subject.tags = ['custom:tag']
 
     client = subject.send(:connect!)
     expect(client).to be_instance_of(Mock::Reporter)
-    expect(subject.tags).to eq(["custom:tag", "env:test", "host:test.host"])
+    expect(subject.tags).to eq(['custom:tag', 'env:test', 'host:test.host'])
   end
 
   RSpec.shared_examples 'host tag is not picked up' do |hostname|
     it 'should not pick up the host tag' do
       subject.reporter = Mock::Reporter
       subject.hostname = hostname
-      subject.tags = ["custom:tag"]
+      subject.tags = ['custom:tag']
 
       client = subject.send(:connect!)
       expect(client).to be_instance_of(Mock::Reporter)
-      expect(subject.tags).to eq(["custom:tag", "env:test"])
+      expect(subject.tags).to eq(['custom:tag', 'env:test'])
     end
   end
 
@@ -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,21 +1,19 @@
 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 [
-      "activerecord.sql:1|c|#custom:tag,env:test,host:test.host,query:post.load",
-      "activerecord.sql.time:333|ms|#custom:tag,env:test,host:test.host,query:post.load",
+      'activerecord.sql:1|c|#custom:tag,env:test,host:test.host,query:post.load',
+      'activerecord.sql.time:333|ms|#custom:tag,env:test,host:test.host,query:post.load',
     ]
   end
 
   it 'should support custom queries' do
-    Post.find_by_sql("SELECT * FROM posts LIMIT 1").to_a
+    Post.find_by_sql('SELECT * FROM posts LIMIT 1').to_a
     expect(buffered).to eq [
-      "activerecord.sql:1|c|#custom:tag,env:test,host:test.host,query:post.load",
-      "activerecord.sql.time:333|ms|#custom:tag,env:test,host:test.host,query:post.load",
+      'activerecord.sql:1|c|#custom:tag,env:test,host:test.host,query:post.load',
+      '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

@@ -10,13 +10,12 @@ describe Datadog::Notifications::Plugins::Grape do
       version 'v1'
       prefix  'api'
 
-      get('versioned') { "OK" }
+      get('versioned') { 'OK' }
     end
 
     Class.new(Grape::API) do
-
       rescue_from unauthorized do |_e|
-        error!({ message: "unauthorized", error: '401 Unauthorized' }, 401)
+        error!({ message: 'unauthorized', error: '401 Unauthorized' }, 401)
       end
 
       get 'echo/:key1/:key2' do
@@ -24,14 +23,14 @@ describe Datadog::Notifications::Plugins::Grape do
       end
 
       get '/rescued' do
-        raise unauthorized, "unauthorized"
+        raise unauthorized, 'unauthorized'
       end
 
       namespace :sub do
         mount sub_api
 
         namespace :secure do
-          get("/resource") { error!("forbidden", 403) }
+          get('/resource') { error!('forbidden', 403) }
         end
       end
     end
@@ -43,9 +42,9 @@ describe Datadog::Notifications::Plugins::Grape do
     expect(last_response.body).to eq('1 1234')
 
     expect(buffered).to eq([
-      "api.request:1|c|#custom:tag,env:test,host:test.host,more:tags,method:GET,status:200,path:/echo/KEY1/KEY2",
-      "api.request.time:333|ms|#custom:tag,env:test,host:test.host,more:tags,method:GET,status:200,path:/echo/KEY1/KEY2",
-    ],)
+      'api.request:1|c|#custom:tag,env:test,host:test.host,more:tags,method:GET,status:200,path:/echo/KEY1/KEY2',
+      'api.request.time:333|ms|#custom:tag,env:test,host:test.host,more:tags,method:GET,status:200,path:/echo/KEY1/KEY2',
+    ])
   end
 
   it 'should support namespaces and versioning' do
@@ -54,9 +53,9 @@ describe Datadog::Notifications::Plugins::Grape do
     expect(last_response.body).to eq('OK')
 
     expect(buffered).to eq([
-      "api.request:1|c|#custom:tag,env:test,host:test.host,more:tags,method:GET,status:200,path:/api/sub/versioned,version:v1",
-      "api.request.time:333|ms|#custom:tag,env:test,host:test.host,more:tags,method:GET,status:200,path:/api/sub/versioned,version:v1",
-    ],)
+      'api.request:1|c|#custom:tag,env:test,host:test.host,more:tags,method:GET,status:200,path:/api/sub/versioned,version:v1',
+      'api.request.time:333|ms|#custom:tag,env:test,host:test.host,more:tags,method:GET,status:200,path:/api/sub/versioned,version:v1',
+    ])
   end
 
   it 'should support deep nesting' do
@@ -65,9 +64,9 @@ describe Datadog::Notifications::Plugins::Grape do
     expect(last_response.body).to eq('forbidden')
 
     expect(buffered).to eq([
-      "api.request:1|c|#custom:tag,env:test,host:test.host,more:tags,method:GET,status:403,path:/sub/secure/resource",
-      "api.request.time:333|ms|#custom:tag,env:test,host:test.host,more:tags,method:GET,status:403,path:/sub/secure/resource",
-    ],)
+      'api.request:1|c|#custom:tag,env:test,host:test.host,more:tags,method:GET,status:403,path:/sub/secure/resource',
+      'api.request.time:333|ms|#custom:tag,env:test,host:test.host,more:tags,method:GET,status:403,path:/sub/secure/resource',
+    ])
   end
 
   it 'should handle rescued errors' do
@@ -75,9 +74,9 @@ describe Datadog::Notifications::Plugins::Grape do
     expect(last_response.status).to eq(401)
 
     expect(buffered).to eq([
-      "api.request:1|c|#custom:tag,env:test,host:test.host,more:tags,method:GET,status:401,path:/rescued",
-      "api.request.time:333|ms|#custom:tag,env:test,host:test.host,more:tags,method:GET,status:401,path:/rescued",
-    ],)
+      'api.request:1|c|#custom:tag,env:test,host:test.host,more:tags,method:GET,status:401,path:/rescued',
+      'api.request.time:333|ms|#custom:tag,env:test,host:test.host,more:tags,method:GET,status:401,path:/rescued',
+    ])
   end
 
   it 'should handle invalid method' do
@@ -85,9 +84,9 @@ describe Datadog::Notifications::Plugins::Grape do
 
     expect(last_response.status).to eq(405)
     expect(buffered).to eq([
-      "api.request:1|c|#custom:tag,env:test,host:test.host,more:tags,method:POST,status:405,path:/rescued",
-      "api.request.time:333|ms|#custom:tag,env:test,host:test.host,more:tags,method:POST,status:405,path:/rescued",
-    ],)
+      'api.request:1|c|#custom:tag,env:test,host:test.host,more:tags,method:POST,status:405,path:/rescued',
+      'api.request.time:333|ms|#custom:tag,env:test,host:test.host,more:tags,method:POST,status:405,path:/rescued',
+    ])
   end
 
   it 'should not report paths on 404s' do
@@ -96,5 +95,4 @@ describe Datadog::Notifications::Plugins::Grape do
 
     expect(buffered).to eq([])
   end
-
 end

data/spec/datadog/notifications_spec.rb

@@ -1,19 +1,18 @@
 require 'spec_helper'
 
 describe Datadog::Notifications do
-
   subject { described_class.instance }
   after   { ActiveSupport::Notifications.unsubscribe(subscription) }
 
   let!(:subscription) do
-    subject.subscribe("mock.perform") do |reporter, event|
+    subject.subscribe('mock.perform') do |reporter, event|
       status = event.payload[:status]
       method = event.payload[:method]
       tags   = ["status:#{status}", "method:#{method}"]
 
       reporter.batch do
-        reporter.increment "web.render", tags: tags
-        reporter.timing "web.render.time", event.duration, tags: tags
+        reporter.increment 'web.render', tags: tags
+        reporter.timing 'web.render.time', event.duration, tags: tags
       end
     end
   end
@@ -25,9 +24,8 @@ describe Datadog::Notifications do
   it 'should subscribe and report' do
     Mock::Instrumentable.new(method: 'GET').perform
     expect(buffered).to eq([
-      "web.render:1|c|#custom:tag,env:test,host:test.host,status:200,method:GET",
-      "web.render.time:333|ms|#custom:tag,env:test,host:test.host,status:200,method:GET",
-    ],)
+      'web.render:1|c|#custom:tag,env:test,host:test.host,status:200,method:GET',
+      '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,22 +22,27 @@ 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 flush_buffer; end
-    @should_batch = true
+    def send_stat(message)
+      messages.push message
+    end
+
+    def messages
+      @messages ||= []
+    end
   end
 
   class Instrumentable
-    def initialize(opts={})
+    def initialize(**opts)
       @opts = opts
     end
 
     def perform
-      ActiveSupport::Notifications.instrument("mock.start", @opts)
-      ActiveSupport::Notifications.instrument("mock.perform", @opts) do |payload|
+      ActiveSupport::Notifications.instrument('mock.start', @opts)
+      ActiveSupport::Notifications.instrument('mock.perform', @opts) do |payload|
         payload[:status] = 200
       end
     end
@@ -49,7 +54,7 @@ end
 RSpec.configure do |c|
   helpers = Module.new do
     def buffered
-      Datadog::Notifications.instance.send(:reporter).buffer
+      Datadog::Notifications.instance.send(:reporter).messages
     end
   end
 
@@ -60,19 +65,19 @@ RSpec.configure do |c|
 end
 
 Datadog::Notifications.configure do |c|
-  c.hostname = "test.host"
+  c.hostname = 'test.host'
   c.reporter = Mock::Reporter
-  c.tags     = ["custom:tag"]
+  c.tags     = ['custom:tag']
 
   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.5.3
+  version: 0.6.3
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-10 00:00:00.000000000 Z
+date: 2020-05-29 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: '3.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +78,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 1.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +165,7 @@ extra_rdoc_files: []
 files:
 - ".editorconfig"
 - ".gitignore"
+- ".rake_tasks~"
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
@@ -195,15 +202,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Generic ActiveSupport::Notifications Datadog handler