solarwinds_apm 6.0.0 → 6.0.1

data/lib/solarwinds_apm/otel_lambda_config.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+# © 2023 SolarWinds Worldwide, LLC. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0
+#
+# 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 'solarwinds_apm/constants'
+require 'solarwinds_apm/api'
+require 'solarwinds_apm/support'
+require 'solarwinds_apm/opentelemetry'
+
+module SolarWindsAPM
+  # OTelLambdaConfig module
+  module OTelLambdaConfig
+    def self.initialize
+      return unless defined?(::OpenTelemetry::SDK::Configurator)
+
+      if ENV['OTEL_TRACES_EXPORTER'].to_s.empty?
+        ENV['OTEL_TRACES_EXPORTER'] = 'otlp'
+      elsif !ENV['OTEL_TRACES_EXPORTER'].include? 'otlp'
+        ENV['OTEL_TRACES_EXPORTER'] += ',otlp'
+      end
+
+      ENV['OTEL_RESOURCE_ATTRIBUTES'] = "sw.apm.version=#{SolarWindsAPM::Version::STRING},sw.data.module=apm,service.name=#{ENV['OTEL_SERVICE_NAME'] || ENV.fetch('AWS_LAMBDA_FUNCTION_NAME', nil)}," + ENV['OTEL_RESOURCE_ATTRIBUTES'].to_s
+      ::OpenTelemetry::SDK.configure(&:use_all)
+
+      # append our propagators
+      ::OpenTelemetry.propagation.instance_variable_get(:@propagators).append(SolarWindsAPM::OpenTelemetry::SolarWindsPropagator::TextMapPropagator.new)
+
+      # register metrics_exporter to meter_provider
+      ::OpenTelemetry.meter_provider.add_metric_reader(::OpenTelemetry::Exporter::OTLP::MetricsExporter.new)
+
+      # append our processors
+      ::OpenTelemetry.tracer_provider.add_span_processor(SolarWindsAPM::OpenTelemetry::OTLPProcessor.new)
+
+      # configure sampler afterwards
+      ::OpenTelemetry.tracer_provider.sampler = ::OpenTelemetry::SDK::Trace::Samplers.parent_based(
+        root: SolarWindsAPM::OpenTelemetry::SolarWindsSampler.new,
+        remote_parent_sampled: SolarWindsAPM::OpenTelemetry::SolarWindsSampler.new,
+        remote_parent_not_sampled: SolarWindsAPM::OpenTelemetry::SolarWindsSampler.new
+      )
+
+      SolarWindsAPM.logger.warn do
+        "[#{name}/#{__method__}] SolarWindsAPM lambda configuration initialized \
+        \nOpenTelemetry.tracer_provider: #{::OpenTelemetry.tracer_provider.inspect}"
+      end
+
+      nil
+    end
+  end
+end

data/lib/solarwinds_apm/patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # © 2023 SolarWinds Worldwide, LLC. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0

data/lib/solarwinds_apm/support/logger_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # © 2023 SolarWinds Worldwide, LLC. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0
@@ -19,13 +21,13 @@ module SolarWindsAPM
       private
 
       def insert_trace_id(msg)
-        return msg if /trace_id=/.match?(msg)
+        return msg if msg.include?('trace_id=')
 
         current_trace = SolarWindsAPM::API.current_trace_info
         if current_trace.do_log
           case msg
           when ::String
-            msg = msg.strip.empty? ? msg : insert_before_empty_lines(msg, current_trace.for_log)
+            msg = insert_before_empty_lines(msg, current_trace.for_log) unless msg.strip.empty?
           when ::Exception
             # conversion to String copied from Logger::Formatter private method #msg2str
             msg = ("#{msg.message} (#{msg.class}) #{current_trace.for_log}\n" <<

data/lib/solarwinds_apm/support/logging_log_event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # © 2023 SolarWinds Worldwide, LLC. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0

data/lib/solarwinds_apm/support/lumberjack_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # © 2023 SolarWinds Worldwide, LLC. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0

data/lib/solarwinds_apm/support/oboe_tracing_mode.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # © 2023 SolarWinds Worldwide, LLC. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0

data/lib/solarwinds_apm/support/service_key_checker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # © 2023 SolarWinds Worldwide, LLC. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0
@@ -8,29 +10,35 @@ module SolarWindsAPM
   # ServiceKeyChecker
   # It is a service that validate the service_key
   class ServiceKeyChecker
-    def initialize(reporter)
+    def initialize(reporter, is_lambda)
       @reporter = reporter
+      @is_lambda = is_lambda
     end
 
     def read_and_validate_service_key
       return '' unless @reporter == 'ssl'
+      return '' if @is_lambda
 
       service_key = fetch_service_key
       if service_key.empty?
-        SolarWindsAPM.logger.error {"[#{self.class}/#{__method__}] SW_APM_SERVICE_KEY not configured."}
+        SolarWindsAPM.logger.error { "[#{self.class}/#{__method__}] SW_APM_SERVICE_KEY not configured." }
         return ''
       end
 
       token, _, service_name = parse_service_key(service_key)
       if token.empty? || !validate_token(token)
-        SolarWindsAPM.logger.error {"[#{self.class}/#{__method__}] SW_APM_SERVICE_KEY problem. API Token in wrong format. Masked token: #{token[0..3]}...#{token[-4..]}"}
+        SolarWindsAPM.logger.error do
+          "[#{self.class}/#{__method__}] SW_APM_SERVICE_KEY problem. API Token in wrong format. Masked token: #{token[0..3]}...#{token[-4..]}"
+        end
         return ''
       end
 
       # if no service_name from service_key, then the SW_APM_SERVICE_KEY is not right format, return
       if service_name.empty?
         ENV.delete('OTEL_SERVICE_NAME')
-        SolarWindsAPM.logger.warn {"[#{self.class}/#{__method__}] SW_APM_SERVICE_KEY format problem. Service Name is missing."}
+        SolarWindsAPM.logger.warn do
+          "[#{self.class}/#{__method__}] SW_APM_SERVICE_KEY format problem. Service Name is missing."
+        end
         return ''
       end
 
@@ -86,9 +94,13 @@ module SolarWindsAPM
       name_.downcase!
       name_.gsub!(/[^a-z0-9.:_-]/, '')
       name_ = name_[0..254]
-      SolarWindsAPM.logger.warn {"[#{self.class}/#{__method__}] Service Name transformed from #{service_name} to #{name_}"} if name_ != service_name
+      if name_ != service_name
+        SolarWindsAPM.logger.warn do
+          "[#{self.class}/#{__method__}] Service Name transformed from #{service_name} to #{name_}"
+        end
+      end
 
       name_
     end
   end
-end
+end

data/lib/solarwinds_apm/support/support_report.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # © 2023 SolarWinds Worldwide, LLC. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0
@@ -29,8 +31,8 @@ module SolarWindsAPM
     SolarWindsAPM.logger.warn '*   Please email the output of this report to SWO-support@solarwinds.com'
     SolarWindsAPM.logger.warn '********************************************************'
     SolarWindsAPM.logger.warn "Ruby: #{RUBY_DESCRIPTION}"
-    SolarWindsAPM.logger.warn "PROGRAM_NAME: #{$PROGRAM_NAME}"   # replace $0 to get executing script
-    SolarWindsAPM.logger.warn "ARGV: #{ARGV.inspect}" 
+    SolarWindsAPM.logger.warn "PROGRAM_NAME: #{$PROGRAM_NAME}" # replace $0 to get executing script
+    SolarWindsAPM.logger.warn "ARGV: #{ARGV.inspect}"
     SolarWindsAPM.logger.warn "SolarWindsAPM.loaded == #{SolarWindsAPM.loaded}"
 
     SolarWindsAPM.logger.warn "SolarWindsAPM::Ruby defined?: #{yesno(defined?(SolarWindsAPM::Ruby))}"
@@ -71,7 +73,7 @@ module SolarWindsAPM
     SolarWindsAPM.logger.warn '* SolarWindsAPM::Config Values'
     SolarWindsAPM.logger.warn '********************************************************'
     SolarWindsAPM.logger.warn SolarWindsAPM::Config.print_config.to_s
-    
+
     SolarWindsAPM.logger.warn '********************************************************'
     SolarWindsAPM.logger.warn '* SolarWindsAPM::OTelConfig Values'
     SolarWindsAPM.logger.warn '********************************************************'

data/lib/solarwinds_apm/support/swomarginalia/comment.rb

@@ -8,11 +8,11 @@ module SolarWindsAPM
     module Comment
       mattr_accessor :components, :lines_to_ignore, :prepend_comment
       SWOMarginalia::Comment.components ||= [:traceparent]
-      # To add new components: 
+      # To add new components:
       # Create file and load after loading solarwinds_apm, and add following:
       # SolarWindsAPM::SWOMarginalia::Comment.component = [:user_defined]
 
-      def self.update!(controller=nil)
+      def self.update!(controller = nil)
         self.marginalia_controller = controller
       end
 
@@ -78,11 +78,11 @@ module SolarWindsAPM
       end
 
       def self.application
-        if defined?(::Rails.application)
-          SWOMarginalia.application_name ||= ::Rails.application.class.name.split("::").first
-        else
-          SWOMarginalia.application_name ||= "rails"
-        end
+        SWOMarginalia.application_name ||= if defined?(::Rails.application)
+                                             ::Rails.application.class.name.split('::').first
+                                           else
+                                             'rails'
+                                           end
 
         SWOMarginalia.application_name
       end
@@ -104,10 +104,10 @@ module SolarWindsAPM
       end
 
       def self.sidekiq_job
-        marginalia_job["class"] if marginalia_job.respond_to?(:[])
+        marginalia_job['class'] if marginalia_job.respond_to?(:[])
       end
 
-      DEFAULT_LINES_TO_IGNORE_REGEX = %r{\.rvm|/ruby/gems/|vendor/|marginalia|rbenv|monitor\.rb.*mon_synchronize}.freeze # rubocop:disable Style/RedundantFreeze
+      DEFAULT_LINES_TO_IGNORE_REGEX = %r{\.rvm|/ruby/gems/|vendor/|marginalia|rbenv|monitor\.rb.*mon_synchronize}
 
       def self.line
         SWOMarginalia::Comment.lines_to_ignore ||= DEFAULT_LINES_TO_IGNORE_REGEX
@@ -116,13 +116,13 @@ module SolarWindsAPM
           line !~ SWOMarginalia::Comment.lines_to_ignore
         end
         return unless last_line
-        
+
         root = if defined?(Rails) && Rails.respond_to?(:root)
                  Rails.root.to_s
                elsif defined?(RAILS_ROOT)
                  RAILS_ROOT
                else
-                 ""
+                 ''
                end
         last_line = last_line[root.length..] if last_line.start_with? root
         last_line
@@ -139,7 +139,7 @@ module SolarWindsAPM
       def self.request_id
         return unless marginalia_controller.respond_to?(:request) && marginalia_controller.request.respond_to?(:uuid)
 
-        marginalia_controller.request.uuid  
+        marginalia_controller.request.uuid
       end
 
       def self.socket
@@ -160,26 +160,27 @@ module SolarWindsAPM
         connection_config[:database]
       end
 
-      ## 
+      ##
       # Insert trace string as traceparent to sql statement
       # Not insert if:
       #   there is no valid current trace context
       #   current trace context is not sampled
-      # 
+      #
       def self.traceparent
         span_context = ::OpenTelemetry::Trace.current_span.context
         return '' if span_context == ::OpenTelemetry::Trace::SpanContext::INVALID
 
-        trace_flag = span_context.trace_flags.sampled? ? '01': '00'
+        trace_flag = span_context.trace_flags.sampled? ? '01' : '00'
         return '' if trace_flag == '00'
 
         format(
           '00-%<trace_id>s-%<span_id>s-%<trace_flags>.2d',
           trace_id: span_context.hex_trace_id,
           span_id: span_context.hex_span_id,
-          trace_flags: trace_flag)
+          trace_flags: trace_flag
+        )
       rescue NameError => e
-        SolarWindsAPM.logger.error {"[#{name}/#{__method__}] Couldn't find OpenTelemetry. Error: #{e.message}"}
+        SolarWindsAPM.logger.error { "[#{name}/#{__method__}] Couldn't find OpenTelemetry. Error: #{e.message}" }
       end
 
       if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('6.1')

data/lib/solarwinds_apm/support/swomarginalia/load_swomarginalia.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # © 2023 SolarWinds Worldwide, LLC. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0
 #
 # 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_relative './swomarginalia'
+require_relative 'swomarginalia'
 
 module SolarWindsAPM
   module SWOMarginalia
@@ -17,24 +19,22 @@ module SolarWindsAPM
 
       def self.insert_into_active_job
         return unless defined? ::ActiveJob::Base
-        
+
         ::ActiveJob::Base.class_eval do
           around_perform do |job, block|
-            begin
-              SWOMarginalia::Comment.update_job! job
-              block.call
-            ensure
-              SWOMarginalia::Comment.clear_job!
-            end
+            SWOMarginalia::Comment.update_job! job
+            block.call
+          ensure
+            SWOMarginalia::Comment.clear_job!
           end
         end
-      end      
+      end
 
       def self.insert_into_action_controller
         return unless defined? ::ActionController::Base
 
         ::ActionController::Base.include SWOMarginalia::ActionControllerInstrumentation
-        
+
         return unless defined? ::ActionController::API
 
         ::ActionController::API.include SWOMarginalia::ActionControllerInstrumentation
@@ -46,9 +46,10 @@ module SolarWindsAPM
         ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(SWOMarginalia::ActiveRecordInstrumentation) if defined? ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
         return unless defined? ActiveRecord::ConnectionAdapters::SQLite3Adapter
 
-        ActiveRecord::ConnectionAdapters::SQLite3Adapter.prepend(SWOMarginalia::ActiveRecordInstrumentation) if defined? ActiveRecord::ConnectionAdapters::SQLite3Adapter
+        return unless defined? ActiveRecord::ConnectionAdapters::SQLite3Adapter
+
+        ActiveRecord::ConnectionAdapters::SQLite3Adapter.prepend(SWOMarginalia::ActiveRecordInstrumentation)
       end
     end
   end
 end
-

data/lib/solarwinds_apm/support/swomarginalia/railtie.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 require 'rails/railtie'
-require_relative './load_swomarginalia'
+require_relative 'load_swomarginalia'
 
 module SolarWindsAPM
   module SWOMarginalia
@@ -19,4 +21,4 @@ module SolarWindsAPM
       end
     end
   end
-end
+end

data/lib/solarwinds_apm/support/swomarginalia/swomarginalia.rb

@@ -1,4 +1,6 @@
-require_relative './comment'
+# frozen_string_literal: true
+
+require_relative 'comment'
 
 module SolarWindsAPM
   module SWOMarginalia

data/lib/solarwinds_apm/support/transaction_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # © 2023 SolarWinds Worldwide, LLC. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0
@@ -16,7 +18,7 @@ module SolarWindsAPM
     end
 
     def self.get(key)
-      return nil unless @cache.has_key?(key)
+      return nil unless @cache.key?(key)
 
       @order.delete(key)
       @order.push(key)
@@ -38,7 +40,7 @@ module SolarWindsAPM
     end
 
     def self.set(key, value)
-      if @cache.has_key?(key)
+      if @cache.key?(key)
         @cache.delete(key)
       elsif @order.size >= @capacity
         evict_key = @order.shift
@@ -47,9 +49,9 @@ module SolarWindsAPM
 
       @cache[key] = value
       @order.push(key)
-      SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] current TransactionCache #{@cache.inspect}"}
+      SolarWindsAPM.logger.debug { "[#{self.class}/#{__method__}] current TransactionCache #{@cache.inspect}" }
     end
   end
 end
 
-SolarWindsAPM::TransactionCache.initialize
+SolarWindsAPM::TransactionCache.initialize

data/lib/solarwinds_apm/support/transaction_settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # © 2023 SolarWinds Worldwide, LLC. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0
@@ -32,8 +34,8 @@ module SolarWindsAPM
       enabled_regexps  = SolarWindsAPM::Config[:enabled_regexps]
       disabled_regexps = SolarWindsAPM::Config[:disabled_regexps]
 
-      SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] enabled_regexps: #{enabled_regexps&.inspect}"}
-      SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] disabled_regexps: #{disabled_regexps&.inspect}"}
+      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) }
@@ -42,7 +44,9 @@ module SolarWindsAPM
 
       true
     rescue StandardError => e
-      SolarWindsAPM.logger.warn {"[#{self.class}/#{__method__}] Could not determine tracing status for #{kind}. #{e.inspect}. transaction_settings regexps/extensions igonred/unfiltered."}
+      SolarWindsAPM.logger.warn do
+        "[#{self.class}/#{__method__}] Could not determine tracing status for #{kind}. #{e.inspect}. transaction_settings regexps/extensions igonred/unfiltered."
+      end
       true
     end
   end

data/lib/solarwinds_apm/support/txn_name_manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # © 2023 SolarWinds Worldwide, LLC. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0
@@ -6,6 +8,7 @@
 
 module SolarWindsAPM
   # SolarWindsTxnNameManager
+  # Transaction Name Manager is sole for enabling solarwinds api to call set_transaction_name
   class TxnNameManager
     def initialize
       @cache = {}
@@ -23,7 +26,7 @@ module SolarWindsAPM
 
     def set(key, value)
       @cache[key] = value
-      SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] txn manager current cache #{@cache.inspect}"}
+      SolarWindsAPM.logger.debug { "[#{self.class}/#{__method__}] txn manager current cache #{@cache.inspect}" }
     end
 
     alias []= set
@@ -32,7 +35,9 @@ module SolarWindsAPM
       @mutex.synchronize do
         @root_context_h[key] = value
       end
-      SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] txn manager current root_context_h #{@root_context_h.inspect}"}
+      SolarWindsAPM.logger.debug do
+        "[#{self.class}/#{__method__}] txn manager current root_context_h #{@root_context_h.inspect}"
+      end
     end
 
     def get_root_context_h(key)
@@ -45,4 +50,4 @@ module SolarWindsAPM
       end
     end
   end
-end
+end

data/lib/solarwinds_apm/support/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # © 2023 SolarWinds Worldwide, LLC. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0
@@ -7,24 +9,25 @@
 module SolarWindsAPM
   # Utils
   class Utils
-    VERSION = '00'.freeze
+    VERSION = '00'
 
     def self.trace_state_header(trace_state)
-      return nil if trace_state.nil?
+      return nil if trace_state.nil? || trace_state.empty?
 
-      arr    = []
-      trace_state.to_h.each { |key, value| arr << "#{key}=#{value}" }
-      header = arr.join(",")
-      SolarWindsAPM.logger.debug {"[#{name}/#{__method__}] generated trace_state_header: #{header}"}
+      arr = trace_state.to_h.map { |key, value| "#{key}=#{value}" }
+      header = arr.join(',')
+      SolarWindsAPM.logger.debug { "[#{name}/#{__method__}] generated trace_state_header: #{header}" }
       header
     end
 
     # Generates a liboboe W3C compatible trace_context from provided OTel span context.
     def self.traceparent_from_context(span_context)
-      flag = span_context.trace_flags.sampled?? 1 : 0
+      flag = span_context.trace_flags.sampled? ? 1 : 0
       xtr = "#{VERSION}-#{span_context.hex_trace_id}-#{span_context.hex_span_id}-0#{flag}"
-      SolarWindsAPM.logger.debug {"[#{name}/#{__method__}] generated traceparent: #{xtr} from #{span_context.inspect}"}
+      SolarWindsAPM.logger.debug do
+        "[#{name}/#{__method__}] generated traceparent: #{xtr} from #{span_context.inspect}"
+      end
       xtr
     end
   end
-end
+end

data/lib/solarwinds_apm/support/x_trace_options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # © 2023 SolarWinds Worldwide, LLC. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0
@@ -7,9 +9,9 @@
 module SolarWindsAPM
   # XTraceOptions
   class XTraceOptions
-    attr_reader :options, :signature, :trigger_trace, :timestamp, 
+    attr_reader :options, :signature, :trigger_trace, :timestamp,
                 :sw_keys, :custom_kvs, :ignored
-    
+
     ##
     # use by Trigger Tracing
     # TODO - refactor for w3c when ticket ready
@@ -36,10 +38,10 @@ module SolarWindsAPM
     # - ts (unix timestamp)
     # - other keys will be reported in the response options as ignored
 
-    SW_XTRACEOPTIONS_RESPONSE_KEY = 'xtrace_options_response'.freeze
+    SW_XTRACEOPTIONS_RESPONSE_KEY = 'xtrace_options_response'
 
     def initialize(context)
-      SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] x_trace_options context: #{context.inspect}"}
+      SolarWindsAPM.logger.debug { "[#{self.class}/#{__method__}] x_trace_options context: #{context.inspect}" }
       @context = context.dup
       @trigger_trace = false
       @custom_kvs = {}
@@ -64,19 +66,19 @@ module SolarWindsAPM
           end
         when 'sw-keys'
           if @sw_keys
-            SolarWindsAPM.logger.info {"[#{self.class}/#{__method__}] Duplicate key: #{k[0]}"}
+            SolarWindsAPM.logger.info { "[#{self.class}/#{__method__}] Duplicate key: #{k[0]}" }
           else
             @sw_keys = k[1].strip
           end
         when /^custom-[^\s]*$/
           if @custom_kvs[k[0]]
-            SolarWindsAPM.logger.info {"[#{self.class}/#{__method__}] Duplicate key: #{k[0]}"}
+            SolarWindsAPM.logger.info { "[#{self.class}/#{__method__}] Duplicate key: #{k[0]}" }
           else
             @custom_kvs[k[0]] = k[1].strip
           end
         when 'ts'
-          if @timestamp > 0
-            SolarWindsAPM.logger.info {"[#{self.class}/#{__method__}] Duplicate key: #{k[0]}"}
+          if @timestamp.positive?
+            SolarWindsAPM.logger.info { "[#{self.class}/#{__method__}] Duplicate key: #{k[0]}" }
           else
             @timestamp = k[1].to_i
           end
@@ -84,13 +86,15 @@ module SolarWindsAPM
           @ignored << k[0]
         end
       end
-      SolarWindsAPM.logger.info("[#{self.class}/#{__method__}] Some keys were ignored: #{@ignored.join(',')}") unless @ignored.empty?
+      return if @ignored.empty?
+
+      SolarWindsAPM.logger.info("[#{self.class}/#{__method__}] Some keys were ignored: #{@ignored.join(',')}")
     end
 
     def add_kvs(kvs, settings)
       return unless settings.auth_ok?
 
-      @custom_kvs.each { |k,v| kvs[k] = v } unless @custom_kvs.empty?
+      @custom_kvs.each { |k, v| kvs[k] = v } unless @custom_kvs.empty?
       kvs['SWKeys'] = @sw_keys if @sw_keys
       kvs['TriggeredTrace'] = true if settings.triggered_trace?
     end
@@ -98,24 +102,26 @@ module SolarWindsAPM
     def obtain_signature
       # INTL_SWO_SIGNATURE_KEY = sw_signature
       signature = obtain_sw_value(SolarWindsAPM::Constants::INTL_SWO_SIGNATURE_KEY)
-      SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] x_trace_options option_signature: #{signature}"}
+      SolarWindsAPM.logger.debug { "[#{self.class}/#{__method__}] x_trace_options option_signature: #{signature}" }
       signature
     end
 
     def options_header
-      # INTL_SWO_X_OPTIONS_KEY = sw_xtraceoptions 
+      # INTL_SWO_X_OPTIONS_KEY = sw_xtraceoptions
       header = obtain_sw_value(SolarWindsAPM::Constants::INTL_SWO_X_OPTIONS_KEY)
-      SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] x_trace_options option_header: #{header}"}
+      SolarWindsAPM.logger.debug { "[#{self.class}/#{__method__}] x_trace_options option_header: #{header}" }
       header
     end
 
     def obtain_sw_value(type)
       sw_value = nil
-      instance_variable = @context&.instance_variable_get("@entries")
+      instance_variable = @context&.instance_variable_get('@entries')
       instance_variable&.each do |key, value|
-        if key.instance_of?(::String)
-          sw_value = value if key == type
-          SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] obtained sw value: #{type} #{key}: #{value.inspect}"}
+        next unless key.instance_of?(::String)
+
+        sw_value = value if key == type
+        SolarWindsAPM.logger.debug do
+          "[#{self.class}/#{__method__}] obtained sw value: #{type} #{key}: #{value.inspect}"
         end
       end
       sw_value