solarwinds_apm 5.1.4 → 5.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b56699604e8448a606d69ed23ba957622c4b70d8d2cbcf070526105f2dcff87
-  data.tar.gz: 5b0f55643f2ea9072418c66c62a6f9ea4ca87fea74fbcec66574a341e0510c82
+  metadata.gz: cdd15fde05af7219d90e153f0acb28c0f075c08ad40be2d40c23b39a5c73bed3
+  data.tar.gz: b8d021ae71f3080d68b0990a062d7d5ec36bc8df91a07bf51ff43acbb7d8b94b
 SHA512:
-  metadata.gz: f77f2c0e8315832f92204bc0cdd29d6588f83cbf2751f8dfac2fb0402c65091c96238f0192da4473b99a0cf5197b44a66839f7d1c58fb5521bd11ce1a96defc6
-  data.tar.gz: 53c8e3740a5361fa4f9e403cf863f2044d821a58a7c42ac8708c859781c363b168af78e39da50b2ceeda783b752205cf0c0cb5bdf86afa7ffa4e63e80ae4dffe
+  metadata.gz: 3237df27aa4fa104f65d3b65915ae6b4a5b3fb50923658249c083ccc6a633a1da665786407aaee0e7711a9e19416ee1df14594c3257cfdc00fe3018e3f99e244
+  data.tar.gz: e70bc08cee67c45fcaa0fbcbb22efb74d4e7752f28b017f1f6c1067cdf9a4785b189972d3f6dfce227c36fee418b28dbaa11e9608d7733762895182d118701c9

data/CHANGELOG.md

@@ -3,6 +3,29 @@ https://github.com/solarwindscloud/solarwinds-apm-ruby/releases
 
 Dates in this file are in the format MM/DD/YYYY.
 
+# 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:
+
+* Update latest liboboe library (12.0.0)
+* Remove centos as testing environments and include amazonlinux as alternatives of RHEL distro
+* Include sanitize RemoteURL for kvs (p.s. RemoteHost is sanitized in library code)
+
+Pushed to Rubygems:
+
+https://rubygems.org/gems/solarwinds_apm/versions/5.1.6
+
+
 # solarwinds_apm 5.1.4 (11/23/2022)
 
 This release includes the following features:

data/README.md

@@ -11,9 +11,9 @@ It requires an [Solarwinds] account to view metrics.  Get yours,
 
 [![Gem Version](https://badge.fury.io/rb/solarwinds_apm.svg)](https://badge.fury.io/rb/solarwinds_apm)
 
-[![Run all Tests](https://github.com/solarwindscloud/solarwinds-apm-ruby/actions/workflows/test_on_4_linux.yml/badge.svg)](https://github.com/solarwindscloud/solarwinds-apm-ruby/actions/workflows/test_on_4_linux.yml)
+[![Run All Tests](https://github.com/solarwindscloud/solarwinds-apm-ruby/actions/workflows/test_on_4_linux.yml/badge.svg)](https://github.com/solarwindscloud/solarwinds-apm-ruby/actions/workflows/test_on_4_linux.yml)
 
-[![C++ Tests](https://github.com/appoptics/appoptics-apm-ruby/actions/workflows/run_cpluplus_tests.yml/badge.svg)](https://github.com/appoptics/appoptics-apm-ruby/actions/workflows/run_cpluplus_tests.yml)
+[![C++ Tests](https://github.com/solarwindscloud/solarwinds-apm-ruby/actions/workflows/run_cpluplus_tests.yml/badge.svg)](https://github.com/solarwindscloud/solarwinds-apm-ruby/actions/workflows/run_cpluplus_tests.yml)
 
 [comment]: <> ([![Maintainability]&#40;https://api.codeclimate.com/v1/badges/ac7f36241a23a3a82fc5/maintainability&#41;]&#40;https://codeclimate.com/github/appoptics/appoptics-apm-ruby/maintainability&#41;)
 

data/ext/oboe_metal/extconf.rb

@@ -58,8 +58,7 @@ if File.exist?('/etc/alpine-release')
     end
 end
 
-ao_clib = "liboboe-1.0-#{ao_arch}.so.0.0.0"
-ao_clib = "liboboe-1.0-#{ao_arch}.so" if ENV['OBOE_DEV'].to_s.downcase == 'true' # for dev build only
+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)

data/ext/oboe_metal/extconf_local.rb

@@ -24,7 +24,7 @@ ext_dir = File.expand_path(File.dirname(__FILE__))
 # the SolarWindsAPM libs.
 ao_lib_dir = File.join(ext_dir, 'lib')
 ao_path = '../../../oboe/factory-output'
-ao_clib = "liboboe-1.0-x86_64.so.0.0.0"
+ao_clib = "liboboe-1.0-x86_64.so"
 ao_item = File.join(ao_path, ao_clib)
 clib = File.join(ao_lib_dir, ao_clib)
 

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

@@ -0,0 +1 @@
+1cfc73a5f69a92b2abdfe973e52dcd4650fb0d224827e38dd3630c817feff0b5

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

@@ -0,0 +1 @@
+46e70e34f873a596e5c76f2914ea6292716dac8ff3ed5020e6599fc60dfe19d3

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

@@ -0,0 +1 @@
+ee8eb315b1271d0586bf232e7e1a8ab28af43be3861341866fc945f3cd7c1d5c

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

@@ -0,0 +1 @@
+e7287ff06e3ba3879838f0b460b85d8f4d2d82f1e0f36d95a4235cf42c56d36f

data/ext/oboe_metal/src/VERSION

@@ -1,2 +1,2 @@
-11.1.0
+12.1.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
 
@@ -750,7 +744,7 @@ int oboe_sample_is_enabled(oboe_settings_cfg_t *cfg);
 int oboe_tracing_decisions(oboe_tracing_decisions_in_t *in, oboe_tracing_decisions_out_t *out);
 
 /* Oboe configuration interface. */
-
+#ifndef _WIN32
 /**
  * Check if the Oboe library is compatible with a given version.revision.
  *
@@ -762,7 +756,7 @@ int oboe_tracing_decisions(oboe_tracing_decisions_in_t *in, oboe_tracing_decisio
  * @return Non-zero if the Oboe library is considered compatible with the specified revision.
  */
 extern int oboe_config_check_version(int version, int revision);
-
+#endif
 /**
  * Get the Oboe library version number.
  *
@@ -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

@@ -530,8 +530,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;
 }
@@ -694,7 +700,11 @@ std::string Reporter::getType() {
 /////// Config ///////
 
 bool Config::checkVersion(int version, int revision) {
+#ifndef _WIN32
     return (oboe_config_check_version(version, revision) != 0);
+#else
+    return true;
+#endif
 }
 
 std::string Config::getVersionString() {