stackify-ruby-apm 1.10.2 → 1.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ace5e2981f0588711fce71484c2192d09647f9387693082b55c907ed421da82
-  data.tar.gz: 1bff561f0a9e316cf487bba4168c89a7bd6defb4f87c0dd1eacdf648ebee2d3c
+  metadata.gz: 4b2d9a08bd90459363bada0dcc980ab8ee610d5f7bbb41100c53f4d6dc8be6ac
+  data.tar.gz: 624b3bd6b64a48270927b77e94663e11416e8f0be84fd86b32b6f5c215251510
 SHA512:
-  metadata.gz: 540d32c55572249886f87bd3c339cd158d9f85d0a0556323698b25046decae29eab319669ec5b077121cb48046c08fca6eb0ad8223d3488fabb54fe0183c6a0a
-  data.tar.gz: ae9f59d8c40f09c71833d67cb836b7ebb278934b336160f2375763416479fa5050fdbbbfbc2b7843630dc21b005caebeb9372df835c93e254c9f507d1ce7cc29
+  metadata.gz: 8e749581d00b6d425476dfd7683a86b4ccd67491a5713c50be3602668e666519d94ca3abc74f561454d8cb2283113426caee59e226cea4e2dd83ba1bd0fbc856
+  data.tar.gz: 9f6784afe5998f4d5c3b5c2501df118d19384b0bd00e9e57c20d58ccc1987021eed0ce114b642624b5ca11339d51c2a91d5527a6a10eab123f57fc8b61fd479b

data/lib/stackify_apm/config.rb

@@ -210,6 +210,7 @@ module StackifyRubyAPM
         httparty
         stackify_logger
         sidekiq
+        delayed_job
       ]
     end
 

data/lib/stackify_apm/context.rb

@@ -12,7 +12,7 @@ module StackifyRubyAPM
   class Context
     include NaivelyHashable
 
-    attr_accessor :request, :response, :aws
+    attr_accessor :request, :response, :aws, :category
     attr_reader :custom, :tags
 
     def initialize

data/lib/stackify_apm/helper/database_helper.rb

@@ -18,7 +18,7 @@ module DatabaseHelper
     elsif driver.include? 'db2'
       'db2'
     elsif driver.include? 'sqlite'
-      'generic'
+      'sqlite'
     end
   end
   # rubocop:enable Metrics/CyclomaticComplexity

data/lib/stackify_apm/instrumenter_helper.rb

@@ -90,9 +90,8 @@ module StackifyRubyAPM
                           )
                         end
 
-                  req = #{current_method_without}(*args, &block)
                   StackifyRubyAPM.span name, type, context: ctx do
-                    req
+                    #{current_method_without}(*args, &block)
                   end
                 else
                   return #{current_method_without}(*args, &block)
@@ -169,9 +168,9 @@ module StackifyRubyAPM
                             CATEGORY: 'Ruby'
                           )
                         end
-                  req = _self_without_apm_#{current_method}(*args, &block)
+
                   StackifyRubyAPM.span name, type, context: ctx do
-                    req
+                    _self_without_apm_#{current_method}(*args, &block)
                   end
                 else
                   return _self_without_apm_#{current_method}(*args, &block)

data/lib/stackify_apm/root_info.rb

@@ -26,7 +26,7 @@ module StackifyRubyAPM
 
       hash = {
         PROFILER_VERSION: StackifyRubyAPM::VERSION,
-        CATEGORY: 'Ruby',
+        CATEGORY: @transaction.context.category || 'Ruby',
         APPLICATION_PATH: '/',
         APPLICATION_FILESYSTEM_PATH: @config.root_path,
         APPLICATION_NAME: @config.application_name.strip,

data/lib/stackify_apm/spies/delayed_job.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+# Monkey patch for the delayed_job class for running async tasks.
+#
+
+module StackifyRubyAPM
+  # @api private
+  module Spies
+    # @api private
+    class DelayedJobSpy
+      def install
+        Delayed::Backend::Base.class_eval do
+          alias_method 'invoke_job_without_apm', 'invoke_job'
+
+          def invoke_job(*args, &block)
+            ret = nil
+            begin
+              name = nil
+              if payload_object.is_a?(::Delayed::PerformableMethod)
+                object = payload_object.object
+                klass = object.is_a?(Class) ? object : object.class
+                class_name = klass.name
+                separator = payload_object.object.is_a?(Class) ? '.' : '#'
+                method_name = payload_object.method_name
+                name = "#{class_name}#{separator}#{method_name}"
+              else
+                name = payload_object.class.name
+              end
+              ctx = StackifyRubyAPM::Context.new
+              ctx.category = 'Delayed::Job'
+              transaction = StackifyRubyAPM.transaction name, 'TASK', context: ctx
+              ret = invoke_job_without_apm(*args, &block)
+            rescue StackifyRubyAPM::InternalError
+              raise # Don't report StackifyRubyAPM errors
+            rescue StandardError => e
+              StackifyRubyAPM.report e
+              raise e
+            ensure
+              transaction.submit()
+            end
+            ret
+          end
+        end
+      end
+    end
+
+    register 'Delayed::Backend::Base', 'delayed/backend/base', DelayedJobSpy.new
+  end
+end

data/lib/stackify_apm/version.rb

@@ -2,5 +2,5 @@
 
 # Sets the version of the APM
 module StackifyRubyAPM
-  VERSION = '1.10.2'.freeze
+  VERSION = '1.10.4'.freeze
 end

data/stackify-ruby-apm.gemspec

@@ -54,6 +54,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'timecop'
   spec.add_development_dependency 'to_bool'
   spec.add_development_dependency 'webmock'
+  spec.add_development_dependency 'delayed_job'
 
   spec.add_dependency('concurrent-ruby', '~> 1.0')
   spec.add_dependency('delegate_matcher', '~> 0.4')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackify-ruby-apm
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.10.4
 platform: ruby
 authors:
 - Stackify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -332,6 +332,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: delayed_job
+  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: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -457,6 +471,7 @@ files:
 - lib/stackify_apm/spies/curb/easy.rb
 - lib/stackify_apm/spies/curb/multi.rb
 - lib/stackify_apm/spies/custom_instrumenter.rb
+- lib/stackify_apm/spies/delayed_job.rb
 - lib/stackify_apm/spies/httparty.rb
 - lib/stackify_apm/spies/httpclient.rb
 - lib/stackify_apm/spies/httprb.rb