solarwinds_apm 6.0.0.prev6 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 512ec5ee7d54316580c83a629faccc98c8c435151f0dade34d102597ad700a9f
-  data.tar.gz: 7a6f84e7c04493d368a157ed098ae2ea67898c40d2eba23e6a2467d6de6faf18
+  metadata.gz: 0ad230df4c45bce0d25321678bc23a0a5fcfa62e98970e3d1ceda24430716314
+  data.tar.gz: bf4556eb3a109b25c8589bd7d4347e34f1475f1be6e86200af88ee604df3ffb0
 SHA512:
-  metadata.gz: 5fbd2c89241e02a6ab3e54bc430f92f98a5ac13ebf9f3cad135b045aea679a9f170ff0cbf5c3f6cf162f3fd90fdb2d6200e692be4259527cf06eea05904b91b4
-  data.tar.gz: e49ec590eb79e9d4c436f8341bffe16cb8d6fe07e77cb2939159da6b0b33222aed3d4d9bb8610cef55a59b572543c5d74eef2bef9179b2a5a65df258b2a0e8ca
+  metadata.gz: 8a7b0a9a5cfa5d0276c1fe5f3a52430380e3c4f2b9ecd8dc1426e29eda4aa7a98b245425dba6b574e9180c088e2dbff02239f66e802efd84938aa39502a418dc
+  data.tar.gz: b20dd4f228fe7ffbc8415c5f33cede6161232f928d99871023b1340a92ded360c5c776efff355a5e8323486227eb008616963d27492c5aeff315bd8aa4ad6dc3

data/ext/oboe_metal/extconf.rb

@@ -7,14 +7,14 @@ require 'mkmf'
 require 'rbconfig'
 require 'open-uri'
 
-CONFIG['warnflags'] = CONFIG['warnflags'].gsub(/-Wdeclaration-after-statement/, '')
-                                         .gsub(/-Wimplicit-function-declaration/, '')
-                                         .gsub(/-Wimplicit-int/, '')
-                                         .gsub(/-Wno-tautological-compare/, '')
-                                         .gsub(/-Wno-self-assign/, '')
-                                         .gsub(/-Wno-parentheses-equality/, '')
-                                         .gsub(/-Wno-constant-logical-operand/, '')
-                                         .gsub(/-Wno-cast-function-type/, '')
+CONFIG['warnflags'] = CONFIG['warnflags'].gsub('-Wdeclaration-after-statement', '')
+                                         .gsub('-Wimplicit-function-declaration', '')
+                                         .gsub('-Wimplicit-int', '')
+                                         .gsub('-Wno-tautological-compare', '')
+                                         .gsub('-Wno-self-assign', '')
+                                         .gsub('-Wno-parentheses-equality', '')
+                                         .gsub('-Wno-constant-logical-operand', '')
+                                         .gsub('-Wno-cast-function-type', '')
 init_mkmf(CONFIG)
 
 ext_dir = __dir__
@@ -27,7 +27,7 @@ swo_include = File.join(ext_dir, 'src')
 # Download the appropriate liboboe from Staging or Production
 version = File.read(File.join(swo_include, 'VERSION')).strip
 if ENV['OBOE_DEV'].to_s.casecmp('true').zero?
-  swo_path = "https://solarwinds-apm-staging.s3.us-west-2.amazonaws.com/apm/c-lib/nightly"
+  swo_path = 'https://solarwinds-apm-staging.s3.us-west-2.amazonaws.com/apm/c-lib/nightly'
   puts 'Fetching c-lib from DEVELOPMENT Build'
 elsif ENV['OBOE_STAGING'].to_s.casecmp('true').zero?
   swo_path = File.join('https://agent-binaries.global.st-ssp.solarwinds.com/apm/c-lib/', version)
@@ -42,7 +42,7 @@ system_arch.delete!("\n")
 case system_arch
 when 'x86_64'
   swo_arch = 'x86_64'
-when 'aarch64'
+when 'aarch64' || 'arm64'
   swo_arch = 'aarch64'
 end
 
@@ -59,13 +59,14 @@ if File.exist?('/etc/alpine-release')
 end
 
 swo_clib = "liboboe-1.0-#{swo_arch}.so"
+swo_clib = "liboboe-1.0-lambda-#{swo_arch}.so" if ENV['LAMBDA_TASK_ROOT'] || ENV['AWS_LAMBDA_FUNCTION_NAME']
 swo_item = File.join(swo_path, swo_clib)
 swo_checksum_file = File.join(swo_lib_dir, "#{swo_clib}.sha256")
 clib = File.join(swo_lib_dir, swo_clib)
 
 retries = 3
 success = false
-while retries > 0
+while retries.positive?
   begin
     IO.copy_stream(URI.parse(swo_item).open, clib)
     clib_checksum = Digest::SHA256.file(clib).hexdigest
@@ -73,29 +74,29 @@ while retries > 0
 
     # unfortunately these messages only show if the install command is run
     # with the `--verbose` flag
-    if clib_checksum != checksum
-      $stderr.puts '== ERROR ================================================================='
-      $stderr.puts 'Checksum Verification failed for the c-extension of the solarwinds_apm gem'
-      $stderr.puts 'Installation cannot continue'
-      $stderr.puts "\nChecksum packaged with gem:   #{checksum}"
-      $stderr.puts "Checksum calculated from lib: #{clib_checksum}"
-      $stderr.puts 'Contact technicalsupport@solarwinds.com if the problem persists'
-      $stderr.puts '=========================================================================='
-      exit 1
-    else
+    if clib_checksum == checksum
       success = true
       retries = 0
+    else
+      warn '== ERROR ================================================================='
+      warn 'Checksum Verification failed for the c-extension of the solarwinds_apm gem'
+      warn 'Installation cannot continue'
+      warn "\nChecksum packaged with gem:   #{checksum}"
+      warn "Checksum calculated from lib: #{clib_checksum}"
+      warn 'Contact technicalsupport@solarwinds.com if the problem persists'
+      warn '=========================================================================='
+      exit 1
     end
   rescue StandardError => e
     File.write(clib, '')
     retries -= 1
-    if retries == 0
-      $stderr.puts '== ERROR =========================================================='
-      $stderr.puts 'Download of the c-extension for the solarwinds_apm gem failed.'
-      $stderr.puts 'solarwinds_apm will not instrument the code. No tracing will occur.'
-      $stderr.puts 'Contact technicalsupport@solarwinds.com if the problem persists.'
-      $stderr.puts "error: #{swo_item}\n#{e.message}"
-      $stderr.puts '==================================================================='
+    if retries.zero?
+      warn '== ERROR =========================================================='
+      warn 'Download of the c-extension for the solarwinds_apm gem failed.'
+      warn 'solarwinds_apm will not instrument the code. No tracing will occur.'
+      warn 'Contact technicalsupport@solarwinds.com if the problem persists.'
+      warn "error: #{swo_item}\n#{e.message}"
+      warn '==================================================================='
       create_makefile('oboe_noop', 'noop')
     end
     sleep 0.5
@@ -116,35 +117,35 @@ if success
     $libs = append_library($libs, 'oboe')
     $libs = append_library($libs, 'stdc++')
 
-    $CFLAGS << " #{ENV['CFLAGS']}"
+    $CFLAGS << " #{ENV.fetch('CFLAGS', nil)}"
     # $CPPFLAGS << " #{ENV['CPPFLAGS']} -std=c++11"
     # TODO for debugging: -pg -gdwarf-2, remove for production
     # -pg does not work on alpine https://www.openwall.com/lists/musl/2014/11/05/2
-    $CPPFLAGS << " #{ENV['CPPFLAGS']} -std=c++11  -gdwarf-2 -I$$ORIGIN/../ext/oboe_metal/include -I$$ORIGIN/../ext/oboe_metal/src"
+    $CPPFLAGS << " #{ENV.fetch('CPPFLAGS', nil)} -std=c++11  -gdwarf-2 -I$$ORIGIN/../ext/oboe_metal/include -I$$ORIGIN/../ext/oboe_metal/src"
     # $CPPFLAGS << " #{ENV['CPPFLAGS']} -std=c++11 -I$$ORIGIN/../ext/oboe_metal/include"
-    $LIBS << " #{ENV['LIBS']}"
+    $LIBS << " #{ENV.fetch('LIBS', nil)}"
 
     # use "z,defs" to see what happens during linking
     # $LDFLAGS << " #{ENV['LDFLAGS']} '-Wl,-rpath=$$ORIGIN/../ext/oboe_metal/lib,-z,defs'  -lrt"
-    $LDFLAGS << " #{ENV['LDFLAGS']} '-Wl,-rpath=$$ORIGIN/../ext/oboe_metal/lib' -lrt"
-    $CXXFLAGS += " -std=c++11 "
+    $LDFLAGS << " #{ENV.fetch('LDFLAGS', nil)} '-Wl,-rpath=$$ORIGIN/../ext/oboe_metal/lib' -lrt"
+    $CXXFLAGS += ' -std=c++11 '
 
     # ____ include debug info, comment out when not debugging
     # ____ -pg -> profiling info for gprof
-    CONFIG["debugflags"] = "-ggdb3 "
-    CONFIG["optflags"] = "-O0"
+    CONFIG['debugflags'] = '-ggdb3 '
+    CONFIG['optflags'] = '-O0'
 
     create_makefile('libsolarwinds_apm', 'src')
   else
-    $stderr.puts '== ERROR ========================================================='
+    warn '== ERROR ========================================================='
     if have_library('oboe')
-      $stderr.puts "The c-library either needs to be updated or doesn't match the OS."
-      $stderr.puts 'No tracing will occur.'
+      warn "The c-library either needs to be updated or doesn't match the OS."
+      warn 'No tracing will occur.'
     else
-      $stderr.puts 'Could not find a matching c-library. No tracing will occur.'
+      warn 'Could not find a matching c-library. No tracing will occur.'
     end
-    $stderr.puts 'Contact technicalsupport@solarwinds.com if the problem persists.'
-    $stderr.puts '=================================================================='
+    warn 'Contact technicalsupport@solarwinds.com if the problem persists.'
+    warn '=================================================================='
     create_makefile('oboe_noop', 'noop')
   end
-end
+end

data/ext/oboe_metal/lib/liboboe-1.0-aarch64.so.sha256

@@ -1 +1 @@
-b3a0b342e5d59ea95b457bcc647b9a2e202d623d5c17a109df2719a5d61815d2
+bcf8ad33da8e896e946e376f9e7d75a584bb98a3a4b41e89e231783f97a1380f

data/ext/oboe_metal/lib/liboboe-1.0-alpine-aarch64.so.sha256

@@ -1 +1 @@
-5f98ddec2afd1992080d4e751b583a075e1a91b95ca3a5e5d7db49978225c8bd
+0cf5329232ec370db869fa207c2a27813d970199f3f319828155481718e2ab01

data/ext/oboe_metal/lib/liboboe-1.0-alpine-x86_64.so.sha256

@@ -1 +1 @@
-5227b6cc86a1d60c479f9e2021200b09e3ba70f47a563788c857f51747dbebe8
+dd02f77cf106ed0f61a333ede73864db61d6c4c11b474a0db82c83d3ea6c7199

data/ext/oboe_metal/lib/liboboe-1.0-lambda-aarch64.so.sha256

@@ -0,0 +1 @@
+ff5cdc5a3da9a7585fd95bc806ac465993b97981832d8dc768d362e0ff1a3221

data/ext/oboe_metal/lib/liboboe-1.0-lambda-x86_64.so.sha256

@@ -0,0 +1 @@
+6caa7a24c9d3377f08b93ef6eb8191e2addb1f880ad4759fbafdf4e88b6620ce

data/ext/oboe_metal/lib/liboboe-1.0-x86_64.so.sha256

@@ -1 +1 @@
-22d5c810eaf9b663b46ae67586059edf18e7e1e3beab89f079d2b86353ef55d9
+8a35ff7ae2feb1ca630b15453143f3d440f91aeb1a7cc7b595d0039600fe297f

data/ext/oboe_metal/src/VERSION

@@ -1 +1 @@
-14.0.1
+15.0.1

data/ext/oboe_metal/src/oboe.h

@@ -919,6 +919,9 @@ bool oboe_consume_triggered_trace_count(unsigned int* value);
 bool oboe_get_last_used_sample_rate(unsigned int* value);
 bool oboe_get_last_used_sample_source(unsigned int* value);
 
+void oboe_metrics_attributes_upsert(const char* key, const char* value);
+bool oboe_metrics_attributes_remove(const char* key);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif

data/ext/oboe_metal/src/oboe_api.cpp

@@ -772,7 +772,7 @@ bool OboeAPI::consumeTokenBucketExhaustionCount(unsigned int& counter) {
     return oboe_consume_token_bucket_exhaustion_count(&counter);
 }
 bool OboeAPI::consumeTraceCount(unsigned int& counter) {
-    return oboe_consume_through_trace_count(&counter);
+    return oboe_consume_trace_count(&counter);
 }
 bool OboeAPI::consumeSampleCount(unsigned int& counter) {
     return oboe_consume_sample_count(&counter);

data/lib/oboe_metal.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,23 @@
 # Disable docs and Camelcase warns since we're implementing
 # an interface here.  See OboeBase for details.
 module SolarWindsAPM
-  extend SolarWindsAPMBase
   include Oboe_metal
 
+  @loaded    = false
+  @reporter  = nil
+  @oboe_api  = nil
+
+  class << self
+    attr_accessor :reporter, :loaded, :oboe_api
+
+    def sample_rate(rate)
+      return unless SolarWindsAPM.loaded
+
+      # Update liboboe with the new SampleRate value
+      SolarWindsAPM::Context.setDefaultSampleRate(rate.to_i)
+    end
+  end
+
   # Reporter that send span data to SWO
   class Reporter
     class << self
@@ -19,21 +35,15 @@ module SolarWindsAPM
       # Start the SolarWindsAPM Reporter
       #
       def start
-        SolarWindsAPM.loaded = false unless SolarWindsAPM::OboeInitOptions.instance.service_key_ok?
-        return unless SolarWindsAPM.loaded
-
-        begin
-          options = SolarWindsAPM::OboeInitOptions.instance.array_for_oboe # creates an array with the options in the right order
-
-          SolarWindsAPM.reporter = Oboe_metal::Reporter.new(*options)
-
-          report_init
-        rescue StandardError=> e
-          $stderr.puts e.message
-          raise
-        end
+        options = SolarWindsAPM::OboeInitOptions.instance.array_for_oboe # creates an array with the options in the right order
+        SolarWindsAPM.reporter = Oboe_metal::Reporter.new(*options)
+        report_init
+        SolarWindsAPM.loaded = true
+      rescue StandardError => e
+        warn e.message
+        SolarWindsAPM.loaded = false
       end
-      alias :restart :start
+      alias restart start
 
       ##
       # sendReport
@@ -49,63 +59,17 @@ module SolarWindsAPM
       #
       # Send the report for the given event
       #
-      def send_status(evt, context=nil, with_system_timestamp: true)
+      def send_status(evt, context = nil, with_system_timestamp: true)
         SolarWindsAPM.reporter.sendStatus(evt, context, with_system_timestamp)
       end
 
-      ##
-      # clear_all_traces
-      #
-      # Truncates the trace output file to zero
-      #
-      def clear_all_traces
-        File.truncate(SolarWindsAPM::OboeInitOptions.instance.host, 0)
-      end
-
-      ##
-      # obtain_all_traces
-      #
-      # Retrieves all traces written to the trace file
-      #
-      def obtain_all_traces
-        io = File.open(SolarWindsAPM::OboeInitOptions.instance.host, 'r')
-        contents = io.readlines(nil)
-        io.close
-
-        return contents if contents.empty?
-
-        traces = []
-
-        # We use Gem.loaded_spec because older versions of the bson
-        # gem didn't even have a version embedded in the gem.  If the
-        # gem isn't in the bundle, it should rightfully error out
-        # anyways.
-        #
-        if Gem.loaded_specs['bson'] && Gem.loaded_specs['bson'].version.to_s < '4.0'
-          s = StringIO.new(contents[0])
-
-          until s.eof?
-            traces << if ::BSON.respond_to? :read_bson_document
-                        BSON.read_bson_document(s)
-                      else
-                        BSON::Document.from_bson(s)
-                      end
-          end
-        else
-          bbb = ::BSON::ByteBuffer.new(contents[0])
-          traces << Hash.from_bson(bbb) until bbb.length == 0
-        end
-
-        traces
-      end
-
       private
 
       # Internal: Report that instrumentation for the given layer has been
       # installed, as well as the version of instrumentation and version of
       # layer.
       #
-      def report_init(layer=:rack) # :nodoc:
+      def report_init(layer = :rack) # :nodoc:
         # Don't send __Init in test or if SolarWindsAPM
         # isn't fully loaded (e.g. missing c-extension)
         return unless SolarWindsAPM.loaded
@@ -122,7 +86,7 @@ module SolarWindsAPM
       #
       # * +layer+ - The layer the reported event belongs to
       # * +kvs+ - A hash containing key/value pairs that will be reported along with this event
-      def log_init(layer=:rack, kvs={})
+      def log_init(layer = :rack, kvs = {})
         context = SolarWindsAPM::Metadata.makeRandom
         return SolarWindsAPM::Context.toString unless context.isValid
 
@@ -145,15 +109,15 @@ module SolarWindsAPM
       # and for SolarWindsAPM.support_report.
       #
       def build_swo_init_report
-
-        platform_info = {'__Init' => true}
+        platform_info = { '__Init' => true }
 
         begin
           platform_info['APM.Version']             = SolarWindsAPM::Version::STRING
           platform_info['APM.Extension.Version']   = extension_lib_version
 
           # OTel Resource Attributes (Optional)
-          platform_info['process.executable.path'] = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']).sub(/.*\s.*/m, '"\&"')
+          platform_info['process.executable.path'] =
+            File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']).sub(/.*\s.*/m, '"\&"')
           platform_info['process.executable.name'] = RbConfig::CONFIG['ruby_install_name']
           platform_info['process.command_line']    = $PROGRAM_NAME
           platform_info['process.telemetry.path']  = Gem::Specification.find_by_name('solarwinds_apm')&.full_gem_path
@@ -164,10 +128,14 @@ module SolarWindsAPM
           # Collect up opentelemetry sdk version (Instrumented Library Versions) (Required)
           begin
             require 'opentelemetry/sdk'
-            ::OpenTelemetry::SDK::Resources::Resource.telemetry_sdk.attribute_enumerator.each {|k,v| platform_info[k] = v}
-            ::OpenTelemetry::SDK::Resources::Resource.process.attribute_enumerator.each {|k,v| platform_info[k] = v}
+            ::OpenTelemetry::SDK::Resources::Resource.telemetry_sdk.attribute_enumerator.each do |k, v|
+              platform_info[k] = v
+            end
+            ::OpenTelemetry::SDK::Resources::Resource.process.attribute_enumerator.each { |k, v| platform_info[k] = v }
           rescue StandardError => e
-            SolarWindsAPM.logger.warn {"[#{self.class}/#{__method__}] Fail to extract telemetry attributes. Error: #{e.message}"}
+            SolarWindsAPM.logger.warn do
+              "[#{self.class}/#{__method__}] Fail to extract telemetry attributes. Error: #{e.message}"
+            end
           end
         rescue StandardError, ScriptError => e
           # Also rescue ScriptError (aka SyntaxError) in case one of the expected
@@ -175,8 +143,8 @@ module SolarWindsAPM
 
           platform_info['Error'] = "Error in build_report: #{e.message}"
 
-          SolarWindsAPM.logger.warn {"[#{self.class}/#{__method__}] Error in build_init_report: #{e.message}"}
-          SolarWindsAPM.logger.debug {e.backtrace}
+          SolarWindsAPM.logger.warn { "[#{self.class}/#{__method__}] Error in build_init_report: #{e.message}" }
+          SolarWindsAPM.logger.debug { e.backtrace }
         end
         platform_info
       end
@@ -187,7 +155,7 @@ module SolarWindsAPM
       def report_gem_in_use
         platform_info = {}
         if defined?(Gem) && Gem.respond_to?(:loaded_specs)
-          Gem.loaded_specs.each_pair {|k, v| platform_info["Ruby.#{k}.Version"] = v.version.to_s}
+          Gem.loaded_specs.each_pair { |k, v| platform_info["Ruby.#{k}.Version"] = v.version.to_s }
         else
           platform_info.merge!(legacy_build_init_report)
         end
@@ -205,16 +173,10 @@ module SolarWindsAPM
       end
     end
   end
-
-  class << self
-    def sample_rate(rate)
-      return unless SolarWindsAPM.loaded
-
-      # Update liboboe with the new SampleRate value
-      SolarWindsAPM::Context.setDefaultSampleRate(rate.to_i)
-    end
-  end
 end
 
-SolarWindsAPM.loaded = true
-# rubocop:enable Style/Documentation
+# Setup an alias
+SolarWindsApm = SolarWindsAPM
+SolarwindsApm = SolarWindsAPM
+SolarwindsAPM = SolarWindsAPM
+Solarwindsapm = SolarWindsAPM

data/lib/rails/generators/solarwinds_apm/install_generator.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,39 +10,39 @@ module SolarWindsAPM
   # InstallGenerator
   class InstallGenerator < ::Rails::Generators::Base
     source_root File.join(File.dirname(__FILE__), 'templates')
-    desc "Copies a SolarWindsAPM gem initializer file to your application."
+    desc 'Copies a SolarWindsAPM gem initializer file to your application.'
 
-    @namespace = "solarwinds_apm:install"
+    @namespace = 'solarwinds_apm:install'
 
     def copy_initializer
       print_header
       print_footer
 
-      template "solarwinds_apm_initializer.rb", "config/initializers/solarwinds_apm.rb"
+      template 'solarwinds_apm_initializer.rb', 'config/initializers/solarwinds_apm.rb'
     end
 
     private
 
     def print_header
-      say ""
-      say shell.set_color "Welcome to the SolarWindsAPM Ruby instrumentation setup.", :green, :bold
-      say ""
-      say shell.set_color "Documentation Links", :magenta
-      say "-------------------"
-      say ""
-      say "SolarWindsAPM Installation Overview:"
-      say "https://documentation.solarwinds.com/en/success_center/observability"
-      say ""
-      say "More information on instrumenting Ruby applications can be found here:"
-      say "https://documentation.solarwinds.com/en/success_center/observability/default.htm#cshid=config-ruby-agent"
+      say ''
+      say shell.set_color 'Welcome to the SolarWindsAPM Ruby instrumentation setup.', :green, :bold
+      say ''
+      say shell.set_color 'Documentation Links', :magenta
+      say '-------------------'
+      say ''
+      say 'SolarWindsAPM Installation Overview:'
+      say 'https://documentation.solarwinds.com/en/success_center/observability'
+      say ''
+      say 'More information on instrumenting Ruby applications can be found here:'
+      say 'https://documentation.solarwinds.com/en/success_center/observability/default.htm#cshid=config-ruby-agent'
     end
 
     def print_footer
-      say ""
-      say "You can change configuration values in the future by modifying config/initializers/solarwinds_apm.rb"
-      say ""
-      say "Thanks! Creating the SolarWindsAPM initializer..."
-      say ""
+      say ''
+      say 'You can change configuration values in the future by modifying config/initializers/solarwinds_apm.rb'
+      say ''
+      say 'Thanks! Creating the SolarWindsAPM initializer...'
+      say ''
     end
   end
 end

data/lib/solarwinds_apm/api/current_trace_info.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
@@ -13,8 +15,8 @@ module SolarWindsAPM
       # {TraceInfo#trace_flags}<br>
       # {TraceInfo#for_log}<br>
       # {TraceInfo#hash_for_log}
-      # 
-      # The <tt>SolarWindsAPM::Config[:log_traceId]</tt> configuration setting for automatic trace context in logs affects the 
+      #
+      # The <tt>SolarWindsAPM::Config[:log_traceId]</tt> configuration setting for automatic trace context in logs affects the
       # return value of methods in this module.
       #
       # The following options are available:<br>
@@ -51,18 +53,18 @@ module SolarWindsAPM
       class TraceInfo
         attr_reader :tracestring, :trace_id, :span_id, :trace_flags, :do_log
 
-        REGEXP = /^(?<tracestring>(?<version>[a-f0-9]{2})-(?<trace_id>[a-f0-9]{32})-(?<span_id>[a-f0-9]{16})-(?<flags>[a-f0-9]{2}))$/.freeze # rubocop:disable Style/RedundantFreeze
+        REGEXP = /^(?<tracestring>(?<version>[a-f0-9]{2})-(?<trace_id>[a-f0-9]{32})-(?<span_id>[a-f0-9]{16})-(?<flags>[a-f0-9]{2}))$/
         private_constant :REGEXP
 
         def initialize
           @trace_id, @span_id, @trace_flags, @tracestring = current_span
-          @service_name = ENV['OTEL_SERVICE_NAME']
+          @service_name = ENV.fetch('OTEL_SERVICE_NAME', nil)
           @do_log = log? # true if the tracecontext should be added to logs
         end
 
         # for_log returns a string in the format
         # 'trace_id=<trace_id> span_id=<span_id> trace_flags=<trace_flags>' or empty string.
-        # 
+        #
         # An empty string is returned depending on the setting for
         # <tt>SolarWindsAPM::Config[:log_traceId]</tt>, which can be :never,
         # :sampled, :traced, or :always.
@@ -88,7 +90,7 @@ module SolarWindsAPM
         #                            span_id: '49e60702469db05f',
         #                            trace_flags: 01,
         #                            resource.service.name: 'otel_service_name' }  or {} depends on Config
-        #   
+        #
         #   # For lograge:
         #   Lograge.custom_options = lambda do |event|
         #     SolarWindsAPM::API.current_trace_info.hash_for_log
@@ -98,7 +100,12 @@ module SolarWindsAPM
         # * Hash
         #
         def hash_for_log
-          @hash_for_log = @do_log ? {'trace_id' => @trace_id, 'span_id' => @span_id, 'trace_flags' => @trace_flags, 'resource.service.name' => @service_name} : {}
+          @hash_for_log = if @do_log
+                            { 'trace_id' => @trace_id, 'span_id' => @span_id, 'trace_flags' => @trace_flags,
+                              'resource.service.name' => @service_name }
+                          else
+                            {}
+                          end
         end
 
         private
@@ -107,7 +114,7 @@ module SolarWindsAPM
           span     = ::OpenTelemetry::Trace.current_span if defined?(::OpenTelemetry::Trace)
           trace_id = span.context.hex_trace_id
           span_id  = span.context.hex_span_id
-          trace_flags = span.context.trace_flags.sampled?? '01' : '00'
+          trace_flags = span.context.trace_flags.sampled? ? '01' : '00'
           tracestring = "00-#{trace_id}-#{span_id}-#{trace_flags}"
           [trace_id, span_id, trace_flags, tracestring]
         end
@@ -130,7 +137,7 @@ module SolarWindsAPM
         def valid?(tracestring)
           matches = REGEXP.match(tracestring)
 
-          matches && matches[:trace_id] != ("0" * 32)
+          matches && matches[:trace_id] != ('0' * 32)
         end
 
         def sampled?(tracestring)

data/lib/solarwinds_apm/api/custom_metrics.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
@@ -30,12 +32,12 @@ module SolarWindsAPM
       # === Returns:
       # * Boolean
       #
-      def increment_metric(name, count=1, with_hostname=false, tags_kvs={}) # rubocop:disable Style/OptionalBooleanParameter
+      def increment_metric(name, count = 1, with_hostname = false, tags_kvs = {}) # rubocop:disable Style/OptionalBooleanParameter
         return true unless SolarWindsAPM.loaded
 
         with_hostname = with_hostname ? 1 : 0
         tags, tags_count = make_tags(tags_kvs)
-        SolarWindsAPM::CustomMetrics.increment(name.to_s, count, with_hostname, nil, tags, tags_count) == 0
+        SolarWindsAPM::CustomMetrics.increment(name.to_s, count, with_hostname, nil, tags, tags_count).zero?
       end
 
       # Send values with counts
@@ -64,12 +66,12 @@ module SolarWindsAPM
       # === Returns:
       # * Boolean
       #
-      def summary_metric(name, value, count=1, with_hostname=false, tags_kvs={}) # rubocop:disable Style/OptionalBooleanParameter
+      def summary_metric(name, value, count = 1, with_hostname = false, tags_kvs = {}) # rubocop:disable Style/OptionalBooleanParameter
         return true unless SolarWindsAPM.loaded
 
         with_hostname = with_hostname ? 1 : 0
         tags, tags_count = make_tags(tags_kvs)
-        SolarWindsAPM::CustomMetrics.summary(name.to_s, value, count, with_hostname, nil, tags, tags_count) == 0
+        SolarWindsAPM::CustomMetrics.summary(name.to_s, value, count, with_hostname, nil, tags, tags_count).zero?
       end
 
       private

data/lib/solarwinds_apm/api/opentelemetry.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
@@ -26,20 +28,22 @@ module SolarWindsAPM
       #     req = Net::HTTP::Get.new(url.to_s)
       #     res = Net::HTTP.start(url.host, url.port) {|http| http.request(req)}
       #   end
-      # 
+      #
       # === Returns:
-      # * Objective
+      # * value returned by block
       #
       def in_span(name, attributes: nil, links: nil, start_timestamp: nil, kind: nil, &block)
         if block.nil?
-          SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] please provide block when using in_span function"}
+          SolarWindsAPM.logger.warn { "[#{name}/#{__method__}] please provide block when using in_span function" }
           return
         end
 
-        SolarWindsAPM.logger.debug {"[#{name}/#{__method__}] solarwinds_apm in_span with OTEL_SERVICE_NAME #{ENV['OTEL_SERVICE_NAME']}"}
-        current_tracer = ::OpenTelemetry.tracer_provider.tracer(ENV['OTEL_SERVICE_NAME'])
+        SolarWindsAPM.logger.debug do
+          "[#{name}/#{__method__}] solarwinds_apm in_span with OTEL_SERVICE_NAME #{ENV.fetch('OTEL_SERVICE_NAME', nil)}"
+        end
+        current_tracer = ::OpenTelemetry.tracer_provider.tracer(ENV.fetch('OTEL_SERVICE_NAME', nil))
         current_tracer.in_span(name, attributes: attributes, links: links, start_timestamp: start_timestamp, kind: kind, &block)
       end
     end
   end
-end
+end