solarwinds_apm 5.1.6 → 5.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8298bf959acf2663351b05afeb78ffa573c02107f9588bbc925a990e35675e4d
-  data.tar.gz: a67822c4554525b9894cdb578b48cf51de562ecd1b5ba353ed58f037ed88daf9
+  metadata.gz: 38400d874e2a05decf3eb4e7691ac398dc41176bb904a72a58e38006440cee4f
+  data.tar.gz: 2ae5f68730f05b225293a983a13583103b1cbe02bbd906d8ad2aa4a7b074622a
 SHA512:
-  metadata.gz: 9998cc5ed8152951dcfbe0a997ac952b89a32eb7fcbcfe3b3cf51a87231606d0471eddfa9d5a14be58780904681776a99b99abfa5dfbd4159d791d8ddaea556c
-  data.tar.gz: 661af15bb3b3a14a361f7e4f95b3367c2fbb459b19b9b7c1894480f9f85050c68fca6ce7029ed9cb7bb7fce82d8cd593c746989311ed8d68fbd4ba2c4a687c3e
+  metadata.gz: 712b3ce5b8dafdf5b53c0bbec9da080a4f28ea34ed798d227a965c611b09775147f5145572c4200fef7034ca5233c2b06b58d5064ec798a162f8d7d76020d9fa
+  data.tar.gz: 054b79133ed377c8d47ab9ce79cdd41519c8bb9f4ef8187d397d6893f0ad3a2a6a6329d22e9e6297b44e9c09d6194b6027e4ec3c7a7ff680d1dc4bcac0371ee6

data/CHANGELOG.md

@@ -3,6 +3,26 @@ https://github.com/solarwindscloud/solarwinds-apm-ruby/releases
 
 Dates in this file are in the format MM/DD/YYYY.
 
+# solarwinds_apm 5.1.8 (05/09/2023)
+
+This release includes the following features:
+
+* Update latest liboboe library (12.2.0)
+
+Pushed to Rubygems:
+
+https://rubygems.org/gems/solarwinds_apm/versions/5.1.8
+
+# solarwinds_apm 5.1.7 (03/14/2023)
+
+This release includes the following features:
+
+* Update latest liboboe library (12.1.0)
+
+Pushed to Rubygems:
+
+https://rubygems.org/gems/solarwinds_apm/versions/5.1.7
+
 # solarwinds_apm 5.1.6 (03/14/2023)
 
 This release includes the following features:
@@ -13,7 +33,7 @@ This release includes the following features:
 
 Pushed to Rubygems:
 
-https://rubygems.org/gems/solarwinds_apm/versions/5.1.5
+https://rubygems.org/gems/solarwinds_apm/versions/5.1.6
 
 
 # solarwinds_apm 5.1.4 (11/23/2022)

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

@@ -1 +1 @@
-d9c280de4ab597fe7d3405a405c07f7e27ae4fb2cba7502f3893335bff119c3b
+5a62c8d1bd4cb5970a1a2e20b5d6424203a783b6d5ae17bffa90f7c8cac1b49a

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

@@ -1 +1 @@
-7864bee37bcaeacef1c3ffae2db3ae2d163ef18ebb107fe11228122211e6ddb4
+0b2d8c81c9180d44206f89e01f76c4f6ae1dc49f289918b8544083afff66086c

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

@@ -1 +1 @@
-48849897b168cde0de01b3c1355d0343e687cbec075f5970d88f166bd5182045
+6443f871141df922693f30a3fbc9772d7af7341539286168e42de51073336daa

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

@@ -1 +1 @@
-139fd6c84d20b5f4b12931a0ecf6630b8b0cae14792d05000c29b8d35aa7332c
+bc83cb241947ad798285fe152dab4f7dd135075a303b128c4d5be7dea0ef9620

data/ext/oboe_metal/src/VERSION

@@ -1,2 +1,2 @@
-12.0.0
+12.2.0
 

data/ext/oboe_metal/src/oboe.h

@@ -29,12 +29,6 @@ extern "C" {
 #include "bson/bson.h"
 #include "oboe_debug.h"
 
-/** Compile time debug logging detail level - cannot log more detailed than this. */
-#define OBOE_DEBUG_LEVEL OBOE_DEBUG_HIGH
-
-/** Limit for number of messages at specified level before demoting to debug MEDIUM. */
-#define MAX_DEBUG_MSG_COUNT 1
-
 /**
  * Default configuration settings update interval in seconds.
  *
@@ -85,7 +79,7 @@ extern "C" {
 /**
  * Default EC2 metadata timeout in milliseconds
  */
-#define OBOE_DEFAULT_EC2_METADATA_TIMEOUT 1000
+#define OBOE_DEFAULT_EC2_METADATA_TIMEOUT 50
 
 #define OBOE_SAMPLE_RESOLUTION 1000000
 
@@ -772,268 +766,6 @@ extern int oboe_config_check_version(int version, int revision);
  */
 extern int oboe_config_get_version();
 
-/**
- * Prototype for a logger call-back function.
- *
- * A logging function of this form can be added to the logger chain using
- * oboe_debug_log_add().
- *
- * @param context The context pointer that was registered in the call to
- *          oboe_debug_log_add().  Use it to pass the pointer-to-self for
- *          objects (ie. "this" in C++) or just a structure in C,  May be
- *          NULL.
- * @param module The module identifier as passed to oboe_debug_logger().
- * @param level The diagnostic detail level as passed to oboe_debug_logger().
- * @param source_name Name of the source file as passed to oboe_debug_logger().
- * @param source_lineno Number of the line in the source file where message is
- *          logged from as passed to oboe_debug_logger().
- * @param msg The formatted message produced from the format string and its
- *          arguments as passed to oboe_debug_logger().
- */
-typedef void (*OboeDebugLoggerFcn)(void *context, int module, int level, const char *source_name, int source_lineno, const char *msg);
-
-/**
- * Get a printable name for a diagnostics logging level.
- */
-extern const char *oboe_debug_log_level_name(int level);
-
-/**
- * Get a printable name for a diagnostics logging module identifier.
- */
-extern const char *oboe_debug_module_name(int module);
-
-/**
- * Get the maximum logging detail level for a module or for all modules.
- *
- * This level applies to the stderr logger only.  Added loggers get all messages
- * below their registed detail level and need to do their own module-specific
- * filtering.
- *
- * @param module One of the OBOE_MODULE_* values.  Use OBOE_MODULE_ALL (-1) to
- *          get the overall maximum detail level.
- * @return Maximum detail level value for module (or overall) where zero is the
- *          lowest and higher values generate more detailed log messages.
- */
-extern int oboe_debug_log_level_get(int module);
-
-/**
- * Set the maximum logging detail level for a module or for all modules.
- *
- * This level applies to the stderr logger only.  Added loggers get all messages
- * below their registered detail level and need to do their own module-specific
- * filtering.
- *
- * @param module One of the OBOE_MODULE_* values.  Use OBOE_MODULE_ALL to set
- *          the overall maximum detail level.
- * @param newLevel Maximum detail level value where zero is the lowest and higher
- *          values generate more detailed log messages.
- */
-extern void oboe_debug_log_level_set(int module, int newLevel);
-
-/**
- * Set the output stream for the default logger.
- *
- * @param newStream A valid, open FILE* stream or NULL to disable the default logger.
- * @return Zero on success; otherwise an error code (normally from errno).
- */
-extern int oboe_debug_log_to_stream(FILE *newStream);
-
-/**
- * If we're logging to a stream, flush it.
- *
- * @return Zero on success; otherwise an error code (normally from errno).
- */
-extern int oboe_debug_log_flush();
-
-/**
- * Set the default logger to write to the specified file.
- *
- * A NULL or empty path name will disable the default logger.
- *
- * If the file exists then it will be opened in append mode.
- *
- * @param pathname The path name of the
- * @return Zero on success; otherwise an error code (normally from errno).
- */
-extern int oboe_debug_log_to_file(const char *pathname);
-
-/**
- * Add a logger that takes messages up to a given logging detail level.
- *
- * This adds the logger to a chain in order of the logging level.  Log messages
- * are passed to each logger down the chain until the remaining loggers only
- * accept messages of a lower detail level.
- *
- * @return Zero on success, one if re-registered with the new logging level, and
- *          otherwise a negative value to indicate an error.
- */
-extern int oboe_debug_log_add(OboeDebugLoggerFcn newLogger, void *context, int logLevel);
-
-/**
- * Remove a logger.
- *
- * Remove the logger from the message handling chain.
- *
- * @return Zero on success, one if it was not found, and otherwise a negative
- *          value to indicate an error.
- */
-extern int oboe_debug_log_remove(OboeDebugLoggerFcn oldLogger, void *context);
-
-/*
- * Log the application's Oboe configuration.
- *
- * We use this to get a reasonable standard format between apps.
- *
- * @param module An OBOE_MODULE_* module identifier.  Use zero for undefined.
- * @param app_name Either NULL or a pointer to a string containing a name for
- *          the application - will prefix the log entry.  Useful when multiple
- *          apps log to the same destination.
- * @param trace_mode A string identifying the configured tracing mode, one of:
- *          "enabled", "disabled", "unset", or "undef" (for invalid values)
- *          Use the oboe_tracing_mode_to_string() function to convert from
- *          numeric values.
- * @param sample_rate The configured sampling rate: -1 for unset or a
- *          integer fraction of 1000000.
- * @param reporter_type String identifying the type of reporter configured:
- *          One of 'udp' (the default), 'ssl', or 'file'.
- * @param reporter_args The string of comma-separated key=value settings
- *          used to initialize the reporter.
- * @param extra: Either NULL or a pointer to a string to be appended to
- *          the log message and designed to include a few other
- *          configuration parameters of interest.
- */
-#if OBOE_DEBUG_LEVEL >= OBOE_DEBUG_INFO
-# define OBOE_DEBUG_LOG_CONFIG(module, app_name, trace_mode, sample_rate, reporter_type, reporter_args, extra) \
-  {                                                                                 \
-    oboe_debug_logger(module, OBOE_DEBUG_INFO, __FILE__, __LINE__,                  \
-        "%s Oboe config: tracing=%s, sampling=%d, reporter=('%s', '%s') %s",        \
-        (app_name == NULL ? "" : app_name),                                         \
-        trace_mode,                                                                 \
-        sample_rate,                                                                \
-        (reporter_type == NULL ? "?" : reporter_type),                              \
-        (reporter_args == NULL ? "?" : reporter_args),                              \
-        (extra == NULL ? "" : extra));                                              \
-  }
-#else
-# define OBOE_DEBUG_LOG_CONFIG(module, app_name, trace_mode, sample_rate, reporter_type, reporter_args, extra) {}
-#endif
-
-/**
- * Log a fatal error.
- */
-#if OBOE_DEBUG_LEVEL >= OBOE_DEBUG_FATAL
-# define OBOE_DEBUG_LOG_FATAL(module, ...)                   \
-  {                                                          \
-    oboe_debug_logger(module, OBOE_DEBUG_FATAL, __FILE__, __LINE__, __VA_ARGS__); \
-  }
-#else
-# define OBOE_DEBUG_LOG_FATAL(module, format_string, ...) {}
-#endif
-
-/**
- * Log a recoverable error.
- *
- * Each message is limited in the number of times that it will be reported at the
- * ERROR level after which it will be logged at the debug MEDIUM level.
- */
-#if OBOE_DEBUG_LEVEL >= OBOE_DEBUG_ERROR
-# define OBOE_DEBUG_LOG_ERROR(module, ...)                   \
-  {                                                          \
-    static int usage_counter = 0;                            \
-    int loglev = (++usage_counter <= MAX_DEBUG_MSG_COUNT ? OBOE_DEBUG_ERROR : OBOE_DEBUG_MEDIUM); \
-    oboe_debug_logger(module, loglev, __FILE__, __LINE__, __VA_ARGS__); \
-  }
-#else
-# define OBOE_DEBUG_LOG_ERROR(module, format_string, ...) {}
-#endif
-
-/**
- * Log a warning.
- *
- * Each message is limited in the number of times that it will be reported at the
- * WARNING level after which it will be logged at the debug MEDIUM level.
- */
-#if OBOE_DEBUG_LEVEL >= OBOE_DEBUG_WARNING
-# define OBOE_DEBUG_LOG_WARNING(module, ...)                 \
-  {                                                          \
-    static int usage_counter = 0;                            \
-    int loglev = (++usage_counter <= MAX_DEBUG_MSG_COUNT ? OBOE_DEBUG_WARNING : OBOE_DEBUG_MEDIUM); \
-    oboe_debug_logger(module, loglev, __FILE__, __LINE__, __VA_ARGS__); \
-  }
-#else
-# define OBOE_DEBUG_LOG_WARNING(module, format_string,...) {}
-#endif
-
-/**
- * Log an informative message.
- *
- * Each message is limited in the number of times that it will be reported at the
- * INFO level after which it will be logged at the debug MEDIUM level.
- */
-#if OBOE_DEBUG_LEVEL >= OBOE_DEBUG_INFO
-# define OBOE_DEBUG_LOG_INFO(module, ...)                    \
-  {                                                                     \
-    static int usage_counter = 0;                            \
-    int loglev = (++usage_counter <= MAX_DEBUG_MSG_COUNT ? OBOE_DEBUG_INFO : OBOE_DEBUG_MEDIUM); \
-    oboe_debug_logger(module, loglev, __FILE__, __LINE__, __VA_ARGS__); \
-  }
-#else
-# define OBOE_DEBUG_LOG_INFO(module, format_string, ...) {}
-#endif
-
-/**
- * Log a low-detail diagnostic message.
- */
-#if OBOE_DEBUG_LEVEL >= OBOE_DEBUG_LOW
-# define OBOE_DEBUG_LOG_LOW(module, ...)                    \
-  {                                                                     \
-    oboe_debug_logger(module, OBOE_DEBUG_LOW, __FILE__, __LINE__, __VA_ARGS__); \
-  }
-#else
-# define OBOE_DEBUG_LOG_LOW(module, format_string, ...) {}
-#endif
-
-/**
- * Log a medium-detail diagnostic message.
- */
-#if OBOE_DEBUG_LEVEL >= OBOE_DEBUG_MEDIUM
-# define OBOE_DEBUG_LOG_MEDIUM(module, ...)                    \
-  {                                                                     \
-    oboe_debug_logger(module, OBOE_DEBUG_MEDIUM, __FILE__, __LINE__, __VA_ARGS__); \
-  }
-#else
-# define OBOE_DEBUG_LOG_MEDIUM(module, ...) {}
-#endif
-
-/**
- * Log a high-detail diagnostic message.
- */
-#if OBOE_DEBUG_LEVEL >= OBOE_DEBUG_HIGH
-# define OBOE_DEBUG_LOG_HIGH(module, ...)                    \
-  {                                                                     \
-    oboe_debug_logger(module, OBOE_DEBUG_HIGH, __FILE__, __LINE__, __VA_ARGS__); \
-  }
-#else
-# define OBOE_DEBUG_LOG_HIGH(module, format_string, ...) {}
-#endif
-
-
-/**
- * Low-level diagnostics logging function.
- *
- * This is normally used only by the OBOE_DEBUG_LOG_* function macros and not used directly.
- *
- * This function may be adapted to format and route diagnostic log messages as desired.
- *
- * @param module One of the numeric module identifiers defined in debug.h - used to control logging detail by module.
- * @param level Diagnostic detail level of this message - used to control logging volume by detail level.
- * @param source_name Name of the source file, if available, or another useful name, or NULL.
- * @param source_lineno Number of the line in the source file where message is logged from, if available, or zero.
- * @param format A C language printf format specification string.
- * @param args A variable argument list in VA_ARG format containing arguments for each argument specifier in the format.
- */
-void oboe_debug_logger(int module, int level, const char *source_name, int source_lineno, const char *format, ...);
-
 /**
  * Get the Oboe library revision number.
  *
@@ -1133,7 +865,7 @@ int oboe_get_profiling_interval();
 // Get server warning message
 const char* oboe_get_server_warning();
 
-// Regex tools
+// Regex tools (Deprecated)
 void* oboe_regex_new_expression(const char* exprString);
 void oboe_regex_delete_expression(void* expression);
 int oboe_regex_match(const char* string, void* expression);
@@ -1144,6 +876,18 @@ oboe_internal_stats_t* oboe_get_internal_stats();
 // Random
 void oboe_random_bytes(uint8_t bytes[], size_t sz);
 
+// oboe logging macro
+#define OBOE_DEBUG_LOG_CONFIG(module, app_name, trace_mode, sample_rate, reporter_type, reporter_args, extra) OBOE_DEBUG_LOG_CONFIG_EX(module, app_name, trace_mode, sample_rate, reporter_type, reporter_args, extra)
+#define OBOE_DEBUG_LOG_FATAL(module, ...) OBOE_DEBUG_LOG_FATAL_EX(module, __VA_ARGS__)
+#define OBOE_DEBUG_LOG_ERROR(module, ...) OBOE_DEBUG_LOG_ERROR_EX(module, __VA_ARGS__)
+#define OBOE_DEBUG_LOG_WARNING(module, ...) OBOE_DEBUG_LOG_WARNING_EX(module, __VA_ARGS__)
+#define OBOE_DEBUG_LOG_INFO(module, ...) OBOE_DEBUG_LOG_INFO_EX(module, __VA_ARGS__)
+#define OBOE_DEBUG_LOG_LOW(module, ...) OBOE_DEBUG_LOG_LOW_EX(module, __VA_ARGS__)
+#define OBOE_DEBUG_LOG_MEDIUM(module, ...) OBOE_DEBUG_LOG_MEDIUM_EX(module, __VA_ARGS__)
+#define OBOE_DEBUG_LOG_HIGH(module, ...) OBOE_DEBUG_LOG_HIGH_EX(module, __VA_ARGS__)
+
+void oboe_init_once();
+
 #ifdef __cplusplus
 } // extern "C"
 #endif

data/ext/oboe_metal/src/oboe_api.cpp

@@ -1,14 +1,10 @@
 /**
  * @file oboe_api.cpp - C++ liboboe wrapper primarily used via swig interfaces
  * by the python and ruby agents
- *
- * TODO:  This doc is outdated
- * This API should follow https://github.com/tracelytics/tracelons/wiki/Instrumentation-API
- **/
+ */
 
 #include "oboe_api.h"
 #include <algorithm>
-/////// Metatdata ///////
 
 Metadata::Metadata(const oboe_metadata_t *md) {
     oboe_metadata_copy(this, md);
@@ -40,7 +36,7 @@ bool Metadata::isSampled() {
     return oboe_metadata_is_sampled(this);
 }
 
-Metadata *Metadata::fromString(std::string s) {
+Metadata *Metadata::fromString(const std::string& s) {
     oboe_metadata_t md;
     oboe_metadata_init(&md);
     oboe_metadata_fromstr(&md, s.data(), s.size());
@@ -175,7 +171,7 @@ void Context::set(oboe_metadata_t *md) {
     oboe_context_set(md);
 }
 
-void Context::fromString(std::string s) {
+void Context::fromString(const std::string& s) {
     oboe_context_set_fromstr(s.data(), s.size());
 }
 
@@ -201,7 +197,7 @@ bool Context::isSampled() {
     return oboe_context_is_sampled();
 }
 
-std::string Context::validateTransformServiceName(std::string service_key) {
+std::string Context::validateTransformServiceName(const std::string& service_key) {
     char service_key_cpy[71 + 1 + 256] = {0};  // Flawfinder: ignore, key=71, colon=1, name<=255
     std::copy_n(service_key.begin(), std::min(service_key.size(), sizeof(service_key_cpy)), std::begin(service_key_cpy));
     int len = strlen(service_key_cpy);                                           // Flawfinder: ignore
@@ -226,20 +222,10 @@ bool Context::isLambda() {
     return (bool) oboe_is_lambda();
 }
 
-/**
- * Create a new event object that continues the trace context.
- *
- * NOTE: The returned object must be "delete"d.
- */
 Event *Context::createEvent() {
     return new Event(Context::get());
 }
 
-/**
- * Create a new event object with a new trace context.
- *
- * NOTE: The returned object must be "delete"d.
- */
 Event *Context::startTrace() {
     oboe_metadata_t *md = Context::get();
     oboe_metadata_random(md);
@@ -253,34 +239,36 @@ Event* Context::createEntry(const oboe_metadata_t *md, int64_t timestamp, const
      * we need to set the thread local metadata the same task id as input parameter md but a different op_id.
      */
     auto thread_local_md = Context::get();
+    // set the thread_local_md to md to fulfill the same trace id requirement in Reporter::sendReport & oboe_event_send
     oboe_metadata_copy(thread_local_md, md);
-    // reset op_id to zeros
+    // reset op_id to zeros to fulfill the different op id requirement in Reporter::sendReport & oboe_event_send
     memset(thread_local_md->ids.op_id, 0, OBOE_MAX_OP_ID_LEN);
 
     auto event = new Event();
+    oboe_event_destroy(event);
     oboe_event_init(event, md, md->ids.op_id);
-    oboe_event_add_info(event, "Label", "entry");
-    oboe_event_add_info_int64(event, "Timestamp_u", timestamp);
-    if (parent_md) {
-        oboe_event_add_edge(event, parent_md);
+
+    event->addInfo("Label", std::string("entry"));
+    event->addInfo("Timestamp_u", timestamp);
+    if(parent_md) {
+        event->addEdge(const_cast<oboe_metadata*>(parent_md));
     }
     return event;
 }
 
 Event* Context::createEvent(int64_t timestamp) {
     auto event = new Event(Context::get());
-    oboe_event_add_info_int64(event, "Timestamp_u", timestamp);
+    event->addInfo("Timestamp_u", timestamp);
     return event;
 }
 
 Event* Context::createExit(int64_t timestamp) {
     auto event = createEvent(timestamp);
-    oboe_event_add_info(event, "Label", "exit");
+    event->addInfo("Label", std::string("exit"));
     return event;
 }
 
 /////// Event ///////
-
 Event::Event() {
     oboe_event_init(this, Context::get(), NULL);
 }
@@ -312,8 +300,8 @@ bool Event::addInfo(char *key, void *val) {
     return true;
 }
 
-bool Event::addInfo(char *key, const std::string &val) {
-    return oboe_event_add_info(this, key, val.data()) == 0;
+bool Event::addInfo(char *key, const std::string& val) {
+    return oboe_event_add_info(this, key, val.c_str()) == 0;
 }
 
 bool Event::addInfo(char *key, long val) {
@@ -373,19 +361,9 @@ bool Event::addEdge(oboe_metadata_t *md) {
 }
 
 bool Event::addHostname() {
-    static char oboe_hostname[HOST_NAME_MAX + 1] = {'\0'}; // Flawfinder: ignore
-
-    if (oboe_hostname[0] == '\0') {
-        (void)gethostname(oboe_hostname, sizeof(oboe_hostname) - 1);
-        if (oboe_hostname[0] == '\0') {
-            // Something is wrong but we don't want to to report this more than
-            // once so we'll set it to a minimal non-empty string.
-            OBOE_DEBUG_LOG_WARNING(OBOE_MODULE_LIBOBOE, "Failed to get hostname, setting it to '?'");
-            oboe_hostname[0] = '?';
-            oboe_hostname[1] = '\0';
-        }
-    }
-    return oboe_event_add_info(this, "Hostname", oboe_hostname) == 0;
+    char host[256] = {0};
+    gethostname(host, sizeof(host)/sizeof(char));
+    return oboe_event_add_info(this, "Hostname", host) == 0;
 }
 
 bool Event::addContextOpId(const oboe_metadata_t *md) {
@@ -530,8 +508,14 @@ MetricTags::MetricTags(size_t count) {
 
 MetricTags::~MetricTags() {
     for (size_t i = 0; i < size; i++) {
-        delete tags[i].key; tags[i].key = nullptr;
-        delete tags[i].value; tags[i].value = nullptr;
+        if (tags[i].key) {
+            free(tags[i].key);
+            tags[i].key = nullptr;
+        }
+        if (tags[i].value) {
+            free(tags[i].value);
+            tags[i].value = nullptr;
+        }
     }
     delete[] tags;
 }