appsignal 2.11.0.beta.3 → 2.11.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d8565582bb357410dee8c4683c62da303f2b1cbbb9dc5dcc0494b03761a7c55
-  data.tar.gz: 7270ef47a9574e21887a8044d1934abdddb75293f919ab3ebda55ce5fb4afd3b
+  metadata.gz: b0817fdd28fcb7bd6bd93f42a4a42939b6059076ba5bb1db77c1d8a6897631e7
+  data.tar.gz: fd9d4818ca5126d282aff16930a1be2a3968da40279a3a6c0ff221719aa1b999
 SHA512:
-  metadata.gz: 233fc5bb7044fab5c6743a6516be7e2058f211aa4ce94529f4a7bde232fc803f6b4833987bf308578c4f7760b86a9ea3f437edf91b796b977fb115100d1e4ee4
-  data.tar.gz: 123e21c4bd820b766d011fdbc221c243ca2b746745e8a8b9de785fe432b599315d3b17c72b8627479c25490d754947d00501d8dd796ff402758343e0fc53a06e
+  metadata.gz: 76d76b6a5c32bd596ab975c2b34a5f7a3e4c295fd12da00ee1d03b83cb2654d4a9133f69a278ab617684af78a18d8af789f9609b6e9525cc9a99484c10857627
+  data.tar.gz: c8c1d34eb4484bb847c35ff75e023c73fc08090ff8d17ecb010d985792b440e36e2812d6ef8dd6945bf23e82c6547f75c6fa24ddd296b49332990b267718ae3c

data/CHANGELOG.md

@@ -18,6 +18,11 @@
   agents. Commit ba9afb538f44c68b8035a8cf40a39d89bc77b021
 - Add support for Active Job priority. PR #632
 - Track Active Job job metrics for magic dashboard. PR #633
+- Report Sidekiq `jid` (job id) as transaction id, reported as "request_id" on
+  AppSignal.com. PR #640
+- Always report Active Job ID, an internal ID used by Active Job. PR #639
+- Support Delayed::Job jobs without specific method name, using
+  `Delayed::Job.enqueue`. PR #642
 
 # 2.10.9
 - Use http proxy if configured when downloading agent. PR #606

data/lib/appsignal/hooks/active_job.rb

@@ -41,11 +41,7 @@ module Appsignal
           transaction.set_error(exception)
           raise exception
         ensure
-          tags = {}
-          queue = job["queue_name"]
-          tags[:queue] = queue if queue
-          priority = job["priority"]
-          tags[:priority] = priority if priority
+          tags = ActiveJobHelpers.tags_for_job(job)
 
           if transaction
             transaction.params =
@@ -54,7 +50,8 @@ module Appsignal
                 Appsignal.config[:filter_parameters]
               )
 
-            transaction_tags = tags
+            transaction_tags = tags.dup
+            transaction_tags["active_job_id"] = job["job_id"]
             provider_job_id = job["provider_job_id"]
             if provider_job_id
               transaction_tags[:provider_job_id] = provider_job_id
@@ -99,6 +96,15 @@ module Appsignal
           end
         end
 
+        def self.tags_for_job(job)
+          tags = {}
+          queue = job["queue_name"]
+          tags[:queue] = queue if queue
+          priority = job["priority"]
+          tags[:priority] = priority if priority
+          tags
+        end
+
         def self.increment_counter(key, value, tags = {})
           Appsignal.increment_counter "active_job_#{key}", value, tags
         end

data/lib/appsignal/hooks/sidekiq.rb

@@ -35,7 +35,7 @@ module Appsignal
       def call(_worker, item, _queue)
         job_status = nil
         transaction = Appsignal::Transaction.create(
-          SecureRandom.uuid,
+          item["jid"],
           Appsignal::Transaction::BACKGROUND_JOB,
           Appsignal::Transaction::GenericRequest.new(
             :queue_start => item["enqueued_at"]

data/lib/appsignal/integrations/delayed_job_plugin.rb

@@ -64,7 +64,7 @@ module Appsignal
         dot_split = default_name.split(".")
         return default_name if dot_split.length == 2
 
-        ["unknown"]
+        "#{default_name}#perform"
       end
 
       def self.extract_value(object_or_hash, field, default_value = nil, convert_to_s = false)

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "2.11.0.beta.3".freeze
+  VERSION = "2.11.0.beta.4".freeze
 end

data/spec/lib/appsignal/hooks/activejob_spec.rb

@@ -110,7 +110,10 @@ if DependencyHelper.active_job_present?
         "metadata" => {},
         "sample_data" => hash_including(
           "params" => [],
-          "tags" => { "queue" => queue }
+          "tags" => {
+            "active_job_id" => kind_of(String),
+            "queue" => queue
+          }
         )
       )
       events = transaction_hash["events"]
@@ -130,7 +133,7 @@ if DependencyHelper.active_job_present?
         transaction_hash = transaction.to_h
         expect(transaction_hash).to include(
           "sample_data" => hash_including(
-            "tags" => { "queue" => "custom_queue" }
+            "tags" => hash_including("queue" => "custom_queue")
           )
         )
       end
@@ -161,7 +164,7 @@ if DependencyHelper.active_job_present?
           transaction_hash = transaction.to_h
           expect(transaction_hash).to include(
             "sample_data" => hash_including(
-              "tags" => { "queue" => queue, "priority" => 10 }
+              "tags" => hash_including("queue" => queue, "priority" => 10)
             )
           )
         end
@@ -194,7 +197,10 @@ if DependencyHelper.active_job_present?
           "metadata" => {},
           "sample_data" => hash_including(
             "params" => [],
-            "tags" => { "queue" => queue }
+            "tags" => {
+              "active_job_id" => kind_of(String),
+              "queue" => queue
+            }
           )
         )
         events = transaction_hash["events"]
@@ -227,7 +233,10 @@ if DependencyHelper.active_job_present?
           "metadata" => {},
           "sample_data" => hash_including(
             "params" => [],
-            "tags" => { "queue" => queue }
+            "tags" => {
+              "active_job_id" => kind_of(String),
+              "queue" => queue
+            }
           )
         )
         events = transaction_hash["events"]
@@ -363,7 +372,10 @@ if DependencyHelper.active_job_present?
             "action" => "ActionMailerTestJob#welcome",
             "sample_data" => hash_including(
               "params" => ["ActionMailerTestJob", "welcome", "deliver_now"],
-              "tags" => { "queue" => "mailers" }
+              "tags" => {
+                "active_job_id" => kind_of(String),
+                "queue" => "mailers"
+              }
             )
           )
         end
@@ -379,7 +391,10 @@ if DependencyHelper.active_job_present?
             "action" => "ActionMailerTestJob#welcome",
             "sample_data" => hash_including(
               "params" => ["ActionMailerTestJob", "welcome", "deliver_now"] + method_expected_args,
-              "tags" => { "queue" => "mailers" }
+              "tags" => {
+                "active_job_id" => kind_of(String),
+                "queue" => "mailers"
+              }
             )
           )
         end
@@ -396,7 +411,10 @@ if DependencyHelper.active_job_present?
               "action" => "ActionMailerTestJob#welcome",
               "sample_data" => hash_including(
                 "params" => ["ActionMailerTestJob", "welcome", "deliver_now", parameterized_expected_args],
-                "tags" => { "queue" => "mailers" }
+                "tags" => {
+                  "active_job_id" => kind_of(String),
+                  "queue" => "mailers"
+                }
               )
             )
           end
@@ -434,7 +452,10 @@ if DependencyHelper.active_job_present?
                 "deliver_now",
                 { active_job_internal_key => ["args"], "args" => [] }
               ],
-              "tags" => { "queue" => "mailers" }
+              "tags" => {
+                "active_job_id" => kind_of(String),
+                "queue" => "mailers"
+              }
             )
           )
         end
@@ -457,7 +478,10 @@ if DependencyHelper.active_job_present?
                     "args" => method_expected_args
                   }
                 ],
-                "tags" => { "queue" => "mailers" }
+                "tags" => {
+                  "active_job_id" => kind_of(String),
+                  "queue" => "mailers"
+                }
               )
             )
           end
@@ -482,7 +506,10 @@ if DependencyHelper.active_job_present?
                     "params" => parameterized_expected_args
                   }
                 ],
-                "tags" => { "queue" => "mailers" }
+                "tags" => {
+                  "active_job_id" => kind_of(String),
+                  "queue" => "mailers"
+                }
               )
             )
           end

data/spec/lib/appsignal/hooks/delayed_job_spec.rb

@@ -227,25 +227,14 @@ describe Appsignal::Hooks::DelayedJobHook do
           end
         end
 
-        context "without job name" do
-          let(:job_data) do
-            { :name => "", :payload_object => payload_object }
-          end
-
-          it "wraps it in a transaction using the class method job name" do
-            perform
-            expect(last_transaction.to_h["action"]).to eql("unknown")
-          end
-        end
-
-        context "with invalid job name" do
+        context "with only job class name" do
           let(:job_data) do
             { :name => "Banana", :payload_object => payload_object }
           end
 
-          it "wraps it in a transaction using the class method job name" do
+          it "appends #perform to the class name" do
             perform
-            expect(last_transaction.to_h["action"]).to eql("unknown")
+            expect(last_transaction.to_h["action"]).to eql("Banana#perform")
           end
         end
 

data/spec/lib/appsignal/hooks/sidekiq_spec.rb

@@ -76,9 +76,10 @@ describe Appsignal::Hooks::SidekiqPlugin, :with_yaml_parse_error => false do
     ]
   end
   let(:job_class) { "TestClass" }
+  let(:jid) { "b4a577edbccf1d805744efa9" }
   let(:item) do
     {
-      "jid"         => "b4a577edbccf1d805744efa9",
+      "jid"         => jid,
       "class"       => job_class,
       "retry_count" => 0,
       "queue"       => "default",
@@ -151,7 +152,7 @@ describe Appsignal::Hooks::SidekiqPlugin, :with_yaml_parse_error => false do
   context "when using the Sidekiq delayed extension" do
     let(:item) do
       {
-        "jid" => "efb140489485999d32b5504c",
+        "jid" => jid,
         "class" => "Sidekiq::Extensions::DelayedClass",
         "queue" => "default",
         "args" => [
@@ -191,7 +192,7 @@ describe Appsignal::Hooks::SidekiqPlugin, :with_yaml_parse_error => false do
   context "when using the Sidekiq ActiveRecord instance delayed extension" do
     let(:item) do
       {
-        "jid" => "efb140489485999d32b5504c",
+        "jid" => jid,
         "class" => "Sidekiq::Extensions::DelayedModel",
         "queue" => "default",
         "args" => [
@@ -243,7 +244,7 @@ describe Appsignal::Hooks::SidekiqPlugin, :with_yaml_parse_error => false do
 
       transaction_hash = transaction.to_h
       expect(transaction_hash).to include(
-        "id" => kind_of(String),
+        "id" => jid,
         "action" => "TestClass#perform",
         "error" => {
           "name" => "ExampleException",
@@ -277,7 +278,7 @@ describe Appsignal::Hooks::SidekiqPlugin, :with_yaml_parse_error => false do
 
       transaction_hash = transaction.to_h
       expect(transaction_hash).to include(
-        "id" => kind_of(String),
+        "id" => jid,
         "action" => "TestClass#perform",
         "error" => nil,
         "metadata" => {
@@ -361,6 +362,7 @@ if DependencyHelper.active_job_present?
     end
     let(:expected_tags) do
       {}.tap do |hash|
+        hash["active_job_id"] = kind_of(String)
         if DependencyHelper.rails_version >= Gem::Version.new("5.0.0")
           hash["provider_job_id"] = kind_of(String)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.11.0.beta.3
+  version: 2.11.0.beta.4
 platform: ruby
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack