scout_apm 1.2.4.1 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddf754c3343fd74b1e1eee46583ad1f57d10dae5
-  data.tar.gz: dd9bac67d7a2477c6eae14c3729ffb695ea3ee1c
+  metadata.gz: 103d9ad8a0cf748a92bf2283463ced16af225ec6
+  data.tar.gz: d941ca86450397e2499805ae3e7d6a717aa26bbb
 SHA512:
-  metadata.gz: dbdcc7b57c0aa7dc0b32106f1de6f6b25a25f4cd3592dbe383d5e2a71acd6d6cd1e955c2f7b68027e271ff130a313134d2bc045a0a5d402a446ec4195d028971
-  data.tar.gz: 2eef5342e7704fcd060991353a3b8753906650fed1b6bbefa0e56a440039e4ca8b46beb6a2339be22b442d40512272a0c39d08ca3e105455dde5c3da2b68dc3a
+  metadata.gz: 8402634e74e3153e3031bcb1ccd3854b32f496761b1634e5434afcf5444e7155d1f44e52f549c208ceb32b88aad601bced8b27b9e80d386a424f0397567411bf
+  data.tar.gz: dcee383d2769bbb15d0be63a8c7de47f8f025553fd10ee48375a2e4ef52f4f843bd7107e168cf40b4fedcaece40aed3b0915c7646091b900e0067c0a8592168e

data/CHANGELOG.markdown

@@ -1,3 +1,10 @@
+# 1.2.5
+
+* Instrument ActionController::Base instead of ::Metal.  This allows us to
+  track time spent in before and after filters, and requests that return early
+  from before filters.
+* Avoid parsing backtraces for requests that don't end up as Slow Transactions
+
 # 1.2.4.1
 
 * Reverting backtrace parser threshold back to 0.5 (same as < v1.2 agents)

data/lib/scout_apm/instruments/action_controller_rails_3.rb

@@ -15,11 +15,13 @@ module ScoutApm
       def install
         @installed = true
 
-        # ActionController::Base is a subclass of ActionController::Metal, so this instruments both
-        # standard Rails requests + Metal.
-        if defined?(::ActionController) && defined?(::ActionController::Metal)
-          ScoutApm::Agent.instance.logger.info "Instrumenting ActionController::Metal"
-          ::ActionController::Metal.class_eval do
+        # We previously instrumented ActionController::Metal, which missed
+        # before and after filter timing. Instrumenting Base includes those
+        # filters, at the expense of missing out on controllers that don't use
+        # the full Rails stack.
+        if defined?(::ActionController) && defined?(::ActionController::Base)
+          ScoutApm::Agent.instance.logger.info "Instrumenting ActionController::Base"
+          ::ActionController::Base.class_eval do
             # include ScoutApm::Tracer
             include ScoutApm::Instruments::ActionControllerRails3Instruments
           end

data/lib/scout_apm/layer_converter.rb

@@ -58,7 +58,6 @@ module ScoutApm
         meta_options.merge!(:desc => layer.desc) if layer.desc
 
         meta = MetricMeta.new(layer.legacy_metric_name, meta_options)
-        meta.extra.merge!(:backtrace => layer.backtrace) if layer.backtrace
         metric_hash[meta] ||= MetricStats.new( meta_options.has_key?(:scope) )
 
         stat = metric_hash[meta]
@@ -163,7 +162,7 @@ module ScoutApm
         if record_specific_metric?(layer.type)
           meta_options.merge!(:desc => layer.desc) if layer.desc
           meta = MetricMeta.new(layer.legacy_metric_name, meta_options)
-          meta.extra.merge!(:backtrace => layer.backtrace) if layer.backtrace
+          meta.extra.merge!(:backtrace => ScoutApm::SlowTransaction.backtrace_parser(layer.backtrace)) if layer.backtrace
           metric_hash[meta] ||= MetricStats.new( meta_options.has_key?(:scope) )
           stat = metric_hash[meta]
           stat.update!(layer.total_call_time, layer.total_exclusive_time)

data/lib/scout_apm/slow_transaction.rb

@@ -2,7 +2,7 @@ module ScoutApm
   class SlowTransaction
     include ScoutApm::BucketNameSplitter
 
-    BACKTRACE_THRESHOLD = 0.5 # the minimum threshold in seconds to record the backtrace for a metric. decreasing this can have a large impact on overhead/
+    BACKTRACE_THRESHOLD = 0.5 # the minimum threshold in seconds to record the backtrace for a metric.
     BACKTRACE_LIMIT = 5 # Max length of callers to display
     MAX_SIZE = 100 # Limits the size of the metric hash to prevent a metric explosion.
 

data/lib/scout_apm/tracked_request.rb

@@ -53,7 +53,7 @@ module ScoutApm
 
       # Do this here, rather than in the layer because we need this caller. Maybe able to move it?
       if layer.total_exclusive_time > ScoutApm::SlowTransaction::BACKTRACE_THRESHOLD
-        layer.store_backtrace(ScoutApm::SlowTransaction.backtrace_parser(caller))
+        layer.store_backtrace(caller)
       end
 
       if finalized?

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "1.2.4.1"
+  VERSION = "1.2.5"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 1.2.4.1
+  version: 1.2.5
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring