datadog-notifications 0.6.7 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fe55c10d1c135748c2a818187431d0f316a8cf0192cefdf7ab45d6245e6add9
-  data.tar.gz: f9449725f5768bb0e75eb02363f12eda4235e474d7fb00e6f7cc4c2b54c599d2
+  metadata.gz: 5935ae5cdf0ad8a0b97044ee63f11b1a7c0c21b4d9d901bff27e14d2d7543b22
+  data.tar.gz: 0aa3de2457df6fb8d23e2ae3ac456cc7c463cc13482851e4e750fa1f1e53a8de
 SHA512:
-  metadata.gz: e649e3040acec1a88eb92075b555ed4ba7c2c7533544ba2c4da01d41627dcd570bede8315c1759018351803eca2b9f00e84b95533ebb5d6412f7ada6705dac3d
-  data.tar.gz: 1077d3018207521015a4f4c5025c032b84405377d43a789a27b1153154eafac83e955abc75a5d4cb558073242caed193e3a018ae8251058ce88379a5c7e078ec
+  metadata.gz: b87c1cd9fc7b2f2f0c4514661b4dd914ef1c529808c6eb1fad0ed1ee20a852b305e96d07b8ca297010495c7d8ae7982cf0cb7e93f8aca75b122d692f4985b415
+  data.tar.gz: 81e36be184535761d78a0e6c1dfd555232b6af6fbd86f6942d00892a5ca63b38377bdef49d60fbd4561794517b583c756bb508aecd34b4dc2e8fc8e9c898e63a

data/.github/workflows/ruby.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ["2.6", "2.7", "3.0"]
+        ruby-version: ["2.7", "3.0", "3.1"]
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1

data/.rubocop.yml

@@ -6,7 +6,7 @@ inherit_mode:
     - Exclude
 
 AllCops:
-  TargetRubyVersion: "2.6"
+  TargetRubyVersion: "2.7"
 
 Naming/FileName:
   Exclude:

data/Gemfile.lock

@@ -1,42 +1,41 @@
 PATH
   remote: .
   specs:
-    datadog-notifications (0.6.7)
+    datadog-notifications (0.7.0)
       activesupport
-      dogstatsd-ruby (>= 4.8, < 5.0)
+      dogstatsd-ruby (>= 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activejob (6.1.3)
-      activesupport (= 6.1.3)
+    activejob (7.0.3)
+      activesupport (= 7.0.3)
       globalid (>= 0.3.6)
-    activemodel (6.1.3)
-      activesupport (= 6.1.3)
-    activerecord (6.1.3)
-      activemodel (= 6.1.3)
-      activesupport (= 6.1.3)
-    activesupport (6.1.3)
+    activemodel (7.0.3)
+      activesupport (= 7.0.3)
+    activerecord (7.0.3)
+      activemodel (= 7.0.3)
+      activesupport (= 7.0.3)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     ast (2.4.2)
     builder (3.2.4)
-    concurrent-ruby (1.1.8)
-    diff-lcs (1.4.4)
-    dogstatsd-ruby (4.8.3)
-    dry-configurable (0.12.1)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    dogstatsd-ruby (5.5.0)
+    dry-configurable (0.15.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5.0)
-    dry-container (0.7.2)
+      dry-core (~> 0.6)
+    dry-container (0.9.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.5.0)
+      dry-configurable (~> 0.13, >= 0.13.0)
+    dry-core (0.7.1)
       concurrent-ruby (~> 1.0)
-    dry-inflector (0.2.0)
-    dry-logic (1.1.0)
+    dry-inflector (0.2.1)
+    dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
     dry-types (1.5.1)
@@ -45,83 +44,76 @@ GEM
       dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    grape (1.5.2)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    grape (1.6.2)
       activesupport
       builder
       dry-types (>= 1.1)
       mustermann-grape (~> 1.0.0)
       rack (>= 1.3.0)
       rack-accept
-    i18n (1.8.9)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
+    minitest (5.15.0)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
-    mustermann-grape (1.0.1)
+    mustermann-grape (1.0.2)
       mustermann (>= 1.0.0)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.1.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.5.0)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.30.1)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-bsm (0.5.4)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
+    rubocop-bsm (0.6.0)
       rubocop (~> 1.0)
       rubocop-performance
-      rubocop-rails
       rubocop-rake
       rubocop-rspec
-    rubocop-performance (1.10.1)
-      rubocop (>= 0.90.0, < 2.0)
+    rubocop-performance (1.14.1)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.9.1)
-      activesupport (>= 4.2.0)
-      rack (>= 1.1)
-      rubocop (>= 0.90.0, < 2.0)
-    rubocop-rake (0.5.1)
-      rubocop
-    rubocop-rspec (2.2.0)
+    rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+    rubocop-rspec (2.11.1)
+      rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
     sqlite3 (1.4.2)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
@@ -139,4 +131,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.2.16
+   2.3.9

data/datadog-notifications.gemspec

@@ -12,12 +12,11 @@ Gem::Specification.new do |s|
   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.required_ruby_version = '>= 2.6'
+  s.required_ruby_version = '>= 2.7'
 
   s.add_runtime_dependency 'activesupport'
-  s.add_runtime_dependency 'dogstatsd-ruby', '>= 4.8', '< 5.0'
+  s.add_runtime_dependency 'dogstatsd-ruby', '>= 5.0'
 
   s.add_development_dependency 'activejob'
   s.add_development_dependency 'activerecord'
@@ -28,4 +27,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rubocop-bsm'
   s.add_development_dependency 'sqlite3'
+  s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/datadog/notifications/config.rb

@@ -4,10 +4,10 @@ module Datadog
       attr_accessor :hostname, :namespace, :tags, :statsd_host, :statsd_port, :reporter, :plugins, :socket_path
 
       def initialize
-        @hostname    = ENV['INSTRUMENTATION_HOSTNAME'] || Socket.gethostname
-        @statsd_host = ENV['STATSD_HOST']
-        @statsd_port = ENV['STATSD_PORT']
-        @socket_path = ENV['SOCKET_PATH']
+        @hostname    = ENV.fetch('INSTRUMENTATION_HOSTNAME') { Socket.gethostname }
+        @statsd_host = ENV.fetch('STATSD_HOST', nil)
+        @statsd_port = ENV.fetch('STATSD_PORT', nil)
+        @socket_path = ENV.fetch('SOCKET_PATH', nil)
         @reporter    = Datadog::Notifications::Reporter
         @tags        = []
         @plugins     = []
@@ -21,7 +21,7 @@ module Datadog
       protected
 
       def connect!
-        env = ENV['RAILS_ENV'] || ENV['RACK_ENV']
+        env = ENV.fetch('RAILS_ENV') { ENV.fetch('RACK_ENV', nil) }
         tags.push("env:#{env}")       if env && tags.none? {|t| t =~ /^env:/ }
 
         enable_hostname = hostname && hostname != 'false'

data/lib/datadog/notifications/version.rb

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

data/spec/datadog/notifications/config_spec.rb

@@ -2,23 +2,21 @@ require 'spec_helper'
 
 describe Datadog::Notifications::Config do
   it 'is connect!' do
-    subject.reporter = Mock::Reporter
     subject.hostname = 'test.host'
     subject.tags = ['custom:tag']
 
     client = subject.send(:connect!)
-    expect(client).to be_instance_of(Mock::Reporter)
+    expect(client).to be_instance_of(Datadog::Notifications::Reporter)
     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 'does not pick up the host tag' do
-      subject.reporter = Mock::Reporter
       subject.hostname = hostname
       subject.tags = ['custom:tag']
 
       client = subject.send(:connect!)
-      expect(client).to be_instance_of(Mock::Reporter)
+      expect(client).to be_instance_of(Datadog::Notifications::Reporter)
       expect(subject.tags).to eq(['custom:tag', 'env:test'])
     end
   end

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

@@ -2,10 +2,19 @@ require 'spec_helper'
 
 describe Datadog::Notifications::Plugins::ActiveJob do
   it 'sanitizes tags' do
-    NoopJob.perform_now
-    expect(buffered).to eq [
-      'activejob.perform:1|c|#custom:tag,env:test,host:test.host,job:noop,queue:test_queue',
-      'activejob.perform.time:333|ms|#custom:tag,env:test,host:test.host,job:noop,queue:test_queue',
+    klass = Class.new(ActiveJob::Base) do
+      def self.name
+        'Mock::NoopJob'
+      end
+
+      self.queue_name = 'test:queue'
+      def perform; end
+    end
+
+    klass.perform_now
+    expect(messages).to eq [
+      'activejob.perform:1|c|#custom:tag,env:test,host:test.host,job:mock/noop,queue:test_queue',
+      'activejob.perform.time:787.0|ms|#custom:tag,env:test,host:test.host,job:mock/noop,queue:test_queue',
     ]
   end
 end

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

@@ -3,17 +3,17 @@ require 'spec_helper'
 describe Datadog::Notifications::Plugins::ActiveRecord do
   it 'sends an increment and timing event for each query' do
     Post.all.to_a
-    expect(buffered).to eq [
+    expect(messages).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.time:111.0|ms|#custom:tag,env:test,host:test.host,query:post.load',
     ]
   end
 
   it 'supports custom queries' do
     Post.find_by_sql('SELECT * FROM posts LIMIT 1').to_a
-    expect(buffered).to eq [
+    expect(messages).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.time:111.0|ms|#custom:tag,env:test,host:test.host,query:post.load',
     ]
   end
 end

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

@@ -41,9 +41,9 @@ describe Datadog::Notifications::Plugins::Grape do
     expect(last_response.status).to eq(200)
     expect(last_response.body).to eq('1 1234')
 
-    expect(buffered).to eq([
+    expect(messages).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.time:111.0|ms|#custom:tag,env:test,host:test.host,more:tags,method:GET,status:200,path:/echo/KEY1/KEY2',
     ])
   end
 
@@ -52,9 +52,9 @@ describe Datadog::Notifications::Plugins::Grape do
     expect(last_response.status).to eq(200)
     expect(last_response.body).to eq('OK')
 
-    expect(buffered).to eq([
+    expect(messages).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.time:111.0|ms|#custom:tag,env:test,host:test.host,more:tags,method:GET,status:200,path:/api/sub/versioned,version:v1',
     ])
   end
 
@@ -63,9 +63,9 @@ describe Datadog::Notifications::Plugins::Grape do
     expect(last_response.status).to eq(403)
     expect(last_response.body).to eq('forbidden')
 
-    expect(buffered).to eq([
+    expect(messages).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.time:111.0|ms|#custom:tag,env:test,host:test.host,more:tags,method:GET,status:403,path:/sub/secure/resource',
     ])
   end
 
@@ -73,9 +73,9 @@ describe Datadog::Notifications::Plugins::Grape do
     get '/rescued'
     expect(last_response.status).to eq(401)
 
-    expect(buffered).to eq([
+    expect(messages).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.time:111.0|ms|#custom:tag,env:test,host:test.host,more:tags,method:GET,status:401,path:/rescued',
     ])
   end
 
@@ -83,9 +83,9 @@ describe Datadog::Notifications::Plugins::Grape do
     post '/rescued'
 
     expect(last_response.status).to eq(405)
-    expect(buffered).to eq([
+    expect(messages).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.time:111.0|ms|#custom:tag,env:test,host:test.host,more:tags,method:POST,status:405,path:/rescued',
     ])
   end
 
@@ -93,6 +93,6 @@ describe Datadog::Notifications::Plugins::Grape do
     get '/sub/missing'
     expect(last_response.status).to eq(404)
 
-    expect(buffered).to eq([])
+    expect(messages).to eq([])
   end
 end

data/spec/datadog/notifications_spec.rb

@@ -19,14 +19,27 @@ describe Datadog::Notifications do
   end
 
   it 'has a reporter' do
-    expect(subject.send(:reporter)).to be_instance_of(Mock::Reporter)
+    expect(subject.send(:reporter)).to be_instance_of(Datadog::Notifications::Reporter)
   end
 
   it 'subscribes and report' do
-    Mock::Instrumentable.new(method: 'GET').perform
-    expect(buffered).to eq([
+    klass = Class.new do
+      def initialize(**opts)
+        @opts = opts
+      end
+
+      def perform
+        ActiveSupport::Notifications.instrument('mock.start', @opts)
+        ActiveSupport::Notifications.instrument('mock.perform', @opts) do |payload|
+          payload[:status] = 200
+        end
+      end
+    end
+    klass.new(method: 'GET').perform
+
+    expect(messages).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.time:111.0|ms|#custom:tag,env:test,host:test.host,status:200,method:GET',
     ])
   end
 end

data/spec/spec_helper.rb

@@ -19,63 +19,42 @@ end
 class Post < ActiveRecord::Base
 end
 
-### Active-job test preparation
+### ActiveJob test preparation
 
 ActiveJob::Base.queue_adapter = :inline
-class NoopJob < ActiveJob::Base
-  self.queue_name = 'test:queue'
-  def perform; end
-end
-
-### Mocks
-
-module Mock
-  class Reporter < Datadog::Notifications::Reporter
-    def timing(stat, _millis, **opts)
-      super(stat, 333, **opts)
-    end
-
-    def send_stat(message)
-      messages.push message
-    end
-
-    def messages
-      @messages ||= []
-    end
-  end
-
-  class Instrumentable
-    def initialize(**opts)
-      @opts = opts
-    end
-
-    def perform
-      ActiveSupport::Notifications.instrument('mock.start', @opts)
-      ActiveSupport::Notifications.instrument('mock.perform', @opts) do |payload|
-        payload[:status] = 200
-      end
-    end
-  end
-end
 
 ### Configuration
 
 RSpec.configure do |c|
   helpers = Module.new do
-    def buffered
-      Datadog::Notifications.instance.send(:reporter).messages
+    def messages
+      @messages ||= []
     end
   end
 
   c.include helpers
   c.before do
-    buffered.clear
+    # clear existing messages
+    messages.clear
+
+    # collect messages
+    reporter = Datadog::Notifications.instance.send(:reporter)
+    forwarder = reporter.send(:forwarder)
+    allow(forwarder).to receive(:send_message) do |msg|
+      @messages.push(msg)
+    end
+
+    # stub Time.now
+    allow(Time).to receive(:now).and_return(
+      Time.at(1616161616.161),
+      Time.at(1616161616.272),
+      Time.at(1616161616.948),
+    )
   end
 end
 
 Datadog::Notifications.configure do |c|
   c.hostname = 'test.host'
-  c.reporter = Mock::Reporter
   c.tags     = ['custom:tag']
 
   c.use Datadog::Notifications::Plugins::ActiveRecord

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-notifications
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -29,9 +29,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.8'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
@@ -39,9 +36,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.8'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
@@ -207,7 +201,8 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/bsm/datadog-notifications
 licenses: []
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -216,21 +211,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Generic ActiveSupport::Notifications Datadog handler
-test_files:
-- spec/datadog/notifications/config_spec.rb
-- spec/datadog/notifications/plugins/active_job_spec.rb
-- spec/datadog/notifications/plugins/active_record_spec.rb
-- spec/datadog/notifications/plugins/grape_spec.rb
-- spec/datadog/notifications_spec.rb
-- spec/spec_helper.rb
+test_files: []