solarwinds_apm 6.0.0 → 6.0.1

data/lib/solarwinds_apm/api/transaction_name.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
@@ -35,35 +37,43 @@ module SolarWindsAPM
       # === Returns:
       # * Boolean
       #
-      def set_transaction_name(custom_name=nil)
+      def set_transaction_name(custom_name = nil)
         status = true
         if ENV.fetch('SW_APM_ENABLED', 'true') == 'false' ||
            SolarWindsAPM::Context.toString == '99-00000000000000000000000000000000-0000000000000000-00'
           # library disabled or noop, just log and skip work.
           # TODO: can we have a single indicator that the API is in noop mode?
-          SolarWindsAPM.logger.debug {"[#{name}/#{__method__}] SolarWindsAPM is in disabled or noop mode."}
+          SolarWindsAPM.logger.debug { "[#{name}/#{__method__}] SolarWindsAPM is in disabled or noop mode." }
         elsif custom_name.nil? || custom_name.empty?
-          SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] Set transaction name failed: custom_name is either nil or empty string."}
+          SolarWindsAPM.logger.warn do
+            "[#{name}/#{__method__}] Set transaction name failed: custom_name is either nil or empty string."
+          end
           status = false
-        elsif SolarWindsAPM::OTelConfig.class_variable_get(:@@config)[:span_processor].nil?
-          SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] Set transaction name failed: Solarwinds processor is missing."}
+        elsif SolarWindsAPM::OTelConfig[:metrics_processor].nil?
+          SolarWindsAPM.logger.warn do
+            "[#{name}/#{__method__}] Set transaction name failed: Solarwinds processor is missing."
+          end
           status = false
         else
-          solarwinds_processor = SolarWindsAPM::OTelConfig.class_variable_get(:@@config)[:span_processor]
-          current_span         = ::OpenTelemetry::Trace.current_span
+          solarwinds_processor = SolarWindsAPM::OTelConfig[:metrics_processor]
+          current_span = ::OpenTelemetry::Trace.current_span
 
           if current_span.context.valid?
             current_trace_id = current_span.context.hex_trace_id
             entry_span_id, trace_flags = solarwinds_processor.txn_manager.get_root_context_h(current_trace_id)&.split('-')
             if entry_span_id.to_s.empty? || trace_flags.to_s.empty?
-              SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] Set transaction name failed: record not found in the transaction manager."}
+              SolarWindsAPM.logger.warn do
+                "[#{name}/#{__method__}] Set transaction name failed: record not found in the transaction manager."
+              end
               status = false
             else
-              solarwinds_processor.txn_manager.set("#{current_trace_id}-#{entry_span_id}",custom_name)
-              SolarWindsAPM.logger.debug {"[#{name}/#{__method__}] Cached custom transaction name for #{current_trace_id}-#{entry_span_id} as #{custom_name}"}
+              solarwinds_processor.txn_manager.set("#{current_trace_id}-#{entry_span_id}", custom_name)
+              SolarWindsAPM.logger.debug do
+                "[#{name}/#{__method__}] Cached custom transaction name for #{current_trace_id}-#{entry_span_id} as #{custom_name}"
+              end
             end
           else
-            SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] Set transaction name failed: invalid span context."}
+            SolarWindsAPM.logger.warn { "[#{name}/#{__method__}] Set transaction name failed: invalid span context." }
             status = false
           end
         end

data/lib/solarwinds_apm/api.rb

@@ -1,14 +1,16 @@
+# 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 './api/transaction_name'
-require_relative './api/current_trace_info'
-require_relative './api/tracing'
-require_relative './api/opentelemetry'
-require_relative './api/custom_metrics'
+require_relative 'api/transaction_name'
+require_relative 'api/current_trace_info'
+require_relative 'api/tracing'
+require_relative 'api/opentelemetry'
+require_relative 'api/custom_metrics'
 
 module SolarWindsAPM
   module API

data/lib/solarwinds_apm/config.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
@@ -12,24 +14,24 @@ module SolarWindsAPM
   # Use SolarWindsAPM::Config.show to view the entire nested hash.
   #
   module Config
-    SW_LOG_LEVEL_MAPPING = {-1 => {:stdlib => ::Logger::FATAL, :otel => 'fatal'},
-                             0 => {:stdlib => ::Logger::FATAL, :otel => 'fatal'},
-                             1 => {:stdlib => ::Logger::ERROR, :otel => 'error'},
-                             2 => {:stdlib => ::Logger::WARN, :otel => 'warn'},
-                             3 => {:stdlib => ::Logger::INFO, :otel => 'info'},
-                             4 => {:stdlib => ::Logger::DEBUG, :otel => 'debug'},
-                             5 => {:stdlib => ::Logger::DEBUG, :otel => 'debug'},
-                             6 => {:stdlib => ::Logger::DEBUG, :otel => 'debug'}}.freeze
+    SW_LOG_LEVEL_MAPPING = { -1 => { stdlib: ::Logger::FATAL, otel: 'fatal' },
+                             0 => { stdlib: ::Logger::FATAL, otel: 'fatal' },
+                             1 => { stdlib: ::Logger::ERROR, otel: 'error' },
+                             2 => { stdlib: ::Logger::WARN, otel: 'warn' },
+                             3 => { stdlib: ::Logger::INFO, otel: 'info' },
+                             4 => { stdlib: ::Logger::DEBUG, otel: 'debug' },
+                             5 => { stdlib: ::Logger::DEBUG, otel: 'debug' },
+                             6 => { stdlib: ::Logger::DEBUG, otel: 'debug' } }.freeze
 
     @@config = {}
-    @@instrumentation = [: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]
+    @@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
@@ -53,26 +55,32 @@ module SolarWindsAPM
       config_files << config_file if File.exist?(config_file)
 
       # Check for file set by env variable
-      config_files << config_file_from_env if ENV.has_key?('SW_APM_CONFIG_RUBY')
+      config_files << config_file_from_env if ENV.key?('SW_APM_CONFIG_RUBY')
 
       # Check for default config file
       config_file = File.join(Dir.pwd, 'solarwinds_apm_config.rb')
       config_files << config_file if File.exist?(config_file)
 
-      SolarWindsAPM.logger.debug {"[#{name}/#{__method__}] Available config_files: #{config_files.join(', ')}" }
-      SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] Multiple configuration files configured, using the first one listed: #{config_files.join(', ')}"} if config_files.size > 1
-      load(config_files[0]) if config_files.size > 0
+      SolarWindsAPM.logger.debug { "[#{name}/#{__method__}] Available config_files: #{config_files.join(', ')}" }
+      if config_files.size > 1
+        SolarWindsAPM.logger.warn do
+          "[#{name}/#{__method__}] Multiple configuration files configured, using the first one listed: #{config_files.join(', ')}"
+        end
+      end
+      load(config_files[0]) if config_files.size.positive?
 
-      set_log_level        # sets SolarWindsAPM::Config[:debug_level], SolarWindsAPM.logger.level
+      set_log_level # sets SolarWindsAPM::Config[:debug_level], SolarWindsAPM.logger.level
     end
 
     def self.config_file_from_env
-      if File.exist?(ENV['SW_APM_CONFIG_RUBY']) && !File.directory?(ENV['SW_APM_CONFIG_RUBY'])
-        config_file = ENV['SW_APM_CONFIG_RUBY']
-      elsif File.exist?(File.join(ENV['SW_APM_CONFIG_RUBY'], 'solarwinds_apm_config.rb'))
-        config_file = File.join(ENV['SW_APM_CONFIG_RUBY'], 'solarwinds_apm_config.rb')
+      if File.exist?(ENV.fetch('SW_APM_CONFIG_RUBY', nil)) && !File.directory?(ENV.fetch('SW_APM_CONFIG_RUBY', nil))
+        config_file = ENV.fetch('SW_APM_CONFIG_RUBY', nil)
+      elsif File.exist?(File.join(ENV.fetch('SW_APM_CONFIG_RUBY', nil), 'solarwinds_apm_config.rb'))
+        config_file = File.join(ENV.fetch('SW_APM_CONFIG_RUBY', nil), 'solarwinds_apm_config.rb')
       else
-        SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] Could not find the configuration file set by the SW_APM_CONFIG_RUBY environment variable:  #{ENV['SW_APM_CONFIG_RUBY']}"}
+        SolarWindsAPM.logger.warn do
+          "[#{name}/#{__method__}] Could not find the configuration file set by the SW_APM_CONFIG_RUBY environment variable:  #{ENV.fetch('SW_APM_CONFIG_RUBY', nil)}"
+        end
       end
       config_file
     end
@@ -92,7 +100,7 @@ module SolarWindsAPM
       if env_var && valid_env_values.include?(env_value)
         value = bool ? true?(env_value) : env_value.to_sym
       elsif env_var && !env_value.to_s.empty?
-        SolarWindsAPM.logger.warn("[#{name}/#{__method__}] #{env_var} must be #{valid_env_values.join('/')} (current setting is #{ENV[env_var]}). Using default value: #{default}.")
+        SolarWindsAPM.logger.warn("[#{name}/#{__method__}] #{env_var} must be #{valid_env_values.join('/')} (current setting is #{ENV.fetch(env_var, nil)}). Using default value: #{default}.")
         return @@config[key.to_sym] = default
       end
 
@@ -103,7 +111,7 @@ module SolarWindsAPM
     end
 
     def self.true?(obj)
-      obj.to_s.casecmp("true").zero?
+      obj.to_s.casecmp('true').zero?
     end
 
     def self.boolean?(obj)
@@ -111,7 +119,7 @@ module SolarWindsAPM
     end
 
     def self.symbol?(obj)
-      [:enabled, :disabled].include?(obj)
+      %i[enabled disabled].include?(obj)
     end
 
     ##
@@ -121,9 +129,13 @@ module SolarWindsAPM
     # to create an output similar to the content of the config file
     #
     def self.print_config
-      SolarWindsAPM.logger.debug {"[#{name}/#{__method__}] General configurations list blow:"}
-      @@config.each do |k,v|
-        SolarWindsAPM.logger.debug {"[#{name}/#{__method__}] Config Key/Value: #{k}, #{v.inspect}"} unless @@instrumentation.include?(k)
+      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
       end
       nil
     end
@@ -137,12 +149,18 @@ module SolarWindsAPM
     #
     def self.initialize
       # for config file backward compatibility
-      @@instrumentation.each {|inst| @@config[inst] = {}}
+      @@instrumentation.each { |inst| @@config[inst] = {} }
       @@config[:transaction_name] = {}
 
       # Always load the template, it has all the keys and defaults defined,
       # no guarantee of completeness in the user's config file
-      load(File.join(File.dirname(File.dirname(__FILE__)), 'rails/generators/solarwinds_apm/templates/solarwinds_apm_initializer.rb'))
+
+      load(File.join(File.dirname(File.dirname(__FILE__)),
+                     'rails/generators/solarwinds_apm/templates/solarwinds_apm_initializer.rb'))
+
+      load_config_file
+
+      print_config if SolarWindsAPM.logger.level.zero?
     end
 
     def self.update!(data)
@@ -164,7 +182,7 @@ module SolarWindsAPM
     #
     # Config variable assignment method.  Here we validate and store the
     # assigned value(s) and trigger any secondary action needed.
-    # ENV always have higher precedence 
+    # ENV always have higher precedence
     #
     def self.[]=(key, value)
       key = key.to_sym
@@ -172,18 +190,24 @@ module SolarWindsAPM
 
       case key
       when :sampling_rate
-        SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] sampling_rate is not a supported setting for SolarWindsAPM::Config. Please use :sample_rate."}
+        SolarWindsAPM.logger.warn do
+          "[#{name}/#{__method__}] sampling_rate is not a supported setting for SolarWindsAPM::Config. Please use :sample_rate."
+        end
 
       when :sample_rate
         unless value.is_a?(Integer) || value.is_a?(Float)
-          SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] :sample_rate must be a number between 0 and 1000000 (1m) (provided: #{value}), corrected to 0"}
+          SolarWindsAPM.logger.warn do
+            "[#{name}/#{__method__}] :sample_rate must be a number between 0 and 1000000 (1m) (provided: #{value}), corrected to 0"
+          end
           value = 0
         end
 
         # Validate :sample_rate value
         unless value.between?(0, 1e6)
-          new_value = value < 0 ? 0 : 1_000_000
-          SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] :sample_rate must be between 0 and 1000000 (1m) (provided: #{value}), corrected to #{new_value}"}
+          new_value = value.negative? ? 0 : 1_000_000
+          SolarWindsAPM.logger.warn do
+            "[#{name}/#{__method__}] :sample_rate must be between 0 and 1000000 (1m) (provided: #{value}), corrected to #{new_value}"
+          end
         end
 
         # Assure value is an integer
@@ -217,7 +241,7 @@ module SolarWindsAPM
       end
 
       # `tracing: disabled` is the default
-      disabled = settings.select { |v| !v.has_key?(:tracing) || v[:tracing] == :disabled }
+      disabled = settings.select { |v| !v.key?(:tracing) || v[:tracing] == :disabled }
       enabled  = settings.select { |v| v[:tracing] == :enabled }
 
       SolarWindsAPM::Config[:enabled_regexps] = compile_regexp(enabled)
@@ -234,18 +258,18 @@ module SolarWindsAPM
 
     def self.compile_settings_regexp(value)
       regexps = value.select do |v|
-        v.has_key?(:regexp) &&
+        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 StandardError => e
-          SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] Problem compiling transaction_settings item #{v}, will ignore. Error: #{e.message}"}
-          nil
+        v[:regexp].is_a?(String) ? Regexp.new(v[:regexp], v[:opts]) : Regexp.new(v[:regexp])
+      rescue StandardError => e
+        SolarWindsAPM.logger.warn do
+          "[#{name}/#{__method__}] Problem compiling transaction_settings item #{v}, will ignore. Error: #{e.message}"
         end
+        nil
       end
       regexps.keep_if { |v| !v.nil? }
       regexps.empty? ? nil : regexps

data/lib/solarwinds_apm/constants.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,28 +9,28 @@
 module SolarWindsAPM
   # Constants
   module Constants
-    HTTP_METHOD                      = "http.method".freeze
-    HTTP_ROUTE                       = "http.route".freeze
-    HTTP_STATUS_CODE                 = "http.status_code".freeze
-    HTTP_URL                         = "http.url".freeze
-    INTL_SWO_AO_COLLECTOR            = "collector.appoptics.com".freeze
-    INTL_SWO_AO_STG_COLLECTOR        = "collector-stg.appoptics.com".freeze
-    INTL_SWO_COMMA                   = ",".freeze
-    INTL_SWO_COMMA_W3C_SANITIZED     = "....".freeze
-    INTL_SWO_EQUALS                  = "=".freeze
-    INTL_SWO_EQUALS_W3C_SANITIZED    = "####".freeze
-    INTL_SWO_TRACESTATE_KEY          = "sw".freeze
-    INTL_SWO_X_OPTIONS_KEY           = "sw_xtraceoptions".freeze
-    INTL_SWO_SIGNATURE_KEY           = "sw_signature".freeze
-    INTL_SWO_DEFAULT_TRACES_EXPORTER = "solarwinds_exporter".freeze
-    INTL_SWO_TRACECONTEXT_PROPAGATOR = "tracecontext".freeze
-    INTL_SWO_PROPAGATOR              = "solarwinds_propagator".freeze
-    INTL_SWO_DEFAULT_PROPAGATORS     = [INTL_SWO_TRACECONTEXT_PROPAGATOR, "baggage",INTL_SWO_PROPAGATOR].freeze
-    INTL_SWO_SUPPORT_EMAIL           = "SWO-support@solarwinds.com".freeze
-    INTL_SWO_OTEL_SCOPE_NAME         = "otel.scope.name".freeze
-    INTL_SWO_OTEL_SCOPE_VERSION      = "otel.scope.version".freeze
-    INTL_SWO_OTEL_STATUS             = "otel.status".freeze
-    INTL_SWO_OTEL_STATUS_DESCRIPTION = "otel.status_description".freeze
-    INTERNAL_TRIGGERED_TRACE         = "TriggeredTrace".freeze
+    HTTP_METHOD                      = 'http.method'
+    HTTP_ROUTE                       = 'http.route'
+    HTTP_STATUS_CODE                 = 'http.status_code'
+    HTTP_URL                         = 'http.url'
+    INTL_SWO_AO_COLLECTOR            = 'collector.appoptics.com'
+    INTL_SWO_AO_STG_COLLECTOR        = 'collector-stg.appoptics.com'
+    INTL_SWO_COMMA                   = ','
+    INTL_SWO_COMMA_W3C_SANITIZED     = '....'
+    INTL_SWO_EQUALS                  = '='
+    INTL_SWO_EQUALS_W3C_SANITIZED    = '####'
+    INTL_SWO_TRACESTATE_KEY          = 'sw'
+    INTL_SWO_X_OPTIONS_KEY           = 'sw_xtraceoptions'
+    INTL_SWO_SIGNATURE_KEY           = 'sw_signature'
+    INTL_SWO_DEFAULT_TRACES_EXPORTER = 'solarwinds_exporter'
+    INTL_SWO_TRACECONTEXT_PROPAGATOR = 'tracecontext'
+    INTL_SWO_PROPAGATOR              = 'solarwinds_propagator'
+    INTL_SWO_DEFAULT_PROPAGATORS     = [INTL_SWO_TRACECONTEXT_PROPAGATOR, 'baggage', INTL_SWO_PROPAGATOR].freeze
+    INTL_SWO_SUPPORT_EMAIL           = 'SWO-support@solarwinds.com'
+    INTL_SWO_OTEL_SCOPE_NAME         = 'otel.scope.name'
+    INTL_SWO_OTEL_SCOPE_VERSION      = 'otel.scope.version'
+    INTL_SWO_OTEL_STATUS             = 'otel.status'
+    INTL_SWO_OTEL_STATUS_DESCRIPTION = 'otel.status_description'
+    INTERNAL_TRIGGERED_TRACE         = 'TriggeredTrace'
   end
 end

data/lib/solarwinds_apm/logger.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/noop/api.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
@@ -9,7 +11,7 @@
 #
 module SolarWindsAPM
   # API
-  module API 
+  module API
   end
 end
 

data/lib/solarwinds_apm/noop/context.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/noop/metadata.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/noop/span.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/noop.rb

@@ -1,13 +1,15 @@
+# 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 './noop/context'
-require_relative './noop/metadata'
-require_relative './noop/span'
-require_relative './noop/api'
+require_relative 'noop/context'
+require_relative 'noop/metadata'
+require_relative 'noop/span'
+require_relative 'noop/api'
 
 module SolarWindsAPM
   include Oboe_metal
@@ -21,11 +23,11 @@ module SolarWindsAPM
     ##
     # noop version of :send_status
     #
-    def self.send_status(event, context=nil, with_system_timestamp: false); end
+    def self.send_status(event, context = nil, with_system_timestamp: false); end
 
     ##
     # noop version of :start
     #
     def self.start; end
   end
-end
+end

data/lib/solarwinds_apm/oboe_init_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,16 +9,18 @@
 require 'singleton'
 require 'uri'
 
-require_relative './support/service_key_checker'
+require_relative 'support/service_key_checker'
 
 module SolarWindsAPM
   # OboeInitOptions
   class OboeInitOptions
     include Singleton
 
-    attr_reader :reporter, :host, :service_name, :ec2_md_timeout, :grpc_proxy # exposing these mainly for testing
+    attr_reader :reporter, :host, :service_name, :ec2_md_timeout, :grpc_proxy, :lambda_env # exposing these mainly for testing
 
     def initialize
+      # determining the lambda env based on env var (not used in array_for_oboe for oboe initialization)
+      @lambda_env = determine_lambda
       # optional hostname alias
       @hostname_alias = ENV['SW_APM_HOSTNAME_ALIAS'] || SolarWindsAPM::Config[:hostname_alias] || ''
       # level at which log messages will be written to log file (0-6)
@@ -82,18 +86,18 @@ module SolarWindsAPM
         @reporter,               # 7
         @host,                   # 8
         @service_key,            # 9
-        @certificates,           #10
-        @buffer_size,            #11
-        @trace_metrics,          #12
-        @histogram_precision,    #13
-        @token_bucket_capacity,  #14
-        @token_bucket_rate,      #15
-        @file_single,            #16
-        @ec2_md_timeout,         #17
-        @grpc_proxy,             #18
-        0,                       #19 arg for lambda (no lambda for ruby yet)
-        @metric_format,          #20
-        @log_type                #21
+        @certificates,           # 10
+        @buffer_size,            # 11
+        @trace_metrics,          # 12
+        @histogram_precision,    # 13
+        @token_bucket_capacity,  # 14
+        @token_bucket_rate,      # 15
+        @file_single,            # 16
+        @ec2_md_timeout,         # 17
+        @grpc_proxy,             # 18
+        0,                       # 19 arg for lambda (no lambda for ruby yet)
+        @metric_format,          # 20
+        @log_type                # 21
       ]
     end
 
@@ -104,32 +108,23 @@ module SolarWindsAPM
     private
 
     def reporter_and_host
-
       reporter = ENV['SW_APM_REPORTER'] || 'ssl'
 
-      host = ''
-      case reporter
-      when 'ssl', 'file'
-        host = ENV['SW_APM_COLLECTOR'] || ''
-      when 'udp'
-        host = ENV['SW_APM_COLLECTOR'] || "#{SolarWindsAPM::Config[:reporter_host]}:#{SolarWindsAPM::Config[:reporter_port]}"
-        # TODO: decide what to do
-        # ____ SolarWindsAPM::Config[:reporter_host] and
-        # ____ SolarWindsAPM::Config[:reporter_port] were moved here from
-        # ____ oboe_metal.rb and are not documented anywhere
-        # ____ udp is for internal use only
-      when 'null'
-        host = ''
-      end
+      host = case reporter
+             when 'ssl', 'file'
+               ENV['SW_APM_COLLECTOR'] || ''
+             else
+               ''
+             end
 
       host = sanitize_collector_uri(host) unless reporter == 'file'
       [reporter, host]
     end
 
     def read_and_validate_service_key
-      service_key_checker = SolarWindsAPM::ServiceKeyChecker.new(@reporter)
+      service_key_checker = SolarWindsAPM::ServiceKeyChecker.new(@reporter, @lambda_env)
       service_key = service_key_checker.read_and_validate_service_key
-      @service_name = service_key.split(':',2).last # instance variable used in testing
+      @service_name = service_key.split(':', 2).last # instance variable used in testing
       service_key
     end
 
@@ -145,8 +140,8 @@ module SolarWindsAPM
       proxy = ENV['SW_APM_PROXY'] || SolarWindsAPM::Config[:http_proxy] || ''
       return proxy if proxy == ''
 
-      unless /http:\/\/.*:\d+$/.match?(proxy)
-        SolarWindsAPM.logger.error {"[#{self.class}/#{__method__}] SW_APM_PROXY/http_proxy doesn't start with 'http://', #{proxy}"}
+      unless %r{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
 
@@ -156,13 +151,15 @@ module SolarWindsAPM
     def read_certificates
       certificate = ''
 
-      file = appoptics_collector?? "#{__dir__}/cert/star.appoptics.com.issuer.crt" : ENV['SW_APM_TRUSTEDPATH']
+      file = appoptics_collector? ? "#{__dir__}/cert/star.appoptics.com.issuer.crt" : ENV.fetch('SW_APM_TRUSTEDPATH', nil)
       return certificate if file.nil? || file&.empty?
 
       begin
-        certificate = File.open(file,"r").read
+        certificate = File.read(file)
       rescue StandardError => e
-        SolarWindsAPM.logger.error {"[#{self.class}/#{__method__}] certificates: #{file} doesn't exist or caused by #{e.message}."}
+        SolarWindsAPM.logger.error do
+          "[#{self.class}/#{__method__}] certificates: #{file} doesn't exist or caused by #{e.message}."
+        end
       end
 
       certificate
@@ -176,7 +173,7 @@ module SolarWindsAPM
       allowed_uri = ['collector.appoptics.com', 'collector-stg.appoptics.com',
                      'collector.appoptics.com:443', 'collector-stg.appoptics.com:443']
 
-      (allowed_uri.include? ENV["SW_APM_COLLECTOR"])? true : false
+      (allowed_uri.include? ENV.fetch('SW_APM_COLLECTOR', nil))
     end
 
     def sanitize_collector_uri(uri)
@@ -186,9 +183,11 @@ module SolarWindsAPM
         sanitized_uri = ::URI.parse("http://#{uri}").host
         return sanitized_uri unless sanitized_uri.nil?
       rescue StandardError => e
-        SolarWindsAPM.logger.error {"[#{self.class}/#{__method__}] uri for collector #{uri} is malformat. Error: #{e.message}"}
+        SolarWindsAPM.logger.error do
+          "[#{self.class}/#{__method__}] uri for collector #{uri} is malformat. Error: #{e.message}"
+        end
       end
-      ""
+      ''
     end
 
     def determine_oboe_log_type
@@ -197,5 +196,14 @@ module SolarWindsAPM
       log_type = 4 if @debug_level == -1
       log_type
     end
+
+    def determine_lambda
+      if ENV['LAMBDA_TASK_ROOT'].to_s.empty? && ENV['AWS_LAMBDA_FUNCTION_NAME'].to_s.empty?
+        false
+      else
+        SolarWindsAPM.logger.debug { "[#{self.class}/#{__method__}] lambda environment - LAMBDA_TASK_ROOT: #{ENV.fetch('LAMBDA_TASK_ROOT', nil)}; AWS_LAMBDA_FUNCTION_NAME: #{ENV.fetch('AWS_LAMBDA_FUNCTION_NAME', nil)}" }
+        true
+      end
+    end
   end
 end