scout_apm 5.7.1 → 6.0.0

data/test/unit/limited_layer_test.rb

@@ -18,16 +18,16 @@ class LimitedLayerTest < Minitest::Test
     ll = ScoutApm::LimitedLayer.new("ActiveRecord")
 
     ll.absorb faux_layer("ActiveRecord", "User#Find", 2, 1, 200, 100)
-    assert_equal 1, ll.total_exclusive_time
+    assert_equal 2, ll.total_exclusive_time
     assert_equal 2, ll.total_call_time
-    assert_equal 100, ll.total_exclusive_allocations
+    assert_equal 200, ll.total_exclusive_allocations
     assert_equal 200, ll.total_allocations
 
 
     ll.absorb faux_layer("ActiveRecord", "User#Find", 4, 3, 400, 300)
-    assert_equal 4, ll.total_exclusive_time           # 3 + 1
+    assert_equal 6, ll.total_exclusive_time           # 4 + 2 (for limited layers, should equal total time)
     assert_equal 6, ll.total_call_time                # 4 + 2
-    assert_equal 400, ll.total_exclusive_allocations  # 300 + 100
+    assert_equal 600, ll.total_exclusive_allocations  # 400 + 200 (same goes for allocations)
     assert_equal 600, ll.total_allocations            # 400 + 200
   end
 

data/test/unit/sampling_test.rb

@@ -7,7 +7,7 @@ class SamplingTest < Minitest::Test
     def setup
       @global_sample_config = FakeConfigOverlay.new(
         {
-          'sample_rate' => 80,
+          'sample_rate' => 0.80,
         }
       )
 
@@ -23,7 +23,7 @@ class SamplingTest < Minitest::Test
 
     def test_individual_sample_to_hash
       sampling = ScoutApm::Sampling.new(@individual_config)
-      assert_equal({'/foo/bar' => 100, '/foo' => 50, '/bar/zap' => 80}, sampling.individual_sample_to_hash(@individual_config.value('sample_endpoints')))
+      assert_equal({'/foo/bar' => 1, '/foo' => 0.50, '/bar/zap' => 0.80}, sampling.individual_sample_to_hash(@individual_config.value('sample_endpoints')))
 
       sampling = ScoutApm::Sampling.new(@global_sample_config)
       assert_nil sampling.individual_sample_to_hash(@global_sample_config.value('sample_endpoints'))
@@ -38,7 +38,7 @@ class SamplingTest < Minitest::Test
     def test_uri_sample
       sampling = ScoutApm::Sampling.new(@individual_config)
       rate = sampling.web_sample_rate('/foo/far')
-      assert_equal 50, rate
+      assert_in_delta 0.50, rate
 
       rate = sampling.web_sample_rate('/bar')
       assert_nil rate
@@ -47,7 +47,7 @@ class SamplingTest < Minitest::Test
       assert_nil rate
 
       rate = sampling.web_sample_rate('/foo/bar/baz')
-      assert_equal 100, rate
+      assert_equal 1.0, rate
     end
 
     def test_job_ignore
@@ -58,18 +58,18 @@ class SamplingTest < Minitest::Test
 
     def test_job_sample
       sampling = ScoutApm::Sampling.new(@individual_config)
-      assert_equal 50, sampling.job_sample_rate('joba')
-      assert_equal 95, sampling.job_sample_rate('Foo::BarJob')
+      assert_in_delta 0.50, sampling.job_sample_rate('joba')
+      assert_in_delta 0.95, sampling.job_sample_rate('Foo::BarJob')
       assert_nil sampling.job_sample_rate('jobb')
     end
 
     def test_sample
       sampling = ScoutApm::Sampling.new(@individual_config)
       sampling.stub(:rand, 0.01) do
-        assert_equal(false, sampling.sample?(50))
+        assert_equal(false, sampling.downsample?(0.50))
       end
       sampling.stub(:rand, 0.99) do
-        assert_equal(true, sampling.sample?(50))
+        assert_equal(true, sampling.downsample?(0.50))
       end
     end
 
@@ -104,7 +104,7 @@ class SamplingTest < Minitest::Test
     end
 
     def test_web_reqeust_general_sampling
-      config = FakeConfigOverlay.new(@individual_config.values.merge({'endpoint_sample_rate' => 80}))
+      config = FakeConfigOverlay.new(@individual_config.values.merge({'endpoint_sample_rate' => 0.80}))
       sampling = ScoutApm::Sampling.new(config)
 
       transaction = FakeTrackedRequest.new_web_request('/foo/far')
@@ -171,7 +171,7 @@ class SamplingTest < Minitest::Test
     end
 
     def test_job_general_sampling
-      config = FakeConfigOverlay.new(@individual_config.values.merge({'job_sample_rate' => 80}))
+      config = FakeConfigOverlay.new(@individual_config.values.merge({'job_sample_rate' => 0.80}))
       sampling = ScoutApm::Sampling.new(config)
 
       transaction = FakeTrackedRequest.new_job_request('joba')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 5.7.1
+  version: 6.0.0
 platform: ruby
 authors:
 - Derek Haynes
@@ -255,7 +255,9 @@ files:
 - lib/scout_apm/auto_instrument/instruction_sequence.rb
 - lib/scout_apm/auto_instrument/layer.rb
 - lib/scout_apm/auto_instrument/parser.rb
+- lib/scout_apm/auto_instrument/prism.rb
 - lib/scout_apm/auto_instrument/rails.rb
+- lib/scout_apm/auto_instrument/requirements.rb
 - lib/scout_apm/background_job_integrations/delayed_job.rb
 - lib/scout_apm/background_job_integrations/faktory.rb
 - lib/scout_apm/background_job_integrations/good_job.rb
@@ -313,6 +315,7 @@ files:
 - lib/scout_apm/instruments/grape.rb
 - lib/scout_apm/instruments/http.rb
 - lib/scout_apm/instruments/http_client.rb
+- lib/scout_apm/instruments/httpx.rb
 - lib/scout_apm/instruments/influxdb.rb
 - lib/scout_apm/instruments/memcached.rb
 - lib/scout_apm/instruments/middleware_detailed.rb
@@ -320,6 +323,7 @@ files:
 - lib/scout_apm/instruments/mongoid.rb
 - lib/scout_apm/instruments/moped.rb
 - lib/scout_apm/instruments/net_http.rb
+- lib/scout_apm/instruments/opensearch.rb
 - lib/scout_apm/instruments/percentile_sampler.rb
 - lib/scout_apm/instruments/process/process_cpu.rb
 - lib/scout_apm/instruments/process/process_memory.rb
@@ -413,7 +417,6 @@ files:
 - lib/scout_apm/utils/numbers.rb
 - lib/scout_apm/utils/scm.rb
 - lib/scout_apm/utils/sql_sanitizer.rb
-- lib/scout_apm/utils/time.rb
 - lib/scout_apm/utils/unique_id.rb
 - lib/scout_apm/version.rb
 - lib/tasks/doctor.rake
@@ -426,7 +429,8 @@ files:
 - test/unit/auto_instrument/anonymous_block_value.rb
 - test/unit/auto_instrument/assignments-instrumented.rb
 - test/unit/auto_instrument/assignments.rb
-- test/unit/auto_instrument/controller-ast.txt
+- test/unit/auto_instrument/controller-ast.parser.txt
+- test/unit/auto_instrument/controller-ast.prism.txt
 - test/unit/auto_instrument/controller-instrumented.rb
 - test/unit/auto_instrument/controller.rb
 - test/unit/auto_instrument/hanging_method.rb
@@ -435,6 +439,8 @@ files:
 - test/unit/auto_instrument/rescue_from-instrumented.rb
 - test/unit/auto_instrument/rescue_from.rb
 - test/unit/auto_instrument_test.rb
+- test/unit/background_job_integrations/faktory_test.rb
+- test/unit/background_job_integrations/shoryuken_test.rb
 - test/unit/background_job_integrations/sidekiq_test.rb
 - test/unit/config_test.rb
 - test/unit/context_test.rb
@@ -459,6 +465,7 @@ files:
 - test/unit/instruments/fixtures/test_view.html.erb
 - test/unit/instruments/http_client_test.rb
 - test/unit/instruments/http_test.rb
+- test/unit/instruments/httpx_test.rb
 - test/unit/instruments/moped_test.rb
 - test/unit/instruments/net_http_test.rb
 - test/unit/instruments/percentile_sampler_test.rb

data/lib/scout_apm/utils/time.rb

@@ -1,12 +0,0 @@
-module ScoutApm
-  module Utils
-    class Time
-      # Handles both integer (unix) time and Time objects
-      # example output:  "09/10/15 04:34:28 -0600"
-      def self.to_s(time)
-        return to_s(::Time.at(time)) if time.is_a? Integer
-        time.strftime("%m/%d/%y %H:%M:%S %z")
-      end
-    end
-  end
-end