scout_apm 2.6.10 → 3.0.0.pre0

data/test/unit/agent_test.rb

@@ -1,5 +1,58 @@
 require 'test_helper'
+require 'scout_apm/agent'
+require 'scout_apm/slow_transaction'
+require 'scout_apm/metric_meta'
+require 'scout_apm/metric_stats'
+require 'scout_apm/context'
+require 'scout_apm/store'
 
 class AgentTest < Minitest::Test
-  # XXX: Write tests around agent startup sequence
+
+  # Safeguard to ensure the main agent thread doesn't have any interaction with the layaway file. Contention on file locks can cause delays.
+  def test_start_with_lock_on_layaway_file
+    # setup the file, putting a lock on it.
+    File.open(DATA_FILE_PATH, "w") {}
+    f = File.open(DATA_FILE_PATH, File::RDWR | File::CREAT)
+    f.flock(File::LOCK_EX)
+
+    agent = ScoutApm::Agent.instance
+
+    no_timeout = true
+    begin
+      Timeout::timeout(3) { agent.start({:monitor => true, :force => true}) }
+    rescue Timeout::Error
+      no_timeout = false
+    ensure
+      f.flock(File::LOCK_UN)
+      f.close
+    end
+    assert no_timeout, "Agent took >= 3s to start. Possible file lock issue."
+  end
+
+  def test_reset_file_with_old_format
+    File.open(DATA_FILE_PATH, 'w') { |file| file.write(Marshal.dump(OLD_FORMAT)) }
+    begin
+      ScoutApm::Agent.instance(:force => true).process_metrics
+    rescue NoMethodError
+      # The agent will raise an exception the first time metrics are processed for scout_apm < 1.2.
+      #
+      #  NoMethodError: undefined method `values' for []:Array
+      # /Users/dlite/projects/scout_apm_ruby/lib/scout_apm/layaway.rb:46:in `periods_ready_for_delivery'
+      # /Users/dlite/projects/scout_apm_ruby/lib/scout_apm/agent/reporting.rb:31:in `report_to_server'
+      # /Users/dlite/projects/scout_apm_ruby/lib/scout_apm/agent/reporting.rb:24:in `process_metrics'
+      # /Users/dlite/projects/scout_apm_ruby/test/unit/layaway_test.rb:27:in `test_reset_file_with_old_format'
+    end
+    # Data will be fine the next go-around
+    no_error = true
+    begin
+      ScoutApm::Agent.instance(:force => true).process_metrics
+    rescue Exception => e
+      no_error = false
+    end
+    assert no_error, "Error trying to process metrics after upgrading from < 1.2 data format: #{e.message if e}"
+  end
+
+  ## TODO - adds tests to ensure other potentially long-running things don't sneak in, like HTTP calls.
+
+  OLD_FORMAT = {1452533280 => {:metrics => {}, :slow_transactions => {}} } # Pre 1.2 agents used a different file format to store data. 
 end

data/test/unit/background_job_integrations/sidekiq_test.rb

@@ -11,6 +11,7 @@ class SidekiqTest < Minitest::Test
   def test_middleware_call_happy_path
     fake_request = mock
     fake_request.expects(:annotate_request)
+    fake_request.expects(:job!)
     fake_request.expects(:start_layer).twice
     fake_request.expects(:stop_layer).twice
     fake_request.expects(:error!).never
@@ -28,6 +29,7 @@ class SidekiqTest < Minitest::Test
   def test_middleware_call_job_exception
     fake_request = mock
     fake_request.expects(:annotate_request)
+    fake_request.expects(:job!)
     fake_request.expects(:start_layer).twice
     fake_request.expects(:stop_layer).twice
     fake_request.expects(:error!)
@@ -45,6 +47,7 @@ class SidekiqTest < Minitest::Test
   def test_middleware_call_edge_cases
     fake_request = mock
     fake_request.expects(:annotate_request)
+    fake_request.expects(:job!)
     fake_request.expects(:start_layer).twice
     fake_request.expects(:stop_layer).twice
     fake_request.expects(:error!)

data/test/unit/config_test.rb

@@ -3,40 +3,36 @@ require 'test_helper'
 require 'scout_apm/config'
 
 class ConfigTest < Minitest::Test
-  def setup
-    @context = ScoutApm::AgentContext.new
-  end
-
   def test_initalize_without_a_config
-    conf = ScoutApm::Config.without_file(@context)
+    conf = ScoutApm::Config.without_file
 
     # nil for random keys
-    assert_nil conf.value('log_file_path')
+    assert_nil conf.value("log_file_path")
 
     # but has values for defaulted keys
-    assert conf.value('host')
+    assert conf.value("host")
 
     # and still reads from ENV
     ENV['SCOUT_CONFIG_TEST_KEY'] = 'testval'
-    assert_equal 'testval', conf.value('config_test_key')
+    assert_equal 'testval', conf.value("config_test_key")
   end
 
   def test_loading_a_file
-    set_rack_env('production')
+    set_rack_env("production")
 
-    conf_file = File.expand_path('../../data/config_test_1.yml', __FILE__)
-    conf = ScoutApm::Config.with_file(@context, conf_file)
+    conf_file = File.expand_path("../../data/config_test_1.yml", __FILE__)
+    conf = ScoutApm::Config.with_file(conf_file)
 
-    assert_equal 'debug', conf.value('log_level')
-    assert_equal 'APM Test Conf (Production)', conf.value('name')
+    assert_equal "debug", conf.value('log_level')
+    assert_equal "APM Test Conf (Production)", conf.value('name')
   end
 
   def test_loading_file_without_env_in_file
     conf_file = File.expand_path("../../data/config_test_1.yml", __FILE__)
-    conf = ScoutApm::Config.with_file(@context, conf_file, :environment => "staging")
+    conf = ScoutApm::Config.with_file(conf_file, environment: "staging")
 
     assert_equal "info", conf.value('log_level') # the default value
-    assert_nil nil, conf.value('name')         # the default value
+    assert_equal nil, conf.value('name')         # the default value
   end
 
   def test_boolean_coercion
@@ -71,15 +67,6 @@ class ConfigTest < Minitest::Test
     assert_equal 10, coercion.coerce(10)
     assert_equal ["a"], coercion.coerce(["a"])
   end
+end
 
-  def test_any_keys_found
-    ENV.stubs(:has_key?).returns(nil)
-
-    conf = ScoutApm::Config.with_file(@context, "a_file_that_doesnt_exist.yml")
-    assert ! conf.any_keys_found?
 
-    ENV.stubs(:has_key?).with("SCOUT_MONITOR").returns("true")
-    conf = ScoutApm::Config.with_file(@context, "a_file_that_doesnt_exist.yml")
-    assert conf.any_keys_found?
-  end
-end

data/test/unit/context_test.rb

@@ -4,25 +4,25 @@ require 'scout_apm/context'
 
 class ContextText < Minitest::Test
   def test_ignore_nil_value
-    context = ScoutApm::Context.new(ScoutApm::AgentContext.new)
+    context = ScoutApm::Context.new
     assert hash = context.add(:nil_key => nil, :org => 'org')
     assert_equal ({:org => 'org'}), hash
   end
 
   def test_ignore_nil_key
-    context = ScoutApm::Context.new(ScoutApm::AgentContext.new)
+    context = ScoutApm::Context.new
     assert hash = context.add(nil => nil, :org => 'org')
     assert_equal ({:org => 'org'}), hash
   end
 
   def test_ignore_unsupported_value_type
-    context = ScoutApm::Context.new(ScoutApm::AgentContext.new)
+    context = ScoutApm::Context.new
     assert hash = context.add(:array => [1,2,3,4], :org => 'org')
     assert_equal ({:org => 'org'}), hash
   end
 
   def test_ignore_unsupported_key_type
-    context = ScoutApm::Context.new(ScoutApm::AgentContext.new)
+    context = ScoutApm::Context.new
     assert hash = context.add([1,2,3,4] => 'hey', :org => 'org')
     assert_equal ({:org => 'org'}), hash
   end

data/test/unit/histogram_test.rb

@@ -35,8 +35,8 @@ class HistogramTest < Minitest::Test
       end
     }
 
-    assert_equal 1.5, round(hist.quantile(0), 1)
-    assert_equal 9.5, round(hist.quantile(100), 1)
+    assert_equal 1.5, hist.quantile(0).round(1)
+    assert_equal 9.5, hist.quantile(100).round(1)
   end
 
   def test_combine
@@ -55,8 +55,8 @@ class HistogramTest < Minitest::Test
     }
 
     combined = hist1.combine!(hist2)
-    assert_equal 1.5, round(combined.quantile(0), 1)
-    assert_equal 9.5, round(combined.quantile(100), 1)
+    assert_equal 1.5, combined.quantile(0).round(1)
+    assert_equal 9.5, combined.quantile(100).round(1)
     assert_equal 200, combined.total
   end
 
@@ -79,20 +79,6 @@ class HistogramTest < Minitest::Test
     assert combined.quantile(0) < combined.quantile(100)
   end
 
-  def test_combine_dedups_identicals
-    hist1 = ScoutApm::NumericHistogram.new(5)
-    hist2 = ScoutApm::NumericHistogram.new(5)
-    hist1.add(1)
-    hist1.add(2)
-    hist2.add(2)
-    hist2.add(3)
-
-    combined = hist1.combine!(hist2)
-    assert_equal 4, combined.total
-    assert_equal [[1, 1], [2, 2], [1, 3]],
-      combined.bins.map{|bin| [bin.count, bin.value.to_i] }
-  end
-
   def test_mean
     hist = ScoutApm::NumericHistogram.new(5)
     10.times {
@@ -103,12 +89,5 @@ class HistogramTest < Minitest::Test
 
     assert_equal 5.5, hist.mean
   end
-
-  private
-
-  # Ruby 1.8 compatible round with precision
-  def round(number, precision)
-    ((number * 10**precision).round.to_f) / (10**precision)
-  end
 end
 

data/test/unit/ignored_uris_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative '../test_helper'
 
 require 'scout_apm/ignored_uris'
 

data/test/unit/instruments/active_record_instruments_test.rb

@@ -0,0 +1,5 @@
+require 'test_helper'
+
+class ActiveRecordInstrumentsTest < Minitest::Test
+end
+

data/test/unit/layaway_test.rb

@@ -10,75 +10,15 @@ class LayawayTest < Minitest::Test
   def test_directory_uses_DATA_FILE_option
     FileUtils.mkdir_p '/tmp/scout_apm_test/data_file_option'
     config = make_fake_config("data_file" => "/tmp/scout_apm_test/data_file_option")
-    context = ScoutApm::AgentContext.new().tap{|c| c.config = config }
-    layaway = ScoutApm::Layaway.new(context)
 
-    assert_equal Pathname.new("/tmp/scout_apm_test/data_file_option"), layaway.directory
+    assert_equal Pathname.new("/tmp/scout_apm_test/data_file_option"), ScoutApm::Layaway.new(config, ScoutApm::Agent.instance.environment).directory
   end
 
   def test_directory_looks_for_root_slash_tmp
     FileUtils.mkdir_p '/tmp/scout_apm_test/tmp'
     config = make_fake_config({})
     env = make_fake_environment(:root => "/tmp/scout_apm_test")
-    context = ScoutApm::AgentContext.new().tap{|c| c.config = config; c.environment = env }
 
-    assert_equal Pathname.new("/tmp/scout_apm_test/tmp"), ScoutApm::Layaway.new(context).directory
-  end
-
-  def test_layaway_file_limit_prevents_new_writes
-    FileUtils.mkdir_p '/tmp/scout_apm_test/layaway_limit'
-    config = make_fake_config("data_file" => "/tmp/scout_apm_test/layaway_limit")
-    context = ScoutApm::AgentContext.new().tap{|c| c.config = config }
-    layaway = ScoutApm::Layaway.new(context)
-    layaway.delete_files_for(:all)
-
-    context = ScoutApm::AgentContext.new
-    current_time = Time.now.utc
-    current_rp = ScoutApm::StoreReportingPeriod.new(current_time, context)
-    stale_rp = ScoutApm::StoreReportingPeriod.new(current_time - current_time.sec - 120, context)
-
-    # layaway.write_reporting_period returns nil on successful write
-    # It should probably be changed to return true or the number of bytes written
-    assert_nil layaway.write_reporting_period(stale_rp, 1)
-
-    # layaway.write_reporting_period returns an explicit false class on failure
-    assert layaway.write_reporting_period(current_rp, 1).is_a?(FalseClass)
-
-    layaway.delete_files_for(:all)
-  end
-
-  def test_layaway_stale_regex_pattern
-    data_dir = '/tmp/scout_apm_test/shared/scout_apm'
-    FileUtils.mkdir_p data_dir
-    # Clean out files
-    FileUtils.safe_unlink(Dir.glob("#{data_dir}/scout_*_*.data"))
-
-    config = make_fake_config({'data_file' => data_dir})
-    env = make_fake_environment(:root => '/tmp/scout_apm_test')
-    context = ScoutApm::AgentContext.new().tap{|c| c.config = config; c.environment = env }
-    layaway = ScoutApm::Layaway.new(context)
-
-
-    not_stale_time = Time.now
-    not_stale_time_formatted = not_stale_time.strftime(ScoutApm::Layaway::TIME_FORMAT)
-
-    stale_time = not_stale_time - (ScoutApm::Layaway::STALE_AGE + 120) # ScoutApm::Layaway::STALE_AGE is in seconds. Add another 2 minutes to STALE_AGE
-    stale_time_formatted = stale_time.strftime(ScoutApm::Layaway::TIME_FORMAT)
-
-    not_stale_file_names = [File.join(data_dir, "scout_#{not_stale_time_formatted}_1.data"),
-                            File.join(data_dir, "scout_#{not_stale_time_formatted}_20.data")]
-    stale_file_names = [File.join(data_dir, "scout_#{stale_time_formatted}_1.data"),
-                        File.join(data_dir, "scout_#{stale_time_formatted}_20.data")]
-    all_file_names = not_stale_file_names + stale_file_names
-
-    (all_file_names).each do |filename|
-      File.new(filename, 'w').close
-    end
-
-    assert_equal Pathname.new("/tmp/scout_apm_test/shared/scout_apm"), ScoutApm::Layaway.new(context).directory
-    assert_equal all_file_names.sort, Dir.glob("#{data_dir}/*data").sort
-
-    layaway.delete_stale_files(not_stale_time - ScoutApm::Layaway::STALE_AGE)
-    assert_equal not_stale_file_names.sort, Dir.glob("#{data_dir}/*data").sort
+    assert_equal Pathname.new("/tmp/scout_apm_test/tmp"), ScoutApm::Layaway.new(config, env).directory
   end
 end

data/test/unit/serializers/payload_serializer_test.rb

@@ -1,4 +1,13 @@
 require 'test_helper'
+require 'scout_apm/attribute_arranger'
+require 'scout_apm/bucket_name_splitter'
+require 'scout_apm/serializers/payload_serializer'
+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/context'
+require 'ostruct'
 require 'json' # to deserialize what has been manually serialized by the production code
 
 class PayloadSerializerTest < Minitest::Test
@@ -8,7 +17,7 @@ class PayloadSerializerTest < Minitest::Test
       :unique_id => "unique_idz",
       :agent_version => 123
     }
-    payload = ScoutApm::Serializers::PayloadSerializerToJson.serialize(metadata, {}, {}, [], [], [], {}, [])
+    payload = ScoutApm::Serializers::PayloadSerializerToJson.serialize(metadata, {}, {}, [], [])
 
     # symbol keys turn to strings
     formatted_metadata = {
@@ -46,10 +55,10 @@ class PayloadSerializerTest < Minitest::Test
         stats.min_call_time = 0.034881757
         stats.sum_of_squares = 0.007382350213180609
         stats.total_call_time = 0.113403176
-        stats.total_exclusive_time = 0.078132088
+        stats.total_exclusive_time = 0.07813208899999999
       }
     }
-    payload = ScoutApm::Serializers::PayloadSerializerToJson.serialize({}, metrics, {}, [], [], [], {}, [])
+    payload = ScoutApm::Serializers::PayloadSerializerToJson.serialize({}, metrics, {}, [], [])
     formatted_metrics = [
       {
         "key" => {
@@ -82,11 +91,10 @@ class PayloadSerializerTest < Minitest::Test
         "max_call_time" => 0.078521419,
         "min_call_time" => 0.034881757,
         "total_call_time" => 0.113403176,
-        "total_exclusive_time" => 0.078132088,
+        "total_exclusive_time" => 0.07813208899999999,
       }
     ]
-    assert_equal formatted_metrics,
-      JSON.parse(payload)["metrics"].sort_by { |m| m["key"]["bucket"] }
+    assert_equal formatted_metrics, JSON.parse(payload)["metrics"]
   end
 
   def test_escapes_json_quotes
@@ -94,7 +102,7 @@ class PayloadSerializerTest < Minitest::Test
       :quotie => "here are some \"quotes\"",
       :payload_version => 2,
     }
-    payload = ScoutApm::Serializers::PayloadSerializerToJson.serialize(metadata, {}, {}, [], [], [], {}, [])
+    payload = ScoutApm::Serializers::PayloadSerializerToJson.serialize(metadata, {}, {}, [], [])
 
     # symbol keys turn to strings
     formatted_metadata = {
@@ -108,40 +116,4 @@ class PayloadSerializerTest < Minitest::Test
     json = { "foo" => "\bbar\nbaz\r" }
     assert_equal json, JSON.parse(ScoutApm::Serializers::PayloadSerializerToJson.jsonify_hash(json))
   end
-
-  def test_escapes_escaped_quotes
-    # Some escapes haven't ever worked on 1.8.7, and is not the issue I'm
-    # fixing now. Remove this when we drop support for ancient ruby
-    skip if RUBY_VERSION == "1.8.7"
-
-    json = {"foo" => %q|`additional_details` = '{\"amount\":1}'|}
-    result = ScoutApm::Serializers::PayloadSerializerToJson.jsonify_hash(json)
-    assert_equal json, JSON.parse(result)
-  end
-
-  def test_escapes_various_special_characters
-    # Some escapes haven't ever worked on 1.8.7, and is not the issue I'm
-    # fixing now. Remove this when we drop support for ancient ruby
-    skip if RUBY_VERSION == "1.8.7"
-
-    json = {"foo" => [
-      %Q|\fbar|,
-      %Q|\rbar|,
-      %Q|\nbar|,
-      %Q|\tbar|,
-      %Q|"bar|,
-      %Q|'bar|,
-      %Q|{bar|,
-      %Q|}bar|,
-      %Q|\\bar|,
-      if RUBY_VERSION == '1.8.7'
-        ""
-      else
-        %Q|\\\nbar|
-      end,
-    ]}
-
-    result = ScoutApm::Serializers::PayloadSerializerToJson.jsonify_hash(json)
-    assert_equal json, JSON.parse(result)
-  end
 end

data/test/unit/slow_request_policy_test.rb

@@ -17,13 +17,9 @@ class FakeRequest
 end
 
 class SlowRequestPolicyTest < Minitest::Test
-  def setup
-    @context = ScoutApm::AgentContext.new
-  end
-
   def test_stored_records_current_time
     test_start = Time.now
-    policy = ScoutApm::SlowRequestPolicy.new(@context)
+    policy = ScoutApm::SlowRequestPolicy.new
     request = FakeRequest.new("users/index")
 
     policy.stored!(request)
@@ -31,20 +27,15 @@ class SlowRequestPolicyTest < Minitest::Test
   end
 
   def test_score
-    policy = ScoutApm::SlowRequestPolicy.new(@context)
+    policy = ScoutApm::SlowRequestPolicy.new
     request = FakeRequest.new("users/index")
 
     request.set_duration(10) # 10 seconds
     policy.last_seen[request.unique_name] = Time.now - 120 # 2 minutes since last seen
-    @context.request_histograms.add(request.unique_name, 1)
-    @context.transaction_time_consumed.add(request.unique_name, 1)
-
-    # Actual value I have in console is 4.01
-    # Score uses Time.now to compare w/ last_seen, and will tick up slowly as
-    # time passes, hence the range below.
-    score = policy.score(request)
+    ScoutApm::Agent.instance.request_histograms.add(request.unique_name, 1)
 
-    assert score > 3.95
-    assert score < 4.05
+    # Actual value I have in console is 1.499
+    assert policy.score(request) > 1.45
+    assert policy.score(request) < 1.55
   end
 end

data/test/unit/sql_sanitizer_test.rb

@@ -1,8 +1,14 @@
 require 'test_helper'
 
+require 'scout_apm/utils/sql_sanitizer'
+
 module ScoutApm
   module Utils
     class SqlSanitizerTest < Minitest::Test
+      def setup
+        ScoutApm::Agent.instance.init_logger
+      end
+
       # Too long, and we just bail out to prevent long running instrumentation
       def test_long_sql
         sql = " " * 1001
@@ -10,8 +16,6 @@ module ScoutApm
       end
 
       def test_postgres_simple_select_of_first
-        skip "Broken on Ruby 1.8.7 because regular expressions do not support look-behinds" if RUBY_VERSION.start_with?("1.8.")
-
         sql = %q|SELECT  "users".* FROM "users"  ORDER BY "users"."id" ASC LIMIT 1|
         ss = SqlSanitizer.new(sql).tap{ |it| it.database_engine = :postgres }
         assert_equal %q|SELECT "users".* FROM "users" ORDER BY "users"."id" ASC LIMIT 1|, ss.to_s
@@ -28,23 +32,7 @@ module ScoutApm
         sql = %q|SELECT "users".* FROM "users" INNER JOIN "blogs" ON "blogs"."user_id" = "users"."id" WHERE (blogs.title = 'hello world')|
         ss = SqlSanitizer.new(sql).tap{ |it| it.database_engine = :postgres }
         assert_equal %q|SELECT "users".* FROM "users" INNER JOIN "blogs" ON "blogs"."user_id" = "users"."id" WHERE (blogs.title = ?)|, ss.to_s
-      end
-
-      def test_postgres_strips_after_where
-        raw_sql = %q|SELECT DISTINCT ON (flagged_traces.metric_name) flagged_traces.metric_name, "flagged_traces"."trace_id", "flagged_traces"."trace_type", "flagged_traces"."trace_occurred_at", flagged_traces.details ->> 'uri' as uri, (flagged_traces.details ->> 'n_sum_millis')::float as potential_savings, (flagged_traces.details ->> 'n_count')::float as num_queries FROM "flagged_traces" WHERE "flagged_traces"."app_id" = 5 AND "flagged_traces"."trace_type" = 'Request' AND ("flagged_traces"."trace_occurred_at" BETWEEN '2019-04-17 12:28:00.000000' AND '2019-04-18 12:28:00.000000') AND "flagged_traces"."flag_type" = 'nplusone' ORDER BY "flagged_traces"."metric_name" ASC, potential_savings DESC|
-        sanitized_sql = SqlSanitizer.new(raw_sql).tap { |it| it.database_engine = :postgres}
-        expected_sql = %q|SELECT DISTINCT ON (flagged_traces.metric_name) flagged_traces.metric_name, "flagged_traces"."trace_id", "flagged_traces"."trace_type", "flagged_traces"."trace_occurred_at", flagged_traces.details ->> 'uri' as uri, (flagged_traces.details ->> 'n_sum_millis')::float as potential_savings, (flagged_traces.details ->> 'n_count')::float as num_queries FROM "flagged_traces" WHERE "flagged_traces"."app_id" = ? AND "flagged_traces"."trace_type" = ? AND ("flagged_traces"."trace_occurred_at" BETWEEN ? AND ?) AND "flagged_traces"."flag_type" = ? ORDER BY "flagged_traces"."metric_name" ASC, potential_savings DESC|
-        assert_equal expected_sql, sanitized_sql.to_s
-      end
-
-      def test_postgres_strips_subquery_strings
-        raw_sql = %q|"SELECT 'orgs'.* FROM "orgs" WHERE  "orgs"."name" = 'Scout' AND "orgs"."created_by_user_id" IN (SELECT 'users'.'id' FROM "users" WHERE (id > AVG(id)) AND "type" = 'USER' AND "created_at" BETWEEN '2019-04-17 12:28:00.000000' AND '2019-04-18 12:28:00.000000')"|
-        sanitized_sql = SqlSanitizer.new(raw_sql).tap { |it| it.database_engine = :postgres}
-        expected_sql = %q|"SELECT 'orgs'.* FROM "orgs" WHERE "orgs"."name" = ? AND "orgs"."created_by_user_id" IN (SELECT 'users'.'id' FROM "users" WHERE (id > AVG(id)) AND "type" = ? AND "created_at" BETWEEN ? AND ?)"|
-        assert_equal expected_sql, sanitized_sql.to_s
-      end
 
-      def test_postgres_strips_integers
         # Strip integers
         sql = %q|SELECT "blogs".* FROM "blogs" WHERE (view_count > 10)|
         ss = SqlSanitizer.new(sql).tap{ |it| it.database_engine = :postgres }
@@ -73,8 +61,6 @@ module ScoutApm
       end
 
       def test_mysql_limit
-        skip "Broken on Ruby 1.8.7 because regular expressions do not support look-behinds" if RUBY_VERSION.start_with?("1.8.")
-
         sql = %q|SELECT  `blogs`.* FROM `blogs`  ORDER BY `blogs`.`id` ASC LIMIT 1|
         ss = SqlSanitizer.new(sql).tap{ |it| it.database_engine = :mysql }
         assert_equal %q|SELECT  `blogs`.* FROM `blogs`  ORDER BY `blogs`.`id` ASC LIMIT 1|, ss.to_s
@@ -105,33 +91,7 @@ module ScoutApm
         assert_equal %q|INSERT INTO `users` VALUES (?, ?)|, ss.to_s
       end
 
-      def test_sqlserver_integers
-        skip "SQLServer Support requires Ruby 1.9+ For Regexes"
-
-        sql = "EXEC sp_executesql N'SELECT  [users].* FROM [users] WHERE (age > 50)  ORDER BY [users].[id] ASC OFFSET 0 ROWS FETCH NEXT @0 ROWS ONLY', N'@0 int', @0 = 10"
-        ss = SqlSanitizer.new(sql).tap{ |it| it.database_engine = :sqlserver }
-        assert_equal %q|SELECT  [users].* FROM [users] WHERE (age > ?)  ORDER BY [users].[id] ASC OFFSET ? ROWS FETCH NEXT @0 ROWS ONLY|, ss.to_s
-      end
-
-      def test_sqlserver_strings
-        skip "SQLServer Support requires Ruby 1.9+ For Regexes"
-
-        sql = "EXEC sp_executesql N'SELECT  [users].* FROM [users] WHERE [users].[email] = @0  ORDER BY [users].[id] ASC OFFSET 0 ROWS FETCH NEXT @1 ROWS ONLY', N'@0 nvarchar(4000), @1 int', @0 = N'foo', @1 = 10"
-        ss = SqlSanitizer.new(sql).tap{ |it| it.database_engine = :sqlserver }
-        assert_equal %q|SELECT  [users].* FROM [users] WHERE [users].[email] = @0  ORDER BY [users].[id] ASC OFFSET ? ROWS FETCH NEXT @1 ROWS ONLY|, ss.to_s
-      end
-
-      def test_sqlserver_in_clause
-        skip "SQLServer Support requires Ruby 1.9+ For Regexes"
-
-        sql = "EXEC sp_executesql N'SELECT  [users].* FROM [users] WHERE (id IN (1,2,3))  ORDER BY [users].[id] ASC OFFSET 0 ROWS FETCH NEXT @0 ROWS ONLY', N'@0 int', @0 = 10"
-        ss = SqlSanitizer.new(sql).tap{ |it| it.database_engine = :sqlserver }
-        assert_equal %q|SELECT  [users].* FROM [users] WHERE (id IN (?))  ORDER BY [users].[id] ASC OFFSET ? ROWS FETCH NEXT @0 ROWS ONLY|, ss.to_s
-      end
-
       def test_scrubs_invalid_encoding
-        skip "Ruby 1.8.7 has no concept of encoding" if RUBY_VERSION.start_with?("1.8.")
-
         sql = "SELECT `blogs`.* FROM `blogs` WHERE (title = 'a\255c')".force_encoding('UTF-8')
         assert_equal false, sql.valid_encoding?
         ss = SqlSanitizer.new(sql).tap{ |it| it.database_engine = :mysql }
@@ -139,13 +99,6 @@ module ScoutApm
         assert_equal %q|SELECT `blogs`.* FROM `blogs` WHERE (title = ?)|, ss.to_s
       end
 
-      def test_set_columns
-        sql = %q|UPDATE "mytable" SET "myfield" = 'fieldcontent', "countofthings" = 10 WHERE "user_id" = 10|
-
-        ss = SqlSanitizer.new(sql).tap{ |it| it.database_engine = :postgres }
-        assert_equal %q|UPDATE "mytable" SET "myfield" = ?, "countofthings" = ? WHERE "user_id" = ?|, ss.to_s
-      end
-
       def assert_faster_than(target_seconds)
         t1 = ::Time.now
         yield

data/test/unit/store_test.rb

@@ -3,90 +3,21 @@ require 'test_helper'
 require 'scout_apm/store'
 
 class FakeFailingLayaway
-  attr_reader :rps_written
   def write_reporting_period(rp)
-    @rps_written ||= []
-    @rps_written << rp
+    raise "Always fails. Sucks."
   end
 end
 
 class StoreTest < Minitest::Test
   # TODO: Introduce a clock object to avoid having to use 'force'
   def test_writing_layaway_removes_timestamps
-    s = ScoutApm::Store.new(ScoutApm::AgentContext.new)
+    s = ScoutApm::Store.new
     s.track_one!("Controller", "user/show", 10)
 
-    assert_equal(1, s.instance_variable_get('@reporting_periods').size)
+    assert_equal(1, s.reporting_periods.size)
 
     s.write_to_layaway(FakeFailingLayaway.new, true)
 
-    assert_equal({}, s.instance_variable_get('@reporting_periods'))
-  end
-
-  def test_writing_layaway_removes_stale_timestamps
-    context = ScoutApm::AgentContext.new
-    current_time = Time.now.utc
-    current_rp = ScoutApm::StoreReportingPeriod.new(current_time, context)
-    stale_rp = ScoutApm::StoreReportingPeriod.new(current_time - current_time.sec - 120, context)
-
-    s = ScoutApm::Store.new(context)
-    ScoutApm::Instruments::Process::ProcessMemory.new(context).metrics(stale_rp.timestamp, s)
-    ScoutApm::Instruments::Process::ProcessMemory.new(context).metrics(current_rp.timestamp, s)
-    assert_equal 2, s.instance_variable_get('@reporting_periods').size
-
-    s.write_to_layaway(FakeFailingLayaway.new, true)
-
-    assert_equal({}, s.instance_variable_get('@reporting_periods'))
-  end
-end
-
-class StoreReportingPeriodTest < Minitest::Test
-  HistogramReport = ScoutApm::Instruments::HistogramReport
-
-  attr_reader :subject
-
-  def setup
-    @subject = ScoutApm::StoreReportingPeriod.new(ScoutApm::StoreReportingPeriodTimestamp.new(Time.now), ScoutApm::AgentContext.new)
-  end
-
-  # Check default values at creation time
-  def test_empty_values
-    assert_equal [], subject.histograms
-    assert_equal ScoutApm::ScoredItemSet.new, subject.request_traces
-    assert_equal ScoutApm::ScoredItemSet.new, subject.job_traces
-    assert_equal ScoutApm::MetricSet.new, subject.metric_set
-  end
-
-  def test_merge_histograms
-    histogramFoo1 = histogram
-    histogramFoo2 = histogram
-    histogramBar1 = histogram
-    histogramBar2 = histogram
-
-    # This assertion may be fragile to reordering in the merge_histograms! function.
-    histogramFoo1.expects(:combine!).with(histogramFoo2)
-    histogramBar1.expects(:combine!).with(histogramBar2)
-
-    subject.merge_histograms!([
-      HistogramReport.new("foo", histogramFoo1),
-      HistogramReport.new("bar", histogramBar1),
-    ])
-
-    subject.merge_histograms!([
-      HistogramReport.new("foo", histogramFoo2),
-      HistogramReport.new("bar", histogramBar2),
-    ])
-
-    result = subject.histograms
-    assert_equal 2, result.length
-    assert_equal ["bar", "foo"], result.map(&:name).sort
-  end
-
-  ###############################################################################
-  # Helpers
-  ###############################################################################
-  def histogram
-    max_bins = 20
-    ScoutApm::NumericHistogram.new(max_bins)
+    assert_equal({}, s.reporting_periods)
   end
 end