scout_apm 2.3.0.pre → 2.3.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 120874f68724447c58563d1cf6dca52a33358713
-  data.tar.gz: ba7281a8b6d1d237d6df4b31d8de16e8b3f329b8
+  metadata.gz: 87d20e596496af9d020ff073a6c0a6dd5f25989b
+  data.tar.gz: 76a903858e591025ec82842c3f2a6d30a66f35fd
 SHA512:
-  metadata.gz: ddcc5fc87345bcda9787a2227ddc10d5ecbd16c6fd05c5b5d771082afc72b2e9b0b7ac2046bb34bb6f8bf78ef5420221ef44b501c9055a479522cfe177820a9c
-  data.tar.gz: a0726334d47ca7e4a094c97335dff2bd873ef11c4181e1d53f6904994cb648cfedd210d74e4581dcf433517b7fbce33890d57c98d04240c9cd94855b79530ee7
+  metadata.gz: d9733bb68af60c98eafddc3ad2d469173987214bc785e80deff2bd6f87161b1c256ca8cdc7b525656cae8bebe06332772b42a4896f624b1a70ca69882f26df1d
+  data.tar.gz: e5a84284b84bb95bea7cbe7dda0bddfafc79e1180c833f8709d778cbbbc926d617c9f94f2a55dbf8870bd5869088bca8727227172823e7358d6b98617248a8ed

data/lib/scout_apm/config.rb

@@ -41,6 +41,8 @@ module ScoutApm
         'compress_payload',
         'config_file',
         'data_file',
+        'database_metric_limit',
+        'database_metric_report_limit',
         'detailed_middleware',
         'dev_trace',
         'direct_host',

data/lib/scout_apm/fake_store.rb

@@ -17,6 +17,12 @@ module ScoutApm
     def track_one!(type, name, value, options={})
     end
 
+    def track_histograms!(histograms, options={})
+    end
+
+    def track_db_query_metrics!(db_query_metric_set, options={})
+    end
+
     def track_slow_transaction!(slow_transaction)
     end
 

data/lib/scout_apm/instant/middleware.rb

@@ -224,7 +224,12 @@ module ScoutApm
       end
 
       def trace
-        @trace ||= LayerConverters::SlowRequestConverter.new(tracked_request).call
+        @trace ||=
+          begin
+            layer_finder = LayerConverters::FindLayerByType.new(tracked_request)
+            converter = LayerConverters::SlowRequestConverter.new(tracked_request, layer_finder, ScoutApm::FakeStore.new)
+            converter.call
+          end
       end
 
       def payload

data/lib/scout_apm/layer_converters/database_converter.rb

@@ -15,8 +15,8 @@ module ScoutApm
           next if skip_layer?(layer)
 
           stat = DbQueryMetricStats.new(
-            layer.name.model,
-            layer.name.normalized_operation,
+            model_name(layer),
+            operation_name(layer),
             scope_layer.legacy_metric_name, # controller_scope
             1,                              # count, this is a single query, so 1
             layer.total_call_time,
@@ -26,15 +26,6 @@ module ScoutApm
         end
       end
 
-      def skip_layer?(layer)
-        layer.type != 'ActiveRecord'            ||
-        layer.limited?                          ||
-        ( ! layer.name.respond_to?(:model))     ||
-        ( ! layer.name.respond_to?(:normalized_operation)) ||
-        layer.name.model.nil?                   ||
-        layer.name.normalized_operation.nil?
-      end
-
       def record!
         # Everything in the metric set here is from a single transaction, which
         # we want to keep track of. (One web call did a User#find 10 times, but
@@ -43,6 +34,41 @@ module ScoutApm
         @store.track_db_query_metrics!(@db_query_metric_set)
       end
 
+      def skip_layer?(layer)
+        layer.type != 'ActiveRecord' ||
+          layer.limited? ||
+          super
+      end
+
+      private
+
+
+      # If we can't name the model, default to:
+      DEFAULT_MODEL = "SQL"
+
+      # If we can't name the operation, default to:
+      DEFAULT_OPERATION = "other"
+
+      def model_name(layer)
+        if layer.name.respond_to?(:model)
+          layer.name.model || DEFAULT_MODEL
+        else
+          DEFAULT_MODEL
+        end
+      rescue
+        DEFAULT_MODEL
+      end
+
+      def operation_name(layer)
+        if layer.name.respond_to?(:normalized_operation)
+          layer.name.normalized_operation || DEFAULT_OPERATION
+        else
+          DEFAULT_OPERATION
+        end
+      rescue
+        DEFAULT_OPERATION
+      end
+
       def records_returned(layer)
         if layer.annotations
           layer.annotations.fetch(:record_count, 0)

data/lib/scout_apm/store.rb

@@ -3,12 +3,6 @@
 # the layaway file for cross-process aggregation.
 module ScoutApm
   class Store
-    # A hash of reporting periods. { StoreReportingPeriodTimestamp => StoreReportingPeriod }
-    attr_reader :reporting_periods
-
-    # Used to pull metrics into each reporting period, as that reporting period is finished.
-    attr_reader :samplers
-
     def initialize
       @mutex = Mutex.new
       @reporting_periods = Hash.new { |h,k| h[k] = StoreReportingPeriod.new(k) }
@@ -20,8 +14,9 @@ module ScoutApm
     end
 
     def current_period
-      reporting_periods[current_timestamp]
+      @reporting_periods[current_timestamp]
     end
+    private :current_period
 
     def find_period(timestamp = nil)
       if timestamp
@@ -30,6 +25,7 @@ module ScoutApm
         current_period
       end
     end
+    private :find_period
 
     # Save newly collected metrics
     def track!(metrics, options={})
@@ -90,7 +86,7 @@ module ScoutApm
     def write_to_layaway(layaway, force=false)
       ScoutApm::Agent.instance.logger.debug("Writing to layaway#{" (Forced)" if force}")
 
-        reporting_periods.select { |time, rp| force || (time.timestamp < current_timestamp.timestamp) }.
+        @reporting_periods.select { |time, rp| force || (time.timestamp < current_timestamp.timestamp) }.
                           each   { |time, rp| collect_samplers(rp) }.
                           each   { |time, rp| write_reporting_period(layaway, time, rp) }
     end
@@ -102,10 +98,11 @@ module ScoutApm
     rescue => e
       ScoutApm::Agent.instance.logger.warn("Failed writing data to layaway file: #{e.message} / #{e.backtrace}")
     ensure
-      ScoutApm::Agent.instance.logger.debug("Before delete, reporting periods length: #{reporting_periods.size}")
-      deleted_items = reporting_periods.delete(time)
-      ScoutApm::Agent.instance.logger.debug("After delete, reporting periods length: #{reporting_periods.size}. Did delete #{deleted_items}")
+      ScoutApm::Agent.instance.logger.debug("Before delete, reporting periods length: #{@reporting_periods.size}")
+      deleted_items = @reporting_periods.delete(time)
+      ScoutApm::Agent.instance.logger.debug("After delete, reporting periods length: #{@reporting_periods.size}. Did delete #{deleted_items}")
     end
+    private :write_reporting_period
 
     ######################################
     # Sampler support
@@ -123,6 +120,7 @@ module ScoutApm
         end
       end
     end
+    private :collect_samplers
   end
 
   # A timestamp, normalized to the beginning of a minute. Used as a hash key to

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.3.0.pre"
+  VERSION = "2.3.0.pre1"
 end
 

data/test/unit/fake_store_test.rb

@@ -0,0 +1,10 @@
+require 'test_helper'
+
+class FakeStoreTest < Minitest::Test
+  def test_responds_to_same_instance_methods_as_store
+    fs = ScoutApm::FakeStore.new
+    s = ScoutApm::Store.new
+
+    assert_equal [], s.methods - fs.methods
+  end
+end

data/test/unit/store_test.rb

@@ -14,11 +14,11 @@ class StoreTest < Minitest::Test
     s = ScoutApm::Store.new
     s.track_one!("Controller", "user/show", 10)
 
-    assert_equal(1, s.reporting_periods.size)
+    assert_equal(1, s.instance_variable_get('@reporting_periods').size)
 
     s.write_to_layaway(FakeFailingLayaway.new, true)
 
-    assert_equal({}, s.reporting_periods)
+    assert_equal({}, s.instance_variable_get('@reporting_periods'))
   end
 
   def test_writing_layaway_removes_stale_timestamps
@@ -29,11 +29,11 @@ class StoreTest < Minitest::Test
     s = ScoutApm::Store.new
     ScoutApm::Instruments::Process::ProcessMemory.new(Logger.new(StringIO.new)).metrics(stale_rp.timestamp, s)
     ScoutApm::Instruments::Process::ProcessMemory.new(Logger.new(StringIO.new)).metrics(current_rp.timestamp, s)
-    assert_equal 2, s.reporting_periods.size
+    assert_equal 2, s.instance_variable_get('@reporting_periods').size
 
     s.write_to_layaway(FakeFailingLayaway.new, true)
 
-    assert_equal({}, s.reporting_periods)
+    assert_equal({}, s.instance_variable_get('@reporting_periods'))
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.3.0.pre
+  version: 2.3.0.pre1
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -294,6 +294,7 @@ files:
 - test/unit/db_query_metric_set_test.rb
 - test/unit/db_query_metric_stats_test.rb
 - test/unit/environment_test.rb
+- test/unit/fake_store_test.rb
 - test/unit/git_revision_test.rb
 - test/unit/histogram_test.rb
 - test/unit/ignored_uris_test.rb
@@ -356,6 +357,7 @@ test_files:
 - test/unit/db_query_metric_set_test.rb
 - test/unit/db_query_metric_stats_test.rb
 - test/unit/environment_test.rb
+- test/unit/fake_store_test.rb
 - test/unit/git_revision_test.rb
 - test/unit/histogram_test.rb
 - test/unit/ignored_uris_test.rb