scout_apm 1.6.8 → 2.0.0.pre

data/lib/scout_apm/utils/klass_helper.rb

@@ -0,0 +1,26 @@
+module ScoutApm
+  module Utils
+    module KlassHelper
+      # KlassHelper.defined?("ActiveRecord", "Base") #=> true / false
+      # KlassHelper.defined?("ActiveRecord::Base")   #=> true / false
+
+      def self.defined?(*names)
+        if names.length == 1
+          names = names[0].split("::")
+        end
+
+        obj = Object
+
+        names.each do |name|
+          begin
+            obj = obj.const_get(name)
+          rescue NameError
+            return false
+          end
+        end
+
+        true
+      end
+    end
+  end
+end

data/lib/scout_apm/utils/sql_sanitizer.rb

@@ -75,7 +75,7 @@ module ScoutApm
       end
 
       def scrubbed(str)
-        return '' if !str.is_a?(String) || str.length > 4000 # safeguard - don't sanitize or scrub large SQL statements
+        return '' if !str.is_a?(String) || str.length > 1000 # safeguard - don't sanitize or scrub large SQL statements
         return str if !str.respond_to?(:encode) # Ruby <= 1.8 doesn't have string encoding
         return str if str.valid_encoding? # Whatever encoding it is, it is valid and we can operate on it
         ScoutApm::Agent.instance.logger.debug "Scrubbing invalid sql encoding."

data/lib/scout_apm/utils/sql_sanitizer_regex.rb

@@ -13,8 +13,8 @@ module ScoutApm
 
       MYSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
       MYSQL_REMOVE_INTEGERS = /(?<!LIMIT )\b\d+\b/.freeze
-      MYSQL_REMOVE_SINGLE_QUOTE_STRINGS = %r{'(?:\\'|[^']|'')*'}.freeze
-      MYSQL_REMOVE_DOUBLE_QUOTE_STRINGS = %r{"(?:\\"|[^"]|"")*"}.freeze
+      MYSQL_REMOVE_SINGLE_QUOTE_STRINGS = /'(?:[^']|'')*'/.freeze
+      MYSQL_REMOVE_DOUBLE_QUOTE_STRINGS = /"(?:[^"]|"")*"/.freeze
       MYSQL_IN_CLAUSE = /IN\s+\(\?[^\)]*\)/.freeze
 
       SQLITE_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze

data/lib/scout_apm/utils/sql_sanitizer_regex_1_8_7.rb

@@ -13,8 +13,8 @@ module ScoutApm
 
       MYSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
       MYSQL_REMOVE_INTEGERS = /\b\d+\b/.freeze
-      MYSQL_REMOVE_SINGLE_QUOTE_STRINGS = /'(?:\\'|[^']|'')*'/.freeze
-      MYSQL_REMOVE_DOUBLE_QUOTE_STRINGS = /"(?:\\"|[^"]|"")*"/.freeze
+      MYSQL_REMOVE_SINGLE_QUOTE_STRINGS = /'(?:[^']|'')*'/.freeze
+      MYSQL_REMOVE_DOUBLE_QUOTE_STRINGS = /"(?:[^"]|"")*"/.freeze
       MYSQL_IN_CLAUSE = /IN\s+\(\?[^\)]*\)/.freeze
 
       SQLITE_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "1.6.8"
+  VERSION = "2.0.0.pre"
 end
 

data/lib/scout_apm.rb

@@ -18,6 +18,12 @@ require 'yaml'
 #####################################
 # Gem Requires
 #####################################
+begin
+  require 'stackprof'
+rescue LoadError
+  require 'scout_apm/utils/fake_stack_prof'
+end
+require 'rusage'
 
 #####################################
 # Internal Requires
@@ -37,6 +43,7 @@ require 'scout_apm/layer_converters/slow_job_converter'
 require 'scout_apm/layer_converters/metric_converter'
 require 'scout_apm/layer_converters/slow_request_converter'
 require 'scout_apm/layer_converters/request_queue_time_converter'
+require 'scout_apm/layer_converters/allocation_metric_converter'
 
 require 'scout_apm/server_integrations/passenger'
 require 'scout_apm/server_integrations/puma'
@@ -77,19 +84,19 @@ require 'scout_apm/instruments/action_controller_rails_3_rails4'
 require 'scout_apm/instruments/middleware_summary'
 # require 'scout_apm/instruments/middleware_detailed' # Currently disabled functionality, see the file for details.
 require 'scout_apm/instruments/rails_router'
-require 'scout_apm/instruments/grape'
 require 'scout_apm/instruments/sinatra'
 require 'scout_apm/instruments/process/process_cpu'
 require 'scout_apm/instruments/process/process_memory'
-require 'scout_apm/instruments/percentile_sampler'
+require 'allocations'
 
 require 'scout_apm/app_server_load'
 
-require 'scout_apm/utils/sql_sanitizer'
-require 'scout_apm/utils/backtrace_parser'
 require 'scout_apm/utils/active_record_metric_name'
-require 'scout_apm/utils/null_logger'
+require 'scout_apm/utils/backtrace_parser'
 require 'scout_apm/utils/installed_gems'
+require 'scout_apm/utils/klass_helper'
+require 'scout_apm/utils/null_logger'
+require 'scout_apm/utils/sql_sanitizer'
 require 'scout_apm/utils/time'
 require 'scout_apm/utils/unique_id'
 
@@ -108,17 +115,16 @@ require 'scout_apm/metric_set'
 require 'scout_apm/store'
 require 'scout_apm/tracer'
 require 'scout_apm/context'
+require 'scout_apm/stackprof_tree_collapser'
 
 require 'scout_apm/metric_meta'
 require 'scout_apm/metric_stats'
 require 'scout_apm/slow_transaction'
 require 'scout_apm/slow_job_record'
 require 'scout_apm/slow_item_set'
-require 'scout_apm/scored_item_set'
 require 'scout_apm/slow_request_policy'
 require 'scout_apm/slow_job_policy'
 require 'scout_apm/job_record'
-require 'scout_apm/request_histograms'
 
 require 'scout_apm/capacity'
 require 'scout_apm/attribute_arranger'

data/scout_apm.gemspec

@@ -10,7 +10,6 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/scoutapp/scout_apm_ruby"
   s.summary     = "Ruby application performance monitoring"
   s.description = "Monitors Ruby apps and reports detailed metrics on performance to Scout."
-  s.license     = "Proprietary (See LICENSE.md)"
 
   s.rubyforge_project = "scout_apm"
 
@@ -18,6 +17,9 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib","data"]
+  s.extensions << 'ext/allocations/extconf.rb'
+
+  s.add_runtime_dependency "rusage", '~> 0.2.0'
 
   s.add_development_dependency "minitest"
   s.add_development_dependency "pry"

data/test/test_helper.rb

@@ -1,12 +1,11 @@
-# Load & Start simplecov before loading scout_apm
-require 'simplecov'
-SimpleCov.start
-
 require 'minitest/autorun'
 require 'minitest/unit'
 require 'minitest/pride'
 require 'pry'
 
+# Load & Start simplecov before loading scout_apm
+require 'simplecov'
+SimpleCov.start
 
 require 'scout_apm'
 

data/test/unit/layaway_test.rb

@@ -18,12 +18,15 @@ class LayawayTest < Minitest::Test
 
   def test_merge_reporting_period
     File.open(DATA_FILE_PATH, 'w') { |file| file.write(Marshal.dump(NEW_FORMAT)) }
-    layaway = ScoutApm::Layaway.new
-    layaway.add_reporting_period(TIMESTAMP, ScoutApm::StoreReportingPeriod.new(TIMESTAMP))
-    unmarshalled = Marshal.load(File.read(DATA_FILE_PATH))
-    assert_equal [TIMESTAMP], unmarshalled.keys
+    ScoutApm::Agent.instance.start
+
+    data = ScoutApm::Layaway.new
+    t = ScoutApm::StoreReportingPeriodTimestamp.new
+    data.add_reporting_period(TIMESTAMP,ScoutApm::StoreReportingPeriod.new(TIMESTAMP))
+    assert_equal [TIMESTAMP], Marshal.load(File.read(DATA_FILE_PATH)).keys
+    # TODO - add tests to verify metrics+slow transactions are merged
   end
 
   TIMESTAMP = ScoutApm::StoreReportingPeriodTimestamp.new(Time.parse("2015-01-01"))
   NEW_FORMAT = {TIMESTAMP => ScoutApm::StoreReportingPeriod.new(TIMESTAMP)} # Format for 1.2+ agents
-end
+end

data/test/unit/serializers/payload_serializer_test.rb

@@ -6,6 +6,7 @@ require 'scout_apm/serializers/payload_serializer_to_json'
 require 'scout_apm/slow_transaction'
 require 'scout_apm/metric_meta'
 require 'scout_apm/metric_stats'
+require 'scout_apm/stackprof_tree_collapser'
 require 'scout_apm/utils/fake_stack_prof'
 require 'scout_apm/context'
 require 'ostruct'
@@ -144,7 +145,7 @@ class PayloadSerializerTest < Minitest::Test
     context = ScoutApm::Context.new
     context.add({"this" => "that"})
     context.add_user({"hello" => "goodbye"})
-    slow_t = ScoutApm::SlowTransaction.new("http://example.com/blabla", "Buckethead/something/else", 1.23, slow_transaction_metrics, context, Time.at(1448198788), [], 10)
+    slow_t = ScoutApm::SlowTransaction.new("http://example.com/blabla", "Buckethead/something/else", 1.23, slow_transaction_metrics, context, Time.at(1448198788), [])
     payload = ScoutApm::Serializers::PayloadSerializerToJson.serialize({}, {}, [slow_t], [], [])
     formatted_slow_transactions = [
       {
@@ -157,7 +158,6 @@ class PayloadSerializerTest < Minitest::Test
         "uri" => "http://example.com/blabla",
         "context" => {"this"=>"that", "user"=>{"hello"=>"goodbye"}},
         "prof" => [],
-        "score" => 10,
         "metrics" => [
           {
             "key" => {

data/test/unit/slow_item_set_test.rb

@@ -88,7 +88,6 @@ class SlowItemSetTest < Minitest::Test
       {}, # metrics
       {}, # context
       Time.now, # end time
-      [], # stackprof
-      0)
+      []) # stackprof
   end
 end

data/test/unit/sql_sanitizer_test.rb

@@ -85,12 +85,6 @@ module ScoutApm
         assert_equal %q|SELECT `blogs`.* FROM `blogs` WHERE (title = ?)|, ss.to_s
       end
 
-      def test_mysql_quotes
-        sql = %q|INSERT INTO `users` VALUES ('foo', 'b\'ar')|
-        ss = SqlSanitizer.new(sql).tap{ |it| it.database_engine = :mysql }
-        assert_equal %q|INSERT INTO `users` VALUES (?, ?)|, ss.to_s
-      end
-
       def test_scrubs_invalid_encoding
         sql = "SELECT `blogs`.* FROM `blogs` WHERE (title = 'a\255c')".force_encoding('UTF-8')
         assert_equal false, sql.valid_encoding?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 2.0.0.pre
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rusage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -71,16 +85,18 @@ description: Monitors Ruby apps and reports detailed metrics on performance to S
 email:
 - support@scoutapp.com
 executables: []
-extensions: []
+extensions:
+- ext/allocations/extconf.rb
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - CHANGELOG.markdown
 - Gemfile
-- LICENSE.md
 - README.markdown
 - Rakefile
 - data/cacert.pem
+- ext/allocations/allocations.c
+- ext/allocations/extconf.rb
 - lib/scout_apm.rb
 - lib/scout_apm/agent.rb
 - lib/scout_apm/agent/logging.rb
@@ -111,7 +127,6 @@ files:
 - lib/scout_apm/instruments/active_record.rb
 - lib/scout_apm/instruments/delayed_job.rb
 - lib/scout_apm/instruments/elasticsearch.rb
-- lib/scout_apm/instruments/grape.rb
 - lib/scout_apm/instruments/http_client.rb
 - lib/scout_apm/instruments/influxdb.rb
 - lib/scout_apm/instruments/middleware_detailed.rb
@@ -119,7 +134,6 @@ files:
 - lib/scout_apm/instruments/mongoid.rb
 - lib/scout_apm/instruments/moped.rb
 - lib/scout_apm/instruments/net_http.rb
-- lib/scout_apm/instruments/percentile_sampler.rb
 - lib/scout_apm/instruments/process/process_cpu.rb
 - lib/scout_apm/instruments/process/process_memory.rb
 - lib/scout_apm/instruments/rails_router.rb
@@ -129,6 +143,7 @@ files:
 - lib/scout_apm/layaway.rb
 - lib/scout_apm/layaway_file.rb
 - lib/scout_apm/layer.rb
+- lib/scout_apm/layer_converters/allocation_metric_converter.rb
 - lib/scout_apm/layer_converters/converter_base.rb
 - lib/scout_apm/layer_converters/depth_first_walker.rb
 - lib/scout_apm/layer_converters/error_converter.rb
@@ -145,9 +160,7 @@ files:
 - lib/scout_apm/platform_integrations/heroku.rb
 - lib/scout_apm/platform_integrations/server.rb
 - lib/scout_apm/reporter.rb
-- lib/scout_apm/request_histograms.rb
 - lib/scout_apm/request_manager.rb
-- lib/scout_apm/scored_item_set.rb
 - lib/scout_apm/serializers/app_server_load_serializer.rb
 - lib/scout_apm/serializers/deploy_serializer.rb
 - lib/scout_apm/serializers/directive_serializer.rb
@@ -169,12 +182,15 @@ files:
 - lib/scout_apm/slow_request_policy.rb
 - lib/scout_apm/slow_transaction.rb
 - lib/scout_apm/stack_item.rb
+- lib/scout_apm/stackprof_tree_collapser.rb
 - lib/scout_apm/store.rb
 - lib/scout_apm/tracer.rb
 - lib/scout_apm/tracked_request.rb
 - lib/scout_apm/utils/active_record_metric_name.rb
 - lib/scout_apm/utils/backtrace_parser.rb
+- lib/scout_apm/utils/fake_stack_prof.rb
 - lib/scout_apm/utils/installed_gems.rb
+- lib/scout_apm/utils/klass_helper.rb
 - lib/scout_apm/utils/null_logger.rb
 - lib/scout_apm/utils/sql_sanitizer.rb
 - lib/scout_apm/utils/sql_sanitizer_regex.rb
@@ -191,17 +207,13 @@ files:
 - test/unit/histogram_test.rb
 - test/unit/instruments/active_record_instruments_test.rb
 - test/unit/layaway_test.rb
-- test/unit/metric_set_test.rb
-- test/unit/scored_item_set_test.rb
 - test/unit/serializers/payload_serializer_test.rb
 - test/unit/slow_item_set_test.rb
 - test/unit/slow_job_policy_test.rb
-- test/unit/slow_request_policy_test.rb
 - test/unit/sql_sanitizer_test.rb
 - test/unit/utils/active_record_metric_name_test.rb
 homepage: https://github.com/scoutapp/scout_apm_ruby
-licenses:
-- Proprietary (See LICENSE.md)
+licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -215,12 +227,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.6.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring
@@ -233,12 +245,8 @@ test_files:
 - test/unit/histogram_test.rb
 - test/unit/instruments/active_record_instruments_test.rb
 - test/unit/layaway_test.rb
-- test/unit/metric_set_test.rb
-- test/unit/scored_item_set_test.rb
 - test/unit/serializers/payload_serializer_test.rb
 - test/unit/slow_item_set_test.rb
 - test/unit/slow_job_policy_test.rb
-- test/unit/slow_request_policy_test.rb
 - test/unit/sql_sanitizer_test.rb
 - test/unit/utils/active_record_metric_name_test.rb
-has_rdoc: 

data/LICENSE.md

@@ -1,27 +0,0 @@
-# Scout Software Agent License 
-
-Subject to and conditioned upon your continued compliance with the terms and conditions of this license, Zimuth, Inc. grants you a non-exclusive, non-sublicensable and non-transferable, limited license to install, use and run one copy of this software on each of your and your affiliate’s computers.  This license also grants you the limited right to distribute verbatim copies of this software and documentation to third parties provided the software and documentation will (a) remain the exclusive property of Zimuth; (b) be subject to the terms and conditions of this license; and (c) include a complete and unaltered copy of this license and all other copyright or other intellectual property rights notices contained in the original.
-
-The software includes the open-source components listed below. Any use of the open-source components by you shall be governed by, and subject to, the terms and conditions of the applicable open-source licenses.
-
-Except as this license expressly permits, you may not:
-
-* copy the software, in whole or in part; 
-* modify, correct, adapt, translate, enhance or otherwise prepare derivative works or improvements of the software; 
-* sell, sublicense, assign, distribute, publish, transfer or otherwise make available the software to any person or entity; 
-* remove, delete, efface, alter, obscure, translate, combine, supplement or otherwise change any trademarks, terms of the documentation, warranties, disclaimers, or intellectual property rights, or other symbols, notices, marks or serial numbers on or relating to any copy of the software or documentation; or
-use the software in any manner or for any purpose that infringes, misappropriates or otherwise violates any intellectual property right or other right of any person or entity, or that violates any applicable law;
-
-By using the software, you acknowledge and agree that:
-
-* the software and documentation are licensed, not sold, to you by Zimuth and you do not and will not have or acquire under or in connection with this license any ownership interest in the software or documentation, or in any related intellectual property rights; and
-* Zimuth will remain the sole and exclusive owner of all right, title and interest in and to the software and documentation, including all related intellectual property rights, subject only to the rights of third parties in open-source components and the limited license granted to you under this license; and
-
-Except for the limited rights and licenses expressly granted to you under this agreement, nothing in this license grants, by implication, waiver, estoppel or otherwise, to you or any third party any intellectual property rights or other right, title, or interest in or to any of the software or documentation.
- 
-This license shall be automatically terminated and revoked if you exceed the scope or violate any terms and conditions of this license. 
-
-ALL LICENSED SOFTWARE, DOCUMENTATION AND OTHER PRODUCTS, INFORMATION, MATERIALS AND SERVICES PROVIDED BY ZIMUTH ARE PROVIDED HERE “AS IS.” ZIMUTH DISCLAIMS ALL WARRANTIES, WHETHER EXPRESS, IMPLIED, STATUTORY OR OTHER (INCLUDING ALL WARRANTIES ARISING FROM COURSE OF DEALING, USAGE OR TRADE PRACTICE), AND SPECIFICALLY DISCLAIMS ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. WITHOUT LIMITING THE FOREGOING, ZIMUTH MAKES NO WARRANTY OF ANY KIND THAT THE LICENSED SOFTWARE OR DOCUMENTATION, OR ANY OTHER LICENSOR OR THIRD-PARTY GOODS, SERVICES, TECHNOLOGIES OR MATERIALS, WILL MEET YOUR REQUIREMENTS, OPERATE WITHOUT INTERRUPTION, ACHIEVE ANY INTENDED RESULT, BE COMPATIBLE OR WORK WITH ANY OTHER GOODS, SERVICES, TECHNOLOGIES OR MATERIALS (INCLUDING ANY SOFTWARE, HARDWARE, SYSTEM OR NETWORK) EXCEPT IF AND TO THE EXTENT EXPRESSLY SET FORTH IN THE DOCUMENTATION, OR BE SECURE, ACCURATE, COMPLETE, FREE OF HARMFUL CODE OR ERROR FREE. ALL OPEN-SOURCE COMPONENTS AND OTHER THIRD-PARTY MATERIALS ARE PROVIDED “AS IS” AND ANY REPRESENTATION OR WARRANTY OF OR CONCERNING ANY OF THEM IS STRICTLY BETWEEN LICENSEE AND THE THIRD-PARTY OWNER OR DISTRIBUTOR OF SUCH OPEN-SOURCE COMPONENTS AND THIRD-PARTY MATERIALS.
- 
-IN NO EVENT WILL ZIMUTH BE LIABLE UNDER OR IN CONNECTION WITH THIS LICENSE OR ITS SUBJECT MATTER UNDER ANY LEGAL OR EQUITABLE THEORY, INCLUDING BREACH OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY AND OTHERWISE, FOR ANY CONSEQUENTIAL, INCIDENTAL, INDIRECT, EXEMPLARY, SPECIAL, ENHANCED OR PUNITIVE DAMAGES, IN EACH CASE REGARDLESS OF WHETHER SUCH PERSONS WERE ADVISED OF THE POSSIBILITY OF SUCH LOSSES OR DAMAGES OR SUCH LOSSES OR DAMAGES WERE OTHERWISE FORESEEABLE, AND NOTWITHSTANDING THE FAILURE OF ANY AGREED OR OTHER REMEDY OF ITS ESSENTIAL PURPOSE.
-

data/lib/scout_apm/instruments/grape.rb

@@ -1,69 +0,0 @@
-module ScoutApm
-  module Instruments
-    class Grape
-      attr_reader :logger
-
-      def initalize(logger=ScoutApm::Agent.instance.logger)
-        @logger = logger
-        @installed = false
-      end
-
-      def installed?
-        @installed
-      end
-
-      def install
-        @installed = true
-
-        if defined?(::Grape) && defined?(::Grape::Endpoint)
-          ScoutApm::Agent.instance.logger.info "Instrumenting Grape::Endpoint"
-
-          ::Grape::Endpoint.class_eval do
-            include ScoutApm::Instruments::GrapeEndpointInstruments
-
-            alias run_without_scout_instruments run
-            alias run run_with_scout_instruments
-          end
-        end
-      end
-    end
-
-    module GrapeEndpointInstruments
-      def run_with_scout_instruments
-        request = ::Grape::Request.new(env)
-        req = ScoutApm::RequestManager.lookup
-        path = ScoutApm::Agent.instance.config.value("uri_reporting") == 'path' ? request.path : request.fullpath
-        req.annotate_request(:uri => path)
-
-        # IP Spoofing Protection can throw an exception, just move on w/o remote ip
-        req.context.add_user(:ip => request.ip) rescue nil
-
-        req.set_headers(request.headers)
-        req.web!
-
-        begin
-          name = ["Grape",
-                  self.options[:method].first,
-                  self.options[:for].to_s,
-                  self.namespace.sub(%r{\A/}, ''), # removing leading slashes
-                  self.options[:path].first,
-          ].compact.map{ |n| n.to_s }.join("/")
-        rescue => e
-          ScoutApm::Agent.instance.logger.info("Error getting Grape Endpoint Name. Error: #{e.message}. Options: #{self.options.inspect}")
-          name = "Grape/Unknown"
-        end
-
-        req.start_layer( ScoutApm::Layer.new("Controller", name) )
-        begin
-          run_without_scout_instruments
-        rescue
-          req.error!
-          raise
-        ensure
-          req.stop_layer
-        end
-      end
-    end
-  end
-end
-

data/lib/scout_apm/instruments/percentile_sampler.rb

@@ -1,37 +0,0 @@
-module ScoutApm
-  module Instruments
-    class PercentileSampler
-      attr_reader :logger
-
-      attr_reader :percentiles
-
-      def initialize(logger, percentiles)
-        @logger = logger
-        @percentiles = Array(percentiles)
-      end
-
-      def human_name
-        "Percentiles"
-      end
-
-      # Gets the 95th%ile for the time requested
-      def metrics(time)
-        ms = {}
-        histos = ScoutApm::Agent.instance.request_histograms_by_time[time]
-        histos.each_name do |name|
-          percentiles.each do |percentile|
-            meta = MetricMeta.new("Percentile/#{percentile}/#{name}")
-            stat = MetricStats.new
-            stat.update!(histos.quantile(name, percentile))
-            ms[meta] = stat
-          end
-        end
-
-        # Wipe the histograms we just collected data on
-        ScoutApm::Agent.instance.request_histograms_by_time.delete(time)
-
-        ms
-      end
-    end
-  end
-end

data/lib/scout_apm/request_histograms.rb

@@ -1,46 +0,0 @@
-module ScoutApm
-  class RequestHistograms
-    DEFAULT_HISTOGRAM_SIZE = 50
-
-    # Private Accessor:
-    # A hash of Endpoint Name to an approximate histogram
-    #
-    # Each time a new request is requested to see if it's slow or not, we
-    # should insert it into the histogram, and get the approximate percentile
-    # of that time
-    attr_reader :histograms
-    private :histograms
-
-    attr_reader :histogram_size
-
-    def initialize(histogram_size = DEFAULT_HISTOGRAM_SIZE)
-      @histogram_size = histogram_size
-      initialize_histograms_hash
-    end
-
-    def each_name
-      @histograms.keys.each { |n| yield n }
-    end
-
-    def add(item, value)
-      @histograms[item].add(value)
-    end
-
-    def approximate_quantile_of_value(item, value)
-      @histograms[item].approximate_quantile_of_value(value)
-    end
-
-    def quantile(item, q)
-      @histograms[item].quantile(q)
-    end
-
-    # Wipes all histograms, setting them back to empty
-    def reset_all!
-      initialize_histograms_hash
-    end
-
-    def initialize_histograms_hash
-      @histograms = Hash.new { |h, k| h[k] = NumericHistogram.new(histogram_size) }
-    end
-  end
-end

data/lib/scout_apm/scored_item_set.rb

@@ -1,79 +0,0 @@
-# Attempts to keep the highest score.
-#
-# Each item must respond to:
-#   #call to get the storable item
-#   #name to get a unique identifier of the storable
-#   #score to get a numeric score, where higher is better
-module ScoutApm
-  class ScoredItemSet
-    include Enumerable
-
-    # A number larger than any score we will actually get.
-    ARBITRARILY_LARGE = 100000000
-
-    # Without otherwise saying, default the size to this
-    DEFAULT_MAX_SIZE = 10
-
-    attr_reader :max_size
-    attr_reader :items
-
-    def initialize(max_size = DEFAULT_MAX_SIZE)
-      @items = {}
-      @max_size = max_size
-    end
-
-    def each
-      items.each do |(_, (_, item))|
-        yield item
-      end
-    end
-
-    # This function is a large if statement, with a few branches. See inline comments for each branch.
-    def <<(new_item)
-      return if new_item.name == :unknown
-
-      # If we have this item in the hash already, compare the new & old ones, and store
-      # the new one only if it's higher score.
-      if items.has_key?(new_item.name)
-        if new_item.score > items[new_item.name].first
-          store!(new_item)
-        end
-
-
-      # If the set is full, then we have to see if we evict anything to store
-      # this one
-      elsif full?
-        smallest_name, smallest_score = items.inject([nil, ARBITRARILY_LARGE]) do |(memo_name, memo_score), (name, (stored_score, _))|
-          if stored_score < memo_score
-            [name, stored_score]
-          else
-            [memo_name, memo_score]
-          end
-        end
-
-        if smallest_score < new_item.score
-          items.delete(smallest_name)
-          store!(new_item)
-        end
-
-
-      # Set isn't full, and we've not seen this new_item, so go ahead and store it.
-      else
-        store!(new_item)
-      end
-    end
-
-
-    private
-
-    def full?
-      items.size >= max_size
-    end
-
-    def store!(new_item)
-      if !new_item.name.nil? # Never store a nil name.
-        items[new_item.name] = [new_item.score, new_item.call]
-      end
-    end
-  end
-end