solarwinds_apm 7.0.1 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62a494962e1b42497287295bec1c5ad4ae5dfa9b57df068d8897707e89e31c73
-  data.tar.gz: dd32d8923f0f93776bad22e506aee1a639c59f153cb67b4c944f92d4018f36d8
+  metadata.gz: 1a5971dc87577f87109a1c774b68f804a6d91d95a14f23693efeeab6aa30663a
+  data.tar.gz: db9a7966cf2df759688617366ff07ed94d59821c5ae671fa803c15ccb10e7bb5
 SHA512:
-  metadata.gz: f28f6c76e3baa28539dc87704f1199e336cea2024a5394e229594d81a77f21280a216738e3bd3a53f5f9a3922a237925e85dd86789e86ff5d47e00b831acb0d0
-  data.tar.gz: e9ad6b91c3d1da150dba81c28a974fbeafe376dbe24be277ec27aeabca58809083c526446d9d66b4b705fe1b304b2b337d3073f8bc094b6e3f5f827709f63388
+  metadata.gz: 886156c1e22aed57662fc1bbb9ff71b3d45be55557980cc1cdcb83fb40087dfa981f28db16379e88090ceabcd0f3a8ecf085e7f4928be33f373be15f9aeed63b
+  data.tar.gz: e793b950bef565ff82d585e4cfd1bf43903ac22ecc49c0dc13c15b3b91459463fbc6428822c1f7c54c12c9c1427aff99f6621dc30c73d5e0d3229b7e3b8cfae4

data/lib/solarwinds_apm/config.rb

@@ -181,29 +181,14 @@ module SolarWindsAPM
       case key
       when :sampling_rate
         SolarWindsAPM.logger.warn do
-          "[#{name}/#{__method__}] sampling_rate is not a supported setting for SolarWindsAPM::Config. Please use :sample_rate."
+          '[Deprecated] sampling_rate is not a supported setting for SolarWindsAPM::Config.'
         end
 
       when :sample_rate
-        unless value.is_a?(Integer) || value.is_a?(Float)
-          SolarWindsAPM.logger.warn do
-            "[#{name}/#{__method__}] :sample_rate must be a number between 0 and 1000000 (1m) (provided: #{value}), corrected to 0"
-          end
-          value = 0
-        end
-
-        # Validate :sample_rate value
-        unless value.between?(0, 1e6)
-          new_value = value.negative? ? 0 : 1_000_000
-          SolarWindsAPM.logger.warn do
-            "[#{name}/#{__method__}] :sample_rate must be between 0 and 1000000 (1m) (provided: #{value}), corrected to #{new_value}"
-          end
+        SolarWindsAPM.logger.warn do
+          '[Deprecated] sample_rate is not a supported setting for SolarWindsAPM::Config.'
         end
 
-        # Assure value is an integer
-        @@config[key.to_sym] = new_value.to_i
-        SolarWindsAPM.sample_rate(new_value)
-
       when :transaction_settings
         compile_settings(value)
 

data/lib/solarwinds_apm/sampling/token_bucket.rb

@@ -23,9 +23,10 @@ module SolarWindsAPM
       @timer = nil
     end
 
-    # used call from update_settings e.g. bucket.update(bucket_settings)
+    # oboe sampler update_settings will update the token
+    # (thread safe as update_settings is guarded by mutex from oboe sampler)
     def update(settings)
-      settings.instance_of?(Hash) ? update_from_hash(settings) : update_from_token_bucket_settings(settings)
+      settings.instance_of?(Hash) ? update_from_hash(settings) : update_from_hash(tb_to_hash(settings))
     end
 
     def update_from_hash(settings)
@@ -36,32 +37,13 @@ module SolarWindsAPM
       end
 
       self.rate = settings[:rate] if settings[:rate]
-
-      return unless settings[:interval]
-
-      self.interval = settings[:interval]
-      return unless running
-
-      stop
       start
     end
 
-    def update_from_token_bucket_settings(settings)
-      if settings.capacity
-        difference = settings.capacity - @capacity
-        self.capacity = settings.capacity
-        self.tokens = @tokens + difference
-      end
-
-      self.rate = settings.rate if settings.rate
-
-      return unless settings.interval
-
-      self.interval = settings.interval
-      return unless running
-
-      stop
-      start
+    def tb_to_hash(settings)
+      { capacity: settings.capacity,
+        rate: settings.rate,
+        interval: settings.interval }
     end
 
     def capacity=(capacity)
@@ -72,8 +54,11 @@ module SolarWindsAPM
       @rate = [0, rate].max
     end
 
+    # self.interval= sets the @interval and @sleep_interval
+    # @sleep_interval is used in the timer thread to sleep between replenishing the bucket
     def interval=(interval)
       @interval = interval.clamp(0, MAX_INTERVAL)
+      @sleep_interval = @interval / 1000.0
     end
 
     def tokens=(tokens)
@@ -83,11 +68,15 @@ module SolarWindsAPM
     # Attempts to consume tokens from the bucket
     # @param n [Integer] Number of tokens to consume
     # @return [Boolean] Whether there were enough tokens
+    # TODO: we need to include thread-safety here since sampler is shared across threads
+    # and we may have multiple threads trying to consume tokens at the same time
     def consume(token = 1)
       if @tokens >= token
         self.tokens = @tokens - token
+        SolarWindsAPM.logger.debug { "[#{self.class}/#{__method__}] Consumed #{token} from total #{@tokens} (#{(@tokens.to_f / @capacity * 100).round(1)}% remaining)" }
         true
       else
+        SolarWindsAPM.logger.debug { "[#{self.class}/#{__method__}] Token consumption failed: requested=#{token}, available=#{@tokens}, capacity=#{@capacity}" }
         false
       end
     end
@@ -99,7 +88,7 @@ module SolarWindsAPM
       @timer = Thread.new do
         loop do
           task
-          sleep(@interval / 1000.0)
+          sleep(@sleep_interval)
         end
       end
     end
@@ -114,7 +103,7 @@ module SolarWindsAPM
 
     # Whether the bucket is actively being replenished
     def running
-      !@timer.nil?
+      !@timer.nil? && @timer.alive?
     end
 
     private

data/lib/solarwinds_apm/version.rb

@@ -13,7 +13,7 @@ module SolarWindsAPM
   module Version
     MAJOR  = 7 # breaking,
     MINOR  = 0 # feature,
-    PATCH  = 1 # fix => BFF
+    PATCH  = 2 # fix => BFF
     PRE    = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solarwinds_apm
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.0.2
 platform: ruby
 authors:
 - Maia Engeli
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-12 00:00:00.000000000 Z
+date: 2025-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-exporter-otlp