appoptics_apm 4.8.2 → 4.10.1

data/ext/oboe_metal/src/bson/platform_hacks.h

@@ -49,20 +49,20 @@ typedef long long int int64_t;
 
 /* big endian is only used for OID generation. little is used everywhere else */
 #ifdef MONGO_BIG_ENDIAN
-#define bson_little_endian64(out, in) ( bson_swap_endian64(out, in) )
-#define bson_little_endian32(out, in) ( bson_swap_endian32(out, in) )
-#define bson_big_endian64(out, in) ( memmove(out, in, 8) )
-#define bson_big_endian32(out, in) ( memmove(out, in, 4) )
+#define oboe_bson_little_endian64(out, in) ( oboe_bson_swap_endian64(out, in) )
+#define oboe_bson_little_endian32(out, in) ( oboe_bson_swap_endian32(out, in) )
+#define oboe_bson_big_endian64(out, in) ( memmove(out, in, 8) )
+#define oboe_bson_big_endian32(out, in) ( memmove(out, in, 4) )
 #else
-#define bson_little_endian64(out, in) ( memmove(out, in, 8) )
-#define bson_little_endian32(out, in) ( memmove(out, in, 4) )
-#define bson_big_endian64(out, in) ( bson_swap_endian64(out, in) )
-#define bson_big_endian32(out, in) ( bson_swap_endian32(out, in) )
+#define oboe_bson_little_endian64(out, in) ( memmove(out, in, 8) )
+#define oboe_bson_little_endian32(out, in) ( memmove(out, in, 4) )
+#define oboe_bson_big_endian64(out, in) ( oboe_bson_swap_endian64(out, in) )
+#define oboe_bson_big_endian32(out, in) ( oboe_bson_swap_endian32(out, in) )
 #endif
 
 MONGO_EXTERN_C_START
 
-MONGO_INLINE void bson_swap_endian64(void* outp, const void* inp){
+MONGO_INLINE void oboe_bson_swap_endian64(void* outp, const void* inp){
     const char *in = (const char*)inp;
     char *out = (char*)outp;
 
@@ -76,7 +76,7 @@ MONGO_INLINE void bson_swap_endian64(void* outp, const void* inp){
     out[7] = in[0];
 
 }
-MONGO_INLINE void bson_swap_endian32(void* outp, const void* inp){
+MONGO_INLINE void oboe_bson_swap_endian32(void* outp, const void* inp){
     const char *in = (const char*)inp;
     char *out = (char*)outp;
 

data/ext/oboe_metal/src/oboe.h

@@ -1,12 +1,12 @@
 /**
  * @file oboe.h
- * 
+ *
  * API header for AppOptics' Oboe application tracing library for use with AppOptics.
  *
  * @package             Oboe
  * @author              AppOptics
  * @copyright           Copyright (c) 2016, SolarWinds LLC
- * @license             
+ * @license
  * @link                https://appoptics.com
  **/
 
@@ -81,6 +81,10 @@ extern "C" {
  * Default events flush batch size in KB.
  */
 #define OBOE_DEFAULT_EVENTS_FLUSH_BATCH_SIZE 2000
+/**
+ * Default EC2 metadata timeout in milliseconds
+ */
+#define OBOE_DEFAULT_EC2_METADATA_TIMEOUT 1000
 
 #define OBOE_SAMPLE_RESOLUTION 1000000
 
@@ -133,7 +137,7 @@ typedef struct oboe_metadata {
 
 typedef struct oboe_event {
     oboe_metadata_t metadata;
-    bson_buffer     bbuf;
+    oboe_bson_buffer     bbuf;
     char *          bb_str;
 #ifdef _FUTURE_PLANS_
     /* Can't add this without breaking the ABI, but someday... */
@@ -167,6 +171,8 @@ typedef struct oboe_init_options {
     int token_bucket_capacity;              // custom token bucket capacity
     int token_bucket_rate;                  // custom token bucket rate
     int file_single;                        // use single files in file reporter for each event
+
+    int ec2_metadata_timeout;               // EC2 metadata timeout in milliseconds
 } oboe_init_options_t;
 
 typedef struct oboe_span_params {
@@ -183,12 +189,22 @@ typedef struct oboe_span_params {
     int do_metrics;                 // boolean flag whether a (HTTP) span should be sent (1) or not (0)
 } oboe_span_params_t;
 
+//
+// oboe_get_tracing_decisions input and output structures
+//
 typedef struct oboe_tracing_decisions_in {
-    int version;
-    const char *service_name;
-    const char *in_xtrace;
-    int custom_sample_rate;
-    int custom_tracing_mode;
+    int version;                    // the version of this structure
+    const char *service_name;       // custom service name
+    const char *in_xtrace;          // existing X-Trace from passed in HTTP header
+    int custom_sample_rate;         // custom sample rate
+    int custom_tracing_mode;        // custom tracing mode
+
+    // v2
+    int custom_trigger_mode;        // custom trigger mode
+    int request_type;               // the request type: OBOE_REQUEST_TYPE_REGULAR, OBOE_REQUEST_TYPE_TRIGGER
+    const char *header_options;     // X-Trace-Options HTTP header value
+    const char *header_signature;   // X-Trace-Options-Signature HTTP header value
+    time_t header_timestamp;        // timestamp from X-Trace-Options header, converted to UNIX timestamp format
 } oboe_tracing_decisions_in_t;
 
 typedef struct oboe_tracing_decisions_out {
@@ -197,6 +213,12 @@ typedef struct oboe_tracing_decisions_out {
     int sample_source;
     int do_sample;
     int do_metrics;
+
+    // v2
+    int request_provisioned;
+    int auth_status;
+    const char *auth_message;
+    const char *status_message;
 } oboe_tracing_decisions_out_t;
 
 typedef struct oboe_internal_stats {
@@ -253,7 +275,7 @@ int oboe_event_add_info_binary (oboe_event_t *, const char *, const char *, size
 int oboe_event_add_info_int64 (oboe_event_t *, const char *, const int64_t);
 int oboe_event_add_info_double (oboe_event_t *, const char *, const double);
 int oboe_event_add_info_bool (oboe_event_t *, const char *, const int);
-int oboe_event_add_info_bson (oboe_event_t *, const char *key, const bson *val);
+int oboe_event_add_info_bson (oboe_event_t *, const char *key, const oboe_bson *val);
 int oboe_event_add_edge (oboe_event_t *, const oboe_metadata_t *);
 int oboe_event_add_edge_fromstr(oboe_event_t *, const char *, size_t);
 
@@ -357,7 +379,7 @@ int oboe_init(oboe_init_options_t* options);
  * Initialize the Oboe subsytems using a specific reporter configuration.
  *
  * This should be called before any other oboe_* functions butm may also be
- * used to change or re-initialize the current reporter.  To reconnect the 
+ * used to change or re-initialize the current reporter.  To reconnect the
  * reporter use oboe_disconnect() and oboe_reconnect() instead.
  *
  * @param protocol One of  OBOE_REPORTER_PROTOCOL_FILE, OBOE_REPORTER_PROTOCOL_UDP,
@@ -367,7 +389,12 @@ int oboe_init(oboe_init_options_t* options);
  */
 int oboe_init_reporter(const char *protocol, oboe_init_options_t *options);
 
-void oboe_init_options_set_defaults(oboe_init_options_t *options);
+/**
+ * returns one of these:
+ * - OBOE_INIT_OPTIONS_SET_DEFAULTS_OK
+ * - OBOE_INIT_OPTIONS_SET_DEFAULTS_WRONG_VERSION
+ */
+int oboe_init_options_set_defaults(oboe_init_options_t *options);
 
 /**
  * Disconnect or shut down the Oboe reporter, but allow it to be reconnect()ed.
@@ -429,6 +456,7 @@ void oboe_shutdown();
 #define OBOE_SETTINGS_FLAG_SAMPLE_START   0x4
 #define OBOE_SETTINGS_FLAG_SAMPLE_THROUGH 0x8
 #define OBOE_SETTINGS_FLAG_SAMPLE_THROUGH_ALWAYS 0x10
+#define OBOE_SETTINGS_FLAG_TRIGGERED_TRACE 0x20
 #define OBOE_SETTINGS_MAX_STRLEN 256
 
 #define OBOE_SETTINGS_UNSET -1
@@ -455,9 +483,6 @@ void oboe_shutdown();
     #pragma pack(push, 1)
 #endif
 
-#define TOKEN_BUCKET_CAPACITY_DEFAULT 16               // bucket capacity (how many tokens fit into the bucket)
-#define TOKEN_BUCKET_RATE_PER_SECOND_DEFAULT 8         // rate per second (number of tokens per second)
-
 #define OBOE_SEND_EVENT 0
 #define OBOE_SEND_STATUS 1
 #define OBOE_SEND_PROFILING 2
@@ -477,7 +502,17 @@ void oboe_shutdown();
 #define OBOE_SPAN_NO_REPORTER -4
 #define OBOE_SPAN_NOT_READY -5
 
-// these codes are used by oboe_sample_layer_custom(), oboe_tracing_decisions(), oboe_reporter_is_ready()
+// these codes are returned by oboe_sample_layer_custom(), oboe_tracing_decisions(),
+// oboe_reporter_is_ready(), and referenced in settings_messages.c (to convert
+// error codes to messages.)
+//
+// they are structured such that codes that are <= 0 are successful, i.e., no
+// error status needs to be reported to the user, while codes > 0 are errors that
+// need to be reported.
+
+#define OBOE_TRACING_DECISIONS_FAILED_AUTH -5
+#define OBOE_TRACING_DECISIONS_TRIGGERED_TRACE_EXHAUSTED -4
+#define OBOE_TRACING_DECISIONS_TRIGGERED_TRACE_DISABLED -3
 #define OBOE_TRACING_DECISIONS_TRACING_DISABLED -2
 #define OBOE_TRACING_DECISIONS_XTRACE_NOT_SAMPLED -1
 #define OBOE_TRACING_DECISIONS_OK 0
@@ -486,8 +521,31 @@ void oboe_shutdown();
 #define OBOE_TRACING_DECISIONS_REPORTER_NOT_READY 3
 #define OBOE_TRACING_DECISIONS_NO_VALID_SETTINGS 4
 #define OBOE_TRACING_DECISIONS_QUEUE_FULL 5
+#define OBOE_TRACING_DECISIONS_BAD_ARG 6
+
+// convert above codes into const char* messages.
+const char* oboe_get_tracing_decisions_message(int code);
+
+#define OBOE_TRACING_DECISIONS_AUTH_NOT_CHECKED -2
+#define OBOE_TRACING_DECISIONS_AUTH_NOT_PRESENT -1
+#define OBOE_TRACING_DECISIONS_AUTH_OK 0
+#define OBOE_TRACING_DECISIONS_AUTH_NO_SIG_KEY 1
+#define OBOE_TRACING_DECISIONS_AUTH_INVALID_SIG 2
+#define OBOE_TRACING_DECISIONS_AUTH_BAD_TIMESTAMP 3
 
-// these codes are used by oboe_init(), oboe_init_reporter(), _oboe_create_reporter()
+// convert above codes into const char* messages.
+const char* oboe_get_tracing_decisions_auth_message (int code);
+
+#define OBOE_REQUEST_TYPE_NONE -1
+#define OBOE_REQUEST_TYPE_REGULAR 0
+#define OBOE_REQUEST_TYPE_TRIGGER 1
+
+#define OBOE_INIT_OPTIONS_SET_DEFAULTS_OK 0
+#define OBOE_INIT_OPTIONS_SET_DEFAULTS_WRONG_VERSION 1
+
+//
+// these codes are returned by oboe_init(), oboe_init_reporter(), _oboe_create_reporter()
+//
 #define OBOE_INIT_ALREADY_INIT -1
 #define OBOE_INIT_OK 0
 #define OBOE_INIT_WRONG_VERSION 1
@@ -501,6 +559,17 @@ void oboe_shutdown();
 #define OBOE_INIT_SSL_LOAD_CERT 9
 #define OBOE_INIT_SSL_REPORTER_CREATE 10
 
+// token buckets
+enum TOKEN_BUCKETS {
+  TOKEN_BUCKET_SAMPLING,    // for normal requests
+  TOKEN_BUCKET_TT_RELAXED,  // for triggered traces initiated by Pingdom and
+                            // other trusted sources (relaxed settings)
+  TOKEN_BUCKET_TT_STRICT,   // for triggered traces initiated by CLI and
+                            // other untrusted sources (strict settings)
+  TOKEN_BUCKET_COUNT        // IMPORTANT NOTE: this must be the last element
+                            // inside the enum
+};
+
 typedef struct {
     uint32_t magic;
     uint32_t timestamp;
@@ -510,8 +579,9 @@ typedef struct {
     uint32_t ttl;
     uint32_t _pad;
     char layer[OBOE_SETTINGS_MAX_STRLEN]; // Flawfinder: ignore
-    double bucket_capacity;
-    double bucket_rate_per_sec;
+    double bucket_capacity[TOKEN_BUCKET_COUNT];
+    double bucket_rate_per_sec[TOKEN_BUCKET_COUNT];
+    char signature_key[OBOE_SETTINGS_MAX_STRLEN]; // Flawfinder: ignore
 } oboe_settings_t;
 
 typedef struct {
@@ -531,6 +601,7 @@ typedef struct {
     volatile uint32_t through_count;            // # of through traces
     volatile uint32_t through_ignored_count;    // # of new requests, that are rejected due to start_always_flag == 0
                                                 // that have through_always_flag == 1
+    volatile uint32_t triggered_count;             // # of triggered traces
     volatile uint32_t last_used_sample_rate;
     volatile uint32_t last_used_sample_source;
 
@@ -541,12 +612,13 @@ typedef struct {
 typedef struct {
     int tracing_mode;          // pushed from server, override from config file
     int sample_rate;           // pushed from server, override from config file
+    int trigger_mode;          // pushed from server, override from config file
     oboe_settings_t *settings; // cached settings, updated by tracelyzer (init to NULL)
-    int last_auto_sample_rate; // stores last known automatic sampling rate 
-    uint16_t last_auto_flags;  // stores last known flags associated with above 
+    int last_auto_sample_rate; // stores last known automatic sampling rate
+    uint16_t last_auto_flags;  // stores last known flags associated with above
     uint32_t last_auto_timestamp; // timestamp from last *settings lookup
     uint32_t last_refresh;        // last refresh time
-    token_bucket_t bucket;
+    token_bucket_t bucket[TOKEN_BUCKET_COUNT];     // token buckets for various tasks
 } oboe_settings_cfg_t;
 
 int oboe_settings_init_local();
@@ -560,9 +632,10 @@ entry_layer_t* oboe_settings_entry_layer_get(const char* name);
 oboe_settings_cfg_t* oboe_settings_cfg_get();
 void oboe_settings_cfg_init(oboe_settings_cfg_t *cfg);
 
-void oboe_settings_set(int sample_rate, int tracing_mode);
+void oboe_settings_set(int sample_rate, int tracing_mode, int trigger_mode);
 void oboe_settings_rate_set(int sample_rate);
 void oboe_settings_mode_set(int tracing_mode);
+void oboe_settings_trigger_set(int trigger_mode);
 
 int oboe_rand_get_value();
 
@@ -588,49 +661,7 @@ int oboe_sample_is_enabled(oboe_settings_cfg_t *cfg);
  * headers, and, if appropriate, rolls the virtual dice to
  * decide if this request should be sampled.
  *
- * This is designed to be called once per layer per request.
- *
- * @param service_name Service name used for this request (may be NULL to use default settings)
- * @param xtrace X-Trace ID string from an HTTP request or higher layer (NULL or empty string if not present).
- * @param sample_rate_out The sample rate used to check if this request should be sampled
- *          (output - may be zero if not used).
- * @param sample_source_out The OBOE_SAMPLE_RATE_SOURCE used to check if this request
- *          should be sampled (output - may be zero if not used).
- * @return Non-zero if the given request should be sampled.
- */
-int oboe_sample_layer(
-    const char *service_name,
-    const char *xtrace,
-    int *sample_rate_out,
-    int *sample_source_out
-);
-
-/**
- * Same as oboe_sample_layer() but accepting custom sample rate and custom tracing mode
- *
- * @param service_name Service name used for this request (may be NULL to use default settings)
- * @param xtrace X-Trace ID string from an HTTP request or higher layer (NULL or empty string if not present).
- * @param custom_sample_rate a custom sample rate only used for this request (OBOE_SETTINGS_UNSET won't override)
- * @param custom_tracing_mode a custom tracing mode only used for this request (OBOE_SETTINGS_UNSET won't override)
- * @param sample_rate_out The sample rate used to check if this request should be sampled
- *          (output - may be zero if not used).
- * @param sample_source_out The OBOE_SAMPLE_RATE_SOURCE used to check if this request
- *          should be sampled (output - may be zero if not used).
- * @param flags_out The flags used to check if this request should be sampled
- */
-int oboe_sample_layer_custom(
-    const char *service_name,
-    const char *in_xtrace,
-    int custom_sample_rate,
-    int custom_tracing_mode,
-    int *sampling_decision_out,
-    int *sample_rate_out,
-    int *sample_source_out,
-    uint16_t *flags_out
-);
-
-/**
- * wrapper for calling oboe_sample_layer_custom() with input/output structs instead of individual params
+ * This is designed to be called once per request.
  *
  * @param in Struct containing all params to help making a tracing decision
  * @param out Struct containing all params that get set during decision making
@@ -773,21 +804,21 @@ extern int oboe_debug_log_remove(OboeDebugLoggerFcn oldLogger, void *context);
  * 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 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: 
+ * @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 
+ *          the log message and designed to include a few other
  *          configuration parameters of interest.
  */
 #if OBOE_DEBUG_LEVEL >= OBOE_DEBUG_INFO
@@ -821,7 +852,7 @@ extern int oboe_debug_log_remove(OboeDebugLoggerFcn oldLogger, void *context);
 /**
  * Log a recoverable error.
  *
- * Each message is limited in the number of times that it will be reported at the 
+ * 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
@@ -838,7 +869,7 @@ extern int oboe_debug_log_remove(OboeDebugLoggerFcn oldLogger, void *context);
 /**
  * Log a warning.
  *
- * Each message is limited in the number of times that it will be reported at the 
+ * 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
@@ -855,7 +886,7 @@ extern int oboe_debug_log_remove(OboeDebugLoggerFcn oldLogger, void *context);
 /**
  * Log an informative message.
  *
- * Each message is limited in the number of times that it will be reported at the 
+ * 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

data/ext/oboe_metal/src/oboe.hpp

@@ -8,6 +8,8 @@
 #define OBOE_HPP
 
 #include <string>
+#include <iostream>
+#include <cstdlib>
 #include <oboe.h>
 
 
@@ -126,74 +128,108 @@ public:
      *
      * call once per request
      *
-     * when compiled via SWIG this function takes 1-4 arguments and returns 4 integers
-     *
+     * when compiled via SWIG this function takes 0-8 input argss and returns 9 output args
+     *
+     * inputs (0-8, all optional):
+     * @param in_xtrace, a valid xtrace string
+     * @param custom_sample_rate, 0-1000000
+     * @param custom_tracing_mode, 0(disabled) or 1(enabled)
+     * @param request_type, 0 normal sampling, 1 trigger trace
+     * @param custom_custom_trigger_mode, 0(disabled) or 1(enabled) 
+     * @param header_options, the string from the X-Trace-Options header
+     * @param header_signature, the string from the X-Trace-Options-Signature header 
+     * @param header_timestamp, the timestamp insidethe X-Trace-Options header 
+     * 
+     * returns:
      * @param do_metrics, ignore when using SWIG, it will be mapped to the second return value
      * @param do_sample, ignore when using SWIG, it will be mapped to the first return value
      * @param sample_rate, ignore when using SWIG, it will be mapped to the third return value
      * @param sample_source, ignore when using SWIG, it will be mapped to the forth return value
-     * @param in_xtrace(optional), a valid xtrace string
-     * @param custom_sample_rate(optional), 0-1000000
-     * @param custom_tracing_mode(optional), 0(disabled) or 1(enabled)
-     * @param service_name(optional), only needed if there can be more than 1 service per process
-     *
-     * @return one of the following codes:
-     *   OBOE_TRACING_DECISIONS_TRACING_DISABLED == -2
-     *   OBOE_TRACING_DECISIONS_XTRACE_NOT_SAMPLED == -1
-     *   OBOE_TRACING_DECISIONS_OK == 0
-     *   OBOE_TRACING_DECISIONS_NULL_OUT == 1
-     *   OBOE_TRACING_DECISIONS_NO_CONFIG == 2
-     *   OBOE_TRACING_DECISIONS_REPORTER_NOT_READY == 3
-     *   OBOE_TRACING_DECISIONS_NO_VALID_SETTINGS == 4
+     * @param type, 0 normal sampling, 1 - trigger trace
+     * @param auth, 0 success, 1 failure, -1 not requested
+     * @param status_msg, message describing the trigger tracing decision
+     * @param auth_msg, message describing the succes/failure of the authorization
+     * 
+     * @status one of the OBOE_TRACING_DECISION_* codes
      */
-    static void getDecisions(int *do_metrics, int *do_sample, int *sample_rate, int *sample_source, int *return_value,
-                             std::string in_xtrace = "",
+
+    static void getDecisions(int *do_metrics, int *do_sample, int *sample_rate, int *sample_source, 
+                             int *type, int *auth, 
+                             std::string *status_msg, std::string *auth_msg, 
+                             int *status,
+                             const char *in_xtrace = NULL,
                              int custom_tracing_mode = OBOE_SETTINGS_UNSET,
-                             int custom_sample_rate = OBOE_SETTINGS_UNSET,
-                             std::string service_name = "")  {
-
-        oboe_tracing_decisions_in_t tdi = {
-                1, //version
-                service_name.c_str(),
-                in_xtrace.c_str(),
-                custom_sample_rate,
-                custom_tracing_mode
-        };
-        oboe_tracing_decisions_out_t tdo = {1, 0, 0, 0, 0}; // first field => version
-
-        *return_value = oboe_tracing_decisions(&tdi, &tdo);
+                             int custom_sample_rate = OBOE_SETTINGS_UNSET, 
+                             int request_type = 0,
+                             int custom_trigger_mode = 0,
+                             const char *header_options = NULL,
+                             const char *header_signature = NULL,
+                             long header_timestamp = 0 
+                             )  {
+
+        oboe_tracing_decisions_in_t tdi;
+        memset(&tdi, 0, sizeof(tdi));
+        tdi.custom_tracing_mode = custom_tracing_mode;
+        tdi.custom_sample_rate = custom_sample_rate;
+        tdi.custom_trigger_mode = custom_trigger_mode;
+        tdi.request_type = request_type;
+        tdi.version = 2;
+        tdi.in_xtrace = in_xtrace;
+        tdi.header_options = header_options;
+        tdi.header_signature = header_signature;
+        tdi.header_timestamp = header_timestamp;
+
+        oboe_tracing_decisions_out_t tdo;
+        memset(&tdo, 0, sizeof(tdo));
+        tdo.version = 2;
+
+        *status = oboe_tracing_decisions(&tdi, &tdo);
+
+       // TODO this can be removed once everything is debugged
+       if (std::getenv("OBOE_VERBOSE")) { // Flawfinder: ignore
+            std::cout << "- - - - - - - - - - - - - - - - - -" << std::endl;
+            std::cout << "Decisions in: " << std::endl;
+       
+            std::cout << "version " << tdi.version << std::endl;
+            if (tdi.service_name) { std::cout << "service_name " << tdi.service_name << std::endl; }
+            if (tdi.in_xtrace) { std::cout << "in_xtrace " << tdi.in_xtrace << std::endl; }
+            std::cout << "custom_sample_rate " << tdi.custom_sample_rate << std::endl;
+            std::cout << "custom_tracing_mode " << tdi.custom_tracing_mode << std::endl;
+            std::cout << "custom_trigger_mode " << tdi.custom_trigger_mode << std::endl;
+            std::cout << "request_type " << tdi.request_type << std::endl;
+            if (tdi.header_options) { std::cout << "header_options " << tdi.header_options << std::endl; }
+            if (tdi.header_signature) { std::cout << "header_signature " << tdi.header_signature << std::endl; }
+            std::cout << "header_timestamp " << tdi.header_timestamp << std::endl;
+
+            std::cout << std::endl;
+            std::cout << "Decisions out: " << std::endl;
+
+            std::cout << "version " << tdo.version << std::endl;
+            std::cout << "sample_rate " << tdo.sample_rate << std::endl;
+            std::cout << "sample_source " << tdo.sample_source << std::endl;
+            std::cout << "do_sample " << tdo.do_sample << std::endl;
+            std::cout << "do_metrics " << tdo.do_metrics << std::endl;
+            std::cout << "request_provisioned " << tdo.request_provisioned << std::endl;
+            std::cout << "auth_status " << tdo.auth_status << std::endl;
+            std::cout << "auth_message " << tdo.auth_message << std::endl;
+            std::cout << "status_message " << tdo.status_message << std::endl;
+
+            std::cout << std::endl << "status is " << *status << std::endl;
+            std::cout << "- - - - - - - - - - - - - - - - - -" << std::endl;
+       }
         
         *do_sample = tdo.do_sample;
         *do_metrics = tdo.do_metrics;
         *sample_rate = tdo.sample_rate;
         *sample_source = tdo.sample_source;
-    }
-
-    /**
-     * Check if the current request should be traced based on the current settings.
-     *
-     * If in_xtrace is empty, or if it is identified as a foreign (ie. cross customer)
-     * trace, then sampling will be considered as a new trace.
-     * Otherwise sampling will be considered as adding to the current trace.
-     * Different services may have special rules.
-     *
-     * This is designed to be called once per service per request.
-     *
-     *  @param service_name Name of the service being considered for tracing
-     *                      if empty, the default service name will be used
-     *  @param in_xtrace Incoming X-Trace ID (NULL or empty string if not present)
-     *  @return Zero to not trace; otherwise return the sample rate used in the low order
-     *          bytes 0 to 2 and the sample source in the higher-order byte 3.
-     */
-    static int sampleRequest(
-        std::string service_name,
-        std::string in_xtrace)
-    {
-        int sample_rate = 0;
-        int sample_source = 0;
-        int rc = (oboe_sample_layer(service_name.c_str(), in_xtrace.c_str(), &sample_rate, &sample_source));
-
-        return (rc == 0 ? 0 : (((sample_source & 0xFF) << 24) | (sample_rate & 0xFFFFFF)));
+        *type = tdo.request_provisioned;
+        if (tdo.status_message && tdo.status_message[0] != '\0') {
+            *status_msg = tdo.status_message;
+        }
+        *auth = tdo.auth_status;
+        if (tdo.auth_message && tdo.auth_message[0] != '\0') {
+            *auth_msg = tdo.auth_message;
+        }
     }
 
     /**
@@ -276,20 +312,23 @@ public:
      * @param max_flush_wait_time Optional parameter to configure maximum wait time for flushing data before terminating in milli seconds
      * @param events_flush_interval Optional parameter to configure how frequently events are flushed
      * @param events_flush_batch_size Optional parameter to configure the batch size before events are flushed
+     * @param ec2_metadata_timeout Optional parameter to configure the timeout (milli seconds) for retrieving EC2 metadata
    */
     static void init(std::string access_key = "", std::string hostname_alias = "",
             int log_level = LOGLEVEL_DEFAULT,
             int max_flush_wait_time = DEFAULT_FLUSH_MAX_WAIT_TIME,
             int events_flush_interval = OBOE_DEFAULT_EVENTS_FLUSH_INTERVAL,
-            int events_flush_batch_size = OBOE_DEFAULT_EVENTS_FLUSH_BATCH_SIZE) {
+            int events_flush_batch_size = OBOE_DEFAULT_EVENTS_FLUSH_BATCH_SIZE,
+            int ec2_metadata_timeout = OBOE_DEFAULT_EC2_METADATA_TIMEOUT) {
         oboe_init_options_t options;
         memset(&options, 0, sizeof(options));
-        options.version = 5;
+        options.version = 7;
         options.log_level = log_level;
         options.hostname_alias = hostname_alias.c_str();
         options.max_flush_wait_time = max_flush_wait_time;
         options.events_flush_interval = events_flush_interval;
         options.events_flush_batch_size = events_flush_batch_size;
+        options.ec2_metadata_timeout = ec2_metadata_timeout;
 
         oboe_init(&options);
    }
@@ -610,14 +649,16 @@ public:
              int histogram_precision,        // the histogram precision (only for ssl)
              int token_bucket_capacity,      // custom token bucket capacity
              int token_bucket_rate,          // custom token bucket rate
-             int file_single                 // use single files in file reporter for each event
+             int file_single,                // use single files in file reporter for each event
+
+             int ec2_metadata_timeout        // the timeout (milli seconds) for retrieving EC2 metadata
              ) {
 
         oboe_init_options_t options;
         memset(&options, 0, sizeof(options));
+        options.version = 7;
         oboe_init_options_set_defaults(&options);
 
-        options.version = 5;
         if (hostname_alias != "") {
             options.hostname_alias = hostname_alias.c_str();
         }
@@ -645,6 +686,7 @@ public:
         options.token_bucket_capacity = token_bucket_capacity;
         options.token_bucket_rate = token_bucket_rate;
         options.file_single = file_single;
+        options.ec2_metadata_timeout = ec2_metadata_timeout;
 
         init_status = oboe_init(&options);
     }