scout_apm 2.4.13 → 2.4.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.markdown +4 -0
- data/lib/scout_apm/framework_integrations/rails_3_or_4.rb +14 -5
- data/lib/scout_apm/version.rb +1 -1
- metadata +3 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c2f05daf2aea310649b012308c81cee4f9de38df
|
|
4
|
+
data.tar.gz: 14407e60e5bb3dfb282b8cd92dd7f03e52b1cb12
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8450ba1ff69c5a8b976d27d755e5879cfc3e855f0951862c9ffab2584ac22dae4476792a628b1c50017d7325d60b65ef00b6590a4ec6a23aef01dc6bdbed9a66
|
|
7
|
+
data.tar.gz: 543779510c2f4b96fb31308bc25aedf3074a8ad3c4890f7bcf56d78daa1092fbf8f3ee15a0124c331216b832d000118398c321fafcc7d38204be1d5136fd9e89
|
data/CHANGELOG.markdown
CHANGED
|
@@ -55,12 +55,21 @@ module ScoutApm
|
|
|
55
55
|
end
|
|
56
56
|
end
|
|
57
57
|
|
|
58
|
+
# Note, this code intentionally avoids `.respond_to?` because of an
|
|
59
|
+
# infinite loop created by the Textacular gem (tested against 3.2.2 of
|
|
60
|
+
# that gem), which some customers have installed.
|
|
61
|
+
#
|
|
62
|
+
# The loop was:
|
|
63
|
+
# - Ask for database adapter
|
|
64
|
+
# - Do .respond_to? on AR::Base to look for connection_config (which isn't present on some versions of rails)
|
|
65
|
+
# - Textacular gem has a monkey-patch that queries the columns of the db
|
|
66
|
+
# This obtains a connection, and runs a query.
|
|
67
|
+
# - Scout tries to run SQLSanitizer against the query, which needs the database adapter.
|
|
68
|
+
# - Goes back to first step.
|
|
69
|
+
#
|
|
70
|
+
# We avoid this issue by not calling .respond_to? here, and instead using the less optimal `rescue nil` approach
|
|
58
71
|
def raw_database_adapter
|
|
59
|
-
adapter =
|
|
60
|
-
ActiveRecord::Base.connection_config[:adapter].to_s
|
|
61
|
-
else
|
|
62
|
-
nil
|
|
63
|
-
end
|
|
72
|
+
adapter = ActiveRecord::Base.connection_config[:adapter].to_s rescue nil
|
|
64
73
|
|
|
65
74
|
if adapter.nil?
|
|
66
75
|
adapter = ActiveRecord::Base.configurations[env]["adapter"]
|
data/lib/scout_apm/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: scout_apm
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.4.
|
|
4
|
+
version: 2.4.14
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Derek Haynes
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2018-
|
|
12
|
+
date: 2018-07-02 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: minitest
|
|
@@ -390,7 +390,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
390
390
|
version: '0'
|
|
391
391
|
requirements: []
|
|
392
392
|
rubyforge_project: scout_apm
|
|
393
|
-
rubygems_version: 2.4.
|
|
393
|
+
rubygems_version: 2.4.5.2
|
|
394
394
|
signing_key:
|
|
395
395
|
specification_version: 4
|
|
396
396
|
summary: Ruby application performance monitoring
|
|
@@ -438,4 +438,3 @@ test_files:
|
|
|
438
438
|
- test/unit/utils/backtrace_parser_test.rb
|
|
439
439
|
- test/unit/utils/numbers_test.rb
|
|
440
440
|
- test/unit/utils/scm.rb
|
|
441
|
-
has_rdoc:
|