scout_apm 2.4.13 → 2.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ec07b46e556c0beae2648d2c25a610199814179
-  data.tar.gz: ed6284b5c6a58a7ab08a464eb6e60cb65334d12f
+  metadata.gz: c2f05daf2aea310649b012308c81cee4f9de38df
+  data.tar.gz: 14407e60e5bb3dfb282b8cd92dd7f03e52b1cb12
 SHA512:
-  metadata.gz: 15c5a89d33a1af9e605a03390b9344cfad0ceefbb18a3afe6800c4afb3797bca60af57d15ef0323165e344d55454877d15e8455f12e3ba5fd15bf3c3eaf01867
-  data.tar.gz: 1caf6345c5900c54a493aa87bd95168fa5733ae91a7b73211094045b0437c707e6e755286481d89514f43dca1a8a2e31f3a8eeb5dec8cbbabdfebbfb8aed52ac
+  metadata.gz: 8450ba1ff69c5a8b976d27d755e5879cfc3e855f0951862c9ffab2584ac22dae4476792a628b1c50017d7325d60b65ef00b6590a4ec6a23aef01dc6bdbed9a66
+  data.tar.gz: 543779510c2f4b96fb31308bc25aedf3074a8ad3c4890f7bcf56d78daa1092fbf8f3ee15a0124c331216b832d000118398c321fafcc7d38204be1d5136fd9e89

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 2.4.14
+
+* Fix database connection issue when installed in an app also using the Textacular gem
+
 # 2.4.13
 
 * Incorporating total time consumed into transaction trace policy

data/lib/scout_apm/framework_integrations/rails_3_or_4.rb

@@ -55,12 +55,21 @@ module ScoutApm
         end
       end
 
+      # Note, this code intentionally avoids `.respond_to?` because of an
+      # infinite loop created by the Textacular gem (tested against 3.2.2 of
+      # that gem), which some customers have installed.
+      #
+      # The loop was:
+      #   - Ask for database adapter
+      #   - Do .respond_to? on AR::Base to look for connection_config (which isn't present on some versions of rails)
+      #   - Textacular gem has a monkey-patch that queries the columns of the db
+      #     This obtains a connection, and runs a query.
+      #   - Scout tries to run SQLSanitizer against the query, which needs the database adapter.
+      #   - Goes back to first step.
+      #
+      # We avoid this issue by not calling .respond_to? here, and instead using the less optimal `rescue nil` approach
       def raw_database_adapter
-        adapter = if ActiveRecord::Base.respond_to?(:connection_config)
-                    ActiveRecord::Base.connection_config[:adapter].to_s
-                  else
-                    nil
-                  end
+        adapter = ActiveRecord::Base.connection_config[:adapter].to_s rescue nil
 
         if adapter.nil?
           adapter = ActiveRecord::Base.configurations[env]["adapter"]

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.4.13"
+  VERSION = "2.4.14"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.4.13
+  version: 2.4.14
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2018-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -390,7 +390,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring
@@ -438,4 +438,3 @@ test_files:
 - test/unit/utils/backtrace_parser_test.rb
 - test/unit/utils/numbers_test.rb
 - test/unit/utils/scm.rb
-has_rdoc: