chore(axiom): remove helper function and split up if statements

Author: hahuja2

axiom/nr_txn.c

@@ -1553,20 +1553,27 @@ nr_status_t nr_txn_record_error_worthy(const nrtxn_t* txn, int priority) {
   return NR_SUCCESS;
 }
 
-static void nr_txn_record_error_helper(nrtxn_t* txn,
-                                       int priority,
-                                       bool add_to_current_segment,
-                                       const char* error_message,
-                                       const char* error_class,
-                                       const char* error_file,
-                                       int error_line,
-                                       char* error_context,
-                                       int error_no,
-                                       const char* stacktrace_json) {
+void nr_txn_record_error_with_additional_attributes(
+    nrtxn_t* txn,
+    int priority,
+    bool add_to_current_segment,
+    const char* error_message,
+    const char* error_class,
+    const char* error_file,
+    int error_line,
+    char* error_context,
+    int error_no,
+    const char* stacktrace_json) {
   nr_segment_t* current_segment = NULL;
   char* span_id = NULL;
   nr_error_t* error = NULL;
 
+  if (nrunlikely((0 == txn) || (0 == txn->options.err_enabled)
+                 || (0 == txn->status.recording) || (0 == stacktrace_json)
+                 || (0 == error_class))) {
+    return;
+  }
+
   if ((txn->error) && (priority < nr_error_priority(txn->error))) {
     /*priority of new error is lower, so we don't need to do anything */
     return;
@@ -1600,15 +1607,7 @@ static void nr_txn_record_error_helper(nrtxn_t* txn,
       current_segment = nr_txn_get_current_segment(txn, NULL);
 
       if (current_segment) {
-        if (NULL == error_file) {
-          nr_segment_set_error(current_segment, error_message, error_class);
-          nrl_verbosedebug(NRL_TXN,
-                           "recording segment error: msg='%.48s' cls='%.48s'"
-                           "span_id='%.48s'",
-                           NRSAFESTR(error_message), NRSAFESTR(error_class),
-                           NRSAFESTR(span_id));
-        } else {
-          nr_segment_set_error_with_additional_params(
+        nr_segment_set_error_with_additional_params(
               current_segment, error_message, error_class, error_file,
               error_line, error_context, error_no);
           nrl_verbosedebug(NRL_TXN,
@@ -1619,18 +1618,12 @@ static void nr_txn_record_error_helper(nrtxn_t* txn,
                            NRSAFESTR(error_file), error_line,
                            NRSAFESTR(error_context), error_no,
                            NRSAFESTR(span_id));
-        }
       }
     }
   }
-  if (NULL == error_file) {
-    error = nr_error_create(priority, error_message, error_class,
-                            stacktrace_json, span_id, nr_get_time());
-  } else {
-    error = nr_error_create_additional_params(
+  error = nr_error_create_additional_params(
         priority, error_message, error_class, error_file, error_line,
         error_context, error_no, stacktrace_json, span_id, nr_get_time());
-  }
 
   /*
    * Ensure previous error is destroyed only we have a valid one to replace it
@@ -1669,31 +1662,9 @@ void nr_txn_record_error(nrtxn_t* txn,
                  || (0 == stacktrace_json))) {
     return;
   }
-  nr_txn_record_error_helper(txn, priority, add_to_current_segment, errmsg,
-                             errclass, NULL, 0, NULL, 0, stacktrace_json);
-}
-
-void nr_txn_record_error_with_additional_attributes(
-    nrtxn_t* txn,
-    int priority,
-    bool add_to_current_segment,
-    const char* error_message,
-    const char* error_class,
-    const char* error_file,
-    int error_line,
-    char* error_context,
-    int error_no,
-    const char* stacktrace_json) {
-  if (nrunlikely((0 == txn) || (0 == txn->options.err_enabled)
-                 || (0 == error_message) || (0 == txn->status.recording)
-                 || (0 == error_message[0]) || (0 == stacktrace_json)
-                 || (0 == error_class) || (0 == error_file) || (0 == error_line)
-                 || (0 == error_context) || (0 == error_no))) {
-    return;
-  }
-  nr_txn_record_error_helper(txn, priority, add_to_current_segment,
-                             error_message, error_class, error_file, error_line,
-                             error_context, error_no, stacktrace_json);
+  nr_txn_record_error_with_additional_attributes(
+      txn, priority, add_to_current_segment, errmsg, errclass, NULL, 0, NULL, 0,
+      stacktrace_json);
 }
 
 char* nr_txn_create_fn_supportability_metric(const char* function_name,
@@ -2535,8 +2506,10 @@ nr_analytics_event_t* nr_error_to_event(const nrtxn_t* txn) {
   nro_set_hash_string(params, "type", "TransactionError");
   nro_set_hash_double(params, "timestamp", ((double)when) / NR_TIME_DIVISOR_D);
   nro_set_hash_string(params, "error.class", nr_error_get_klass(txn->error));
-  nro_set_hash_string(params, "error.message",
-                      nr_error_get_message(txn->error));
+  if (NULL != nr_error_get_message(txn->error)) {
+    nro_set_hash_string(params, "error.message",
+                        nr_error_get_message(txn->error));
+  }
   nro_set_hash_string(params, "transactionName", txn->name);
   nro_set_hash_double(params, "duration",
                       ((double)duration) / NR_TIME_DIVISOR_D);
@@ -2584,19 +2557,41 @@ nr_analytics_event_t* nr_error_to_event(const nrtxn_t* txn) {
                                                 NR_ATTRIBUTE_DESTINATION_ERROR);
   user_attributes = nr_attributes_user_to_obj(txn->attributes,
                                               NR_ATTRIBUTE_DESTINATION_ERROR);
-  if (nr_error_get_file(txn->error) && nr_error_get_context(txn->error)) {
+  if (nr_error_get_message(txn->error)) {
+    if (NULL == user_attributes) {
+      user_attributes = nro_new_hash();
+    }
+    nro_set_hash_string(user_attributes, "user.error.message",
+                        nr_error_get_message(txn->error));
+  }
+  if (nr_error_get_file(txn->error)) {
     if (NULL == user_attributes) {
       user_attributes = nro_new_hash();
     }
     nro_set_hash_string(user_attributes, "user.error.file",
                         nr_error_get_file(txn->error));
-    nro_set_hash_int(user_attributes, "user.error.line",
-                     nr_error_get_line(txn->error));
+  }
+  if (nr_error_get_context(txn->error)) {
+    if (NULL == user_attributes) {
+      user_attributes = nro_new_hash();
+    }
     nro_set_hash_string(user_attributes, "user.error.context",
                         nr_error_get_context(txn->error));
-    nro_set_hash_int(user_attributes, "user.error.no",
+  }
+  if (nr_error_get_no(txn->error)) {
+    if (NULL == user_attributes) {
+      user_attributes = nro_new_hash();
+    }
+    nro_set_hash_int(user_attributes, "user.error.number",
                      nr_error_get_no(txn->error));
   }
+  if (nr_error_get_line(txn->error)) {
+    if (NULL == user_attributes) {
+      user_attributes = nro_new_hash();
+    }
+    nro_set_hash_int(user_attributes, "user.error.line",
+                     nr_error_get_line(txn->error));
+  }
   event = nr_analytics_event_create(params, agent_attributes, user_attributes);
 
   nro_delete(params);