solarwinds_apm 7.0.0 → 7.1.0

data/lib/solarwinds_apm/sampling/trace_options.rb

@@ -9,63 +9,66 @@
 module SolarWindsAPM
   class TraceOptions
     TRIGGER_TRACE_KEY = 'trigger-trace'
-    TIMESTAMP_KEY = 'ts'
-    SW_KEYS_KEY = 'sw-keys'
-
-    CUSTOM_KEY_REGEX = /^custom-[^\s]*$/
+    TIMESTAMP_KEY     = 'ts'
+    SW_KEYS_KEY       = 'sw-keys'
+    CUSTOM_KEY_REGEX  = /^custom-[^\s]*$/
 
     def self.parse_trace_options(header, logger)
+      logger.debug { "[#{self.class}/#{__method__}] Parsing trace options header: #{header&.slice(0, 100)}..." }
       trace_options = TriggerTraceOptions.new(nil, nil, nil, {}, [], TraceOptionsResponse.new(nil, nil, []))
 
-      kvs = header.split(';').map do |kv|
+      kvs = header.split(';').filter_map do |kv|
         key, *values = kv.split('=').map(&:strip)
+        next if key.nil? || key.empty?
+
         value = values.any? ? values.join('=') : nil
         [key, value]
       end
 
-      kvs.reject! { |key, _| key.nil? || key.empty? }
+      logger.debug { "[#{self.class}/#{__method__}] Parsed kvs #{kvs.inspect}" }
 
       kvs.each do |k, v|
         case k
         when TRIGGER_TRACE_KEY
           if v || trace_options.trigger_trace
-            logger.debug { 'invalid trace option for trigger trace' }
+            logger.debug { "[#{self.class}/#{__method__}] invalid trace option for trigger trace: value=#{v}, already_set=#{trace_options.trigger_trace}" }
             trace_options.ignored << [k, v]
             next
           end
           trace_options.trigger_trace = true
         when TIMESTAMP_KEY
           if v.nil? || trace_options.timestamp
-            logger.debug { 'invalid trace option for timestamp' }
+            logger.debug { "[#{self.class}/#{__method__}] invalid trace option for timestamp: value=#{v}, already_set=#{trace_options.timestamp}" }
             trace_options.ignored << [k, v]
             next
           end
 
           unless numeric_integer?(v)
-            logger.debug { 'invalid trace option for timestamp, should be an integer' }
+            logger.debug { "[#{self.class}/#{__method__}] invalid trace option for timestamp, should be an integer: #{v}" }
             trace_options.ignored << [k, v]
             next
           end
           trace_options.timestamp = v.to_i
         when SW_KEYS_KEY
           if v.nil? || trace_options.sw_keys
-            logger.debug { 'invalid trace option for sw keys' }
+            logger.debug { "[#{self.class}/#{__method__}] invalid trace option for sw keys: value=#{v}, already_set=#{trace_options.sw_keys}" }
             trace_options.ignored << [k, v]
             next
           end
           trace_options.sw_keys = v
         when CUSTOM_KEY_REGEX
           if v.nil? || trace_options.custom[k]
-            logger.debug { "invalid trace option for custom key #{k}" }
+            logger.debug { "[#{self.class}/#{__method__}] invalid trace option for custom key #{k}: value=#{v}, already_set=#{trace_options.custom[k]}" }
             trace_options.ignored << [k, v]
             next
           end
           trace_options.custom[k] = v
         else
+          logger.debug { "[#{self.class}/#{__method__}] Unknown key ignored: #{k}=#{v}" }
           trace_options.ignored << [k, v]
         end
       end
-
+      logger.debug { "[#{self.class}/#{__method__}] Parsing complete: trigger_trace=#{trace_options.trigger_trace}, timestamp=#{trace_options.timestamp}, sw_keys=#{trace_options.sw_keys}, custom_keys=#{trace_options.custom}, ignored=#{trace_options.ignored}" }
       trace_options
     end
 
@@ -86,15 +89,29 @@ module SolarWindsAPM
         'trigger-trace': trace_options_response.trigger_trace,
         ignored: trace_options_response.ignored.empty? ? nil : trace_options_response.ignored.join(',')
       }
-      kvs.compact.map { |k, v| "#{k}:#{v}" }.join(';')
+
+      kvs.compact!
+      result = kvs.map { |k, v| "#{k}:#{v}" }.join(';')
+      SolarWindsAPM.logger.debug { "[#{self.class}/#{__method__}] Stringified trace options response: #{result}" }
+      result
     end
 
     def self.validate_signature(header, signature, key, timestamp)
-      return Auth::NO_SIGNATURE_KEY unless key
-      return Auth::BAD_TIMESTAMP unless timestamp && (Time.now.to_i - timestamp).abs <= 5 * 60
+      unless key
+        SolarWindsAPM.logger.debug { "[#{self.class}/#{__method__}] Signature validation failed: no signature key available" }
+        return Auth::NO_SIGNATURE_KEY
+      end
+
+      unless timestamp && (Time.now.to_i - timestamp).abs <= 5 * 60
+        SolarWindsAPM.logger.debug { "[#{self.class}/#{__method__}] Signature validation failed: bad timestamp (diff more than 300s)" }
+        return Auth::BAD_TIMESTAMP
+      end
 
       digest = OpenSSL::HMAC.hexdigest('SHA1', key, header)
-      signature == digest ? Auth::OK : Auth::BAD_SIGNATURE
+      is_valid = signature == digest
+
+      SolarWindsAPM.logger.debug { "[#{self.class}/#{__method__}] Signature validation result: #{is_valid ? 'valid' : 'invalid'}" }
+      is_valid ? Auth::OK : Auth::BAD_SIGNATURE
     end
   end
 end

data/lib/solarwinds_apm/sampling.rb

@@ -10,7 +10,6 @@ require 'json'
 require 'fileutils'
 require 'tempfile'
 require 'uri'
-require 'opentelemetry-sdk'
 
 require_relative 'sampling/sampling_constants'
 require_relative 'sampling/dice'

data/lib/solarwinds_apm/support/resource_detector.rb

@@ -64,9 +64,7 @@ module SolarWindsAPM
 
           response = nil
           ::OpenTelemetry::Common::Utilities.untraced do
-            http = Net::HTTP.new(url.host, url.port)
-            request = Net::HTTP::Get.new(url)
-            response = http.request(request)
+            response = Net::HTTP.get_response(url)
           end
 
           raise 'Response returned non-200 status code' unless response&.code.to_i == 200
@@ -152,37 +150,41 @@ module SolarWindsAPM
     end
 
     def self.detect_ec2
-      attribute = ::OpenTelemetry::Resource::Detector::AWS::EC2.detect
-      SolarWindsAPM.logger.debug { "#{self.class}/#{__method__}] retrieved resource_attributes: #{attribute.instance_variable_get(:@attributes)}" }
-      attribute
-    rescue StandardError
-      ::OpenTelemetry::SDK::Resources::Resource.create({})
+      run_opentelemetry_detector(::OpenTelemetry::Resource::Detector::AWS::EC2)
     end
 
     def self.detect_azure
-      attribute = ::OpenTelemetry::Resource::Detector::Azure.detect
-      SolarWindsAPM.logger.debug { "#{self.class}/#{__method__}] retrieved resource_attributes: #{attribute.instance_variable_get(:@attributes)}" }
-      attribute
-    rescue StandardError
-      ::OpenTelemetry::SDK::Resources::Resource.create({})
+      run_opentelemetry_detector(::OpenTelemetry::Resource::Detector::Azure)
     end
 
     def self.detect_container
-      attribute = ::OpenTelemetry::Resource::Detector::Container.detect
-      SolarWindsAPM.logger.debug { "#{self.class}/#{__method__}] retrieved resource_attributes: #{attribute.instance_variable_get(:@attributes)}" }
+      run_opentelemetry_detector(::OpenTelemetry::Resource::Detector::Container)
+    end
+
+    def self.run_opentelemetry_detector(detector_class)
+      attribute = detector_class.detect
+      SolarWindsAPM.logger.debug { "[#{self.class}/#{__method__}] Detector #{detector_class} retrieved: #{attribute.instance_variable_get(:@attributes)}" }
       attribute
-    rescue StandardError
+    rescue StandardError => e
+      SolarWindsAPM.logger.error { "[#{self.class}/#{__method__}] Detector #{detector_class} failed. Error: #{e.message}." }
       ::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/transaction_settings.rb

@@ -37,17 +37,24 @@ module SolarWindsAPM
       SolarWindsAPM.logger.debug { "[#{self.class}/#{__method__}] enabled_regexps: #{enabled_regexps&.inspect}" }
       SolarWindsAPM.logger.debug { "[#{self.class}/#{__method__}] disabled_regexps: #{disabled_regexps&.inspect}" }
 
-      return false if disabled_regexps.is_a?(Array) && disabled_regexps.any? { |regex| regex.match?(@url_path) }
-      return true if enabled_regexps.is_a?(Array) && enabled_regexps.any? { |regex| regex.match?(@url_path) }
-      return false if disabled_regexps.is_a?(Array) && disabled_regexps.any? { |regex| regex.match?(span_layer) }
-      return true if enabled_regexps.is_a?(Array) && enabled_regexps.any? { |regex| regex.match?(span_layer) }
+      return false if matches_any?(disabled_regexps, @url_path)
+      return true  if matches_any?(enabled_regexps, @url_path)
+      return false if matches_any?(disabled_regexps, span_layer)
+      return true  if matches_any?(enabled_regexps, span_layer)
 
       true
     rescue StandardError => e
       SolarWindsAPM.logger.warn do
-        "[#{self.class}/#{__method__}] Could not determine tracing status for #{kind}. #{e.inspect}. transaction_settings regexps/extensions igonred/unfiltered."
+        "[#{self.class}/#{__method__}] Could not determine tracing status for #{@kind}. #{e.inspect}. transaction_settings regexps/extensions igonred/unfiltered."
       end
       true
     end
+
+    # Checks if a given string matches any regex in a list.
+    def matches_any?(regex_list, string_to_match)
+      return false unless regex_list.is_a?(Array)
+
+      regex_list.any? { |regex| regex.match?(string_to_match) }
+    end
   end
 end

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

@@ -12,7 +12,7 @@ module SolarWindsAPM
   # solarwinds_apm.gemspec during gem build process
   module Version
     MAJOR  = 7 # breaking,
-    MINOR  = 0 # feature,
+    MINOR  = 1 # feature,
     PATCH  = 0 # fix => BFF
     PRE    = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solarwinds_apm
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.1.0
 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-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-exporter-otlp
@@ -27,6 +27,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.29.1
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-exporter-otlp-logs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: opentelemetry-exporter-otlp-metrics
   requirement: !ruby/object:Gem::Requirement
@@ -55,6 +69,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.31.0
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-instrumentation-logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-logs-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-metrics-sdk
   requirement: !ruby/object:Gem::Requirement