scout_apm 2.1.19 → 2.1.20

data/CHANGELOG.markdown

@@ -1,3 +1,10 @@
+# 2.1.20
+
+* Add a `detailed_middleware` boolean configuration option to capture
+  per-middleware data, as opposed to the default of aggregating all middleware
+  together.  This has a small amount of additional overhead, approximately
+  10-15ms per request.
+
 # 2.1.19
 
 * Log all configuration settings at start when log level is debug

data/lib/scout_apm.rb

@@ -75,7 +75,7 @@ require 'scout_apm/instruments/active_record'
 require 'scout_apm/instruments/action_controller_rails_2'
 require 'scout_apm/instruments/action_controller_rails_3_rails4'
 require 'scout_apm/instruments/middleware_summary'
-# require 'scout_apm/instruments/middleware_detailed' # Currently disabled functionality, see the file for details.
+require 'scout_apm/instruments/middleware_detailed' # Disabled by default, see the file for more details
 require 'scout_apm/instruments/rails_router'
 require 'scout_apm/instruments/grape'
 require 'scout_apm/instruments/sinatra'

data/lib/scout_apm/agent.rb

@@ -287,8 +287,13 @@ module ScoutApm
         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)
+
+        if config.value("detailed_middleware")
+          install_instrument(ScoutApm::Instruments::MiddlewareDetailed)
+        else
+          install_instrument(ScoutApm::Instruments::MiddlewareSummary)
+        end
       end
 
       install_instrument(ScoutApm::Instruments::ActiveRecord)

data/lib/scout_apm/config.rb

@@ -37,6 +37,7 @@ module ScoutApm
         'compress_payload',
         'config_file',
         'data_file',
+        'detailed_middleware',
         'dev_trace',
         'direct_host',
         'disabled_instruments',
@@ -45,8 +46,8 @@ module ScoutApm
         'hostname',
         'ignore',
         'key',
-        'log_level',
         'log_file_path',
+        'log_level',
         'monitor',
         'name',
         'profile',
@@ -129,6 +130,7 @@ module ScoutApm
       "monitor"                => BooleanCoercion.new,
       "enable_background_jobs" => BooleanCoercion.new,
       "dev_trace"              => BooleanCoercion.new,
+      "detailed_middleware"    => BooleanCoercion.new,
       "ignore"                 => JsonCoercion.new,
     }
 
@@ -203,6 +205,7 @@ module ScoutApm
     class ConfigDefaults
       DEFAULTS = {
         'compress_payload'       => true,
+        'detailed_middleware'    => false,
         'dev_trace'              => false,
         'direct_host'            => 'https://apm.scoutapp.com',
         'disabled_instruments'   => [],

data/lib/scout_apm/instruments/middleware_detailed.rb

@@ -1,13 +1,11 @@
 # Inserts a new middleware between each actual middleware in the application,
 # so as to trace the time for each one.
 #
-# Currently disabled due to the overhead of this approach (~10-15ms per request
-# in practice).  Instead, middleware as a whole are instrumented via the
-# MiddlewareSummary class.
+# Currently disabled by default due to the overhead of this approach (~10-15ms
+# per request in practice).  Instead, middleware as a whole are instrumented
+# via the MiddlewareSummary class.
 #
-# There will likely be a configuration flag to turn this on in favor of the
-# summary tracing in a future version of the agent, but this is not yet
-# implemented.
+# Turn this on with the configuration setting `detailed_middleware` set to true
 module ScoutApm
   module Instruments
     class MiddlewareDetailed

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.1.19"
+  VERSION = "2.1.20"
 end
 

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.1.19
+  version: 2.1.20
+  prerelease: 
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,104 +10,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-29 00:00:00.000000000 Z
+date: 2017-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: m
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Monitors Ruby apps and reports detailed metrics on performance to Scout.
@@ -118,8 +133,8 @@ extensions:
 - ext/rusage/extconf.rb
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
+- .gitignore
+- .rubocop.yml
 - CHANGELOG.markdown
 - Gemfile
 - LICENSE.md
@@ -267,27 +282,28 @@ files:
 homepage: https://github.com/scoutapp/scout_apm_ruby
 licenses:
 - Proprietary (See LICENSE.md)
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - data
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.5.1
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ruby application performance monitoring
 test_files:
 - test/data/config_test_1.yml

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 9c96b81ab9e23fab3fc75e9775a71820eeff30cd
-  data.tar.gz: 290163e5b70f31c60e0b81fc9910a06940e96632
-SHA512:
-  metadata.gz: 880a943dfb1962b22d1ff843966cac3d0eab48a0a3fe3054809fd8e0ffbded904ef7e3cf0e86ef85a76ddd02b2968d566513c8db9d29e661ec380b21d483fefb
-  data.tar.gz: bc6802491669535de00a932310c070a004b275d19412cc745cf113654a7d2646ba6559cddd5859647b5d3709547b46a255e962cbbd31b60d967ab807dad60476