scout_apm 2.5.1 → 5.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 89a778c6a185b81e358249aef0f9420bec2d9cbc
-  data.tar.gz: d4f063fd0c52537c5780fab065052e3b1c989848
+SHA256:
+  metadata.gz: c81f31cea98bcd57302e874b0efdbeee694af968f40f71a8f527f081c4b456db
+  data.tar.gz: 5bddaf96e0dec2e801b8625fbc8400f285a7e1d9cbd4a984429ce06e6abfa417
 SHA512:
-  metadata.gz: 2d46fa2cb57eb83c07c6a4b0552f9565834423b3af09402753524af2af81ff963d60a6b2fee6b19b8c786976baa61d67efc448477421f04f4fa0a84c5d97b3f2
-  data.tar.gz: 6db9909c632798dd5be1976577d74fc099a7587359a4af2736ae0c020240b4640cf8c6bbf2a165c299b7fe22c41d3fc5d2b73866d8c30a71809ced3a33019b78
+  metadata.gz: '02537899ea45c1a3e12178f2d208231670ac3b5e79b993fe19b99b004ce21f0c5017d4ca57673ff6e9d69eb739e00ab147c2a31d33ca46ac058faf5728c818be'
+  data.tar.gz: 56cb31af74654f8cf1579cd208907cb3ea769d5e99959e6e4df5ead8a257926cd67b9901215010115bd31c5b9184177d7bd6e63e9b9d4735cecc3b53924ef6c5

data/.github/workflows/test.yml

@@ -0,0 +1,68 @@
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: 2.6
+      - run: bundle exec rubocop
+
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - ruby: 2.1
+            gemfile: gems/rails3.gemfile
+          - ruby: 2.2
+          - ruby: 2.3
+          - ruby: 2.4
+          - ruby: 2.5
+          - ruby: 2.6
+          - ruby: 2.6
+            gemfile: gems/typhoeus.gemfile
+            test_features: "typhoeus"
+          - ruby: 2.6
+            gemfile: gems/octoshark.gemfile
+          - ruby: 2.6
+            gemfile: gems/rails3.gemfile
+            bundler: 1.17.3
+          - ruby: 2.7
+          - ruby: 2.7
+            prepend: true
+          - ruby: 3.0
+          - ruby: 3.0
+            prepend: true
+          - ruby: 3.0
+            gemfile: gems/instruments.gemfile
+            test_features: "instruments"
+          - ruby: 3.0
+            gemfile: gems/instruments.gemfile
+            prepend: true
+            test_features: "instruments"
+          - ruby: 3.0
+            gemfile: gems/sidekiq.gemfile
+            test_features: "sidekiq_install"
+
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+      SCOUT_TEST_FEATURES: ${{ matrix.test_features }}
+      SCOUT_USE_PREPEND: ${{ matrix.prepend }}
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          bundler: ${{matrix.bundler}}
+          ruby-version: ${{ matrix.ruby }}
+      - run: bundle exec rake

data/.gitignore

@@ -18,3 +18,4 @@ coverage/*
 lib/*.bundle
 lib/*.so
 log/scout_apm.log
+gems/*.lock

data/.rubocop.yml

@@ -1,13 +1,13 @@
 # Disable all cops by default
 AllCops:
   DisabledByDefault: true
+  Exclude:
+    - 'test/unit/auto_instrument/*'
+    - vendor/bundle/**/*
+  SuggestExtensions: false
 
 # 80 is stifling, especially with a few levels of nesting before we even start.
 # So bump it to 100 to keep really long lines from creeping in.
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: false
   Max: 100
-
-Style/HashSyntax:
-  Enabled: true
-  EnforcedStyle: hash_rockets

data/CHANGELOG.markdown

@@ -1,6 +1,179 @@
+# Unreleased
+
+# 5.3.2
+
+* Update redis instruments to support redis v5.0+ (#458)
+# 5.3.1
+
+* Fix typo in HTTPClient prepend instrumentation (#457)
+
+# 5.3.0
+
+* Add configuraiton option to use `Module#prepend` instead of `Module#alias_method` (default)
+  for instrumentation (#448). The default method for instrumentation has not changed, but
+  configuration options were added to allow switching to `Module#prepend` for most
+  instrumentation. Refer to the documentation for more information:
+  [Library Instrumentation Method](https://scoutapm.com/docs/ruby/configuration#library-instrumentation-method)
+
+# 5.2.0
+
+* Use Sidekiq lifecycle hooks to start Scout agent on Sidekiq start. (#449)
+
+# 5.1.1
+
+* Improvements to SqlServer scrubbing in SqlSanitizer (#422)
+
+# 5.1.0
+
+* Specify correct (MIT) license in Gemspec (#430)
+* Install HTTP::Client instruments (#420)
+* Sanitize FROM jsonb_as_recordset AS correctly in Postgres (#332)
+* Call to_h on `ActiveRecord::Base.configurations` (#434)
+* Allow loading of trusted `config/scout_apm.yml` via `YAML.unsafe_load` if available (#435)
+* Better exception handling when loading config (#436)
+* Check for nil other_metric_set in merge_external_service_metrics (#437)
+* Log `warn` in InstructionSequence only if SCOUT_LOG_LEVEL is debug (#438)
+* Check for Parser::TreeRewriter before loading AutoInstruments to avoid LoadError (#440)
+* Fall back to STDERR upon exception in build_logger (#441)
+
+
+# 5.0.0
+
+* Add External Service metrics reporting (#403)
+* Relicense to MIT (#429)
+* Opt out of frozen string literals in select files (#427)
+* Fall back when logger can't write to destination (#423)
+* Avoid exception on race condition (#407)
+* Add Mina deploy tracking support (#327)
+
+# 4.1.2
+
+* Add record_queue_time configuration (PR #422)
+
+# 4.1.1
+
+* Fix issue with Typheous Hydra instrument (#418)
+
+# 4.1.0
+
+* Preload Celluloid in Shoryuken instrumentation (#331)
+* Fix deprecation warning in Rails 6.1+ (#365)
+* Set Typheous's desc more directly (#392)
+* Delegate to ActiveRecord #log more intelligently (#394)
+* Don't delay starting agent when possible (#397)
+* Fix template naming issue in Rails 6+ (#399)
+* Avoid double-counting issue with AutoInstruments (#405)
+* Renaming test files for Remote::{Server|Route|Message} to be included in test run (#409)
+* More robust naming of Sidekiq jobs (#412)
+* Allow render_template instruments to work with older Rails (#413)
+* Fix function to manually capture exceptions (#415)
+* Enhance SQL Sanitization (#417)
+
+# 4.0.4
+
+* Add Faktory Support (#385)
+* Remove Regexp hack for 1.8.7 (no longer supported) (#384)
+* More robust DelayedJob detection (#382)
+* Fix kwargs handling in Tracing module (#381)
+
+# 4.0.3
+
+* Handle edge case with nil Typhoeus current-layer (#380)
+* Fix args passing to render_partial (#379)
+
+# 4.0.2
+
+* Add Typhoeus instrumentation (#376)
+
+# 4.0.1
+
+* Add support for Ruby 3.0 (#374)
+* Use Github Actions for CI (#370)
+* Fix edge case in sanitization of Postgres SQL (#368)
+
+# 4.0.0
+
+* Require Ruby >= 2.1 (#270)
+* ErrorService reporting. Enable with `errors_enabled` config setting. (#347)
+* Modular SlowRequestPolicy (#364)
+* Fix deprecation warnings (#354)
+
+# 2.6.10
+
+* Fix an edge case in JSON serialization (#360)
+
+# 2.6.9
+
+* Add `ssl_cert_file` config option (#352)
+* Improve sanitization of Postgres UPDATE SQL (#351)
+* Allow custom URL sanitization (#341)
+
+# 2.6.8
+
+* Lock rake version for 1.8.7 to older version (#329)
+* Delete unneeded .DS_Store file that snuck in (#334)
+* Fix typo in "queue_time_ms"
+* Fix Rails 6 deprecation warning at boot time (#337)
+* Fix partial naming on Rails 6.0 (#339)
+* Support Sidekiq 6.1 instrumentation (#340)
+
+# 2.6.7
+
+* Remove accidental call to `as_json`
+
+# 2.6.6
+
+* Add basic support for parsing Microsoft SQLServer queries (#317)
+* Refine Postgresql Sanitization with subqueries and JSON operations (#262)
+
+# 2.6.5
+
+* Add a tag to any requests that reach maximum number of spans (#316)
+* Update testing library Mocha (#315)
+* Fix case sensitivity mismatch in Job renaming (#314)
+* Add support for Sneakers 2.5 (#313)
+* Fix edge case with Resque instrumentation (#312)
+* Fix missing source code when used with BugSnag (#308)
+
+# 2.6.4
+
+* Add defensive check against a nil @address in Net/HTTP instruments (#306)
+
+# 2.6.3
+
+* Standardize Metadata with other language agents (#302)
+* Add Mongoid 7.x support (#295)
+* Add HTTP::Client support (#260)
+
+# 2.6.2
+
+* Fix Autoinstruments logging when running without ActiveSupport (#290)
+* Fix edge-case Autoinstruments syntax error (#287)
+* Fix invalid syntax for running on Ruby 1.8.7
+
+# 2.6.1
+
+* Logging total autoinstrumented spans and the ratio of significant to total spans (#283).
+* Added `autoinstruments_ignore` option (also #283).
+
+# 2.6.0
+
+* Autoinstruments (#247). Disabled by default. Set `auto_instruments: true` to enable.
+
+# 2.5.3
+
+* Add Que support (#265)
+* Add Memcached support (#279)
+
+# 2.5.2
+
+* Don't process limited layers in detailed traces (#268)
+* Fix OctoShark (and other gems which patch ActiveRecord) interaction (#217)
+* Legacy [Rails 2.3 fix for as_json](https://github.com/scoutapp/scout_apm_ruby/pull/276)
+
 # 2.5.1
 
-* Decrease timeline trace span limit to 1,500 as an attempted workaround for [this bug](https://github.com/scoutapp/scout_apm_ruby/issues/267).
+* Decrease timeline trace span limit to 1,500 to address [this bug](https://github.com/scoutapp/scout_apm_ruby/issues/267).
 
 # 2.5.0
 
@@ -17,7 +190,7 @@
 
 # 2.4.22
 
-* Support Rails 6.0 View Instruments (#251) 
+* Support Rails 6.0 View Instruments (#251)
 * Update documentation URLs (#236)
 
 # 2.4.21
@@ -665,7 +838,7 @@ Big set of features getting merged in for this release.
 
 # 0.1.3
 
-* Adds capacity calculation via "Instance/Capacity" metric. 
+* Adds capacity calculation via "Instance/Capacity" metric.
 * Tweaks tracing to still count a transaction if it results in a 500 error and includes it in accumulated time.
 * Adds per-transaction error tracking (ex: Errors/Controller/widgets/index)
 

data/Gemfile

@@ -3,10 +3,4 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in scout_apm.gemspec
 gemspec
 
-# Pin development dependencies more conservatively for Ruby 1.8.7
-if RUBY_VERSION <= "1.8.7"
-  gem "activesupport", "~> 3.2"
-  gem "i18n", "~> 0.6.11"
-  gem "pry", "~> 0.9.12"
-  gem "rake", "~> 10.5"
-end
+gem "rake", ">= 12.3.3"

data/LICENSE.md

@@ -1,31 +1,24 @@
-# Scout Software Agent License 
-
-Subject to and conditioned upon your continued compliance with the terms and conditions of this license, Zimuth, Inc. grants you a non-exclusive, non-sublicensable and non-transferable, limited license to install, use and run one copy of this software on each of your and your affiliate’s computers.  This license also grants you the limited right to distribute verbatim copies of this software and documentation to third parties provided the software and documentation will (a) remain the exclusive property of Zimuth; (b) be subject to the terms and conditions of this license; and (c) include a complete and unaltered copy of this license and all other copyright or other intellectual property rights notices contained in the original.
-
-The software includes the open-source components listed below. Any use of the open-source components by you shall be governed by, and subject to, the terms and conditions of the applicable open-source licenses.
-
-Except as this license expressly permits, you may not:
-
-* copy the software, in whole or in part; 
-* modify, correct, adapt, translate, enhance or otherwise prepare derivative works or improvements of the software; 
-* sell, sublicense, assign, distribute, publish, transfer or otherwise make available the software to any person or entity; 
-* remove, delete, efface, alter, obscure, translate, combine, supplement or otherwise change any trademarks, terms of the documentation, warranties, disclaimers, or intellectual property rights, or other symbols, notices, marks or serial numbers on or relating to any copy of the software or documentation; or
-use the software in any manner or for any purpose that infringes, misappropriates or otherwise violates any intellectual property right or other right of any person or entity, or that violates any applicable law;
-
-By using the software, you acknowledge and agree that:
-
-* the software and documentation are licensed, not sold, to you by Zimuth and you do not and will not have or acquire under or in connection with this license any ownership interest in the software or documentation, or in any related intellectual property rights; and
-* Zimuth will remain the sole and exclusive owner of all right, title and interest in and to the software and documentation, including all related intellectual property rights, subject only to the rights of third parties in open-source components and the limited license granted to you under this license; and
-
-Except for the limited rights and licenses expressly granted to you under this agreement, nothing in this license grants, by implication, waiver, estoppel or otherwise, to you or any third party any intellectual property rights or other right, title, or interest in or to any of the software or documentation.
- 
-This license shall be automatically terminated and revoked if you exceed the scope or violate any terms and conditions of this license. 
-
-ALL LICENSED SOFTWARE, DOCUMENTATION AND OTHER PRODUCTS, INFORMATION, MATERIALS AND SERVICES PROVIDED BY ZIMUTH ARE PROVIDED HERE “AS IS.” ZIMUTH DISCLAIMS ALL WARRANTIES, WHETHER EXPRESS, IMPLIED, STATUTORY OR OTHER (INCLUDING ALL WARRANTIES ARISING FROM COURSE OF DEALING, USAGE OR TRADE PRACTICE), AND SPECIFICALLY DISCLAIMS ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. WITHOUT LIMITING THE FOREGOING, ZIMUTH MAKES NO WARRANTY OF ANY KIND THAT THE LICENSED SOFTWARE OR DOCUMENTATION, OR ANY OTHER LICENSOR OR THIRD-PARTY GOODS, SERVICES, TECHNOLOGIES OR MATERIALS, WILL MEET YOUR REQUIREMENTS, OPERATE WITHOUT INTERRUPTION, ACHIEVE ANY INTENDED RESULT, BE COMPATIBLE OR WORK WITH ANY OTHER GOODS, SERVICES, TECHNOLOGIES OR MATERIALS (INCLUDING ANY SOFTWARE, HARDWARE, SYSTEM OR NETWORK) EXCEPT IF AND TO THE EXTENT EXPRESSLY SET FORTH IN THE DOCUMENTATION, OR BE SECURE, ACCURATE, COMPLETE, FREE OF HARMFUL CODE OR ERROR FREE. ALL OPEN-SOURCE COMPONENTS AND OTHER THIRD-PARTY MATERIALS ARE PROVIDED “AS IS” AND ANY REPRESENTATION OR WARRANTY OF OR CONCERNING ANY OF THEM IS STRICTLY BETWEEN LICENSEE AND THE THIRD-PARTY OWNER OR DISTRIBUTOR OF SUCH OPEN-SOURCE COMPONENTS AND THIRD-PARTY MATERIALS.
- 
-IN NO EVENT WILL ZIMUTH BE LIABLE UNDER OR IN CONNECTION WITH THIS LICENSE OR ITS SUBJECT MATTER UNDER ANY LEGAL OR EQUITABLE THEORY, INCLUDING BREACH OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY AND OTHERWISE, FOR ANY CONSEQUENTIAL, INCIDENTAL, INDIRECT, EXEMPLARY, SPECIAL, ENHANCED OR PUNITIVE DAMAGES, IN EACH CASE REGARDLESS OF WHETHER SUCH PERSONS WERE ADVISED OF THE POSSIBILITY OF SUCH LOSSES OR DAMAGES OR SUCH LOSSES OR DAMAGES WERE OTHERWISE FORESEEABLE, AND NOTWITHSTANDING THE FAILURE OF ANY AGREED OR OTHER REMEDY OF ITS ESSENTIAL PURPOSE.
-
-## OPEN SOURCE COMPONENTS
+The MIT License (MIT)
+
+Copyright (c) 2015-2021 Zimuth, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 
 This product includes `rusage`, which inherits the Artistic License 2.0 from proc/wait3.
 See http://www.rubydoc.info/gems/rusage/0.2.0.

data/gems/README.md

@@ -0,0 +1,28 @@
+# Gems
+
+These gemfiles list specific configurations of gems that we use in travis testing.
+
+## Travis Matrix
+
+```yaml
+matrix:
+  include:
+    - rvm: "1.8.7"
+      gemfile: gems/rails3.gemfile
+```
+
+Using a gemfile controls the specific versions of the gems that are installed, and can be used to reproduce customer configurations for testing.
+
+## Local Testing
+
+To install the gems specified by a specific gemfile:
+
+```
+BUNDLE_GEMFILE=gems/rails5.gemfile bundle install
+```
+
+Then, to run tests using these gems:
+
+```
+BUNDLE_GEMFILE=gems/rails5.gemfile bundle exec rake
+```

data/gems/instruments.gemfile

@@ -0,0 +1,6 @@
+eval_gemfile("../Gemfile")
+
+gem 'httpclient'
+gem 'http'
+gem 'redis'
+gem 'moped'

data/gems/octoshark.gemfile

@@ -0,0 +1,4 @@
+eval_gemfile("../Gemfile")
+
+# https://github.com/scoutapp/scout_apm_ruby/issues/217
+gem 'octoshark'

data/gems/rails3.gemfile

@@ -0,0 +1,5 @@
+eval_gemfile("../Gemfile")
+
+gem "json", "1.8.6"
+gem "rails", "~> 3.2"
+gem "sqlite3", "~> 1.3.5"

data/gems/rails4.gemfile

@@ -0,0 +1,4 @@
+eval_gemfile("../Gemfile")
+
+gem "rails", "~> 4.2"
+gem "sqlite3", "~> 1.3.6"

data/gems/rails5.gemfile

@@ -0,0 +1,4 @@
+eval_gemfile("../Gemfile")
+
+gem "rails", "~> 5.0"
+gem "sqlite3", "~> 1.3", ">= 1.3.6"

data/gems/rails6.gemfile

@@ -0,0 +1,4 @@
+eval_gemfile("../Gemfile")
+
+gem "rails", "~> 6.0"
+gem "sqlite3", "~> 1.4"

data/gems/sidekiq.gemfile

@@ -0,0 +1,4 @@
+eval_gemfile("../Gemfile")
+
+# https://github.com/scoutapp/scout_apm_ruby/issues/449
+gem 'sidekiq', '>= 6.5.0'

data/gems/typhoeus.gemfile

@@ -0,0 +1,3 @@
+eval_gemfile("../Gemfile")
+
+gem 'typhoeus'

data/lib/scout_apm/agent/preconditions.rb

@@ -27,10 +27,10 @@ module ScoutApm
         PRECONDITION_DETECTED_SERVER = {
           :message => proc {|environ| "Deferring agent start. Standing by for first request" },
           :check => proc { |context|
-            app_server_missing = !context.environment.app_server_integration(true).found?
-            background_job_missing = context.environment.background_job_integrations.length == 0
+            app_server_found = context.environment.app_server_integration(true).found?
+            background_job_integration_found = context.environment.background_job_integrations.length > 0
 
-            !app_server_missing && !background_job_missing
+            app_server_found || background_job_integration_found
           },
           :severity => :info,
         },

data/lib/scout_apm/agent.rb

@@ -66,6 +66,7 @@ module ScoutApm
 
       if context.started?
         start_background_worker unless background_worker_running?
+        start_error_service_background_worker unless error_service_background_worker_running?
         return
       end
 
@@ -81,6 +82,7 @@ module ScoutApm
       @app_server_load ||= AppServerLoad.new(context).run
 
       start_background_worker
+      start_error_service_background_worker
     end
 
     def instrument_manager
@@ -198,5 +200,25 @@ module ScoutApm
         @background_worker               &&
         @background_worker.running?
     end
+
+    # seconds to batch error reports
+    ERROR_SEND_FREQUENCY = 5
+    def start_error_service_background_worker
+      periodic_work = ScoutApm::ErrorService::PeriodicWork.new(context)
+
+      @error_service_background_worker = ScoutApm::BackgroundWorker.new(context, ERROR_SEND_FREQUENCY)
+      @error_service_background_worker_thread = Thread.new do
+        @error_service_background_worker.start { 
+          periodic_work.run
+        }
+      end
+    end
+
+    def error_service_background_worker_running?
+      @error_service_background_worker_thread          &&
+        @error_service_background_worker_thread.alive? &&
+        @error_service_background_worker               &&
+        @error_service_background_worker.running?
+    end
   end
 end

data/lib/scout_apm/agent_context.rb

@@ -96,11 +96,18 @@ module ScoutApm
     end
 
     def slow_request_policy
-      @slow_request_policy ||= ScoutApm::SlowRequestPolicy.new(self)
+      @slow_request_policy ||= ScoutApm::SlowRequestPolicy.new(self).tap{|p| p.add_default_policies }
     end
 
     def slow_job_policy
-      @slow_job_policy ||= ScoutApm::SlowJobPolicy.new(self)
+      @slow_job_policy ||= ScoutApm::SlowRequestPolicy.new(self).tap{|p| p.add_default_policies }
+    end
+
+    # Maintains a Histogram of insignificant/significant autoinstrument layers.
+    # significant = 1
+    # insignificant = 0
+    def auto_instruments_layer_histograms
+      @auto_instruments_layer_histograms ||= ScoutApm::RequestHistograms.new
     end
 
     # Histogram of the cumulative requests since the start of the process
@@ -135,6 +142,18 @@ module ScoutApm
       config.value('dev_trace') && environment.env == "development"
     end
 
+    ###################
+    #  Error Service  #
+    ###################
+
+    def error_buffer
+      @error_buffer ||= ScoutApm::ErrorService::ErrorBuffer.new(self)
+    end
+
+    def ignored_exceptions
+      @ignored_exceptions ||= ScoutApm::ErrorService::IgnoredExceptions.new(self, config.value('errors_ignored_exceptions'))
+    end
+
     #############
     #  Setters  #
     #############

data/lib/scout_apm/app_server_load.rb

@@ -29,12 +29,17 @@ module ScoutApm
     end
 
     def data
-      { :server_time        => to_s_safe(Time.now),
+      { 
+        :language           => 'ruby',
+        :language_version   => RUBY_VERSION,
+        :ruby_version       => RUBY_VERSION, # Deprecated.
+
         :framework          => to_s_safe(environment.framework_integration.human_name),
         :framework_version  => to_s_safe(environment.framework_integration.version),
+
+        :server_time        => to_s_safe(Time.now),
         :environment        => to_s_safe(environment.framework_integration.env),
         :app_server         => to_s_safe(environment.app_server),
-        :ruby_version       => RUBY_VERSION,
         :hostname           => to_s_safe(environment.hostname),
         :database_engine    => to_s_safe(environment.database_engine),      # Detected
         :database_adapter   => to_s_safe(environment.raw_database_adapter), # Raw

data/lib/scout_apm/auto_instrument/instruction_sequence.rb

@@ -0,0 +1,31 @@
+
+require 'scout_apm/auto_instrument/rails'
+
+module ScoutApm
+  module AutoInstrument
+    module InstructionSequence
+      def load_iseq(path)
+        if Rails.controller_path?(path) & !Rails.ignore?(path)
+          begin
+            new_code = Rails.rewrite(path)
+            return self.compile(new_code, path, path)
+          rescue
+            warn "Failed to apply auto-instrumentation to #{path}: #{$!}" if ENV['SCOUT_LOG_LEVEL'].to_s.downcase == "debug"
+          end
+        elsif Rails.ignore?(path)
+          warn "AutoInstruments are ignored for path=#{path}." if ENV['SCOUT_LOG_LEVEL'].to_s.downcase == "debug"
+        end
+
+        return self.compile_file(path)
+      end
+    end
+
+    # This should work (https://bugs.ruby-lang.org/issues/15572), but it doesn't.
+    # RubyVM::InstructionSequence.extend(InstructionSequence)
+
+    # So we do this instead:
+    class << ::RubyVM::InstructionSequence
+      prepend InstructionSequence
+    end
+  end
+end

data/lib/scout_apm/auto_instrument/layer.rb

@@ -0,0 +1,23 @@
+
+module ScoutApm
+  def self.AutoInstrument(name, backtrace)
+    request = ScoutApm::RequestManager.lookup
+
+    file_name, _ = backtrace.first.split(":", 2)
+
+    begin
+      layer = ScoutApm::Layer.new('AutoInstrument', name)
+      layer.backtrace = backtrace
+      layer.file_name = file_name
+
+      request.start_layer(layer)
+      started_layer = true
+
+      result = yield
+    ensure
+      request.stop_layer if started_layer
+    end
+
+    return result
+  end
+end

data/lib/scout_apm/auto_instrument/parser.rb

@@ -0,0 +1,27 @@
+
+require 'parser/current'
+raise LoadError, "Parser::TreeRewriter was not defined" unless defined?(Parser::TreeRewriter)
+
+module ScoutApm
+  module AutoInstrument
+    class Cache
+      def initialize
+        @local_assignments = {}
+      end
+      
+      def local_assignments?(node)
+        unless @local_assignments.key?(node)
+          if node.type == :lvasgn
+            @local_assignments[node] = true
+          elsif node.children.find{|child| child.is_a?(Parser::AST::Node) && self.local_assignments?(child)}
+            @local_assignments[node] = true
+          else
+            @local_assignments[node] = false
+          end
+        end
+        
+        return @local_assignments[node]
+      end
+    end
+  end
+end