scout_apm 2.1.21 → 2.1.22

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 36b64e82960822e331059ed940c8e357255c3883
+  data.tar.gz: 6f04ee57e89946210a1cce690fda0178da06ed00
+SHA512:
+  metadata.gz: 8bbe4fd93b2767b05096d13a68d530393c8a61399b43105ae0b26ffde043ac41f7b9825eb352510d6a81d4d22f44f9b484e268632c76d39532089a5ba9e763e3
+  data.tar.gz: 10af6806c69c598167a619b0bbe4e5cc0170502b51a5b70e8cfa0e702d1fc9ded6e761702704421d37e3019ae07f03b0f8539a7fb3eb6b14d98a1c549089dc37

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 2.1.22
+
+* Add DevTrace support for newest 4.2.x and 5.x versions of Rails
+
 # 2.1.21
 
 * Fix edge case, causing DevTrace to fail

data/lib/scout_apm/instant/middleware.rb

@@ -53,7 +53,8 @@ module ScoutApm
         rack_response = @app.call(env)
         begin
           DevTraceResponseManipulator.new(env, rack_response).call
-        rescue => e
+        rescue Exception => e
+          # If anything went wrong at all, just bail out and return the unmodified response.
           ScoutApm::Agent.instance.logger.debug("DevTrace: Raised an exception: #{e.message}, #{e.backtrace}")
           rack_response
         end
@@ -132,27 +133,41 @@ module ScoutApm
 
       def adjust_html_response
         case true
-        when rails_response?      then  adjust_rails_response
+        when older_rails_response? then adjust_older_rails_response
+        when newer_rails_response? then adjust_newer_rails_response
         when rack_proxy_response? then  adjust_rack_proxy_response
         else
           # No action taken, we only adjust if we know exactly what we have.
         end
       end
 
-      def rails_response?
-        rack_body.is_a?(ActionDispatch::Response)
+      def older_rails_response?
+        if defined?(ActionDispatch::Response)
+          return true if rack_body.is_a?(ActionDispatch::Response)
+        end
+      end
+
+      def newer_rails_response?
+        if defined?(ActionDispatch::Response::RackBody)
+          return true if rack_body.is_a?(ActionDispatch::Response::RackBody)
+        end
       end
 
       def rack_proxy_response?
         rack_body.is_a?(Rack::BodyProxy)
       end
 
-      # Preserve the ActionDispatch::Response object we're working with
-      def adjust_rails_response
-        logger.debug("DevTrace: in middleware, dev_trace is active, and response has a body. This appears to be an HTML page and an ActionDispatch::Response. Path=#{path}; ContentType=#{content_type}")
+      def adjust_older_rails_response
+        logger.debug("DevTrace: in middleware, dev_trace is active, and response has a (older) body. This appears to be an HTML page and an ActionDispatch::Response. Path=#{path}; ContentType=#{content_type}")
         rack_body.body = [ html_manipulator.res ]
       end
 
+      # Preserve the ActionDispatch::Response object we're working with
+      def adjust_newer_rails_response
+        logger.debug("DevTrace: in middleware, dev_trace is active, and response has a (newer) body. This appears to be an HTML page and an ActionDispatch::Response. Path=#{path}; ContentType=#{content_type}")
+        @rack_body = [ html_manipulator.res ]
+      end
+
       def adjust_rack_proxy_response
         logger.debug("DevTrace: in middleware, dev_trace is active, and response has a body. This appears to be an HTML page and an Rack::BodyProxy. Path=#{path}; ContentType=#{content_type}")
         @rack_body = [ html_manipulator.res ]

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.1.21"
+  VERSION = "2.1.22"
 end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.1.21
-  prerelease: 
+  version: 2.1.22
 platform: ruby
 authors:
 - Derek Haynes
@@ -10,118 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-01-30 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.
@@ -133,8 +118,8 @@ extensions:
 - ext/rusage/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
+- ".gitignore"
+- ".rubocop.yml"
 - CHANGELOG.markdown
 - Gemfile
 - LICENSE.md
@@ -283,28 +268,27 @@ 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: 1.8.23.2
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby application performance monitoring
 test_files:
 - test/data/config_test_1.yml