scout_apm 2.1.12 → 2.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d01f68861b6803d09d9780d51233cd1eb66db7c
-  data.tar.gz: 8ef93aab69a31d695e98e56bb2b9c0f8ca8a4cd4
+  metadata.gz: 270c8e00f124e50fa52444a01e1d17339ea46a86
+  data.tar.gz: e9699a8a5614f9e752a0b64fba22079a655e52d1
 SHA512:
-  metadata.gz: 77ed9e84c4fda4c8c4f7786ad854e23cf991ce24b71750e239ac61681f256fd02d2b9dfd0be496550dec3e7a9f901dec4a05e596d4d628e47d611d3378a3ffaa
-  data.tar.gz: 717459f9e898f05a969713ae6840b182357e0701a5c37cb8cee835310b4eeeebf8f004add0f2addfab05cfe1a132b482ee8ae00c0e2212b5e3939622f5bd9910
+  metadata.gz: 5e1935a1bdb172835103fc0b6a61ecf3e3306df472db5a87730c4d056cc20ad8fa36abde59b59bdf577e463645e57c358e6a12e3e719ca870811ed90d6bbe0ea
+  data.tar.gz: e53d0af91f2de2f6123ade8b76744cdbf8b33bc10d13913aa930782a75b576b0db4b5a91b92bfe93b50dd15be4d90d8dce64fd6d9a56828eb29543544504a467

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 2.1.13
+
+* Rework Delayed Job instrumentation to not interfere with other instruments.
+
 # 2.1.12
 
 * Revert 2.1.11's Delayed Job change - caused issues in a handful of environments

data/lib/scout_apm/agent.rb

@@ -275,20 +275,13 @@ module ScoutApm
 
     # Loads the instrumention logic.
     def load_instruments
-      if !background_job_missing?
-#        case environment.background_job_name
-#        when :delayed_job
-#          install_instrument(ScoutApm::Instruments::DelayedJob)
-#        end
-      else
-        case environment.framework
-        when :rails       then install_instrument(ScoutApm::Instruments::ActionControllerRails2)
-        when :rails3_or_4 then
-          install_instrument(ScoutApm::Instruments::ActionControllerRails3Rails4)
-          install_instrument(ScoutApm::Instruments::MiddlewareSummary)
-          install_instrument(ScoutApm::Instruments::RailsRouter)
-        # when :sinatra     then install_instrument(ScoutApm::Instruments::Sinatra)
-        end
+      case environment.framework
+      when :rails then
+        install_instrument(ScoutApm::Instruments::ActionControllerRails2)
+      when :rails3_or_4 then
+        install_instrument(ScoutApm::Instruments::ActionControllerRails3Rails4)
+        install_instrument(ScoutApm::Instruments::MiddlewareSummary)
+        install_instrument(ScoutApm::Instruments::RailsRouter)
       end
 
       install_instrument(ScoutApm::Instruments::ActiveRecord)

data/lib/scout_apm/background_job_integrations/delayed_job.rb

@@ -8,7 +8,7 @@ module ScoutApm
       end
 
       def present?
-        defined?(::Delayed::Job) && File.basename($PROGRAM_NAME).start_with?('delayed_job')
+        defined?(::Delayed::Job)
       end
 
       def forking?

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.1.12"
+  VERSION = "2.1.13"
 end
 

data/lib/scout_apm.rb

@@ -69,7 +69,6 @@ require 'scout_apm/instruments/mongoid'
 require 'scout_apm/instruments/redis'
 require 'scout_apm/instruments/influxdb'
 require 'scout_apm/instruments/elasticsearch'
-require 'scout_apm/instruments/delayed_job'
 require 'scout_apm/instruments/active_record'
 require 'scout_apm/instruments/action_controller_rails_2'
 require 'scout_apm/instruments/action_controller_rails_3_rails4'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.1.12
+  version: 2.1.13
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -147,7 +147,6 @@ files:
 - lib/scout_apm/instruments/action_controller_rails_2.rb
 - lib/scout_apm/instruments/action_controller_rails_3_rails4.rb
 - lib/scout_apm/instruments/active_record.rb
-- lib/scout_apm/instruments/delayed_job.rb
 - lib/scout_apm/instruments/elasticsearch.rb
 - lib/scout_apm/instruments/grape.rb
 - lib/scout_apm/instruments/http_client.rb
@@ -268,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.4.8
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring
@@ -296,3 +295,4 @@ test_files:
 - test/unit/utils/active_record_metric_name_test.rb
 - test/unit/utils/backtrace_parser_test.rb
 - test/unit/utils/numbers_test.rb
+has_rdoc: 

data/lib/scout_apm/instruments/delayed_job.rb

@@ -1,57 +0,0 @@
-module ScoutApm
-  module Instruments
-    class DelayedJob
-      attr_reader :logger
-
-      def initialize(logger=ScoutApm::Agent.instance.logger)
-        @logger = logger
-        @installed = false
-      end
-
-      def installed?
-        @installed
-      end
-
-      def install
-        @installed = true
-        if defined?(::Delayed::Worker)
-          ::Delayed::Worker.class_eval do
-            include ScoutApm::Tracer
-            include ScoutApm::Instruments::DelayedJobInstruments
-            alias run_without_scout_instruments run
-            alias run run_with_scout_instruments
-          end
-        end
-      end
-    end
-
-    module DelayedJobInstruments
-      def run_with_scout_instruments(job)
-        scout_method_name = method_from_handler(job.handler)
-        queue = job.queue
-        latency = (Time.now.to_f - job.created_at.to_f) * 1000
-
-        ScoutApm::Agent.instance.store.track_one!("Queue", queue, 0, {:extra_metrics => {:latency => latency}})
-        req = ScoutApm::RequestManager.lookup
-        req.job!
-        req.start_layer( ScoutApm::Layer.new("Job", scout_method_name) )
-
-        begin
-          run_without_scout_instruments(job)
-        rescue
-          req.error!
-          raise
-        ensure
-          req.stop_layer
-        end
-      end
-
-      def method_from_handler(handler)
-        job_handler = YAML.load(handler)
-        klass = job_handler.object.name
-        method = job_handler.method_name
-        "#{klass}##{method}"
-      end
-    end
-  end
-end