scout_apm 2.4.19 → 2.4.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d38cfea3836f29b9e730a02bf557962026bb9ac
-  data.tar.gz: 9e27ad539198445863b7bd617852d0ca4a6550a1
+  metadata.gz: 3410254ae73b93df713b64fd10fc4e913e9ac8be
+  data.tar.gz: aa5bcf808cc4a7190d8d6597f1b1ae92fc0a77a3
 SHA512:
-  metadata.gz: 7f659866301061871d82cf314df34b735a07d0cfad4e58d2a9cced65dac466b32e9ce8079b8f7d254be4a68192eaf1f4ca830147997417be3d6768924ec94a5d
-  data.tar.gz: 738cecce8b1d3e32e6043244c9c2573dda6813c6fc106402e9d83dd00e19807c46fa085f596b6bbc2d5fbb7090e4acdd525bb0a6f69766474ea276fc9000c959
+  metadata.gz: d2144aa3b55a6ff69d22cdae53a88fb4eeb8d56040606ddf9cb4421cc6b802d7604004d04bcdd64242460c8c37174e730d118c632cf37a1965e4bf0a862b7a67
+  data.tar.gz: 2f79898f6ab830d10c8f6c783e987e47d2a8caa80d5e8b3ae98336372b4cec6abf8a1a9a70b2ac16800ce530ce04b318e3db783f1481fe5439c2a03e69e77584

data/CHANGELOG.markdown

@@ -1,3 +1,9 @@
+# 2.4.20
+
+* `start_resque_server_instrument` option to allow disabling the WEBrick server
+   component in custom installation scenarios
+* Allow setting `revision_sha` setting in YAML
+
 # 2.4.19
 
 * Fix disabled_instruments (#220)

data/lib/scout_apm/background_job_integrations/resque.rb

@@ -26,8 +26,12 @@ module ScoutApm
       def install_before_fork
         ::Resque.before_first_fork do
           begin
-            ScoutApm::Agent.instance.start
-            ScoutApm::Agent.instance.context.start_remote_server!(bind, port)
+            if ScoutApm::Agent.instance.context.config.value('start_resque_server_instrument')
+              ScoutApm::Agent.instance.start
+              ScoutApm::Agent.instance.context.start_remote_server!(bind, port)
+            else
+              logger.info("Not starting remote server due to 'start_resque_server_instrument' setting")
+            end
           rescue Errno::EADDRINUSE
             ScoutApm::Agent.instance.context.logger.warn "Error while Installing Resque Instruments, Port #{port} already in use. Set via the `remote_agent_port` configuration option"
           rescue => e

data/lib/scout_apm/config.rb

@@ -30,6 +30,7 @@ require 'scout_apm/environment'
 # uri_reporting    - 'path' or 'full_path' default is 'full_path', which reports URL params as well as the path.
 # remote_agent_host - Internal: What host to bind to, and also send messages to for remote. Default: 127.0.0.1.
 # remote_agent_port - What port to bind the remote webserver to
+# start_resque_server_instrument - Used in special situations with certain Resque installs
 #
 # Any of these config settings can be set with an environment variable prefixed
 # by SCOUT_ and uppercasing the key: SCOUT_LOG_LEVEL for instance.
@@ -66,7 +67,9 @@ module ScoutApm
         'remote_agent_host',
         'remote_agent_port',
         'report_format',
+        'revision_sha',
         'scm_subdirectory',
+        'start_resque_server_instrument',
         'uri_reporting',
         'instrument_http_url_length',
     ]
@@ -158,6 +161,7 @@ module ScoutApm
       'database_metric_limit'  => IntegerCoercion.new,
       'database_metric_report_limit' => IntegerCoercion.new,
       'instrument_http_url_length' => IntegerCoercion.new,
+      'start_resque_server_instrument' => BooleanCoercion.new,
     }
 
 
@@ -263,6 +267,7 @@ module ScoutApm
         'database_metric_limit'  => 5000, # The hard limit on db metrics
         'database_metric_report_limit' => 1000,
         'instrument_http_url_length' => 300,
+        'start_resque_server_instrument' => true, # still only starts if Resque is detected
       }.freeze
 
       def value(key)

data/lib/scout_apm/framework_integrations/rails_2.rb

@@ -15,7 +15,8 @@ module ScoutApm
 
       def present?
         defined?(::Rails) &&
-          defined?(ActionController) &&
+          defined?(::Rails::VERSION) &&
+            defined?(ActionController) &&
           Rails::VERSION::MAJOR < 3
       end
 

data/lib/scout_apm/framework_integrations/rails_3_or_4.rb

@@ -15,7 +15,8 @@ module ScoutApm
 
       def present?
         defined?(::Rails) &&
-          defined?(ActionController) &&
+          defined?(::Rails::VERSION) &&
+            defined?(ActionController) &&
           Rails::VERSION::MAJOR >= 3
       end
 

data/lib/scout_apm/git_revision.rb

@@ -17,7 +17,7 @@ module ScoutApm
     private
 
     def detect
-      detect_from_env_var    ||
+      detect_from_config     ||
       detect_from_heroku     ||
       detect_from_capistrano ||
       detect_from_git
@@ -27,8 +27,11 @@ module ScoutApm
       ENV['HEROKU_SLUG_COMMIT']
     end
 
-    def detect_from_env_var
-      ENV['SCOUT_REVISION_SHA']
+    # Config will locate the value from:
+    #   ENV variable - SCOUT_REVISION_SHA
+    #   YAML setting - revision_sha
+    def detect_from_config
+      context.config.value('revision_sha')
     end
 
     def detect_from_capistrano

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.4.19"
+  VERSION = "2.4.20"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.4.19
+  version: 2.4.20
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2018-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -392,7 +392,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring