datadog-notifications 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 299177adeebc9ed3fd6984f9725fb88ae46ab24b1582548976e8d4aa1a48f55a
-  data.tar.gz: bdea7f81d306dbb4f45d77b1870475596a3b9e04ef4675ca7ef117c03066be9a
+  metadata.gz: 0fe55c10d1c135748c2a818187431d0f316a8cf0192cefdf7ab45d6245e6add9
+  data.tar.gz: f9449725f5768bb0e75eb02363f12eda4235e474d7fb00e6f7cc4c2b54c599d2
 SHA512:
-  metadata.gz: 4c7a6359a6b6abc80be605d04dd8934d7460de1a16ec1f2c7d6018c7f37c5b036658b8fa022f459117ea2367157cdc1e601c6482b72ff5ecf85e6965835e4d4e
-  data.tar.gz: f72472a2cfee96d1cb79f6ceddccdc8103ba8dffdd86465866dc17236ac95b59822558bad85cb40e848f4372a2ef588ba1bcd2fc7e3834a8e0415a2f23f0cbc7
+  metadata.gz: e649e3040acec1a88eb92075b555ed4ba7c2c7533544ba2c4da01d41627dcd570bede8315c1759018351803eca2b9f00e84b95533ebb5d6412f7ada6705dac3d
+  data.tar.gz: 1077d3018207521015a4f4c5025c032b84405377d43a789a27b1153154eafac83e955abc75a5d4cb558073242caed193e3a018ae8251058ce88379a5c7e078ec

data/Gemfile.lock

@@ -1,13 +1,16 @@
 PATH
   remote: .
   specs:
-    datadog-notifications (0.6.6)
+    datadog-notifications (0.6.7)
       activesupport
       dogstatsd-ruby (>= 4.8, < 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activejob (6.1.3)
+      activesupport (= 6.1.3)
+      globalid (>= 0.3.6)
     activemodel (6.1.3)
       activesupport (= 6.1.3)
     activerecord (6.1.3)
@@ -42,6 +45,8 @@ 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)
       activesupport
       builder
@@ -67,7 +72,7 @@ GEM
     rainbow (3.0.0)
     rake (13.0.3)
     regexp_parser (2.1.1)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -122,6 +127,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activejob
   activerecord
   bundler
   datadog-notifications!
@@ -133,4 +139,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.1.4
+   2.2.16

data/datadog-notifications.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency 'dogstatsd-ruby', '>= 4.8', '< 5.0'
 
+  s.add_development_dependency 'activejob'
   s.add_development_dependency 'activerecord'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'grape', '>= 1.0.2'

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

@@ -18,9 +18,10 @@ module Datadog::Notifications::Plugins
     private
 
     def record(reporter, event)
-      job  = event.payload[:job]
-      name = job.class.name.sub(/Job$/, '').underscore
-      tags = self.tags + %W[job:#{name} queue:#{job.queue_name}]
+      job   = event.payload[:job]
+      name  = job.class.name.sub(/Job$/, '').underscore
+      queue = job.queue_name.tr(':', '_')
+      tags  = self.tags + %W[job:#{name} queue:#{queue}]
 
       reporter.batch do
         reporter.increment metric_name, tags: tags

data/lib/datadog/notifications/version.rb

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

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

@@ -0,0 +1,11 @@
+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',
+    ]
+  end
+end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'rspec'
 require 'rack/test'
 require 'grape'
 require 'active_record'
+require 'active_job'
 require 'sqlite3'
 
 ### Active-record test preparation
@@ -18,6 +19,14 @@ end
 class Post < ActiveRecord::Base
 end
 
+### Active-job test preparation
+
+ActiveJob::Base.queue_adapter = :inline
+class NoopJob < ActiveJob::Base
+  self.queue_name = 'test:queue'
+  def perform; end
+end
+
 ### Mocks
 
 module Mock
@@ -70,6 +79,7 @@ Datadog::Notifications.configure do |c|
   c.tags     = ['custom:tag']
 
   c.use Datadog::Notifications::Plugins::ActiveRecord
+  c.use Datadog::Notifications::Plugins::ActiveJob
   c.use Datadog::Notifications::Plugins::Grape,
         tags: ['more:tags'],
         metric_name: 'api.request',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-notifications
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,6 +44,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: activejob
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -186,6 +200,7 @@ files:
 - lib/datadog/notifications/reporter.rb
 - lib/datadog/notifications/version.rb
 - 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
@@ -208,12 +223,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 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