scout_apm 5.6.0 → 5.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46df05a2d67c23f243d1eedfddd2eabdd8a6151ef8974e185ea7c8efbe01d076
-  data.tar.gz: 072bcd67b72f477c924dd647f2e3f87e586f3a97ff8dbbd727d5f5991c060f54
+  metadata.gz: 351ed300191874b86b1c402a2696897d05006266c2c88716a15d8588aefa00b2
+  data.tar.gz: dcdc4fb47007eb665f7a4df6a3a9a7bcde78550656692fc5023020739b0974d9
 SHA512:
-  metadata.gz: 31ab64b2f5a212322989d118edba3f92cb4c4a223618bebd7f4fae318ebb243459dcd730388a080d7e7d6e0ce1147af857bb656f67bdeda902878e167f195f90
-  data.tar.gz: 9191e3bf53423a7db1e9c0265a6b8cf03eb7bce0374ed392c137ab1c592dffee312c8efe8e6301e3a0fad17e033429af4c0b98b7608438be44251682236874d6
+  metadata.gz: 8fe62cd0646f58ad535d3912cf9c023fb8d7c52116dd30b3359e7f33f50f51ba3457090fe2df8f0bec5e5194b02bcccb44feaa466d76fa14938b91f11f1f74c0
+  data.tar.gz: cd20a788b47c33be24c8ee88eb00d443bf3d20990ba3fb769ca64353b14b090b931c121d6f07aa40bd366381f3f77646b41206e66cb9507cb204ee3eaadf62fe

data/CHANGELOG.markdown

@@ -1,5 +1,8 @@
 # Unreleased
 
+# 5.6.1
+- Fix `job_sample_rate` and `endpoint_sample_rate` default configuration values (#529)
+
 # 5.6.0
 - New options for sampling and ignore configurationn (#521)
   - `sample_rate` - Set the rate at which requests are sampled globally (1-100, a percentage of requests to keep).

data/lib/scout_apm/config.rb

@@ -184,6 +184,13 @@ module ScoutApm
       end
     end
 
+    class NullableIntegerCoercion
+      def coerce(val)
+        return val if val.nil?
+        val.to_i
+      end
+    end
+
     # Simply returns the passed in value, without change
     class NullCoercion
       def coerce(val)
@@ -213,8 +220,8 @@ module ScoutApm
       'sample_rate' => IntegerCoercion.new,
       'sample_endpoints' => JsonCoercion.new,
       'sample_jobs' => JsonCoercion.new,
-      'endpoint_sample_rate' => IntegerCoercion.new,
-      'job_sample_rate' => IntegerCoercion.new,
+      'endpoint_sample_rate' => NullableIntegerCoercion.new,
+      'job_sample_rate' => NullableIntegerCoercion.new,
       'start_resque_server_instrument' => BooleanCoercion.new,
       'timeline_traces' => BooleanCoercion.new,
       'auto_instruments' => BooleanCoercion.new,
@@ -337,8 +344,8 @@ module ScoutApm
         'sample_rate'                          => 100,
         'sample_endpoints'                     => [],
         'sample_jobs'                          => [],
-        'endpoint_sample_rate'                 => 100,
-        'job_sample_rate'                      => 100,
+        'endpoint_sample_rate'                 => nil,
+        'job_sample_rate'                      => nil,
         'start_resque_server_instrument'       => true, # still only starts if Resque is detected
         'collect_remote_ip'                    => true,
         'record_queue_time'                    => true,

data/lib/scout_apm/sampling.rb

@@ -16,7 +16,15 @@ module ScoutApm
       @sample_jobs = individual_sample_to_hash(config.value('sample_jobs'))
       @job_sample_rate = config.value('job_sample_rate')
 
-      logger.info("Sampling initialized with config: global_sample_rate: #{@global_sample_rate}, endpoint_sample_rate: #{@endpoint_sample_rate}, sample_endpoints: #{@sample_endpoints}, ignore_endpoints: #{@ignore_endpoints}, job_sample_rate: #@job_sample_rate}, sample_jobs: #{@sample_jobs}, ignore_jobs: #{@ignore_jobs}")
+      log_string = "Sampling initialized with config: "
+      log_string += "global_sample_rate: #{@global_sample_rate.inspect}, "
+      log_string += "endpoint_sample_rate: #{@endpoint_sample_rate.inspect}, "
+      log_string += "sample_endpoints: #{@sample_endpoints.inspect}, "
+      log_string += "ignore_endpoints: #{@ignore_endpoints.inspect}, "
+      log_string += "job_sample_rate: #{@job_sample_rate.inspect}, "
+      log_string += "sample_jobs: #{@sample_jobs.inspect}, "
+      log_string += "ignore_jobs: #{@ignore_jobs.inspect}"
+      logger.info(log_string)
     end
 
     def drop_request?(transaction)

data/lib/scout_apm/version.rb

@@ -1,3 +1,3 @@
 module ScoutApm
-  VERSION = "5.6.0"
+  VERSION = "5.6.1"
 end

data/test/unit/config_test.rb

@@ -72,6 +72,26 @@ class ConfigTest < Minitest::Test
     assert_equal ["a"], coercion.coerce(["a"])
   end
 
+  def test_integer_coercion
+    coercion = ScoutApm::Config::IntegerCoercion.new
+    assert_equal 1, coercion.coerce("1")
+    assert_equal 1, coercion.coerce(1)
+    assert_equal 0, coercion.coerce("0")
+    assert_equal 0, coercion.coerce(0)
+    assert_equal 0, coercion.coerce("")
+    assert_equal 0, coercion.coerce(nil)
+  end
+
+  def test_nullable_integer_coercion
+    coercion = ScoutApm::Config::NullableIntegerCoercion.new
+    assert_equal 1, coercion.coerce("1")
+    assert_equal 1, coercion.coerce(1)
+    assert_equal 0, coercion.coerce("0")
+    assert_equal 0, coercion.coerce(0)
+    assert_equal 0, coercion.coerce("")
+    assert_equal nil, coercion.coerce(nil)
+  end
+
   def test_any_keys_found
     ENV.stubs(:has_key?).returns(nil)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 5.6.0
+  version: 5.6.1
 platform: ruby
 authors:
 - Derek Haynes
 - Andre Lewis
 bindir: bin
 cert_chain: []
-date: 2025-01-15 00:00:00.000000000 Z
+date: 2025-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest