solarwinds_apm 7.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b86f18a58a518205b6f5d0d8e4054e821d2e2cc22b86366ff0ab13d0b2542322
-  data.tar.gz: 8e6a2c4dbbee0e2689b36086f1f003237d1e6f0adefd36cb13038a782e449e50
+  metadata.gz: 62a494962e1b42497287295bec1c5ad4ae5dfa9b57df068d8897707e89e31c73
+  data.tar.gz: dd32d8923f0f93776bad22e506aee1a639c59f153cb67b4c944f92d4018f36d8
 SHA512:
-  metadata.gz: 1884c401f28f7b57e0df2e2b0784b28964e50785555542376ad0527d72a7c43636115d48d332908a200fff3f2dd42160d8f4e79ec21e3e302e41ae048848f0eb
-  data.tar.gz: 339c983072fc99986d575593a1bbcd84b5ff9728c61a47279de70ba010416b5fdad7cfa2d9b457c206049b1533ad87212f7b4ac26091f3dbcd7c68ad10a4edf1
+  metadata.gz: f28f6c76e3baa28539dc87704f1199e336cea2024a5394e229594d81a77f21280a216738e3bd3a53f5f9a3922a237925e85dd86789e86ff5d47e00b831acb0d0
+  data.tar.gz: e9ad6b91c3d1da150dba81c28a974fbeafe376dbe24be277ec27aeabca58809083c526446d9d66b4b705fe1b304b2b337d3073f8bc094b6e3f5f827709f63388

data/lib/solarwinds_apm/config.rb

@@ -6,6 +6,8 @@
 #
 # Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 
+require 'set'
+
 module SolarWindsAPM
   ##
   # This module exposes a nested configuration hash that can be used to
@@ -24,14 +26,6 @@ module SolarWindsAPM
                              6 => { stdlib: ::Logger::DEBUG, otel: 'debug' } }.freeze
 
     @@config = {}
-    @@instrumentation = %i[action_controller action_controller_api action_view
-                           active_record bunnyclient bunnyconsumer curb
-                           dalli delayed_jobclient delayed_jobworker
-                           excon faraday graphql grpc_client grpc_server grape
-                           httpclient nethttp memcached mongo moped padrino rack redis
-                           resqueclient resqueworker rest_client
-                           sequel sidekiqclient sidekiqworker sinatra typhoeus
-                           curb excon faraday httpclient nethttp rest_client typhoeus]
 
     ##
     # load_config_file
@@ -131,8 +125,6 @@ module SolarWindsAPM
     def self.print_config
       SolarWindsAPM.logger.debug { "[#{name}/#{__method__}] General configurations list blow:" }
       @@config.each do |k, v|
-        next if @@instrumentation.include?(k)
-
         SolarWindsAPM.logger.debug do
           "[#{name}/#{__method__}] Config Key/Value: #{k}, #{v.inspect}"
         end
@@ -148,8 +140,6 @@ module SolarWindsAPM
     # This will be called when require 'solarwinds_apm/config' happen
     #
     def self.initialize
-      # for config file backward compatibility
-      @@instrumentation.each { |inst| @@config[inst] = {} }
       @@config[:transaction_name] = {}
 
       # Always load the template, it has all the keys and defaults defined,

data/lib/solarwinds_apm/noop/README.md

@@ -1,12 +1,31 @@
-
 # Noop Mode
 
 Here we can define modules and classes for noop mode.
 
-Instead of polluting code with SolarWindsAPM.loaded conditionals
+Instead of polluting code with SolarWindsAPM.loaded conditionals, we load these classes when in noop mode and they expose noop behavior.
+
+The following methods require noop implementations based on the API modules:
+
+## Currently Implemented Noop Modules in `api.rb`:
+
+- **Tracing**:
+  - `solarwinds_ready?(wait_milliseconds=3000, integer_response: false)` - Always returns false
+
+- **CurrentTraceInfo**:
+  - `current_trace_info` - Returns a TraceInfo instance with default/empty values
+  - TraceInfo class with noop methods: `for_log`, `hash_for_log`, and attributes: `tracestring`, `trace_id`, `span_id`, `trace_flags`, `do_log`
+
+- **CustomMetrics**:
+  - `increment_metric(name, count=1, with_hostname=false, tags_kvs={})` - Returns false with deprecation warning
+  - `summary_metric(name, value, count=1, with_hostname=false, tags_kvs={})` - Returns false with deprecation warning
+
+- **OpenTelemetry**:
+  - `in_span(name, attributes: nil, links: nil, start_timestamp: nil, kind: nil, &block)` - Simply yields to the block if given
 
-we load these classes when in noop mode and they expose noop behavior.
+- **TransactionName**:
+  - `set_transaction_name(custom_name=nil)` - Always returns true
 
-so far only one class is needed:
+- **CustomInstrumentation/Tracer**:
+  - `add_tracer(method_name, span_name=nil, options={})` - Always returns nil.
 
-- SolarWindsAPM::Context  and its toString() method from oboe
+These modules are extended into `SolarWindsAPM::API` to provide consistent behavior when SolarWindsAPM is disabled or in noop mode.

data/lib/solarwinds_apm/noop/api.rb

@@ -79,10 +79,17 @@ module NoopAPI
       true
     end
   end
+
+  module Tracer
+    def add_tracer(*); end
+  end
 end
 
-SolarWindsAPM::API.extend(NoopAPI::Tracing)
-SolarWindsAPM::API.extend(NoopAPI::CurrentTraceInfo)
-SolarWindsAPM::API.extend(NoopAPI::CustomMetrics)
-SolarWindsAPM::API.extend(NoopAPI::OpenTelemetry)
-SolarWindsAPM::API.extend(NoopAPI::TransactionName)
+[
+  NoopAPI::Tracing,
+  NoopAPI::CurrentTraceInfo,
+  NoopAPI::CustomMetrics,
+  NoopAPI::OpenTelemetry,
+  NoopAPI::TransactionName,
+  NoopAPI::Tracer
+].each { |mod| SolarWindsAPM::API.extend(mod) }

data/lib/solarwinds_apm/sampling/dice.rb

@@ -14,6 +14,7 @@ module SolarWindsAPM
     def initialize(settings)
       @scale = settings[:scale]
       @rate = settings[:rate] || 0
+      @random_generator = Random.new
     end
 
     def update(settings)
@@ -23,11 +24,12 @@ module SolarWindsAPM
 
     # return Boolean
     def roll
-      (rand * @scale) < @rate
+      rand_num = @random_generator.rand
+      SolarWindsAPM.logger.debug { "[#{self.class}/#{__method__}] rand_num=#{rand_num.round(6)}, @scale=#{@scale}, @rate=#{@rate}" }
+      (rand_num * @scale) < @rate
     end
 
     def rate=(rate)
-      # Math.max(0, Math.min(this.#scale, n))
       @rate = rate.clamp(0, @scale)
     end
   end

data/lib/solarwinds_apm/sampling/http_sampler.rb

@@ -9,7 +9,7 @@
 module SolarWindsAPM
   class HttpSampler < Sampler
     REQUEST_TIMEOUT = 10 # 10s
-    GET_SETTING_DURAION = 60 # 60s
+    GET_SETTING_DURATION = 60 # 60s
 
     # we don't need hostname as it's for separating browser and local env
     def initialize(config)
@@ -22,11 +22,31 @@ module SolarWindsAPM
       @hostname = hostname
       @setting_url = URI.join(@url, "./v1/settings/#{@service}/#{@hostname}")
 
-      Thread.new { settings_request }
+      @pid = nil
+      @thread = nil
+
+      reset_on_fork
+    end
+
+    # restart the settings request thread after forking
+    def should_sample?(params)
+      reset_on_fork
+      super
     end
 
     private
 
+    def reset_on_fork
+      pid = Process.pid
+      return if @pid == pid
+
+      @pid = pid
+      @thread = Thread.new { settings_request }
+      @logger.debug { "[#{self.class}/#{__method__}] Restart the settings_request thread in process: #{@pid}." }
+    rescue ThreadError => e
+      @logger.error { "[#{self.class}/#{__method__}] Unexpected error in HttpSampler#reset_on_fork: #{e.message}" }
+    end
+
     # Node.js equivalent: Retrieve system hostname
     # e.g. docker -> docker.swo.ubuntu.development; macos -> NHSDFWSSD
     def hostname
@@ -36,27 +56,39 @@ module SolarWindsAPM
 
     def fetch_with_timeout(url, timeout_seconds = nil)
       uri = url
+      timeout = timeout_seconds || REQUEST_TIMEOUT
+
+      deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + timeout
+
+      remaining = lambda {
+        r = deadline - Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        r.negative? ? 0.0 : r
+      }
+
       response = nil
 
-      thread = Thread.new do
+      begin
         ::OpenTelemetry::Common::Utilities.untraced do
-          Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+          Net::HTTP.start(
+            uri.host, uri.port,
+            use_ssl: uri.scheme == 'https',
+            open_timeout: timeout,
+            read_timeout: timeout # will shrink later
+          ) do |http|
             request = Net::HTTP::Get.new(uri)
             request['Authorization'] = @headers
 
+            # Before issuing request, tighten read_timeout to remaining
+            http.read_timeout = remaining.call
             response = http.request(request)
           end
         end
+      rescue Net::ReadTimeout, Net::OpenTimeout
+        @logger.debug { "Request timed out after #{timeout} seconds" }
       rescue StandardError => e
         @logger.debug { "Error during request: #{e.message}" }
       end
 
-      thread_join = thread.join(timeout_seconds || REQUEST_TIMEOUT)
-      if thread_join.nil?
-        @logger.debug { "Request timed out after #{timeout_seconds} seconds" }
-        thread.kill
-      end
-
       response
     end
 
@@ -77,11 +109,11 @@ module SolarWindsAPM
           sleep([0, expiry_timeout].max)
         else
           @logger.warn { 'Retrieved sampling settings are invalid. Ensure proper configuration.' }
-          sleep(GET_SETTING_DURAION)
+          sleep(GET_SETTING_DURATION)
         end
       rescue StandardError => e
         @logger.warn { "Failed to retrieve sampling settings (#{e.message}), tracing will be disabled until valid ones are available." }
-        sleep(GET_SETTING_DURAION)
+        sleep(GET_SETTING_DURATION)
       end
     end
   end

data/lib/solarwinds_apm/sampling/settings.rb

@@ -22,7 +22,7 @@ module SolarWindsAPM
         flags |= SolarWindsAPM::Flags::OVERRIDE
       end
 
-      remote.dup.tap { |merged| merged[:flags] = flags }
+      remote.merge(flags: flags)
     end
   end
 end

data/lib/solarwinds_apm/support/resource_detector.rb

@@ -175,14 +175,21 @@ module SolarWindsAPM
       ::OpenTelemetry::SDK::Resources::Resource.create({})
     end
 
+    def self.number?(string)
+      true if Float(string)
+    rescue StandardError
+      false
+    end
+
     def self.safe_integer?(number)
       min_safe_integer = -((2**53) - 1)
       max_safe_integer = (2**53) - 1
-      number.is_a?(Integer) && number >= min_safe_integer && number <= max_safe_integer
+      number = number.to_i if number?(number)
+      number.between?(min_safe_integer, max_safe_integer)
     end
 
     def self.windows?
-      %w[mingw32 cygwin].any? { |platform| RUBY_PLATFORM.include?(platform) }
+      /mswin|mingw|cygwin/.match?(RUBY_PLATFORM)
     end
 
     def self.random_uuid

data/lib/solarwinds_apm/support/txn_name_manager.rb

@@ -52,9 +52,7 @@ module SolarWindsAPM
           txn_name_exist = true
           @transaction_name[txn_name].exit
         end
-      end
 
-      @mutex.synchronize do
         if txn_name_exist || @transaction_name.size < MAX_CARDINALITY
           @cache[key] = txn_name
           @transaction_name[txn_name] = Thread.new { cleanup_txn(key, txn_name) }

data/lib/solarwinds_apm/version.rb

@@ -13,7 +13,7 @@ module SolarWindsAPM
   module Version
     MAJOR  = 7 # breaking,
     MINOR  = 0 # feature,
-    PATCH  = 0 # fix => BFF
+    PATCH  = 1 # 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.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Maia Engeli
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-06 00:00:00.000000000 Z
+date: 2025-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-exporter-otlp