solarwinds_apm 5.1.8 → 6.0.0.preV1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38400d874e2a05decf3eb4e7691ac398dc41176bb904a72a58e38006440cee4f
-  data.tar.gz: 2ae5f68730f05b225293a983a13583103b1cbe02bbd906d8ad2aa4a7b074622a
+  metadata.gz: 78b2c4b54eaff62c93db5c06ebd9e85f73aea61943fa8eb90f0ba157dc81ab01
+  data.tar.gz: 2133540e0d8ec4ab097cd638d0cfd834649bc4898555ffb9cbfd7fa58a6e2355
 SHA512:
-  metadata.gz: 712b3ce5b8dafdf5b53c0bbec9da080a4f28ea34ed798d227a965c611b09775147f5145572c4200fef7034ca5233c2b06b58d5064ec798a162f8d7d76020d9fa
-  data.tar.gz: 054b79133ed377c8d47ab9ce79cdd41519c8bb9f4ef8187d397d6893f0ad3a2a6a6329d22e9e6297b44e9c09d6194b6027e4ec3c7a7ff680d1dc4bcac0371ee6
+  metadata.gz: 2731e533815670079641e91865a502157162a4924d4c1c0950b50f3e42d7417619305f51a2db22f12ef45ea9111b826d59bcd091f9201b1375afdb06e940421a
+  data.tar.gz: 6c2053e792310de17c09a58b68e8b74ba100a01c025d703d8cee315b7c3ad7ae6f23da08fe0b5dda2a6328a710330c6ce1468db12703c4d16ce98f1564df5436

data/LICENSE

@@ -1,4 +1,3 @@
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/

data/ext/oboe_metal/extconf.rb

@@ -6,19 +6,18 @@
 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.
@@ -37,13 +36,13 @@ else
   ao_path = File.join('https://agent-binaries.cloud.solarwinds.com/apm/c-lib/', version)
 end
 
-ao_arch = "x86_64"
+ao_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'
+  ao_arch = 'x86_64'
+when 'aarch64'
+  ao_arch = 'aarch64'
 end
 
 if File.exist?('/etc/alpine-release')
@@ -67,12 +66,9 @@ retries = 3
 success = false
 while retries > 0
   begin
-    download = URI.open(ao_item, 'rb')
-    IO.copy_stream(download, clib)
-
+    IO.copy_stream(URI.parse(ao_item).open, clib)
     clib_checksum = Digest::SHA256.file(clib).hexdigest
-    download.close
-    checksum =  File.read(ao_checksum_file).strip
+    checksum      =  File.read(ao_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
@@ -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 @@
-5a62c8d1bd4cb5970a1a2e20b5d6424203a783b6d5ae17bffa90f7c8cac1b49a
+b931c715d8ddaa9f2b91c72ad708ed3467e6e68ee4255756123b2ca96f1b98d0

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

@@ -1 +1 @@
-0b2d8c81c9180d44206f89e01f76c4f6ae1dc49f289918b8544083afff66086c
+c8189fe6f5b31c15c31d3b005aebcff90f97ff82e92d9e0d3b254bbbe2a7367d

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

@@ -1 +1 @@
-6443f871141df922693f30a3fbc9772d7af7341539286168e42de51073336daa
+2824ba630ba794ff6280358922b54e8e1be4ccdb145376f90601e6652d149525

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

@@ -1 +1 @@
-bc83cb241947ad798285fe152dab4f7dd135075a303b128c4d5be7dea0ef9620
+82a003ec82e3703260cdc215ef4c0c0bc7bc916cef27ef509034b60fd5ef9b35

data/ext/oboe_metal/src/VERSION

@@ -1,2 +1,2 @@
-12.2.0
+12.4.0
 

data/ext/oboe_metal/src/oboe_api.cpp

@@ -293,27 +293,27 @@ Event *Event::startTrace(const oboe_metadata_t *md) {
 }
 
 // called e.g. from Python e.addInfo("Key", None) & Ruby e.addInfo("Key", nil)
-bool Event::addInfo(char *key, void *val) {
+bool Event::addInfo(const char *key, void *val) {
     // oboe_event_add_info(evt, key, NULL) does nothing
     (void)key;
     (void)val;
     return true;
 }
 
-bool Event::addInfo(char *key, const std::string& val) {
+bool Event::addInfo(const char *key, const std::string& val) {
     return oboe_event_add_info(this, key, val.c_str()) == 0;
 }
 
-bool Event::addInfo(char *key, long val) {
+bool Event::addInfo(const char *key, long val) {
     int64_t val_ = val;
     return oboe_event_add_info_int64(this, key, val_) == 0;
 }
 
-bool Event::addInfo(char *key, double val) {
+bool Event::addInfo(const char *key, double val) {
     return oboe_event_add_info_double(this, key, val) == 0;
 }
 
-bool Event::addInfo(char *key, bool val) {
+bool Event::addInfo(const char *key, bool val) {
     return oboe_event_add_info_bool(this, key, val) == 0;
 }
 
@@ -321,7 +321,7 @@ bool Event::addInfo(char *key, bool val) {
  * this function was added for profiling
  * to report the timestamps of omitted snapshots
  */
-bool Event::addInfo(char *key, const long *vals, int num) {
+bool Event::addInfo(const char *key, const long *vals, int num) {
     oboe_bson_append_start_array(&(this->bbuf), key);
     for (int i = 0; i < num; i++) {
         oboe_bson_append_long(&(this->bbuf), std::to_string(i).c_str(), (int64_t)vals[i]);
@@ -330,11 +330,12 @@ bool Event::addInfo(char *key, const long *vals, int num) {
     return true;
 }
 
+#ifndef SWIG
 /*
  * A profiling specific addInfo function
  * to add the frames that make up a snapshot
  */
-bool Event::addInfo(char *key, const std::vector<FrameData> &vals) {
+bool Event::addInfo(const char *key, const std::vector<FrameData> &vals) {
     oboe_bson_append_start_array(&(this->bbuf), key);
     int i = 0;
     for (FrameData val : vals) {
@@ -355,6 +356,7 @@ bool Event::addInfo(char *key, const std::vector<FrameData> &vals) {
     oboe_bson_append_finish_object(&(this->bbuf));
     return true;
 }
+#endif
 
 bool Event::addEdge(oboe_metadata_t *md) {
     return oboe_event_add_edge(this, md) == 0;

data/ext/oboe_metal/src/oboe_api.h

@@ -315,15 +315,15 @@ class Event : private oboe_event_t {
     ~Event();
 
     // called e.g. from Python e.addInfo("Key", None) & Ruby e.addInfo("Key", nil)
-    bool addInfo(char *key, void *val);
-    bool addInfo(char *key, const std::string& val);
-    bool addInfo(char *key, long val);
-    bool addInfo(char *key, double val);
-    bool addInfo(char *key, bool val);
-    bool addInfo(char *key, const long *vals, int num);
+    bool addInfo(const char *key, void *val);
+    bool addInfo(const char *key, const std::string& val);
+    bool addInfo(const char *key, long val);
+    bool addInfo(const char *key, double val);
+    bool addInfo(const char *key, bool val);
+    bool addInfo(const char *key, const long *vals, int num);
 
 #ifndef SWIG  // for profiling only used by Ruby gem cpp-code
-    bool addInfo(char *key, const std::vector<FrameData> &vals);
+    bool addInfo(const char *key, const std::vector<FrameData> &vals);
 #endif
 
     bool addEdge(oboe_metadata_t *md);

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.
@@ -41,6 +42,7 @@ enum OBOE_DEBUG_MODULE {
     OBOE_MODULE_HOST_ID_SERVICE,
     OBOE_MODULE_AWS_RESOURCE_PROVIDER,
     OBOE_MODULE_AZURE_RESOURCE_PROVIDER,
+    OBOE_MODULE_UAMSCLIENT_RESOURCE_PROVIDER
 };
 
 /** Compile time debug logging detail level - cannot log more detailed than this. */

data/ext/oboe_metal/src/oboe_swig_wrap.cc

@@ -5480,14 +5480,14 @@ _wrap_Event_addInfo__SWIG_0(int argc, VALUE *argv, VALUE self) {
   arg1 = reinterpret_cast< Event * >(argp1);
   res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","addInfo", 2, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","addInfo", 2, argv[0] ));
   }
   arg2 = reinterpret_cast< char * >(buf2);
   res3 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg3), 0, 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","addInfo", 3, argv[1] )); 
   }
-  result = (bool)(arg1)->addInfo(arg2,arg3);
+  result = (bool)(arg1)->addInfo((char const *)arg2,arg3);
   vresult = SWIG_From_bool(static_cast< bool >(result));
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
   return vresult;
@@ -5521,7 +5521,7 @@ _wrap_Event_addInfo__SWIG_1(int argc, VALUE *argv, VALUE self) {
   arg1 = reinterpret_cast< Event * >(argp1);
   res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","addInfo", 2, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","addInfo", 2, argv[0] ));
   }
   arg2 = reinterpret_cast< char * >(buf2);
   {
@@ -5535,7 +5535,7 @@ _wrap_Event_addInfo__SWIG_1(int argc, VALUE *argv, VALUE self) {
     }
     arg3 = ptr;
   }
-  result = (bool)(arg1)->addInfo(arg2,(std::string const &)*arg3);
+  result = (bool)(arg1)->addInfo((char const *)arg2,(std::string const &)*arg3);
   vresult = SWIG_From_bool(static_cast< bool >(result));
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
   if (SWIG_IsNewObj(res3)) delete arg3;
@@ -5572,7 +5572,7 @@ _wrap_Event_addInfo__SWIG_2(int argc, VALUE *argv, VALUE self) {
   arg1 = reinterpret_cast< Event * >(argp1);
   res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","addInfo", 2, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","addInfo", 2, argv[0] ));
   }
   arg2 = reinterpret_cast< char * >(buf2);
   ecode3 = SWIG_AsVal_long(argv[1], &val3);
@@ -5580,7 +5580,7 @@ _wrap_Event_addInfo__SWIG_2(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "long","addInfo", 3, argv[1] ));
   } 
   arg3 = static_cast< long >(val3);
-  result = (bool)(arg1)->addInfo(arg2,arg3);
+  result = (bool)(arg1)->addInfo((char const *)arg2,arg3);
   vresult = SWIG_From_bool(static_cast< bool >(result));
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
   return vresult;
@@ -5615,7 +5615,7 @@ _wrap_Event_addInfo__SWIG_3(int argc, VALUE *argv, VALUE self) {
   arg1 = reinterpret_cast< Event * >(argp1);
   res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","addInfo", 2, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","addInfo", 2, argv[0] ));
   }
   arg2 = reinterpret_cast< char * >(buf2);
   ecode3 = SWIG_AsVal_double(argv[1], &val3);
@@ -5623,7 +5623,7 @@ _wrap_Event_addInfo__SWIG_3(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "double","addInfo", 3, argv[1] ));
   } 
   arg3 = static_cast< double >(val3);
-  result = (bool)(arg1)->addInfo(arg2,arg3);
+  result = (bool)(arg1)->addInfo((char const *)arg2,arg3);
   vresult = SWIG_From_bool(static_cast< bool >(result));
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
   return vresult;
@@ -5658,7 +5658,7 @@ _wrap_Event_addInfo__SWIG_4(int argc, VALUE *argv, VALUE self) {
   arg1 = reinterpret_cast< Event * >(argp1);
   res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","addInfo", 2, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","addInfo", 2, argv[0] ));
   }
   arg2 = reinterpret_cast< char * >(buf2);
   ecode3 = SWIG_AsVal_bool(argv[1], &val3);
@@ -5666,7 +5666,7 @@ _wrap_Event_addInfo__SWIG_4(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "bool","addInfo", 3, argv[1] ));
   } 
   arg3 = static_cast< bool >(val3);
-  result = (bool)(arg1)->addInfo(arg2,arg3);
+  result = (bool)(arg1)->addInfo((char const *)arg2,arg3);
   vresult = SWIG_From_bool(static_cast< bool >(result));
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
   return vresult;
@@ -5704,7 +5704,7 @@ _wrap_Event_addInfo__SWIG_5(int argc, VALUE *argv, VALUE self) {
   arg1 = reinterpret_cast< Event * >(argp1);
   res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","addInfo", 2, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","addInfo", 2, argv[0] ));
   }
   arg2 = reinterpret_cast< char * >(buf2);
   res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_long, 0 |  0 );
@@ -5717,7 +5717,7 @@ _wrap_Event_addInfo__SWIG_5(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "int","addInfo", 4, argv[2] ));
   } 
   arg4 = static_cast< int >(val4);
-  result = (bool)(arg1)->addInfo(arg2,(long const *)arg3,arg4);
+  result = (bool)(arg1)->addInfo((char const *)arg2,(long const *)arg3,arg4);
   vresult = SWIG_From_bool(static_cast< bool >(result));
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
   return vresult;
@@ -5857,12 +5857,12 @@ SWIGINTERN VALUE _wrap_Event_addInfo(int nargs, VALUE *args, VALUE self) {
   
 fail:
   Ruby_Format_OverloadedError( argc, 5, "Event.addInfo", 
-    "    bool Event.addInfo(char *key, void *val)\n"
-    "    bool Event.addInfo(char *key, std::string const &val)\n"
-    "    bool Event.addInfo(char *key, long val)\n"
-    "    bool Event.addInfo(char *key, double val)\n"
-    "    bool Event.addInfo(char *key, bool val)\n"
-    "    bool Event.addInfo(char *key, long const *vals, int num)\n");
+    "    bool Event.addInfo(char const *key, void *val)\n"
+    "    bool Event.addInfo(char const *key, std::string const &val)\n"
+    "    bool Event.addInfo(char const *key, long val)\n"
+    "    bool Event.addInfo(char const *key, double val)\n"
+    "    bool Event.addInfo(char const *key, bool val)\n"
+    "    bool Event.addInfo(char const *key, long const *vals, int num)\n");
   
   return Qnil;
 }
@@ -8373,6 +8373,7 @@ SWIGEXPORT void Init_oboe_metal(void) {
   rb_define_const(mOboe_metal, "OBOE_MODULE_HOST_ID_SERVICE", SWIG_From_int(static_cast< int >(OBOE_MODULE_HOST_ID_SERVICE)));
   rb_define_const(mOboe_metal, "OBOE_MODULE_AWS_RESOURCE_PROVIDER", SWIG_From_int(static_cast< int >(OBOE_MODULE_AWS_RESOURCE_PROVIDER)));
   rb_define_const(mOboe_metal, "OBOE_MODULE_AZURE_RESOURCE_PROVIDER", SWIG_From_int(static_cast< int >(OBOE_MODULE_AZURE_RESOURCE_PROVIDER)));
+  rb_define_const(mOboe_metal, "OBOE_MODULE_UAMSCLIENT_RESOURCE_PROVIDER", SWIG_From_int(static_cast< int >(OBOE_MODULE_UAMSCLIENT_RESOURCE_PROVIDER)));
   rb_define_const(mOboe_metal, "MAX_DEBUG_MSG_COUNT", SWIG_From_int(static_cast< int >(1)));
   rb_define_module_function(mOboe_metal, "oboe_debug_log_init", VALUEFUNC(_wrap_oboe_debug_log_init), -1);
   rb_define_module_function(mOboe_metal, "oboe_debug_logger", VALUEFUNC(_wrap_oboe_debug_logger), -1);

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 if ENV.has_key?('SW_APM_GEM_TEST') || !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

data/lib/rails/generators/solarwinds_apm/install_generator.rb

@@ -2,6 +2,7 @@
 # All rights reserved.
 
 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."
@@ -20,7 +21,6 @@ module SolarWindsAPM
 
     private
 
-    # rubocop:disable Metrics/MethodLength
     def print_header
       say ""
       say shell.set_color "Welcome to the SolarWindsAPM Ruby instrumentation setup.", :green, :bold
@@ -34,7 +34,6 @@ module SolarWindsAPM
       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
-    # rubocop:enable Metrics/MethodLength
 
     def print_footer
       say ""