solarwinds_apm 5.1.9 → 6.0.0.preV1

data/lib/solarwinds_apm/support/transaction_settings.rb

@@ -1,233 +1,50 @@
 # Copyright (c) 2018 SolarWinds, LLC.
 # All rights reserved.
 #
-
-AO_TRACING_ENABLED = 1
-AO_TRACING_DISABLED = 0
-AO_TRACING_UNSET = -1
-
-AO_TRACING_DECISIONS_OK = 0
-
-OBOE_SETTINGS_UNSET = -1
-
 module SolarWindsAPM
   ##
   # This module helps with setting up the transaction filters and applying them
   #
   class TransactionSettings
+    SWO_TRACING_ENABLED      = 1
+    SWO_TRACING_DISABLED     = 0
 
-    attr_accessor :do_sample, :do_metrics
-    attr_reader   :auth_msg, :do_propagate, :status_msg, :type, :source, :rate, :tracestring, :sw_member_value
-
-    def initialize(url = '', headers = {}, options = nil)
-      @do_metrics = false
-      @do_sample = false
-      @do_propagate = true
-
-      SolarWindsAPM.trace_context = SolarWindsAPM::TraceContext.new(headers)
-      @tracestring = SolarWindsAPM.trace_context.tracestring
-      @sw_member_value = SolarWindsAPM.trace_context.sw_member_value
-      tracing_mode = AO_TRACING_ENABLED
-
-      # TODO
-      #   NH-11132 will address this
-      # incoming tracing info has priority over existing context
-      # if SolarWindsAPM::Context.isValid && !@sw_member_value
-      #   @do_sample = SolarWindsAPM.tracing?
-      #   return
-      # end
-
-      if url && asset?(url)
-        @do_propagate = false
-        return
-      end
-
-      if tracing_mode_disabled? && !tracing_enabled?(url) ||
-        tracing_disabled?(url)
-
-        tracing_mode = AO_TRACING_DISABLED
-      end
-
-      # args (all optional)
-      # 0 char const *in_xtrace
-      # 1 char const *tracestate
-      # 2 int custom_tracing_mode
-      # 3 int custom_sample_rate
-      # 4 int request_type
-      # 5 int custom_trigger_mode
-      # 6 char const *header_options
-      # 7 char const *header_signature
-      # 8 long header_timestamp
-      args = [@tracestring, @sw_member_value] #0,1
-      args << tracing_mode #2
-      args << (SolarWindsAPM::Config[:sample_rate] || OBOE_SETTINGS_UNSET) #3
-
-      if options && (options.options || options.signature)
-        args << (options.trigger_trace ? 1 : 0) #4
-        args << (trigger_tracing_mode_disabled? ? 0 : 1) #5
-        args << options.options #6
-        args << options.signature #7
-        args << options.timestamp #8
-      end
-
-      metrics, sample, @rate, @source, @bucket_rate, @bucket_cap, @type, @auth, @status_msg, @auth_msg, @status =
-        SolarWindsAPM::Context.getDecisions(*args)
-
-      if @status > AO_TRACING_DECISIONS_OK
-        SolarWindsAPM.logger.warn "[solarwinds_apm/sample] Problem getting the sampling decisions: #{@status_msg} code: #{@status}"
-      end
-
-      @do_metrics = metrics > 0
-      @do_sample = sample > 0
-    end
-
-    def to_s
-      "do_propagate: #{do_propagate}, do_sample: #{do_sample}, do_metrics: #{do_metrics} rate: #{rate}, source: #{source}"
-    end
-
-    def add_kvs(kvs)
-      kvs[:SampleRate] = @rate
-      kvs[:SampleSource] = @source
-    end
-
-    def triggered_trace?
-      @type == 1
+    def initialize(url: '', name: '', kind: '')
+      @url = url
+      @name = name
+      @kind = kind
     end
 
-    def auth_ok?
-      # @auth is undefined if initialize is called with an existing context
-      !@auth || @auth < 1
+    # calculate trace mode to set either 1 or 0 based on url and name+kind
+    # first check if url match, if not match, then match the name+kind
+    def calculate_trace_mode
+      tracing_mode_enabled? && tracing_enabled? ? SWO_TRACING_ENABLED : SWO_TRACING_DISABLED
     end
 
     private
 
-    ##
-    # check the config setting for :tracing_mode
-    def tracing_mode_disabled?
-      SolarWindsAPM::Config[:tracing_mode] &&
-        [:disabled, :never].include?(SolarWindsAPM::Config[:tracing_mode])
+    def tracing_mode_enabled?
+      SolarWindsAPM::Config[:tracing_mode] && ![:disabled, :never].include?(SolarWindsAPM::Config[:tracing_mode])
     end
 
-    ##
-    # tracing_enabled?
-    #
-    # Given a path, this method determines whether it matches any of the
-    # regexps to exclude it from metrics and traces
-    #
-    def tracing_enabled?(url)
-      return false unless SolarWindsAPM::Config[:url_enabled_regexps].is_a? Array
-      # once we only support Ruby >= 2.4.0 use `match?` instead of `=~`
-      return SolarWindsAPM::Config[:url_enabled_regexps].any? { |regex| regex =~ url }
-    rescue => e
-      SolarWindsAPM.logger.warn "[SolarWindsAPM/filter] Could not apply :enabled filter to path. #{e.inspect}"
-      true
-    end
-
-    ##
-    # tracing_disabled?
-    #
-    # Given a path, this method determines whether it matches any of the
-    # regexps to exclude it from metrics and traces
-    #
-    def tracing_disabled?(url)
-      return false unless SolarWindsAPM::Config[:url_disabled_regexps].is_a? Array
-      # once we only support Ruby >= 2.4.0 use `match?` instead of `=~`
-      return SolarWindsAPM::Config[:url_disabled_regexps].any? { |regex| regex =~ url }
-    rescue => e
-      SolarWindsAPM.logger.warn "[SolarWindsAPM/filter] Could not apply :disabled filter to path. #{e.inspect}"
-      false
-    end
-
-    def trigger_tracing_mode_disabled?
-      SolarWindsAPM::Config[:trigger_tracing_mode] &&
-        SolarWindsAPM::Config[:trigger_tracing_mode] == :disabled
-    end
-
-    ##
-    # asset?
-    #
-    # Given a path, this method determines whether it is a static asset
-    #
-    def asset?(path)
-      return false unless SolarWindsAPM::Config[:dnt_compiled]
-      # once we only support Ruby >= 2.4.0 use `match?` instead of `=~`
-      return SolarWindsAPM::Config[:dnt_compiled] =~ path
-    rescue => e
-      SolarWindsAPM.logger.warn "[SolarWindsAPM/filter] Could not apply do-not-trace filter to path. #{e.inspect}"
-      false
-    end
-
-    public
-
-    class << self
+    def tracing_enabled?
+      span_layer = "#{@name}:#{@kind}"
 
-      def asset?(path)
-        return false unless SolarWindsAPM::Config[:dnt_compiled]
-        # once we only support Ruby >= 2.4.0 use `match?` instead of `=~`
-        return SolarWindsAPM::Config[:dnt_compiled] =~ path
-      rescue => e
-        SolarWindsAPM.logger.warn "[SolarWindsAPM/filter] Could not apply do-not-trace filter to path. #{e.inspect}"
-        false
-      end
+      enabled_regexps = SolarWindsAPM::Config[:enabled_regexps]
+      disabled_regexps = SolarWindsAPM::Config[:disabled_regexps]
 
-      def compile_url_settings(settings)
-        if !settings.is_a?(Array) || settings.empty?
-          reset_url_regexps
-          return
-        end
+      SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] enabled_regexps: #{enabled_regexps&.inspect}"}
+      SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] disabled_regexps: #{disabled_regexps&.inspect}"}
 
-        # `tracing: disabled` is the default
-        disabled = settings.select { |v| !v.has_key?(:tracing) || v[:tracing] == :disabled }
-        enabled = settings.select { |v| v[:tracing] == :enabled }
+      return false if disabled_regexps.is_a?(Array) && disabled_regexps.any? { |regex| regex.match?(@url) }
+      return true if enabled_regexps.is_a?(Array) && enabled_regexps.any? { |regex| regex.match?(@url) }
+      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) }
 
-        SolarWindsAPM::Config[:url_enabled_regexps] = compile_regexp(enabled)
-        SolarWindsAPM::Config[:url_disabled_regexps] = compile_regexp(disabled)
-      end
-
-      def compile_regexp(settings)
-        regexp_regexp     = compile_url_settings_regexp(settings)
-        extensions_regexp = compile_url_settings_extensions(settings)
-
-        regexps = [regexp_regexp, extensions_regexp].flatten.compact
-
-        regexps.empty? ? nil : regexps
-      end
-
-      def compile_url_settings_regexp(value)
-        regexps = value.select do |v|
-          v.key?(:regexp) &&
-            !(v[:regexp].is_a?(String) && v[:regexp].empty?) &&
-            !(v[:regexp].is_a?(Regexp) && v[:regexp].inspect == '//')
-        end
-
-        regexps.map! do |v|
-          begin
-            v[:regexp].is_a?(String) ? Regexp.new(v[:regexp], v[:opts]) : Regexp.new(v[:regexp])
-          rescue
-            SolarWindsAPM.logger.warn "[solarwinds_apm/config] Problem compiling transaction_settings item #{v}, will ignore."
-            nil
-          end
-        end
-        regexps.keep_if { |v| !v.nil? }
-        regexps.empty? ? nil : regexps
-      end
-
-      def compile_url_settings_extensions(value)
-        extensions = value.select do |v|
-          v.key?(:extensions) &&
-            v[:extensions].is_a?(Array) &&
-            !v[:extensions].empty?
-        end
-        extensions = extensions.map { |v| v[:extensions] }.flatten
-        extensions.keep_if { |v| v.is_a?(String) }
-
-        extensions.empty? ? nil : Regexp.new("(#{Regexp.union(extensions).source})(\\?.+){0,1}$")
-      end
-
-      def reset_url_regexps
-        SolarWindsAPM::Config[:url_enabled_regexps] = nil
-        SolarWindsAPM::Config[:url_disabled_regexps] = nil
-      end
+      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."}
+      true
     end
   end
 end

data/lib/solarwinds_apm/support/transformer.rb

@@ -0,0 +1,56 @@
+module SolarWindsAPM
+  module OpenTelemetry
+    # Transformer
+    class Transformer
+      VERSION = '00'.freeze
+
+      def self.sw_from_context(span_context)
+        flag = span_context.trace_flags.sampled?? 1 : 0
+        "#{span_context.hex_span_id}-0#{flag}"
+      end
+
+      def self.trace_state_header(trace_state)
+        arr = []
+        trace_state.to_h.each do |key, value|
+          arr << "#{key}=#{value}"
+        end
+        arr.join(",")
+      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
+        xtr = "#{VERSION}-#{span_context.hex_trace_id}-#{span_context.hex_span_id}-0#{flag}"
+        SolarWindsAPM.logger.debug("Generated traceparent #{xtr} from #{span_context.inspect}")
+        xtr
+      end
+
+      # Formats tracestate sw value from span_id and liboboe decision as 16-byte span_id with 8-bit trace_flags
+      # e.g. 1a2b3c4d5e6f7g8h-01
+      def self.sw_from_span_and_decision(span_id, decision)
+        [span_id, decision].join("-")
+      end
+
+      # trace_flags [Integer]
+      def self.trace_flags_from_int(trace_flags)
+        "0#{trace_flags}"
+      end
+
+      def self.trace_flags_from_boolean(trace_flags)
+        trace_flags == true ? "01" : "00"
+      end
+
+      def self.sampled?(decision)
+        decision == ::OpenTelemetry::SDK::Trace::Samplers::Decision::RECORD_AND_SAMPLE
+      end
+
+      def self.span_id_from_sw(sw_value)
+        sw_value.split("-")[0]
+      end
+
+      def self.create_key(name_)
+        ::OpenTelemetry::Context.create_key(name_)
+      end
+    end
+  end
+end

data/lib/solarwinds_apm/support/txn_name_manager.rb

@@ -0,0 +1,25 @@
+module SolarWindsAPM
+  module OpenTelemetry
+    # SolarWindsTxnNameManager
+    class TxnNameManager
+      def initialize
+        @cache = {}
+      end
+
+      def get(key)
+        @cache[key]
+      end
+
+      def del(key)
+        @cache.delete(key)
+      end
+
+      def set(key, value)
+        SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] current cache #{@cache.inspect}"}
+        @cache[key] = value
+      end
+
+      alias []= set
+    end
+  end
+end

data/lib/solarwinds_apm/support/x_trace_options.rb

@@ -2,10 +2,10 @@
 # All rights reserved.
 
 module SolarWindsAPM
+  # XTraceOptions
   class XTraceOptions
-
-    attr_reader :options, :signature, :trigger_trace, :timestamp
-    attr_reader :sw_keys, :custom_kvs, :ignored # used in tests
+    attr_reader :options, :signature, :trigger_trace, :timestamp, 
+                :sw_keys, :custom_kvs, :ignored
     
     ##
     # use by Trigger Tracing
@@ -33,16 +33,20 @@ module SolarWindsAPM
     # - ts (unix timestamp)
     # - other keys will be reported in the response options as ignored
 
-    def initialize(options, signature = nil)
-      @options = options.dup
-      @signature = signature.dup
+    SW_XTRACEOPTIONS_RESPONSE_KEY = 'xtrace_options_response'.freeze
+
+    def initialize(context)
+      SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] x_trace_options context: #{context.inspect}"}
+      @context = context.dup
       @trigger_trace = false
       @custom_kvs = {}
       @sw_keys = nil
       @ignored = []
       @timestamp = 0
+      @options = options_header
+      @signature = obtain_signature
 
-      options&.split(/;+/)&.each do |val|
+      @options&.split(/;+/)&.each do |val|
         k = val.split('=', 2)
 
         next unless k[0] # it can be nil, eg when the header starts with ';'
@@ -57,19 +61,19 @@ module SolarWindsAPM
           end
         when 'sw-keys'
           if @sw_keys
-            SolarWindsAPM.logger.info "[solarwinds_apm/x-trace-options] 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 "[solarwinds_apm/x-trace-options] 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 "[solarwinds_apm/x-trace-options] Duplicate key: #{k[0]}"
+            SolarWindsAPM.logger.info {"[#{self.class}/#{__method__}] Duplicate key: #{k[0]}"}
           else
             @timestamp = k[1].to_i
           end
@@ -77,10 +81,7 @@ module SolarWindsAPM
           @ignored << k[0]
         end
       end
-      unless @ignored.empty?
-        msg = "[solarwinds_apm/x-trace-options] Some keys were ignored: #{@ignored.join(',')}"
-        SolarWindsAPM.logger.info(msg)
-      end
+      SolarWindsAPM.logger.info("[#{self.class}/#{__method__}] Some keys were ignored: #{@ignored.join(',')}") unless @ignored.empty?
     end
 
     def add_kvs(kvs, settings)
@@ -91,23 +92,38 @@ module SolarWindsAPM
       kvs['TriggeredTrace'] = true if settings.triggered_trace?
     end
 
-    def add_response_header(headers, settings)
-      return unless options
+    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}"}
+      signature
+    end
 
-      response = []
-      response << "auth=#{settings.auth_msg}" if @signature
-      if settings.auth_ok?
-        if @trigger_trace
-          trigger_msg = settings.tracestring && settings.type == 0 ? 'ignored' : settings.status_msg
-        else
-          trigger_msg = 'not-requested'
+    def options_header
+      # 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}"}
+      header
+    end
+
+    def obtain_sw_value(type)
+      sw_value = nil
+      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}"}
         end
-        response << "trigger-trace=#{trigger_msg}"
-        response << "ignored=#{@ignored.join(',')}" unless @ignored.empty?
       end
+      sw_value
+    end
 
-      headers['X-Trace-Options-Response'] = response.join(';')
+    def intify_trigger_trace
+      @trigger_trace ? 1 : 0
     end
 
+    def self.sw_xtraceoptions_response_key
+      SW_XTRACEOPTIONS_RESPONSE_KEY
+    end
   end
 end

data/lib/solarwinds_apm/support.rb

@@ -1,13 +1,36 @@
-# Copyright (c) SolarWinds, LLC.
-# All rights reserved
+# Copyright (c) 2023 SolarWinds, LLC.
+# All rights reserved.
+#
+# This file is for loading support library
+#
 
-pattern = File.join(File.dirname(__FILE__), 'support', '*.rb')
-Dir.glob(pattern) do |f|
-  next if f =~ /profiling/ unless defined?(SolarWindsAPM::CProfiler) # ignore defining SolarWindsAPM::Profiling if Init_profiling disabled
-  begin
-    require f
-  rescue => e
-    SolarWindsAPM.logger.error "[solarwinds_apm/loading] Error loading support file '#{f}' : #{e}"
-    SolarWindsAPM.logger.debug "[solarwinds_apm/loading] #{e.backtrace.first}"
+require_relative './support/logger_formatter'
+require_relative './support/logging_log_event'
+require_relative './support/lumberjack_formatter'
+require_relative './support/transaction_cache'
+require_relative './support/transaction_settings'
+require_relative './support/oboe_tracing_mode'
+require_relative './support/txn_name_manager'
+require_relative './support/transformer'
+require_relative './support/x_trace_options'
+
+if SolarWindsAPM::Config[:tag_sql]
+  if defined?(::Rails)
+    if ::Rails.version < '7'
+      require_relative './support/swomarginalia/railtie'
+    elsif ::Rails.version >= '7'
+      # User has to define in their config/environments:
+      # config.active_record.query_log_tags = [ 
+      #   { 
+      #     tracecontext: -> { 
+      #       SolarWindsAPM::SWOMarginalia::Comment.traceparent 
+      #     } 
+      #   }
+      # ]
+      require_relative './support/swomarginalia/comment'
+    end
+  else
+    require_relative './support/swomarginalia/load_swomarginalia'
+    SolarWindsAPM::SWOMarginalia::LoadSWOMarginalia.insert
   end
 end

data/lib/solarwinds_apm/support_report.rb

@@ -14,33 +14,23 @@ module SolarWindsAPM
   # yesno
   #
   # Utility method to translate value/nil to "yes"/"no" strings
-  def self.yesno(x)
-    x ? 'yes' : 'no'
+  def self.yesno(condition)
+    condition ? 'yes' : 'no'
   end
 
-  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize
   def self.support_report
     @logger_level = SolarWindsAPM.logger.level
     SolarWindsAPM.logger.level = ::Logger::DEBUG
 
     SolarWindsAPM.logger.warn '********************************************************'
     SolarWindsAPM.logger.warn '* BEGIN SolarWindsAPM Support Report'
-    SolarWindsAPM.logger.warn '*   Please email the output of this report to technicalsupport@solarwinds.com'
+    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 "$0: #{$0}"
-    SolarWindsAPM.logger.warn "$1: #{$1}" unless $1.nil?
-    SolarWindsAPM.logger.warn "$2: #{$2}" unless $2.nil?
-    SolarWindsAPM.logger.warn "$3: #{$3}" unless $3.nil?
-    SolarWindsAPM.logger.warn "$4: #{$4}" unless $4.nil?
+    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}"
 
-    on_heroku = SolarWindsAPM.heroku?
-    SolarWindsAPM.logger.warn "On Heroku?: #{yesno(on_heroku)}"
-    if on_heroku
-      SolarWindsAPM.logger.warn "SW_APM_URL: #{ENV['SW_APM_URL']}"
-    end
-
     SolarWindsAPM.logger.warn "SolarWindsAPM::Ruby defined?: #{yesno(defined?(SolarWindsAPM::Ruby))}"
     SolarWindsAPM.logger.warn "SolarWindsAPM.reporter: #{SolarWindsAPM.reporter}"
 
@@ -52,9 +42,7 @@ module SolarWindsAPM
     SolarWindsAPM.logger.warn "Using Rails?: #{yesno(using_rails)}"
     if using_rails
       SolarWindsAPM.logger.warn "SolarWindsAPM::Rails loaded?: #{yesno(defined?(SolarWindsAPM::Rails))}"
-      if defined?(SolarWindsAPM::Rack)
-        SolarWindsAPM.logger.warn "SolarWindsAPM::Rack middleware loaded?: #{yesno(::Rails.configuration.middleware.include? SolarWindsAPM::Rack)}"
-      end
+      SolarWindsAPM.logger.warn "SolarWindsAPM::Rack middleware loaded?: #{yesno(::Rails.configuration.middleware.include?(SolarWindsAPM::Rack))}" if defined?(SolarWindsAPM::Rack)
     end
 
     using_sinatra = defined?(::Sinatra)
@@ -80,34 +68,24 @@ module SolarWindsAPM
     SolarWindsAPM.logger.warn '********************************************************'
     SolarWindsAPM.logger.warn '* SolarWindsAPM::Config Values'
     SolarWindsAPM.logger.warn '********************************************************'
-    SolarWindsAPM::Config.print_config
 
     SolarWindsAPM.logger.warn '********************************************************'
     SolarWindsAPM.logger.warn '* OS, Platform + Env'
     SolarWindsAPM.logger.warn '********************************************************'
-    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 "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 '********************************************************'
-    SolarWindsAPM.logger.warn '* Raw __Init KVs'
-    SolarWindsAPM.logger.warn '********************************************************'
-    platform_info = SolarWindsAPM::Util.build_init_report
-    platform_info.each { |k,v|
-      SolarWindsAPM.logger.warn "#{k}: #{v}"
-    }
-
     SolarWindsAPM.logger.warn '********************************************************'
     SolarWindsAPM.logger.warn '* END SolarWindsAPM Support Report'
     SolarWindsAPM.logger.warn '*   Support Email: technicalsupport@solarwinds.com'
-    SolarWindsAPM.logger.warn '*   Github: https://github.com/librato/ruby-solarwinds'
+    SolarWindsAPM.logger.warn '*   Github: https://github.com/solarwindscloud/swotel-ruby'
     SolarWindsAPM.logger.warn '********************************************************'
 
     SolarWindsAPM.logger.level = @logger_level
     nil
   end
-  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize
 end

data/lib/solarwinds_apm/thread_local.rb

@@ -18,7 +18,7 @@ module SolarWindsAPM
         Thread.current[key]
       end
 
-      define_method(name.to_s + '=') do |value|
+      define_method("#{name}=") do |value|
         Thread.current[key] = value
       end
     end

data/lib/solarwinds_apm/version.rb

@@ -6,10 +6,10 @@ module SolarWindsAPM
   # The current version of the gem. Used mainly by
   # solarwinds_apm.gemspec during gem build process
   module Version
-    MAJOR  = 5 # breaking,
-    MINOR  = 1 # feature,
-    PATCH  = 9 # fix => BFF
-    PRE    = nil # for pre-releases into packagecloud, set to nil for production releases into rubygems
+    MAJOR  = 6 # breaking,
+    MINOR  = 0 # feature,
+    PATCH  = 0 # fix => BFF
+    PRE    = 'preV1' # for pre-releases into packagecloud, set to nil for production releases into rubygems
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
   end