solarwinds_apm 5.1.9 → 6.0.0.preV2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e79b789228d9d0885289c825d1ae712bab1d9450334f6b27fd72e19763b436a
-  data.tar.gz: 62ec2e7f017cfa2824d269d7db3a3330d9c5c5555424552f8c289f1401caa60d
+  metadata.gz: 4f218890396745c5ba75f0819fa07e3717014fe7aa4072136cf62c23bcbadf34
+  data.tar.gz: b02cde4d6b896bc60da7fe2c1ab67fd01500a97073d6b67cae497eca70773fa7
 SHA512:
-  metadata.gz: 210f5a2c53d302666b12a3afff04481bf3ea094f509b6275aedf5825cdce721d45dcd5dfd170b2c1ab484ef01c9e5bc098235213a066d0cb860caa99c9fbf00b
-  data.tar.gz: 49280e85e07e7523c67b0bb848d71c9160c01c4861fffcccd526af7be436ca709fb31e9995f5326cf497ceffa1622244fc98ba5bba1c601fcf2e5687a49b7d01
+  metadata.gz: f699da24367449958aaff9900c3a0e6ef312917a98df5eda9fd7694a7ccf0f4b27a4f9ff02c3b855d89f2360215b6b0e0b3cfcb541f3b34cc05f7c6de468520f
+  data.tar.gz: 65b88f0502aadd4e1e0fda69e39c73350efc100c5a64d226ccd474aa11409af8fd40a5ee1f5735516a2fd7ac5fc20fb16e5f8140c2550029bf8fafdd049d0002

data/LICENSE

@@ -1,18 +1,18 @@
-
-                                 Apache License
+ 
+                                Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
-
+ 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
+ 
    1. Definitions.
-
+ 
       "License" shall mean the terms and conditions for use, reproduction,
       and distribution as defined by Sections 1 through 9 of this document.
-
+ 
       "Licensor" shall mean the copyright owner or entity authorized by
       the copyright owner that is granting the License.
-
+ 
       "Legal Entity" shall mean the union of the acting entity and all
       other entities that control, are controlled by, or are under common
       control with that entity. For the purposes of this definition,
@@ -20,24 +20,24 @@
       direction or management of such entity, whether by contract or
       otherwise, or (ii) ownership of fifty percent (50%) or more of the
       outstanding shares, or (iii) beneficial ownership of such entity.
-
+ 
       "You" (or "Your") shall mean an individual or Legal Entity
       exercising permissions granted by this License.
-
+ 
       "Source" form shall mean the preferred form for making modifications,
       including but not limited to software source code, documentation
       source, and configuration files.
-
+ 
       "Object" form shall mean any form resulting from mechanical
       transformation or translation of a Source form, including but
       not limited to compiled object code, generated documentation,
       and conversions to other media types.
-
+ 
       "Work" shall mean the work of authorship, whether in Source or
       Object form, made available under the License, as indicated by a
       copyright notice that is included in or attached to the work
       (an example is provided in the Appendix below).
-
+ 
       "Derivative Works" shall mean any work, whether in Source or Object
       form, that is based on (or derived from) the Work and for which the
       editorial revisions, annotations, elaborations, or other modifications
@@ -45,7 +45,7 @@
       of this License, Derivative Works shall not include works that remain
       separable from, or merely link (or bind by name) to the interfaces of,
       the Work and Derivative Works thereof.
-
+ 
       "Contribution" shall mean any work of authorship, including
       the original version of the Work and any modifications or additions
       to that Work or Derivative Works thereof, that is intentionally
@@ -59,18 +59,18 @@
       Licensor for the purpose of discussing and improving the Work, but
       excluding communication that is conspicuously marked or otherwise
       designated in writing by the copyright owner as "Not a Contribution."
-
+ 
       "Contributor" shall mean Licensor and any individual or Legal Entity
       on behalf of whom a Contribution has been received by Licensor and
       subsequently incorporated within the Work.
-
+ 
    2. Grant of Copyright License. Subject to the terms and conditions of
       this License, each Contributor hereby grants to You a perpetual,
       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
       copyright license to reproduce, prepare Derivative Works of,
       publicly display, publicly perform, sublicense, and distribute the
       Work and such Derivative Works in Source or Object form.
-
+ 
    3. Grant of Patent License. Subject to the terms and conditions of
       this License, each Contributor hereby grants to You a perpetual,
       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
@@ -86,24 +86,24 @@
       or contributory patent infringement, then any patent licenses
       granted to You under this License for that Work shall terminate
       as of the date such litigation is filed.
-
+ 
    4. Redistribution. You may reproduce and distribute copies of the
       Work or Derivative Works thereof in any medium, with or without
       modifications, and in Source or Object form, provided that You
       meet the following conditions:
-
+ 
       (a) You must give any other recipients of the Work or
           Derivative Works a copy of this License; and
-
+ 
       (b) You must cause any modified files to carry prominent notices
           stating that You changed the files; and
-
+ 
       (c) You must retain, in the Source form of any Derivative Works
           that You distribute, all copyright, patent, trademark, and
           attribution notices from the Source form of the Work,
           excluding those notices that do not pertain to any part of
           the Derivative Works; and
-
+ 
       (d) If the Work includes a "NOTICE" text file as part of its
           distribution, then any Derivative Works that You distribute must
           include a readable copy of the attribution notices contained
@@ -120,14 +120,14 @@
           or as an addendum to the NOTICE text from the Work, provided
           that such additional attribution notices cannot be construed
           as modifying the License.
-
+ 
       You may add Your own copyright statement to Your modifications and
       may provide additional or different license terms and conditions
       for use, reproduction, or distribution of Your modifications, or
       for any such Derivative Works as a whole, provided Your use,
       reproduction, and distribution of the Work otherwise complies with
       the conditions stated in this License.
-
+ 
    5. Submission of Contributions. Unless You explicitly state otherwise,
       any Contribution intentionally submitted for inclusion in the Work
       by You to the Licensor shall be under the terms and conditions of
@@ -135,12 +135,12 @@
       Notwithstanding the above, nothing herein shall supersede or modify
       the terms of any separate license agreement you may have executed
       with Licensor regarding such Contributions.
-
+ 
    6. Trademarks. This License does not grant permission to use the trade
       names, trademarks, service marks, or product names of the Licensor,
       except as required for reasonable and customary use in describing the
       origin of the Work and reproducing the content of the NOTICE file.
-
+ 
    7. Disclaimer of Warranty. Unless required by applicable law or
       agreed to in writing, Licensor provides the Work (and each
       Contributor provides its Contributions) on an "AS IS" BASIS,
@@ -150,7 +150,7 @@
       PARTICULAR PURPOSE. You are solely responsible for determining the
       appropriateness of using or redistributing the Work and assume any
       risks associated with Your exercise of permissions under this License.
-
+ 
    8. Limitation of Liability. In no event and under no legal theory,
       whether in tort (including negligence), contract, or otherwise,
       unless required by applicable law (such as deliberate and grossly
@@ -162,7 +162,7 @@
       work stoppage, computer failure or malfunction, or any and all
       other commercial damages or losses), even if such Contributor
       has been advised of the possibility of such damages.
-
+ 
    9. Accepting Warranty or Additional Liability. While redistributing
       the Work or Derivative Works thereof, You may choose to offer,
       and charge a fee for, acceptance of support, warranty, indemnity,
@@ -172,31 +172,4 @@
       of any other Contributor, and only if You agree to indemnify,
       defend, and hold each Contributor harmless for any liability
       incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
+      of your accepting any such warranty or additional liability.

data/ext/oboe_metal/extconf.rb

@@ -6,73 +6,69 @@
 require 'mkmf'
 require 'rbconfig'
 require 'open-uri'
-require 'no_proxy_fix'
 
 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/, '')
+                                         .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 = File.expand_path(File.dirname(__FILE__))
+ext_dir = __dir__
 
 # Set the mkmf lib paths so we have no issues linking to
 # the SolarWindsAPM libs.
-ao_lib_dir = File.join(ext_dir, 'lib')
-ao_include = File.join(ext_dir, 'src')
+swo_lib_dir = File.join(ext_dir, 'lib')
+swo_include = File.join(ext_dir, 'src')
 
 # Download the appropriate liboboe from Staging or Production
-version = File.read(File.join(ao_include, 'VERSION')).strip
+version = File.read(File.join(swo_include, 'VERSION')).strip
 if ENV['OBOE_DEV'].to_s.downcase == 'true'
-  ao_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.downcase == 'true'
-  ao_path = File.join('https://agent-binaries.global.st-ssp.solarwinds.com/apm/c-lib/', version)
+  swo_path = File.join('https://agent-binaries.global.st-ssp.solarwinds.com/apm/c-lib/', version)
   puts 'Fetching c-lib from STAGING'
 else
-  ao_path = File.join('https://agent-binaries.cloud.solarwinds.com/apm/c-lib/', version)
+  swo_path = File.join('https://agent-binaries.cloud.solarwinds.com/apm/c-lib/', version)
 end
 
-ao_arch = "x86_64"
+swo_arch = 'x86_64'
 system_arch = `uname -m` # for mac, the command is `uname` # "Darwin\n"; try `uname -a`
 case system_arch.gsub("\n","")
-when "x86_64"
-  ao_arch = "x86_64"
-when "aarch64"
-  ao_arch = "aarch64"
+when 'x86_64'
+  swo_arch = 'x86_64'
+when 'aarch64'
+  swo_arch = 'aarch64'
 end
 
 if File.exist?('/etc/alpine-release')
   version = File.read('/etc/alpine-release').strip
 
-  tmp_ao_arch = ao_arch.clone
-  ao_arch =
+  tmp_swo_arch = swo_arch.clone
+  swo_arch =
     if Gem::Version.new(version) < Gem::Version.new('3.9')
-      "alpine-libressl-#{tmp_ao_arch}"
+      "alpine-libressl-#{tmp_swo_arch}"
     else # openssl
-      "alpine-#{tmp_ao_arch}"
+      "alpine-#{tmp_swo_arch}"
     end
 end
 
-ao_clib = "liboboe-1.0-#{ao_arch}.so"
-ao_item = File.join(ao_path, ao_clib)
-ao_checksum_file = File.join(ao_lib_dir, "#{ao_clib}.sha256")
-clib = File.join(ao_lib_dir, ao_clib)
+swo_clib = "liboboe-1.0-#{swo_arch}.so"
+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
   begin
-    download = URI.open(ao_item, 'rb')
-    IO.copy_stream(download, clib)
-
+    IO.copy_stream(URI.parse(swo_item).open, clib)
     clib_checksum = Digest::SHA256.file(clib).hexdigest
-    download.close
-    checksum =  File.read(ao_checksum_file).strip
+    checksum      =  File.read(swo_checksum_file).strip
 
     # unfortunately these messages only show if the install command is run
     # with the `--verbose` flag
@@ -89,7 +85,7 @@ while retries > 0
       success = true
       retries = 0
     end
-  rescue => e
+  rescue StandardError => e
     File.write(clib, '')
     retries -= 1
     if retries == 0
@@ -97,7 +93,7 @@ while retries > 0
       $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: #{ao_item}\n#{e.message}"
+      $stderr.puts "error: #{swo_item}\n#{e.message}"
       $stderr.puts '==================================================================='
       create_makefile('oboe_noop', 'noop')
     end
@@ -107,9 +103,9 @@ end
 
 if success
   # Create relative symlinks for the SolarWindsAPM library
-  Dir.chdir(ao_lib_dir) do
-    File.symlink(ao_clib, 'liboboe.so')
-    File.symlink(ao_clib, 'liboboe-1.0.so.0')
+  Dir.chdir(swo_lib_dir) do
+    File.symlink(swo_clib, 'liboboe.so')
+    File.symlink(swo_clib, 'liboboe-1.0.so.0')
   end
 
   dir_config('oboe', 'src', 'lib')
@@ -139,15 +135,15 @@ if success
 
     create_makefile('libsolarwinds_apm', 'src')
   else
-    $stderr.puts   '== ERROR ========================================================='
+    $stderr.puts '== 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.'
     else
       $stderr.puts 'Could not find a matching c-library. No tracing will occur.'
     end
-    $stderr.puts   'Contact technicalsupport@solarwinds.com if the problem persists.'
-    $stderr.puts   '=================================================================='
+    $stderr.puts 'Contact technicalsupport@solarwinds.com if the problem persists.'
+    $stderr.puts '=================================================================='
     create_makefile('oboe_noop', 'noop')
   end
 end

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

@@ -1 +1 @@
-5403faf71b2d26bf2a0fd32d159f10b920d5fdafc0aef4b335e5e272d22c1b70
+b931c715d8ddaa9f2b91c72ad708ed3467e6e68ee4255756123b2ca96f1b98d0

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

@@ -1 +1 @@
-78964dc06204715aa29a8ff47b259984ae476ab72f3d0d983e2ef1c52ef70d6a
+c8189fe6f5b31c15c31d3b005aebcff90f97ff82e92d9e0d3b254bbbe2a7367d

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

@@ -1 +1 @@
-97c82835d4dbf1130b33a1c75a3c5d9923b1b5c5224e19db9902288c29d128c5
+2824ba630ba794ff6280358922b54e8e1be4ccdb145376f90601e6652d149525

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

@@ -1 +1 @@
-6c04a460825bf130caa83433ad0aa01b56f4c5a4ca891df3ffa516db8dc9486a
+82a003ec82e3703260cdc215ef4c0c0bc7bc916cef27ef509034b60fd5ef9b35

data/ext/oboe_metal/src/VERSION

@@ -1,2 +1,2 @@
-12.3.0
+12.4.0
 

data/ext/oboe_metal/src/init_solarwinds_apm.cc

@@ -9,14 +9,8 @@ extern "C" {
 
 void Init_oboe_metal(void);
 
-void Init_profiling(void);
-
 void Init_libsolarwinds_apm() {
     Init_oboe_metal();
-
-    // * create SolarWindsAPM::CProfiler module for enabling SolarWindsAPM::Profiling
-    // * see lib/solarwinds_apm/support.rb
-    // Init_profiling(); 
 }
 
 #ifdef __cplusplus

data/ext/oboe_metal/src/oboe_debug.h

@@ -6,6 +6,7 @@ extern "C" {
 #endif
 
 #include <stdbool.h>
+#include <stdio.h>
 
 /**
  * Defined diagnostic log detail levels.

data/lib/oboe_metal.rb

@@ -1,15 +1,13 @@
 # Copyright (c) 2016 SolarWinds, LLC.
 # All rights reserved.
 
-require 'thread'
-
 # Disable docs and Camelcase warns since we're implementing
 # an interface here.  See OboeBase for details.
-# rubocop:disable Style/Documentation, Naming/MethodName
 module SolarWindsAPM
   extend SolarWindsAPMBase
   include Oboe_metal
 
+  # Reporter that send span data to SWO
   class Reporter
     class << self
       ##
@@ -26,13 +24,8 @@ module SolarWindsAPM
 
           SolarWindsAPM.reporter = Oboe_metal::Reporter.new(*options)
 
-          # Only report __Init from here if we are not instrumenting a framework.
-          # Otherwise, frameworks will handle reporting __Init after full initialization
-          unless defined?(::Rails) || defined?(::Sinatra) || defined?(::Padrino) || defined?(::Grape)
-            SolarWindsAPM::API.report_init
-          end
-
-        rescue => e
+          report_init
+        rescue StandardError=> e
           $stderr.puts e.message
           raise
         end
@@ -44,8 +37,8 @@ module SolarWindsAPM
       #
       # Send the report for the given event
       #
-      def sendReport(evt)
-        SolarWindsAPM.reporter.sendReport(evt)
+      def send_report(evt, with_system_timestamp: true)
+        SolarWindsAPM.reporter.sendReport(evt, with_system_timestamp)
       end
 
       ##
@@ -53,8 +46,8 @@ module SolarWindsAPM
       #
       # Send the report for the given event
       #
-      def sendStatus(evt, context = nil)
-        SolarWindsAPM.reporter.sendStatus(evt, context)
+      def send_status(evt, context=nil, with_system_timestamp: true)
+        SolarWindsAPM.reporter.sendStatus(evt, context, with_system_timestamp)
       end
 
       ##
@@ -67,20 +60,11 @@ module SolarWindsAPM
       end
 
       ##
-      # hard_clear_all_traces
-      #
-      # Truncates the trace output file to zero by deleting the original bson file
-      #
-      def hard_clear_all_traces
-        File.delete(SolarWindsAPM::OboeInitOptions.instance.host) if File.exist?(SolarWindsAPM::OboeInitOptions.instance.host)
-      end
-
-      ##
-      # get_all_traces
+      # obtain_all_traces
       #
       # Retrieves all traces written to the trace file
       #
-      def get_all_traces
+      def obtain_all_traces
         io = File.open(SolarWindsAPM::OboeInitOptions.instance.host, 'r')
         contents = io.readlines(nil)
         io.close
@@ -106,68 +90,121 @@ module SolarWindsAPM
           end
         else
           bbb = ::BSON::ByteBuffer.new(contents[0])
-          until bbb.length == 0
-            traces << Hash.from_bson(bbb)
-          end
+          traces << Hash.from_bson(bbb) until bbb.length == 0
         end
 
         traces
       end
-    end
-  end
 
-  module EventUtil
-    def self.metadataString(evt)
-      evt.metadataString
+      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:
+        # Don't send __Init in test or if SolarWindsAPM
+        # isn't fully loaded (e.g. missing c-extension)
+        return unless SolarWindsAPM.loaded
+
+        platform_info = build_swo_init_report
+        log_init(layer, platform_info)
+      end
+
+      ##
+      # :nodoc:
+      # Internal: Reports agent init to the collector
+      #
+      # ==== Arguments
+      #
+      # * +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={})
+        context = SolarWindsAPM::Metadata.makeRandom
+        return SolarWindsAPM::Context.toString unless context.isValid
+
+        event = context.createEvent
+        event.addInfo('Layer', layer.to_s)
+        event.addInfo('Label', 'single')
+        kvs.each do |k, v|
+          event.addInfo(k, v.to_s)
+        end
+
+        SolarWindsAPM::Reporter.send_status(event, context, with_system_timestamp: true)
+        SolarWindsAPM::Context.toString
+      end
+
+      ##
+      #  build_swo_init_report
+      #
+      # Internal: Build a hash of KVs that reports on the status of the
+      # running environment for swo only. This is used on stack boot in __Init reporting
+      # and for SolarWindsAPM.support_report.
+      #
+      def build_swo_init_report
+
+        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.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
+          platform_info['os.type']                 = RUBY_PLATFORM
+
+          platform_info.merge!(report_gem_in_use)
+
+          # 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}
+          rescue StandardError => e
+            SolarWindsAPM.logger.warn {"[#{self.class}/#{__method__}] Fail to extract telemetry attributes. Error: #{e.message}"}
+          end
+        rescue StandardError, ScriptError => e
+          # Also rescue ScriptError (aka SyntaxError) in case one of the expected
+          # version defines don't exist
+
+          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}
+        end
+        platform_info
+      end
+
+      ##
+      # Collect up the loaded gems
+      ##
+      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}
+        else
+          platform_info.merge!(legacy_build_init_report)
+        end
+        platform_info
+      end
+
+      ##
+      # get extension library version by looking at the VERSION file
+      # oboe not loaded yet, can't use oboe_api function to read oboe VERSION
+      ##
+      def extension_lib_version
+        gem_location = Gem::Specification.find_by_name('solarwinds_apm')
+        clib_version_file = File.join(gem_location&.gem_dir, 'ext', 'oboe_metal', 'src', 'VERSION')
+        File.read(clib_version_file).strip
+      end
     end
   end
 
   class << self
-    # def sample?(opts = {})
-    #   # Return false if no-op mode
-    #   return false unless SolarWindsAPM.loaded
-    #
-    #   # Assure defaults since SWIG enforces Strings
-    #   xtrace  = opts[:xtrace]     ? opts[:xtrace].to_s.strip       : SW_APM_STR_BLANK
-    #
-    #   # the first arg has changed to be the service name, blank means to use the default (from the service key)
-    #   rv = SolarWindsAPM::Context.sampleRequest(SW_APM_STR_BLANK, xtrace)
-    #
-    #   if rv == 0
-    #     SolarWindsAPM.sample_rate = -1
-    #     SolarWindsAPM.sample_source = -1
-    #     false
-    #   else
-    #     # liboboe version > 1.3.1 returning a bit masked integer with SampleRate and
-    #     # source embedded
-    #     SolarWindsAPM.sample_rate = (rv & SAMPLE_RATE_MASK)
-    #     SolarWindsAPM.sample_source = (rv & SAMPLE_SOURCE_MASK) >> 24
-    #     true
-    #   end
-    # rescue StandardError => e
-    #   SolarWindsAPM.logger.debug "[oboe/error] sample? error: #{e.inspect}"
-    #   false
-    # end
-
-    # def set_tracing_mode(mode)
-    #   return unless SolarWindsAPM.loaded
-    #
-    #   value = mode.to_sym
-    #
-    #   case value
-    #   when :disabled, :never
-    #     SolarWindsAPM::Context.setTracingMode(SW_APM_TRACE_DISABLED)
-    #
-    #   when :enabled, :always
-    #     SolarWindsAPM::Context.setTracingMode(SW_APM_TRACE_ENABLED)
-    #
-    #   else
-    #     SolarWindsAPM.logger.fatal "[oboe/error] Invalid tracing mode set: #{mode}"
-    #     SolarWindsAPM::Context.setTracingMode(SW_APM_TRACE_DISABLED)
-    #   end
-    # end
-
-    def set_sample_rate(rate)
+    def sample_rate(rate)
       return unless SolarWindsAPM.loaded
 
       # Update liboboe with the new SampleRate value
@@ -175,7 +212,6 @@ module SolarWindsAPM
     end
   end
 end
-# rubocop:enable Style/Documentation
 
 SolarWindsAPM.loaded = true
-SolarWindsAPM.config_lock = Mutex.new
+# rubocop:enable Style/Documentation