scout_apm 3.0.0.pre1 → 3.0.0.pre2

data/test/unit/serializers/payload_serializer_test.rb

@@ -17,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 = {
@@ -58,7 +58,7 @@ class PayloadSerializerTest < Minitest::Test
         stats.total_exclusive_time = 0.07813208899999999
       }
     }
-    payload = ScoutApm::Serializers::PayloadSerializerToJson.serialize({}, metrics, {}, [], [])
+    payload = ScoutApm::Serializers::PayloadSerializerToJson.serialize({}, metrics, {}, [], [], [])
     formatted_metrics = [
       {
         "key" => {
@@ -104,7 +104,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 = {

data/test/unit/store_test.rb

@@ -21,3 +21,54 @@ class StoreTest < Minitest::Test
     assert_equal({}, s.reporting_periods)
   end
 end
+
+class StoreReportingPeriodTest < Minitest::Test
+  HistogramReport = ScoutApm::Instruments::HistogramReport
+
+  attr_reader :subject
+
+  def setup
+    @subject = ScoutApm::StoreReportingPeriod.new(ScoutApm::StoreReportingPeriodTimestamp.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)
+  end
+end

data/test/unit/utils/numbers_test.rb

@@ -0,0 +1,15 @@
+require_relative '../../test_helper'
+require 'scout_apm/utils/numbers'
+
+class NumbersTest < Minitest::Test
+  Numbers = ScoutApm::Utils::Numbers
+
+  def test_round
+    assert_equal 12, Numbers.round(12.1234567, 0)
+    assert_equal 12.1, Numbers.round(12.1234567, 1)
+    assert_equal 12.12, Numbers.round(12.1234567, 2)
+    assert_equal 12.123, Numbers.round(12.1234567, 3)
+
+    assert_equal 12, Numbers.round(12.0000, 2)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre1
+  version: 3.0.0.pre2
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -193,6 +193,7 @@ files:
 - lib/scout_apm/scored_item_set.rb
 - lib/scout_apm/serializers/app_server_load_serializer.rb
 - lib/scout_apm/serializers/directive_serializer.rb
+- lib/scout_apm/serializers/histograms_serializer_to_json.rb
 - lib/scout_apm/serializers/jobs_serializer_to_json.rb
 - lib/scout_apm/serializers/metrics_to_json_serializer.rb
 - lib/scout_apm/serializers/payload_serializer.rb
@@ -217,9 +218,11 @@ files:
 - lib/scout_apm/utils/active_record_metric_name.rb
 - lib/scout_apm/utils/backtrace_parser.rb
 - lib/scout_apm/utils/fake_stacks.rb
+- lib/scout_apm/utils/gzip_helper.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/numbers.rb
 - lib/scout_apm/utils/sql_sanitizer.rb
 - lib/scout_apm/utils/sql_sanitizer_regex.rb
 - lib/scout_apm/utils/sql_sanitizer_regex_1_8_7.rb
@@ -238,6 +241,7 @@ files:
 - test/unit/histogram_test.rb
 - test/unit/ignored_uris_test.rb
 - test/unit/instruments/active_record_instruments_test.rb
+- test/unit/instruments/percentile_sampler_test.rb
 - test/unit/layaway_test.rb
 - test/unit/metric_set_test.rb
 - test/unit/scored_item_set_test.rb
@@ -248,6 +252,7 @@ files:
 - test/unit/store_test.rb
 - test/unit/utils/active_record_metric_name_test.rb
 - test/unit/utils/backtrace_parser_test.rb
+- test/unit/utils/numbers_test.rb
 - tester.rb
 homepage: https://github.com/scoutapp/scout_apm_ruby
 licenses:
@@ -270,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring
@@ -286,6 +291,7 @@ test_files:
 - test/unit/histogram_test.rb
 - test/unit/ignored_uris_test.rb
 - test/unit/instruments/active_record_instruments_test.rb
+- test/unit/instruments/percentile_sampler_test.rb
 - test/unit/layaway_test.rb
 - test/unit/metric_set_test.rb
 - test/unit/scored_item_set_test.rb
@@ -296,4 +302,4 @@ test_files:
 - test/unit/store_test.rb
 - test/unit/utils/active_record_metric_name_test.rb
 - test/unit/utils/backtrace_parser_test.rb
-has_rdoc: 
+- test/unit/utils/numbers_test.rb