solarwinds_apm 6.0.0.preV5 → 6.0.0

data/lib/solarwinds_apm/oboe_init_options.rb

@@ -7,6 +7,8 @@
 require 'singleton'
 require 'uri'
 
+require_relative './support/service_key_checker'
+
 module SolarWindsAPM
   # OboeInitOptions
   class OboeInitOptions
@@ -21,7 +23,7 @@ module SolarWindsAPM
       @debug_level = (ENV['SW_APM_DEBUG_LEVEL'] || SolarWindsAPM::Config[:debug_level] || 3).to_i
       # file name including path for log file
       # TODO eventually find better way to combine ruby and oboe logs
-      @log_file_path = ENV['SW_APM_LOGFILE'] || ''
+      @log_file_path = ENV['SW_APM_LOG_FILEPATH'] || ''
       # maximum number of transaction names to track
       @max_transactions = (ENV['SW_APM_MAX_TRANSACTIONS'] || -1).to_i
       # maximum wait time for flushing data before terminating in milli seconds
@@ -50,7 +52,7 @@ module SolarWindsAPM
       # custom token bucket rate
       @token_bucket_rate = (ENV['SW_APM_TOKEN_BUCKET_RATE'] || -1).to_i
       # use single files in file reporter for each event
-      @file_single = ENV['SW_APM_REPORTER_FILE_SINGLE'].to_s.downcase == 'true' ? 1 : 0
+      @file_single = ENV['SW_APM_REPORTER_FILE_SINGLE'].to_s.casecmp('true').zero? ? 1 : 0
       # timeout for ec2 metadata
       @ec2_md_timeout = read_and_validate_ec2_md_timeout
       @grpc_proxy = read_and_validate_proxy
@@ -59,6 +61,8 @@ module SolarWindsAPM
       # hardcoded arg for trace id format to use w3c format
       # flag for format of metric (0 = Both; 1 = AppOptics only; 2 = SWO only; default = 0)
       @metric_format = determine_the_metric_model
+      # log type (0 = stderr; 1 = stdout; 2 = file; 3 = null; 4 = disabled; default = 0)
+      @log_type = determine_oboe_log_type
     end
 
     # for testing with changed ENV vars
@@ -75,7 +79,6 @@ module SolarWindsAPM
         @max_flush_wait_time,    # 4
         @events_flush_interval,  # 5
         @event_flush_batch_size, # 6
-
         @reporter,               # 7
         @host,                   # 8
         @service_key,            # 9
@@ -89,7 +92,8 @@ module SolarWindsAPM
         @ec2_md_timeout,         #17
         @grpc_proxy,             #18
         0,                       #19 arg for lambda (no lambda for ruby yet)
-        @metric_format           #22
+        @metric_format,          #20
+        @log_type                #21
       ]
     end
 
@@ -123,81 +127,10 @@ module SolarWindsAPM
     end
 
     def read_and_validate_service_key
-      return '' unless @reporter == 'ssl'
-
-      service_key = ENV['SW_APM_SERVICE_KEY'] || SolarWindsAPM::Config[:service_key]
-      if service_key.nil? || service_key == ''
-        SolarWindsAPM.logger.error {"[#{self.class}/#{__method__}] SW_APM_SERVICE_KEY not configured."}
-        return ''
-      end
-
-      match = service_key.match(/([^:]+)(:{0,1})(.*)/)
-      token = match[1]
-      service_name = match[3]
-
-      return '' unless validate_token(token)   # return if token is not even valid
-
-      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."}
-        return ''
-      end
-
-      # check OTEL_RESOURCE_ATTRIBUTES
-      otel_resource_service_name = nil
-      ENV['OTEL_RESOURCE_ATTRIBUTES']&.split(',')&.each do |pair|
-        key, value = pair.split('=')
-        if key == 'service.name'
-          otel_resource_service_name = value
-          break
-        end
-      end
-
-      SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] provided otel_resource_service_name #{otel_resource_service_name}"} if otel_resource_service_name
-      service_name = otel_resource_service_name if otel_resource_service_name && validate_transform_service_name(otel_resource_service_name)
-
-      # check OTEL_SERVICE_NAME
-      otel_service_name = ENV['OTEL_SERVICE_NAME']
-      if otel_service_name && validate_transform_service_name(otel_service_name)
-        service_name = otel_service_name
-        SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] provided otel_service_name #{otel_service_name}"}
-      elsif ENV['OTEL_SERVICE_NAME'].nil?
-        ENV['OTEL_SERVICE_NAME'] = service_name
-      end
-
-      return '' unless validate_transform_service_name(service_name)
-
-      "#{token}:#{service_name}"
-    end
-
-    def validate_token(token)
-      if (token !~ /^[0-9a-zA-Z_-]{71}$/) && ENV['SW_APM_COLLECTOR'] !~ /java-collector:1222/
-        masked = "#{token[0..3]}...#{token[-4..]}"
-        SolarWindsAPM.logger.error {"[#{self.class}/#{__method__}] SW_APM_SERVICE_KEY problem. API Token in wrong format. Masked token: #{masked}"}
-        return false
-      end
-
-      true
-    end
-
-    def validate_transform_service_name(service_name)
-      service_name = 'test_ssl_collector' if ENV['SW_APM_COLLECTOR'] =~ /java-collector:1222/
-      if service_name.empty?
-        SolarWindsAPM.logger.error {"[#{self.class}/#{__method__}] SW_APM_SERVICE_KEY problem. Service Name is missing"}
-        return false
-      end
-
-      name = service_name.dup
-      name.downcase!
-      name.gsub!(/[^a-z0-9.:_-]/, '')
-      name = name[0..254]
-
-      if name != service_name
-        SolarWindsAPM.logger.warn {"[#{self.class}/#{__method__}] SW_APM_SERVICE_KEY problem. Service Name transformed from #{service_name} to #{name}"}
-        service_name = name
-      end
-      @service_name = service_name # instance variable used in testing
-      true
+      service_key_checker = SolarWindsAPM::ServiceKeyChecker.new(@reporter)
+      service_key = service_key_checker.read_and_validate_service_key
+      @service_name = service_key.split(':',2).last # instance variable used in testing
+      service_key
     end
 
     def read_and_validate_ec2_md_timeout
@@ -212,7 +145,7 @@ module SolarWindsAPM
       proxy = ENV['SW_APM_PROXY'] || SolarWindsAPM::Config[:http_proxy] || ''
       return proxy if proxy == ''
 
-      unless proxy =~ /http:\/\/.*:\d+$/
+      unless /http:\/\/.*:\d+$/.match?(proxy)
         SolarWindsAPM.logger.error {"[#{self.class}/#{__method__}] SW_APM_PROXY/http_proxy doesn't start with 'http://', #{proxy}"}
         return '' # try without proxy, it may work, shouldn't crash but may not report
       end
@@ -221,14 +154,15 @@ module SolarWindsAPM
     end
 
     def read_certificates
+      certificate = ''
+
       file = appoptics_collector?? "#{__dir__}/cert/star.appoptics.com.issuer.crt" : ENV['SW_APM_TRUSTEDPATH']
-      return String.new if file.nil? || file&.empty?
+      return certificate if file.nil? || file&.empty?
 
       begin
         certificate = File.open(file,"r").read
       rescue StandardError => e
         SolarWindsAPM.logger.error {"[#{self.class}/#{__method__}] certificates: #{file} doesn't exist or caused by #{e.message}."}
-        certificate = String.new
       end
 
       certificate
@@ -256,5 +190,12 @@ module SolarWindsAPM
       end
       ""
     end
+
+    def determine_oboe_log_type
+      log_type = 0
+      log_type = 2 unless ENV['SW_APM_LOG_FILEPATH'].to_s.empty?
+      log_type = 4 if @debug_level == -1
+      log_type
+    end
   end
 end

data/lib/solarwinds_apm/opentelemetry/solarwinds_exporter.rb

@@ -133,7 +133,7 @@ module SolarWindsAPM
       # helper function that extract gem library version for func add_instrumented_framework
       def check_framework_version(framework)
         framework_version = nil
-        if @version_cache.keys.include? framework
+        if @version_cache.has_key?(framework)
 
           framework_version = @version_cache[framework]
         else

data/lib/solarwinds_apm/opentelemetry/solarwinds_processor.rb

@@ -131,7 +131,7 @@ module SolarWindsAPM
 
       # This span from inbound HTTP request if from a SERVER by some http.method
       def span_http?(span)
-        (span.kind == ::OpenTelemetry::Trace::SpanKind::SERVER && !span.attributes[HTTP_METHOD].nil?)
+        span.kind == ::OpenTelemetry::Trace::SpanKind::SERVER && !span.attributes[HTTP_METHOD].nil?
       end
 
       # Calculate if this span instance has_error
@@ -173,4 +173,4 @@ module SolarWindsAPM
       end
     end
   end
-end
+end

data/lib/solarwinds_apm/opentelemetry/solarwinds_sampler.rb

@@ -102,7 +102,7 @@ module SolarWindsAPM
         end
 
         sw_member_value    = parent_span_context.tracestate[SolarWindsAPM::Constants::INTL_SWO_TRACESTATE_KEY]
-        trigger_trace_mode = OboeTracingMode.get_oboe_trigger_trace_mode(@config["trigger_trace"])
+        trigger_trace_mode = SolarWindsAPM::OboeTracingMode.get_oboe_trigger_trace_mode(@config["trigger_trace"])
         sample_rate        = UNSET
         options            = xtraceoptions&.options
         trigger_trace      = xtraceoptions&.intify_trigger_trace || 0
@@ -272,7 +272,8 @@ module SolarWindsAPM
         SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] trace_state_no_response #{trace_state_no_response.inspect}"}
 
         trace_state_no_response = parent_span_context.tracestate.delete(XTraceOptions.sw_xtraceoptions_response_key)
-        no_sw_count             = trace_state_no_response.to_h.reject { |k, _v| k == "sw" }.count
+        no_sw_count             = trace_state_no_response.to_h.count { |k, _v| k != 'sw' }
+
         new_attributes[SW_TRACESTATE_CAPTURE_KEY] = Utils.trace_state_header(trace_state_no_response) if no_sw_count > 0 
         SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] new_attributes after add_tracestate_capture_to_new_attributes: #{new_attributes.inspect}"}
         
@@ -290,4 +291,4 @@ module SolarWindsAPM
       end
     end
   end
-end
+end

data/lib/solarwinds_apm/opentelemetry.rb

@@ -11,4 +11,4 @@ require_relative './opentelemetry/solarwinds_propagator'
 require_relative './opentelemetry/solarwinds_processor'
 require_relative './opentelemetry/solarwinds_sampler'
 require_relative './opentelemetry/solarwinds_exporter'
-require_relative './opentelemetry/solarwinds_response_propagator'
+require_relative './opentelemetry/solarwinds_response_propagator'

data/lib/solarwinds_apm/otel_config.rb

@@ -22,27 +22,13 @@ module SolarWindsAPM
       SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] Agent disabled. No Trace exported."}
     end
 
-    def self.validate_service_key
-      return unless (ENV['SW_APM_REPORTER'] || 'ssl') == 'ssl'
-
-      disable_agent unless ENV['SW_APM_SERVICE_KEY'] || SolarWindsAPM::Config[:service_key]
-    end
-
     def self.resolve_sampler
-
-      resolve_sampler_config
+      sampler_config = {"trigger_trace" => SolarWindsAPM::Config[:trigger_tracing_mode]}
       @@config[:sampler] =
         ::OpenTelemetry::SDK::Trace::Samplers.parent_based(
-          root: SolarWindsAPM::OpenTelemetry::SolarWindsSampler.new(@@config[:sampler_config]),
-          remote_parent_sampled: SolarWindsAPM::OpenTelemetry::SolarWindsSampler.new(@@config[:sampler_config]),
-          remote_parent_not_sampled: SolarWindsAPM::OpenTelemetry::SolarWindsSampler.new(@@config[:sampler_config]))
-    end
-
-    def self.resolve_sampler_config
-      sampler_config = {}
-      sampler_config["trigger_trace"] = "enabled"
-      sampler_config["trigger_trace"] = nil if ENV["SW_APM_TRIGGER_TRACING_MODE"] == 'disabled'
-      @@config[:sampler_config] = sampler_config
+          root: SolarWindsAPM::OpenTelemetry::SolarWindsSampler.new(sampler_config),
+          remote_parent_sampled: SolarWindsAPM::OpenTelemetry::SolarWindsSampler.new(sampler_config),
+          remote_parent_not_sampled: SolarWindsAPM::OpenTelemetry::SolarWindsSampler.new(sampler_config))
     end
 
     #
@@ -65,31 +51,18 @@ module SolarWindsAPM
       end
     end
 
-    def self.obfuscate_helper(instrumentation)
-      if @@config_map[instrumentation] # user provided the option
-        @@config_map[instrumentation][:db_statement] = :obfuscate unless @@config_map[instrumentation][:db_statement] # user provided the db_statement, ignore our default setting 
-      else
-        @@config_map[instrumentation] = {db_statement: :obfuscate}
-      end
-    end
-
-    def self.obfuscate_query
-      obfuscate_helper("OpenTelemetry::Instrumentation::Dalli")
-      obfuscate_helper("OpenTelemetry::Instrumentation::Mysql2")
-      obfuscate_helper("OpenTelemetry::Instrumentation::PG")
-    end
-
     def self.[](key)
       @@config[key.to_sym]
     end
 
     def self.print_config
-      @@config.each do |config, value|
-        SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] config:     #{config} = #{value}"}
+      @@config.each do |k,v|
+        SolarWindsAPM.logger.debug {"[#{name}/#{__method__}] Config Key/Value: #{k}, #{v.class}"}
       end
-      @@config_map.each do |config, value|
-        SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] config_map: #{config} = #{value}"}
+      @@config_map.each do |k,v|
+        SolarWindsAPM.logger.debug {"[#{name}/#{__method__}] Config Key/Value: #{k}, #{v}"}
       end
+      nil
     end
 
     def self.resolve_solarwinds_processor
@@ -122,21 +95,19 @@ module SolarWindsAPM
         return
       end
 
-      validate_service_key
-
-      return unless @@agent_enabled
-
       resolve_sampler
-
       resolve_solarwinds_propagator
       resolve_solarwinds_processor
       resolve_response_propagator
 
-      obfuscate_query
-
       print_config if SolarWindsAPM.logger.level.zero?
 
+      # resolve OTEL environmental variables
       ENV['OTEL_TRACES_EXPORTER'] = 'none' if ENV['OTEL_TRACES_EXPORTER'].to_s.empty?
+      if ENV['OTEL_LOG_LEVEL'].to_s.empty?
+        log_level = (ENV['SW_APM_DEBUG_LEVEL'] || SolarWindsAPM::Config[:debug_level] || 3).to_i
+        ENV['OTEL_LOG_LEVEL'] = SolarWindsAPM::Config::SW_LOG_LEVEL_MAPPING.dig(log_level, :otel)
+      end
 
       ::OpenTelemetry::SDK.configure { |c| c.use_all(@@config_map) }
 

data/lib/solarwinds_apm/patch/dummy_patch.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module SolarWindsAPM
+  module Patch
+    module DummyPatch
+    end
+  end
+end

data/lib/solarwinds_apm/patch.rb

@@ -0,0 +1,11 @@
+# © 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.
+
+# This file is for loading any customized patch for upstream
+
+# e.g.
+# require_relative './patch/dummy_patch'
+# OpenTelemetry::Instrumentation::Registry.prepend(SolarWindsAPM::Patch::DummyPatch) if defined? OpenTelemetry::Instrumentation::Registry && OpenTelemetry::Instrumentation::Registry::VERSION <= '0.3.0'

data/lib/solarwinds_apm/support/logger_formatter.rb

@@ -19,7 +19,7 @@ module SolarWindsAPM
       private
 
       def insert_trace_id(msg)
-        return msg if msg =~ /trace_id=/
+        return msg if /trace_id=/.match?(msg)
 
         current_trace = SolarWindsAPM::API.current_trace_info
         if current_trace.do_log

data/lib/solarwinds_apm/support/oboe_tracing_mode.rb

@@ -5,29 +5,27 @@
 # 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.
 
 module SolarWindsAPM
-  module OpenTelemetry
-    # OboeTracingMode
-    # Used in solarwinds_sampler
-    class OboeTracingMode
-      OBOE_SETTINGS_UNSET = -1
-      OBOE_TRACE_DISABLED = 0
-      OBOE_TRACE_ENABLED = 1
-      OBOE_TRIGGER_DISABLED = 0
-      OBOE_TRIGGER_ENABLED = 1
+  # OboeTracingMode
+  # Used in solarwinds_sampler
+  class OboeTracingMode
+    OBOE_SETTINGS_UNSET = -1
+    OBOE_TRACE_DISABLED = 0
+    OBOE_TRACE_ENABLED = 1
+    OBOE_TRIGGER_DISABLED = 0
+    OBOE_TRIGGER_ENABLED = 1
 
-      def self.get_oboe_trace_mode(tracing_mode)
-        mode = OBOE_SETTINGS_UNSET
-        mode = OBOE_TRACE_ENABLED if tracing_mode == 'enabled'
-        mode = OBOE_TRACE_DISABLED if tracing_mode == 'disabled'
-        mode
-      end
+    def self.get_oboe_trace_mode(tracing_mode)
+      mode = OBOE_SETTINGS_UNSET
+      mode = OBOE_TRACE_ENABLED if tracing_mode == :enabled
+      mode = OBOE_TRACE_DISABLED if tracing_mode == :disabled
+      mode
+    end
 
-      def self.get_oboe_trigger_trace_mode(trigger_trace_mode)
-        mode = OBOE_SETTINGS_UNSET
-        mode = OBOE_TRIGGER_ENABLED if trigger_trace_mode == 'enabled'
-        mode = OBOE_TRIGGER_DISABLED if trigger_trace_mode == 'disabled'
-        mode
-      end
+    def self.get_oboe_trigger_trace_mode(trigger_trace_mode)
+      mode = OBOE_SETTINGS_UNSET
+      mode = OBOE_TRIGGER_ENABLED if trigger_trace_mode == :enabled
+      mode = OBOE_TRIGGER_DISABLED if trigger_trace_mode == :disabled
+      mode
     end
   end
-end
+end

data/lib/solarwinds_apm/support/service_key_checker.rb

@@ -0,0 +1,94 @@
+# © 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.
+
+module SolarWindsAPM
+  # ServiceKeyChecker
+  # It is a service that validate the service_key
+  class ServiceKeyChecker
+    def initialize(reporter)
+      @reporter = reporter
+    end
+
+    def read_and_validate_service_key
+      return '' unless @reporter == 'ssl'
+
+      service_key = fetch_service_key
+      if service_key.empty?
+        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..]}"}
+        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."}
+        return ''
+      end
+
+      service_name = transform_service_name(service_name)
+
+      # check if otel_resource_service or otel_service_name has service name to override the original service name
+      otel_resource_service_name = fetch_otel_resource_service_name
+      service_name = transform_service_name(otel_resource_service_name) unless otel_resource_service_name.empty?
+
+      otel_service_name = fetch_otel_service_name
+      if otel_service_name.empty?
+        ENV['OTEL_SERVICE_NAME'] = service_name
+      else
+        service_name = transform_service_name(otel_service_name)
+      end
+
+      "#{token}:#{service_name}"
+    end
+
+    private
+
+    # since oboe_init_options init afte config, so [:service_key] will be present at this point
+    def fetch_service_key
+      ENV['SW_APM_SERVICE_KEY'] || SolarWindsAPM::Config[:service_key] || ''
+    end
+
+    def parse_service_key(service_key)
+      match = service_key.match(/([^:]+)(:{0,1})(.*)/)
+      return ['', '', ''] if match.nil?
+
+      [match[1], match[2], match[3]]
+    end
+
+    # precedence: OTEL_SERVICE_NAME > OTEL_RESOURCE_ATTRIBUTES > service_key
+    def fetch_otel_service_name
+      ENV['OTEL_SERVICE_NAME'] || ''
+    end
+
+    def fetch_otel_resource_service_name
+      ENV['OTEL_RESOURCE_ATTRIBUTES']&.split(',')&.find do |pair|
+        key, value = pair.split('=')
+        break value if key == 'service.name'
+      end || ''
+    end
+
+    # In case of java-collector, please provide a dummy service key
+    def validate_token(token)
+      /^[0-9a-zA-Z_-]{71}$/.match?(token)
+    end
+
+    def transform_service_name(service_name)
+      name_ = service_name.dup
+      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
+
+      name_
+    end
+  end
+end

data/lib/solarwinds_apm/{support_report.rb → support/support_report.rb}

@@ -7,12 +7,11 @@
 require 'rbconfig'
 require 'logger'
 
+##
+# This module is used to debug problematic setups and/or environments.
+# Depending on the environment, output may be to stdout or the framework
+# log file (e.g. log/production.log)
 module SolarWindsAPM
-  ##
-  # This module is used to debug problematic setups and/or environments.
-  # Depending on the environment, output may be to stdout or the framework
-  # log file (e.g. log/production.log)
-
   ##
   # yesno
   #
@@ -71,6 +70,12 @@ module SolarWindsAPM
     SolarWindsAPM.logger.warn '********************************************************'
     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 '********************************************************'
+    SolarWindsAPM.logger.warn SolarWindsAPM::OTelConfig.print_config.to_s
 
     SolarWindsAPM.logger.warn '********************************************************'
     SolarWindsAPM.logger.warn '* OS, Platform + Env'
@@ -78,9 +83,7 @@ module SolarWindsAPM
     SolarWindsAPM.logger.warn "host_os:  #{RbConfig::CONFIG['host_os']}"
     SolarWindsAPM.logger.warn "sitearch: #{RbConfig::CONFIG['sitearch']}"
     SolarWindsAPM.logger.warn "arch:     #{RbConfig::CONFIG['arch']}"
-    SolarWindsAPM.logger.warn RUBY_PLATFORM
-    SolarWindsAPM.logger.warn "RACK_ENV: #{ENV['RACK_ENV']}"
-    SolarWindsAPM.logger.warn "RAILS_ENV: #{ENV['RAILS_ENV']}" if using_rails
+    SolarWindsAPM.logger.warn "Platform: #{RUBY_PLATFORM}"
 
     SolarWindsAPM.logger.warn '********************************************************'
     SolarWindsAPM.logger.warn '* END SolarWindsAPM Support Report'

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

@@ -25,7 +25,7 @@ module SolarWindsAPM
       end
 
       def self.construct_comment
-        ret = String.new
+        ret = +''
         components.each do |c|
           component_value = send(c)
           ret << "#{c}='#{component_value}'," if component_value.present?
@@ -107,7 +107,7 @@ module SolarWindsAPM
         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}
+      DEFAULT_LINES_TO_IGNORE_REGEX = %r{\.rvm|/ruby/gems/|vendor/|marginalia|rbenv|monitor\.rb.*mon_synchronize}.freeze # rubocop:disable Style/RedundantFreeze
 
       def self.line
         SWOMarginalia::Comment.lines_to_ignore ||= DEFAULT_LINES_TO_IGNORE_REGEX

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

@@ -79,7 +79,7 @@ module SolarWindsAPM
 
     def self.with_annotation(comment, &block)
       SWOMarginalia::Comment.inline_annotations.push(comment)
-      block.call if block.present?
+      yield if block.present?
     ensure
       SWOMarginalia::Comment.inline_annotations.pop
     end

data/lib/solarwinds_apm/support/transaction_settings.rb

@@ -21,15 +21,11 @@ module SolarWindsAPM
     # calculate trace mode to set either 1 or 0 based on url_path and name+kind
     # first check if url_path match, if not match, then match the name+kind
     def calculate_trace_mode
-      tracing_mode_enabled? && tracing_enabled? ? SWO_TRACING_ENABLED : SWO_TRACING_DISABLED
+      SolarWindsAPM::Config[:tracing_mode] == :enabled && tracing_enabled? ? SWO_TRACING_ENABLED : SWO_TRACING_DISABLED
     end
 
     private
 
-    def tracing_mode_enabled?
-      SolarWindsAPM::Config[:tracing_mode] && ![:disabled, :never].include?(SolarWindsAPM::Config[:tracing_mode])
-    end
-
     def tracing_enabled?
       span_layer = "#{@kind}:#{@name}"
 

data/lib/solarwinds_apm/support.rb

@@ -15,6 +15,7 @@ require_relative './support/oboe_tracing_mode'
 require_relative './support/txn_name_manager'
 require_relative './support/utils'
 require_relative './support/x_trace_options'
+require_relative './support/support_report'
 
 if SolarWindsAPM::Config[:tag_sql]
   if defined?(::Rails)

data/lib/solarwinds_apm/version.rb

@@ -12,7 +12,7 @@ module SolarWindsAPM
     MAJOR  = 6 # breaking,
     MINOR  = 0 # feature,
     PATCH  = 0 # fix => BFF
-    PRE    = 'preV5'.freeze # for pre-releases into packagecloud, set to nil for production releases into rubygems
+    PRE    = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
   end