scout_apm 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee80eaab8042686350c223a715ff7a12ff7b5eee
-  data.tar.gz: 13d93be3815d1b014716081d130466764a79aeed
+  metadata.gz: 5e7455372ff88117a2caf4ecac5634b833131c30
+  data.tar.gz: c726bd01b48f93f6bd55f5b06dd36f86ecabfa4b
 SHA512:
-  metadata.gz: bba413fa76099cdede351d9fa6263ea53e93448a8235918ddac4a9c1072174aff0fb084a5e3cd591079e656d779c369838bc6866b2644c75772e4ab0dc85442c
-  data.tar.gz: ccbc7c25bc0aae891b79563b14c4bc4d72ca8f1ebe92b1a32c19e7e74861e61a3003208117a5d9a26dba3c2d83f7b49b7fc351d5df3670ff189c59cacd865869
+  metadata.gz: 8d996da034590250b3fcc9b87a412de39ddb01956ee144c4bd4917f4f7b18f6a23650fcbd9b9e2f6f48c2ac8952cc972bd65415b5e5cbbcc733fa26981111796
+  data.tar.gz: ea8f5cfe8e3e9222d138a7c09f40d57b32d19a756f8472b6d764b125f57a34cf54bf3f884668147a661cf1af1d3afd10e18dca9a9d4b110fb9d372c37fbea82a

data/.rubocop.yml

@@ -0,0 +1,8 @@
+# 80 is stifling, especially with a few levels of nesting before we even start.
+# So bump it to 100 to keep really long lines from creeping in.
+Metrics/LineLength:
+  Max: 100
+
+Style/UseHashRocketsWithSymbolValues: false
+
+

data/CHANGELOG.markdown

@@ -1,5 +1,11 @@
 # master
 
+# 2.1.4
+
+* Enhance regular expression that determines if a backtrace line is "inside"
+  the application
+    * Avoids labeling vendor/ as part of the monitored app
+
 # 2.1.3
 
 * Less noisy output on errors with Context

data/lib/scout_apm/utils/backtrace_parser.rb

@@ -14,7 +14,10 @@ module ScoutApm
       def initialize(call_stack, root=ScoutApm::Environment.instance.root)
         @call_stack = call_stack
         # We can't use a constant as it'd be too early to fetch environment info
-        @@app_dir_regex = %r|#{root}/(.*)|
+        #
+        # This regex looks for files under the app root, inside lib/, app/, and
+        # config/ dirs, and captures the path under root.
+        @@app_dir_regex = %r[#{root}/((?:lib/|app/|config/).*)]
       end
 
       def call
@@ -27,7 +30,6 @@ module ScoutApm
         end
         stack
       end
-
     end
   end
 end

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.1.3"
+  VERSION = "2.1.4"
 end
 

data/test/unit/utils/backtrace_parser_test.rb

@@ -49,4 +49,18 @@ class BacktraceParserTest < Minitest::Test
     result = ScoutApm::Utils::BacktraceParser.new(raw_backtrace, "/Users/scout/different-secrets").call
     assert_equal 0, result.length
   end
+
+  def test_excludes_vendor_paths
+    raw_backtrace = [
+      "#{root}/vendor/ruby/thing.rb",
+      "#{root}/app/controllers/users_controller.rb",
+      "#{root}/vendor/ruby/thing.rb",
+      "#{root}/config/initializers/inject_something.rb",
+    ]
+    result = ScoutApm::Utils::BacktraceParser.new(raw_backtrace, root).call
+
+    assert_equal 2, result.length
+    assert_equal false, (result[0] =~ %r|app/controllers/users_controller.rb|).nil?
+    assert_equal false, (result[1] =~ %r|config/initializers/inject_something.rb|).nil?
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Derek Haynes
@@ -118,6 +118,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - CHANGELOG.markdown
 - Gemfile
 - LICENSE.md