scout_apm 4.0.4 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16b10ca7e3c7474546feb2b367438e9fabeb2c799e85608b96afb3ddea37b647
-  data.tar.gz: 044ced73909cff452e59bccf14e7dfcf344fd8f6262c5b633b0d3239995609fd
+  metadata.gz: f9a94a38d6b06a02e34ce7923e8084976739cc8d0fba1adfbc606f88b0bdf4d7
+  data.tar.gz: aebe73f5379911e8691be2771b3a3fc3f5fbdd4779f2038f6a6f6e0ed38e1e20
 SHA512:
-  metadata.gz: c2ae77ef620e77bce7b267fe8c39ff2f91945dfffc3ad008dd01cbd3b45268a8b44624713652d1df2bdeb2789bedb1fdb98aa58742b48326b1821ea01482132d
-  data.tar.gz: c533bf6cf2822f7688b4377e9f69e005eb1255c0c03cd000dd5d4edaef74b7761b4b8af9b8d39d1229480fd7f2cd0b0f6bcaf1890be5b3f6a9540bf7f8e03f64
+  metadata.gz: d8850b1365747879effcfe383d0b438070069d2b625365dc8ea61db7c72cf6840cdf73675c95aea7a7688750dbcb41efec1b7320232312172bc49be9b207d421
+  data.tar.gz: f3d389aa73f8b4090627843410c610edc1c5fa88740587136dbd8277d3ddfa5360e61d0d256ae23db7cf53f20b482d3f283541c077efcd2d12032e5f3f72f4e2

data/.github/workflows/test.yml

@@ -26,6 +26,9 @@ jobs:
           - 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
@@ -36,6 +39,7 @@ jobs:
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+      SCOUT_TEST_FEATURES: ${{ matrix.test_features }}
 
     runs-on: ubuntu-latest
 

data/CHANGELOG.markdown

@@ -1,9 +1,42 @@
+# 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)

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/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/auto_instrument/rails.rb

@@ -69,7 +69,6 @@ module ScoutApm
           end
 
           method_name = @method.last.children[0]
-          class_name = @scope.last.children[1]
           bt = ["#{file_name}:#{line}:in `#{method_name}'"]
 
           return [

data/lib/scout_apm/background_job_integrations/shoryuken.rb

@@ -37,6 +37,8 @@ module ScoutApm
       end
 
       def install_processor
+        # celluloid has not loaded by this point and older versions of `shorykuen/processor` assume that it did
+        require 'celluloid' if defined?(::Shoryuken::VERSION) && ::Shoryuken::VERSION < '3'
         require 'shoryuken/processor' # sidekiq v4 has not loaded this file by this point
 
         ::Shoryuken::Processor.class_eval do

data/lib/scout_apm/background_job_integrations/sidekiq.rb

@@ -80,12 +80,23 @@ module ScoutApm
       DELAYED_WRAPPER_KLASS = 'Sidekiq::Extensions::DelayedClass'.freeze
 
 
+      # Capturing the class name is a little tricky, since we need to handle several cases:
+      # 1. ActiveJob, with the class in the key 'wrapped'
+      # 2. ActiveJob, but the 'wrapped' key is wrong (due to YAJL serializing weirdly), find it in args.job_class
+      # 3. DelayedJob wrapper, deserializing using YAML into the real object, which can be introspected
+      # 4. No wrapper, just sidekiq's class
       def job_class(msg)
         job_class = msg.fetch('class', UNKNOWN_CLASS_PLACEHOLDER)
 
-        if job_class == ACTIVE_JOB_KLASS && msg.key?('wrapped')
+        if job_class == ACTIVE_JOB_KLASS && msg.key?('wrapped') && msg['wrapped'].is_a?(String)
           begin
-            job_class = msg['wrapped']
+            job_class = msg['wrapped'].to_s
+          rescue
+            ACTIVE_JOB_KLASS
+          end
+        elsif job_class == ACTIVE_JOB_KLASS && msg.try(:[], 'args').try(:[], 'job_class')
+          begin
+            job_class = msg['args']['job_class'].to_s
           rescue
             ACTIVE_JOB_KLASS
           end

data/lib/scout_apm/config.rb

@@ -29,6 +29,7 @@ require 'scout_apm/environment'
 # report_format    - 'json' or 'marshal'. Marshal is legacy and will be removed.
 # scm_subdirectory - if the app root lives in source management in a subdirectory. E.g. #{SCM_ROOT}/src
 # uri_reporting    - 'path' or 'full_path' default is 'full_path', which reports URL params as well as the path.
+# record_queue_time - true/false to enable recording of queuetime.
 # 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
@@ -55,6 +56,8 @@ module ScoutApm
         'direct_host',
         'disabled_instruments',
         'enable_background_jobs',
+        'external_service_metric_limit',
+        'external_service_metric_report_limit',
         'host',
         'hostname',
         'ignore',
@@ -69,6 +72,7 @@ module ScoutApm
         'name',
         'profile',
         'proxy',
+        'record_queue_time',
         'remote_agent_host',
         'remote_agent_port',
         'report_format',
@@ -177,7 +181,10 @@ module ScoutApm
       'compress_payload' => BooleanCoercion.new,
       'database_metric_limit'  => IntegerCoercion.new,
       'database_metric_report_limit' => IntegerCoercion.new,
+      'external_service_metric_limit'  => IntegerCoercion.new,
+      'external_service_metric_report_limit' => IntegerCoercion.new,
       'instrument_http_url_length' => IntegerCoercion.new,
+      'record_queue_time' => BooleanCoercion.new,
       'start_resque_server_instrument' => BooleanCoercion.new,
       'timeline_traces' => BooleanCoercion.new,
       'auto_instruments' => BooleanCoercion.new,
@@ -289,9 +296,12 @@ module ScoutApm
         'remote_agent_port'      => 7721, # picked at random
         'database_metric_limit'  => 5000, # The hard limit on db metrics
         'database_metric_report_limit' => 1000,
+        'external_service_metric_limit'  => 5000, # The hard limit on external service metrics
+        'external_service_metric_report_limit' => 1000,
         'instrument_http_url_length' => 300,
         'start_resque_server_instrument' => true, # still only starts if Resque is detected
         'collect_remote_ip' => true,
+        'record_queue_time' => true,
         'timeline_traces' => true,
         'auto_instruments' => false,
         'auto_instruments_ignore' => [],

data/lib/scout_apm/error_service/middleware.rb

@@ -9,10 +9,10 @@ module ScoutApm
         begin
           response = @app.call(env)
         rescue Exception => exception
-          puts "[Scout Error Service] Caught Exception: #{exception.class.name}"
-
           context = ScoutApm::Agent.instance.context
 
+          context.logger.debug "[Scout Error Service] Caught Exception: #{exception.class.name}"
+
           # Bail out early, and reraise if the error is not interesting.
           if context.ignored_exceptions.ignored?(exception)
             raise

data/lib/scout_apm/error_service/payload.rb

@@ -12,7 +12,7 @@ module ScoutApm
       # TODO: Don't use to_json since it isn't supported in Ruby 1.8.7
       def serialize
         payload = as_json.to_json
-        context.logger.info(payload)
+        context.logger.debug(payload)
         payload
       end
 

data/lib/scout_apm/error_service.rb

@@ -16,7 +16,9 @@ module ScoutApm
     # Used internally by SidekiqException
     def self.capture(exception, params = {})
       return if disabled?
-      return if ScoutApm::Agent.instance.context.ignored_exceptions.ignore?(exception)
+
+      context = ScoutApm::Agent.instance.context
+      return if context.ignored_exceptions.ignore?(exception)
 
       context.errors_buffer.capture(exception, env)
     end

data/lib/scout_apm/external_service_metric_set.rb

@@ -0,0 +1,97 @@
+# Note, this class must be Marshal Dumpable
+module ScoutApm
+  class ExternalServiceMetricSet
+    include Enumerable
+
+    attr_reader :metrics # the raw metrics. You probably want #metrics_to_report
+
+    def marshal_dump
+      [ @metrics ]
+    end
+
+    def marshal_load(array)
+      @metrics = array.first
+      @context = ScoutApm::Agent.instance.context
+    end
+
+    def initialize(context)
+      @context = context
+
+      # A hash of ExternalServiceMetricStats values, keyed by ExternalServiceMetricStats.key
+      @metrics = Hash.new
+    end
+
+    # Need to look this up again if we end up as nil. Which I guess can happen
+    # after a Marshal load?
+    def context
+      @context ||= ScoutApm::Agent.instance.context
+    end
+
+    def each
+      metrics.each do |_key, external_service_metric_stat|
+        yield external_service_metric_stat
+      end
+    end
+
+    # Looks up a ExternalServiceMetricStats instance in the +@metrics+ hash. Sets the value to +other+ if no key
+    # Returns a ExternalServiceMetricStats instance
+    def lookup(other)
+      metrics[other.key] ||= other
+    end
+
+    # Take another set, and merge it with this one
+    def combine!(other)
+      other.each do |metric|
+        self << metric
+      end
+      self
+    end
+
+    # Add a single ExternalServiceMetricStats object to this set.
+    #
+    # Looks up an existing one under this key and merges, or just saves a new
+    # one under the key
+    def <<(stat)
+      existing_stat = metrics[stat.key]
+      if existing_stat
+        existing_stat.combine!(stat)
+      elsif at_limit?
+        # We're full up, can't add any more.
+        # Should I log this? It may get super noisy?
+      else
+        metrics[stat.key] = stat
+      end
+    end
+
+    def increment_transaction_count!
+      metrics.each do |_key, external_service_metric_stat|
+        external_service_metric_stat.increment_transaction_count!
+      end
+    end
+
+    def metrics_to_report
+      report_limit = context.config.value('external_service_metric_report_limit')
+      if metrics.size > report_limit
+        metrics.
+          values.
+          sort_by {|stat| stat.call_time }.
+          reverse.
+          take(report_limit)
+      else
+        metrics.values
+      end
+    end
+
+    def inspect
+      metrics.map {|key, metric|
+        "#{key.inspect} - Count: #{metric.call_count}, Total Time: #{"%.2f" % metric.call_time}"
+      }.join("\n")
+    end
+
+    def at_limit?
+      @limit ||= context.config.value('external_service_metric_limit')
+      metrics.size >= @limit
+    end
+
+  end
+end

data/lib/scout_apm/external_service_metric_stats.rb

@@ -0,0 +1,85 @@
+module ScoutApm
+  class ExternalServiceMetricStats
+
+    DEFAULT_HISTOGRAM_SIZE = 50
+
+    attr_reader :domain_name
+    attr_reader :operation
+    attr_reader :scope
+
+    attr_reader :transaction_count
+
+    attr_reader :call_count
+    attr_reader :call_time
+
+    attr_reader :min_call_time
+    attr_reader :max_call_time
+
+    attr_reader :histogram
+
+    def initialize(domain_name, operation, scope, call_count, call_time)
+      @domain_name = domain_name
+      @operation = operation
+
+      @call_count = call_count
+
+      @call_time = call_time
+      @min_call_time = call_time
+      @max_call_time = call_time
+
+      # This histogram is for call_time
+      @histogram = NumericHistogram.new(DEFAULT_HISTOGRAM_SIZE)
+      @histogram.add(call_time)
+
+      @transaction_count = 0
+
+      @scope = scope
+    end
+
+    # Merge data in this scope. Used in ExternalServiceMetricSet
+    def key
+      @key ||= [domain_name, operation, scope]
+    end
+
+    # Combine data from another ExternalServiceMetricStats into +self+. Modifies and returns +self+
+    def combine!(other)
+      return self if other == self
+
+      @transaction_count += other.transaction_count
+      @call_count += other.call_count
+      @call_time += other.call_time
+
+      @min_call_time = other.min_call_time if @min_call_time.zero? or other.min_call_time < @min_call_time
+      @max_call_time = other.max_call_time if other.max_call_time > @max_call_time
+
+      @histogram.combine!(other.histogram)
+      self
+    end
+
+    def as_json
+      json_attributes = [
+        :domain_name,
+        :operation,
+        :scope,
+
+        :transaction_count,
+        :call_count,
+
+        :histogram,
+        :call_time,
+        :max_call_time,
+        :min_call_time,
+      ]
+
+      ScoutApm::AttributeArranger.call(self, json_attributes)
+    end
+
+    # Called by the Set on each ExternalServiceMetricStats object that it holds, only
+    # once during the recording of a transaction.
+    #
+    # Don't call elsewhere, and don't set to 1 in the initializer.
+    def increment_transaction_count!
+      @transaction_count += 1
+    end
+  end
+end

data/lib/scout_apm/fake_store.rb

@@ -26,6 +26,9 @@ module ScoutApm
     def track_db_query_metrics!(db_query_metric_set, options={})
     end
 
+    def track_external_service_metrics!(external_service_metric_set, options={})
+    end
+
     def track_slow_transaction!(slow_transaction)
     end
 

data/lib/scout_apm/framework_integrations/rails_3_or_4.rb

@@ -71,7 +71,11 @@ module ScoutApm
       #
       # We avoid this issue by not calling .respond_to? here, and instead using the less optimal `rescue nil` approach
       def raw_database_adapter
-        adapter = ActiveRecord::Base.connection_config[:adapter].to_s rescue nil
+        adapter = ActiveRecord::Base.connection_db_config.configuration_hash[:adapter] rescue nil
+
+        if adapter.nil?
+          adapter = ActiveRecord::Base.connection_config[:adapter].to_s rescue nil
+        end
 
         if adapter.nil?
           adapter = ActiveRecord::Base.configurations[env]["adapter"]

data/lib/scout_apm/git_revision.rb

@@ -20,6 +20,7 @@ module ScoutApm
       detect_from_config     ||
       detect_from_heroku     ||
       detect_from_capistrano ||
+      detect_from_mina ||
       detect_from_git
     end
 
@@ -43,6 +44,14 @@ module ScoutApm
       nil
     end
 
+    # https://github.com/mina-deploy/mina
+    def detect_from_mina 
+      File.read(File.join(app_root, '.mina_git_revision')).strip
+    rescue
+      logger.debug "Unable to detect Git Revision from Mina: #{$!.message}"
+      nil
+    end
+
     def detect_from_git
       if File.directory?(".git")
         `git rev-parse --short HEAD`.strip 

data/lib/scout_apm/ignored_uris.rb

@@ -4,7 +4,9 @@ module ScoutApm
     attr_reader :regex
 
     def initialize(prefixes)
-      regexes = Array(prefixes).map {|prefix| %r{\A#{prefix}} }
+      regexes = Array(prefixes).
+        reject{|prefix| prefix == ""}.
+        map {|prefix| %r{\A#{prefix}} }
       @regex = Regexp.union(*regexes)
     end
 

data/lib/scout_apm/instant/middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 module ScoutApm
   module Instant
 

data/lib/scout_apm/instruments/action_controller_rails_3_rails4.rb

@@ -95,8 +95,11 @@ module ScoutApm
               req.instant_key = instant_key
             end
 
-            if current_layer && current_layer.type == "Controller"
-              # Don't start a new layer if ActionController::API or ActionController::Base handled it already.
+            # Don't start a new layer if ActionController::API or
+            # ActionController::Base handled it already. Needs to account for
+            # any layers started during a around_action (most likely
+            # AutoInstrument, but could be another custom instrument)
+            if current_layer && (current_layer.type == "Controller" || current_layer.type == "AutoInstrument" || req.web?)
               super
             else
               begin

data/lib/scout_apm/instruments/action_view.rb

@@ -83,7 +83,7 @@ module ScoutApm
           maybe_template = args[1]
 
           template_name = @template.virtual_path rescue nil        # Works on Rails 3.2 -> end of Rails 5 series
-          template_name ||= maybe_template.virtual_path rescue nil # Works on Rails 6 -> 6.0.3
+          template_name ||= maybe_template.virtual_path rescue nil # Works on Rails 6 -> 6.0.3.5
           template_name ||= "Unknown Partial"
 
           layer_name = template_name + "/Rendering"
@@ -105,7 +105,10 @@ module ScoutApm
         def collection_with_template(*args, **kwargs)
           req = ScoutApm::RequestManager.lookup
 
-          template_name = @template.virtual_path rescue "Unknown Collection"
+          maybe_template = args[1]
+
+          template_name = @template.virtual_path rescue nil # Works on Rails 3.2 -> end of Rails 5 series
+          template_name ||= maybe_template.virtual_path rescue nil # Works on Rails 6 -> 6.0.3.5
           template_name ||= "Unknown Collection"
           layer_name = template_name + "/Rendering"
 
@@ -126,10 +129,15 @@ module ScoutApm
       end
 
       module ActionViewTemplateRendererInstruments
-        def render_template(*args, **kwargs)
+        # Don't forward kwargs here, since Rails 3, 4, 5, 6 don't use them, and
+        # it causes annoyances in the instrumentation
+        def render_template(*args)
           req = ScoutApm::RequestManager.lookup
 
-          template_name = args[0].virtual_path rescue "Unknown"
+          maybe_template = args[1]
+
+          template_name = args[0].virtual_path rescue nil # Works on Rails 3.2 -> end of Rails 5 series
+          template_name ||= maybe_template.virtual_path rescue nil # Works on Rails 6 -> 6.1.3
           template_name ||= "Unknown"
           layer_name = template_name + "/Rendering"
 
@@ -138,7 +146,7 @@ module ScoutApm
 
           begin
             req.start_layer(layer)
-            super(*args, **kwargs)
+            super(*args)
           ensure
             req.stop_layer
           end

data/lib/scout_apm/instruments/active_record.rb

@@ -215,6 +215,7 @@ module ScoutApm
           end
         end
       end
+      ruby2_keywords :log if respond_to?(:ruby2_keywords, true)
     end
 
     module ActiveRecordInstruments
@@ -267,6 +268,7 @@ module ScoutApm
           end
         end
       end
+      ruby2_keywords :log if respond_to?(:ruby2_keywords, true)
     end
 
     ################################################################################

data/lib/scout_apm/instruments/elasticsearch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 module ScoutApm
   module Instruments
     class Elasticsearch

data/lib/scout_apm/instruments/sinatra.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 # XXX: Is this file used?
 module ScoutApm
   module Instruments

data/lib/scout_apm/instruments/typhoeus.rb

@@ -29,10 +29,11 @@ module ScoutApm
 
       module TyphoeusHydraInstrumentation
         def run(*args, &block)
+          layer = ScoutApm::Layer.new("HTTP", "Hydra")
+          layer.desc = scout_desc
+
           req = ScoutApm::RequestManager.lookup
-          req.start_layer(ScoutApm::Layer.new("HTTP", "Hydra"))
-          current_layer = req.current_layer
-          current_layer.desc = scout_desc if current_layer
+          req.start_layer(layer)
 
           begin
             super(*args, &block)
@@ -50,10 +51,11 @@ module ScoutApm
 
       module TyphoeusInstrumentation
         def run(*args, &block)
+          layer = ScoutApm::Layer.new("HTTP", scout_request_verb)
+          layer.desc = scout_desc(scout_request_verb, scout_request_url)
+
           req = ScoutApm::RequestManager.lookup
-          req.start_layer(ScoutApm::Layer.new("HTTP", scout_request_verb))
-          current_layer = req.current_layer
-          current_layer.desc = scout_desc(scout_request_verb, scout_request_url) if current_layer
+          req.start_layer(layer)
 
           begin
             super(*args, &block)