Merge pull request #137 from hennevogel/bugfix/aj-failures

Fix measurements of performing/failed ActiveJobs

Author: hennevogel

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 For the full commit log, [see here](https://github.com/influxdata/influxdb-rails/commits/master).
 
+## v1.0.1.beta3, release 2020-10-16
+- Drop `perform_start.active_job` subscriber, it's rather useless on dashboards.
+
 ## v1.0.1.beta2, released 2020-09-14
 - Implement [`deliver.action_mailer`](https://guides.rubyonrails.org/active_support_instrumentation.html#deliver-action-mailer) subscriber
 - Add missing Active Job documentation

README.md

@@ -137,7 +137,6 @@ Reported tags:
 Reported ActiveSupport instrumentation hooks:
 
 - [enqueue.active\_job](https://guides.rubyonrails.org/active_support_instrumentation.html#enqueue-active-job)
-- [perform_start.active\_job](https://guides.rubyonrails.org/active_support_instrumentation.html#perform-start-active-job)
 - [perform.active\_job](https://guides.rubyonrails.org/active_support_instrumentation.html#perform-active-job)
 
 Reported values:
@@ -149,14 +148,14 @@ Reported values:
 Reported tags:
 
 ```ruby
-  hook:       ["enqueue", "perform_start", "perform"],
-  state:      ["queued", "running", "succeeded", "failed"],
+  hook:       ["enqueue", "perform"],
+  state:      ["queued", "succeeded", "failed"],
   job:        "SomeJobClassName",
   queue:      "queue_name"
 ```
 
 *Note*: Only the measurements with the hook `perform` report a duration in the value.
-The other hooks are counters and always report a value of `1`.
+The enqueue hook is a counter and always reports a value of `1`.
 
 ### Action Mailer
 

lib/influxdb/rails/middleware/active_job_subscriber.rb

@@ -44,8 +44,8 @@ def short_hook_name
 
         def fetch_short_hook_name
           return "enqueue" if hook_name.include?("enqueue")
-          return "perform_start" if hook_name.include?("perform_start")
-          return "perform" if hook_name.include?("perform")
+
+          "perform"
         end
 
         def job
@@ -59,7 +59,7 @@ def value
         end
 
         def failed?
-          payload[:exception_object]
+          payload[:aborted]
         end
       end
     end

lib/influxdb/rails/railtie.rb

@@ -32,7 +32,6 @@ class Railtie < ::Rails::Railtie # :nodoc:
           "sql.active_record"                    => Middleware::SqlSubscriber,
           "instantiation.active_record"          => Middleware::ActiveRecordSubscriber,
           "enqueue.active_job"                   => Middleware::ActiveJobSubscriber,
-          "perform_start.active_job"             => Middleware::ActiveJobSubscriber,
           "perform.active_job"                   => Middleware::ActiveJobSubscriber,
           "deliver.action_mailer"                => Middleware::ActionMailerSubscriber,
           "block_instrumentation.influxdb_rails" => Middleware::BlockInstrumentationSubscriber,

lib/influxdb/rails/version.rb

@@ -1,5 +1,5 @@
 module InfluxDB
   module Rails
-    VERSION = "1.0.1.beta2".freeze
+    VERSION = "1.0.1.beta3".freeze
   end
 end