appoptics_apm 4.12.2 → 4.13.0

data/ext/oboe_metal/extconf.rb

@@ -22,14 +22,13 @@ ext_dir = File.expand_path(File.dirname(__FILE__))
 
 # Check if we're running in JRuby
 jruby = defined?(JRUBY_VERSION) ? true : false
-
 # Set the mkmf lib paths so we have no issues linking to
 # the AppOpticsAPM libs.
 ao_lib_dir = File.join(ext_dir, 'lib')
 ao_include = File.join(ext_dir, 'src')
 
 # Download the appropriate liboboe from S3(via rake for testing) or files.appoptics.com (production)
-version = File.read(File.join(ao_include, 'VERSION')).chomp
+version = File.read(File.join(ao_include, 'VERSION')).strip
 if ENV['APPOPTICS_FROM_S3'].to_s.downcase == 'true'
   ao_path = File.join('https://rc-files-t2.s3-us-west-2.amazonaws.com/c-lib/', version)
   puts 'Fetching c-lib from S3'
@@ -39,12 +38,7 @@ end
 
 ao_arch = 'x86_64'
 if File.exist?('/etc/alpine-release')
-
-  if RUBY_VERSION < '2.5.0'
-    version = open('/etc/alpine-release').read.chomp
-  else
-    version = URI.open('/etc/alpine-release').read.chomp
-  end
+  version = File.read('/etc/alpine-release').strip
 
   ao_arch =
     if Gem::Version.new(version) < Gem::Version.new('3.9')
@@ -56,34 +50,31 @@ end
 
 ao_clib = "liboboe-1.0-#{ao_arch}.so.0.0.0"
 ao_item = File.join(ao_path, ao_clib)
-ao_checksum_item = "#{ao_item}.sha256"
+ao_checksum_file = File.join(ao_lib_dir, "#{ao_clib}.sha256")
 clib = File.join(ao_lib_dir, ao_clib)
 
 retries = 3
 success = false
 while retries > 0
   begin
-    # download
-    if RUBY_VERSION < '2.5.0'
-      download = open(ao_item, 'rb')
-      checksum = open(ao_checksum_item, 'r').read.chomp
-    else
-      download = URI.open(ao_item, 'rb')
-      checksum = URI.open(ao_checksum_item, 'r').read.chomp
-    end
+    download = RUBY_VERSION < '2.5.0' ? open(ao_item, 'rb') : URI.open(ao_item, 'rb')
     IO.copy_stream(download, clib)
+
     clib_checksum = Digest::SHA256.file(clib).hexdigest
     download.close
+    checksum =  File.read(ao_checksum_file).strip
 
-    # verify_checksum
+    # 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 appoptics_apm gem.'
-      $stderr.puts 'appoptics_apm will not instrument the code. No tracing will occur.'
-      $stderr.puts 'Contact support@appoptics.com if the problem persists.'
+      $stderr.puts 'Checksum Verification failed for the c-extension of the appoptics_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 '=========================================================================='
-      create_makefile('oboe_noop', 'noop')
-      retries = 0
+      exit 1
     else
       success = true
       retries = 0
@@ -95,7 +86,7 @@ while retries > 0
       $stderr.puts '== ERROR =========================================================='
       $stderr.puts 'Download of the c-extension for the appoptics_apm gem failed.'
       $stderr.puts 'appoptics_apm will not instrument the code. No tracing will occur.'
-      $stderr.puts 'Contact support@appoptics.com if the problem persists.'
+      $stderr.puts 'Contact technicalsupport@solarwinds.com if the problem persists.'
       $stderr.puts "error: #{ao_item}\n#{e.message}"
       $stderr.puts '==================================================================='
       create_makefile('oboe_noop', 'noop')
@@ -128,17 +119,20 @@ if success
     $CFLAGS << " #{ENV['CFLAGS']}"
     # $CPPFLAGS << " #{ENV['CPPFLAGS']} -std=c++11"
     # TODO for debugging: -pg -gdwarf-2, remove for production
-    # $CPPFLAGS << " #{ENV['CPPFLAGS']} -std=c++11 -pg -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"
+    # -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['CPPFLAGS']} -std=c++11 -I$$ORIGIN/../ext/oboe_metal/include"
     $LIBS << " #{ENV['LIBS']}"
-    $LDFLAGS << " #{ENV['LDFLAGS']} '-Wl,-rpath=$$ORIGIN/../ext/oboe_metal/lib'  -pg -lrt"
-    # $LDFLAGS << " #{ENV['LDFLAGS']} '-Wl,-rpath=$$ORIGIN/../ext/oboe_metal/lib'"
+
+    # 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 "
 
     # ____ include debug info, comment out when not debugging
     # ____ -pg -> profiling info for gprof
-    # CONFIG["debugflags"] = "-ggdb3 -pg"
-    # CONFIG["optflags"] = "-O0"
+    CONFIG["debugflags"] = "-ggdb3 "
+    CONFIG["optflags"] = "-O0"
 
     create_makefile('libappoptics_apm', 'src')
 
@@ -150,7 +144,7 @@ if success
     else
       $stderr.puts 'Could not find a matching c-library. No tracing will occur.'
     end
-    $stderr.puts   'Contact support@appoptics.com if the problem persists.'
+    $stderr.puts   'Contact technicalsupport@solarwinds.com if the problem persists.'
     $stderr.puts   '=================================================================='
     create_makefile('oboe_noop', 'noop')
   end

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

@@ -0,0 +1 @@
+af7d764a88cec323940fc6040947f2dcf8041c389744bdfc46b7f2fe0a465dab

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

@@ -0,0 +1 @@
+092e232d0e1aa1826b77c98d96f7bb2db39058c9bec3e2c0387cc6fb51b5b83c

data/ext/oboe_metal/src/README.md

@@ -0,0 +1,6 @@
+
+oboe_api.hpp and oboe_api.cpp are copied here from the oboe repo during install
+
+it is best to edit these file in the oboe repo and use the OBOE_WIP=true env
+var to include the development version while they aren't deploy to s3.
+

data/ext/oboe_metal/src/VERSION

@@ -1 +1,2 @@
-10.1.0
+10.2.0
+

data/ext/oboe_metal/src/frames.cc

@@ -0,0 +1,246 @@
+// Copyright (c) 2021 SolarWinds, LLC.
+// All rights reserved.
+
+#include "frames.h"
+
+using namespace std;
+
+unordered_map<VALUE, FrameData> cached_frames;
+
+// in theory the mutex is not needed, because Ruby does not context switch
+// while executing a foreign function, but will this always hold true?
+mutex cached_frames_mutex;
+
+void Frames::reserve_cached_frames() {
+    lock_guard<mutex> guard(cached_frames_mutex);
+    // unordered_maps grow automatically, but it starts at 1 and then
+    // doubles when it is full, so lets avoid the warmup
+    cached_frames.reserve(500);  // it will round to a prime number: 503
+}
+
+void Frames::clear_cached_frames() {
+    lock_guard<mutex> guard(cached_frames_mutex);
+        // unordered_maps grow automatically, but it starts at 1 and then
+        // doubles when it is full, so lets avoid the warmup
+    cached_frames.clear();
+}
+
+// this is a private function
+int Frames::cache_frame(VALUE frame) {
+    VALUE val;
+    FrameData data;
+
+    // only cache it if it does not exist
+    if (cached_frames.count(frame) == 0) {
+        val = rb_profile_frame_label(frame);  // returns method or block
+        if (RB_TYPE_P(val, T_STRING))
+            data.method = RSTRING_PTR(val);
+
+        if (data.method.rfind("block ", 0) == 0) {
+            // we don't need more info if it is a block
+            // we ignore block level info because they make things messy
+            lock_guard<mutex> guard(cached_frames_mutex);
+            cached_frames.insert({frame, data});
+            return 0;
+        }
+
+        val = rb_profile_frame_classpath(frame);  // returns class or nil
+        if (RB_TYPE_P(val, T_STRING)) data.klass = RSTRING_PTR(val);
+
+        val = rb_profile_frame_absolute_path(frame);  // returns file, use rb_profile_frame_path() if nil
+        if (!RB_TYPE_P(val, T_STRING)) val = rb_profile_frame_path(frame);
+        if (RB_TYPE_P(val, T_STRING)) data.file = RSTRING_PTR(val);
+
+        // Ruby 3 reports <cfunc>, but the linenumbers are bogus
+        // the default line number is 0
+        if (!data.file.compare("<cfunc>") == 0) {
+            val = rb_profile_frame_first_lineno(frame);  // returns line number
+            if (RB_TYPE_P(val, T_FIXNUM)) {
+                data.lineno = NUM2INT(val);
+            }
+        }
+        lock_guard<mutex> guard(cached_frames_mutex);
+        cached_frames.insert({frame, data});
+    }
+    return 0;
+}
+
+// all frames in frames_buffer must be in cached_frames
+// before calling this function
+// we are saving the check for better performance
+int Frames::collect_frame_data(VALUE *frames_buffer, int num, vector<FrameData> &frame_data) {
+    if (num == 1) {
+        if (frames_buffer[0] == PR_IN_GC) {
+            FrameData data;
+            data.method = "GARBAGE COLLECTION";
+            frame_data.push_back(data);
+            return 0;
+        } else if (frames_buffer[0] == PR_OTHER_THREAD) {
+            FrameData data;
+            data.method = "OTHER THREADS";
+            frame_data.push_back(data);
+            return 0;
+        }
+    }
+
+    for (int i = 0; i < num; i++) {
+        VALUE frame = frames_buffer[i];
+        frame_data.push_back(cached_frames[frame]);
+    }
+    return 0;
+}
+
+/////
+// For the sake of efficiency this function filters uninteresting frames and
+// does the caching of frames at the same time
+//
+// in-place removal of
+// - frames with line number == 0
+// - all but last of repeated frames
+// - "block" frames (they are confusing) <- revisit
+// and cache uncached frames
+int Frames::remove_garbage(VALUE *frames_buffer, int num) {
+    if (num == 1 && (frames_buffer[0] == PR_OTHER_THREAD || frames_buffer[0] == PR_IN_GC))
+        return 1;
+
+    // TODO decide what to do with <cfunc> frames in Ruby 3
+
+    // 1) ignore top frames where the line number is 0
+    // does that mean there is no line number???
+    bool found = true;
+
+    while (found && num > 0) {
+        if (cached_frames.count(frames_buffer[num - 1]) == 1) {
+            found = (cached_frames[frames_buffer[num - 1]].lineno == 0);
+            if (found) num--;
+        } else {
+            VALUE val = rb_profile_frame_first_lineno(frames_buffer[num - 1]);
+            found = (!RB_TYPE_P(val, T_FIXNUM) || !NUM2INT(val));
+            if (found) {
+                lock_guard<mutex> guard(cached_frames_mutex);
+                cached_frames[frames_buffer[num - 1]].lineno = 0;
+                num--;
+            }
+        }
+    }
+
+    // 2) remove all repeated frames, keep the last one
+    int count = 0;
+    int k = 0;
+    found = false;
+    while (count < num - k) {
+        // is this frame repeated ahead?
+        // if so we will replace it with the next one in line
+        for (int j = count + k + 1; j < num; j++) {
+            if (frames_buffer[count] == frames_buffer[j]) {
+                found = true;
+                break;
+            }
+        }
+
+        if (found) {
+            // if we found this frame again later in the snapshot
+            // we are going to override this one
+            // but not if this is going beyond the boundary
+            k++;
+            if (count + k < num - 1) frames_buffer[count] = frames_buffer[count + k];
+        } else {
+            count++;
+            frames_buffer[count] = frames_buffer[count + k];
+        }
+        found = false;
+    }
+
+    // 3) remove "block" frames, they are reported inconsistently and mess up
+    //    the profile in the dashboard
+    // 4)  while we are at it we also cache all the frames
+    // these 2 are combined so we don't have to run this loop twice
+    num = count;
+    count = 0, k = 0;
+    string method;
+
+    while (count < num - k) {
+        frames_buffer[count] = frames_buffer[count + k];
+        cache_frame(frames_buffer[count]);
+        method = cached_frames[frames_buffer[count]].method;
+
+        // TODO revisit need to remove block frames, they only appear when the Ruby
+        // ____ script is not started with a method and has blocks outside of the
+        // ____ methods called and sometimes inside of rack
+        if (method.rfind("block ", 0) == 0) {
+            k++;
+        } else {
+            count++;
+        }
+    }
+    return count;
+}
+
+// returns the number of the matching frames
+int Frames::num_matching(VALUE *frames_buffer, int num,
+                         VALUE *prev_frames_buffer, int prev_num) {
+    int i;
+    int min = std::min(num, prev_num);
+
+    for (i = 0; i < min; i++) {
+        // we have to start from the "top"
+        if (frames_buffer[num - 1 - i] != prev_frames_buffer[prev_num - 1 - i]) {
+            return i;
+        }
+    }
+    return i;
+}
+
+/////////////////////// DEBUGGING HELPER FUNCTIONS /////////////////////////////
+// helper function to print frame from ruby pointers to frame
+void Frames::print_raw_frame_info(VALUE frame) {
+    if (frame == PR_IN_GC || frame == PR_OTHER_THREAD) {
+        return;
+    }
+
+    VALUE val;
+    int lineno;
+    string file, klass, method;
+
+    val = rb_profile_frame_first_lineno(frame);  // returns line number
+    if (RB_TYPE_P(val, T_FIXNUM)) lineno = NUM2INT(val);
+
+    val = rb_profile_frame_classpath(frame);  // returns class or nil
+    if (RB_TYPE_P(val, T_STRING)) klass = RSTRING_PTR(val);
+
+    val = rb_profile_frame_absolute_path(frame);  // returns file, use rb_profile_frame_path() if nil
+    if (!RB_TYPE_P(val, T_STRING)) val = rb_profile_frame_path(frame);
+    if (RB_TYPE_P(val, T_STRING)) file = RSTRING_PTR(val);
+
+    val = rb_profile_frame_label(frame);  // returns method or block
+    if (RB_TYPE_P(val, T_STRING)) method = RSTRING_PTR(val);
+
+    cout << "    " << frame << "   "
+         << "L: " << lineno << " "
+         << "F: " << file << " "
+         << "C: " << klass << " "
+         << "M: " << method << endl;
+}
+
+void Frames::print_all_raw_frames(VALUE *frames_buffer, int num) {
+    for (int i = 0; i < num; i++) {
+        print_raw_frame_info(frames_buffer[i]);
+    }
+}
+
+// helper function to print frame info
+void Frames::print_frame_info(VALUE frame) {
+    if (cached_frames.find(frame) != cached_frames.end())
+        std::cout << cached_frames[frame].lineno << " "
+                  << cached_frames[frame].file << " "
+                  << cached_frames[frame].klass << " "
+                  << cached_frames[frame].method << std::endl;
+}
+
+// helper function for printing the cached frames
+void Frames::print_cached_frames() {
+    std::cout << "cached_frames contains:" << endl;
+    for (auto it = cached_frames.cbegin(); it != cached_frames.cend(); ++it)
+        std::cout << "           " << it->first << " - " << it->second.method << ":" << it->second.lineno << endl;  // cannot modify *it
+    std::cout << std::endl;
+}

data/ext/oboe_metal/src/frames.h

@@ -0,0 +1,40 @@
+// Copyright (c) 2021 SolarWinds, LLC.
+// All rights reserved.
+
+#ifndef FRAMES_H
+#define FRAMES_H
+
+#include <vector>
+
+#include <mutex>
+#include <unordered_map>
+
+#include <ruby/ruby.h>
+#include <ruby/debug.h>
+
+#include "profiling.h"
+#include "oboe_api.hpp"
+
+using namespace std;
+
+class Frames {
+   public:
+    static void clear_cached_frames();
+    static void reserve_cached_frames();
+    static int collect_frame_data(VALUE *frames_buffer, int num, vector<FrameData> &frame_data);
+    static int remove_garbage(VALUE *frames_buffer, int num);
+    static int num_matching(VALUE *frames_buffer, int num,
+                            VALUE *prev_frames_buffer, int prev_num);
+
+   private:
+    static int cache_frame(VALUE frame);
+
+    // Debugging helper functions
+   public:
+    static void print_raw_frame_info(VALUE frame);
+    static void print_all_raw_frames(VALUE *frames_buffer, int num);
+    static void print_frame_info(VALUE frame);
+    static void print_cached_frames();
+};
+
+#endif //FRAMES_H

data/ext/oboe_metal/src/init_appoptics_apm.cc

@@ -1,3 +1,6 @@
+// Copyright (c) 2019 SolarWinds, LLC.
+// All rights reserved.
+
 #include <iostream>
 
 #ifdef __cplusplus
@@ -6,13 +9,11 @@ extern "C" {
 
 void Init_oboe_metal(void);
 
-//void Init_profiling(void);
+void Init_profiling(void);
 
 void Init_libappoptics_apm() {
     Init_oboe_metal();
-//     std::cout << "*** oboe_metal initialized ***" << std::endl;
-//    Init_profiling();
-//     std::cout << "*** profiling intitialized ***" << std::endl;
+    Init_profiling();
 }
 
 #ifdef __cplusplus