scout_apm 1.2.11 → 1.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99bbe7dc8f3e03137118c997250a4ddc41f9889c
-  data.tar.gz: 3f7305a88ee28e41392d1c30fa182b879d94c95c
+  metadata.gz: 238644dc9ea19370a84d3bb7c352faef442b555e
+  data.tar.gz: 7c43ada6596aed42f483084fab03c66a50f9732a
 SHA512:
-  metadata.gz: e4b44b8e106be2167bd52ed3c405e201c098a4b8b5027afab3dc6a0b51e04f259b8378faa94908d063f234ed3d7dc742dbd05b114614ff77b85c5de7cf35f52a
-  data.tar.gz: bd9ce3b704d0c25ca02409981784420738d223018d55368d19c810c9b498d3caf708e4f66267445b3f30a56095090f5f1716fd497f27e18970e9190ae28c6b00
+  metadata.gz: e882ef1bbf5ac0b908dc249c4ffdde6e7db167a5d909d89c70ca974fdf9deb63ceadf987c33418de5a426782621c0b67d2589f97872642c52a45a185e15ac7cf
+  data.tar.gz: b40f7a9b49bc263d209d13e27fb6fe448861e166bf17e3bae8a95253ddd4acf07900f30af97171824218dc47b2941e87578bded7db69752aa878c90ad3347003

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 1.2.12
+
+* add uri_reporting option to report bare path (as opposed to fullpath). Default is 'fullpath'; set to 'path' to avoid exposing URL parameters.  
+
 # 1.2.11
 
 * Summarizing middleware instrumentation into a single metric for lower overhead.

data/lib/scout_apm/config.rb

@@ -13,6 +13,7 @@ require 'scout_apm/environment'
 # log_level        - DEBUG / INFO / WARN as usual
 # monitor          - true or false.  False prevents any instrumentation from starting
 # name             - override the name reported to APM. This is the name that shows in the Web UI
+# uri_reporting    - 'path' or 'full_path' default is 'full_path', which reports URL params as well as the path.
 #
 # Any of these config settings can be set with an environment variable prefixed
 # by SCOUT_ and uppercasing the key: SCOUT_LOG_LEVEL for instance.
@@ -22,7 +23,8 @@ module ScoutApm
     DEFAULTS =  {
         'host'      => 'https://checkin.scoutapp.com',
         'log_level' => 'info',
-        'stackprof_interval' => 20000 # microseconds, 1000 = 1 millisecond, so 20k == 20 milliseconds
+        'stackprof_interval' => 20000, # microseconds, 1000 = 1 millisecond, so 20k == 20 milliseconds
+        'uri_reporting' => 'full_path'
     }.freeze
 
     def initialize(config_path = nil)

data/lib/scout_apm/instruments/action_controller_rails_2.rb

@@ -58,7 +58,8 @@ module ScoutApm
       # specific controller actions.
       def perform_action_with_scout_instruments(*args, &block)
         req = ScoutApm::RequestManager.lookup
-        req.annotate_request(:uri => request.fullpath)
+        path = ScoutApm::Agent.instance.config.value("uri_reporting") == 'path' ? request.path : request.fullpath
+        req.annotate_request(:uri => path)
         req.context.add_user(:ip => request.remote_ip)
         req.set_headers(request.headers)
         req.start_layer( ScoutApm::Layer.new("Controller", "#{controller_path}/#{action_name}") )

data/lib/scout_apm/instruments/action_controller_rails_3_rails4.rb

@@ -59,7 +59,8 @@ module ScoutApm
     module ActionControllerRails3Rails4Instruments
       def process_action(*args)
         req = ScoutApm::RequestManager.lookup
-        req.annotate_request(:uri => request.fullpath)
+        path = ScoutApm::Agent.instance.config.value("uri_reporting") == 'path' ? request.path : request.fullpath
+        req.annotate_request(:uri => path)
         req.context.add_user(:ip => request.remote_ip)
         req.set_headers(request.headers)
 

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "1.2.11"
+  VERSION = "1.2.12"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 1.2.11
+  version: 1.2.12
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring
@@ -192,4 +192,3 @@ test_files:
 - test/unit/slow_transaction_set_test.rb
 - test/unit/sql_sanitizer_test.rb
 - test/unit/utils/active_record_metric_name_test.rb
-has_rdoc: