chore(agent): add helper function for nr_error_create

Author: hahuja2

axiom/nr_errors.c

@@ -14,38 +14,50 @@
 #include "util_strings.h"
 #include "util_time.h"
 
-nr_error_t* nr_error_create(int priority,
+static nr_error_t* nr_error_create_helper(int priority,
                             const char* message,
                             const char* klass,
+                            const char* error_file,
+                            int error_line,
+                            const char* error_context,
+                            int error_no,
                             const char* stacktrace_json,
                             const char* span_id,
                             nrtime_t when) {
   nr_error_t* error;
 
-  if (0 == message) {
-    return 0;
-  }
-  if (0 == klass) {
-    return 0;
-  }
-  if (0 == stacktrace_json) {
-    return 0;
-  }
-
   error = (nr_error_t*)nr_zalloc(sizeof(nr_error_t));
   error->priority = priority;
   error->when = when;
   error->message = nr_strdup(message);
   error->klass = nr_strdup(klass);
   error->stacktrace_json = nr_strdup(stacktrace_json);
-  error->option = 0;
+  if (NULL != error_file && NULL != error_context) {
+    error->error_file = nr_strdup(error_file);
+    error->error_line = error_line;
+    error->error_context = nr_strdup(error_context);
+    error->error_no = error_no;
+  }
 
   if (NULL != span_id) {
     error->span_id = nr_strdup(span_id);
   }
   return error;
 }
 
+nr_error_t* nr_error_create(int priority,
+                            const char* message,
+                            const char* klass,
+                            const char* stacktrace_json,
+                            const char* span_id,
+                            nrtime_t when) {
+  if (0 == message || 0 == klass || 0 == stacktrace_json) {
+    return 0;
+  }
+  return nr_error_create_helper(priority, message, klass, NULL, 0, NULL, 0,
+                         stacktrace_json, span_id, when);
+}
+
 nr_error_t* nr_error_create_additional_params(int priority,
                                               const char* message,
                                               const char* klass,
@@ -56,31 +68,12 @@ nr_error_t* nr_error_create_additional_params(int priority,
                                               const char* stacktrace_json,
                                               const char* span_id,
                                               nrtime_t when) {
-  nr_error_t* error;
-
   if (0 == message || 0 == klass || 0 == error_file || 0 == error_context
       || 0 == stacktrace_json) {
     return 0;
   }
-
-  error = (nr_error_t*)nr_zalloc(sizeof(nr_error_t));
-  error->priority = priority;
-  error->when = when;
-  error->message = nr_strdup(message);
-  error->klass = nr_strdup(klass);
-  error->error_file = nr_strdup(error_file);
-  error->error_line = error_line;
-  error->error_context = nr_strdup(error_context);
-  error->error_no = error_no;
-
-  error->stacktrace_json = nr_strdup(stacktrace_json);
-
-  if (NULL != span_id) {
-    error->span_id = nr_strdup(span_id);
-  }
-
-  error->option = 1;
-  return error;
+  return nr_error_create_helper(priority, message, klass, error_file, error_line, error_context, error_no,
+                         stacktrace_json, span_id, when);
 }
 
 const char* nr_error_get_message(const nr_error_t* error) {
@@ -125,13 +118,6 @@ int nr_error_get_no(const nr_error_t* error) {
   return error->error_no;
 }
 
-int nr_error_get_option(const nr_error_t* error) {
-  if (NULL == error) {
-    return 0;
-  }
-  return error->option;
-}
-
 nrtime_t nr_error_get_time(const nr_error_t* error) {
   if (NULL == error) {
     return 0;
@@ -167,25 +153,10 @@ void nr_error_destroy(nr_error_t** error_ptr) {
   nr_free(error->klass);
   nr_free(error->span_id);
   nr_free(error->stacktrace_json);
-  nr_realfree((void**)error_ptr);
-}
-
-void nr_error_destroy_additional_params(nr_error_t** error_ptr) {
-  nr_error_t* error;
-
-  if (0 == error_ptr) {
-    return;
+  if ((NULL != error->error_file) && (NULL != error->error_context)) {
+    nr_free(error->error_file);
+    nr_free(error->error_context);
   }
-  error = *error_ptr;
-  if (0 == error) {
-    return;
-  }
-  nr_free(error->message);
-  nr_free(error->klass);
-  nr_free(error->error_file);
-  nr_free(error->error_context);
-  nr_free(error->span_id);
-  nr_free(error->stacktrace_json);
   nr_realfree((void**)error_ptr);
 }
 

axiom/nr_errors.h

@@ -149,11 +149,6 @@ extern int nr_error_priority(const nr_error_t* error);
  */
 extern void nr_error_destroy(nr_error_t** error_ptr);
 
-/*
- * Purpose : Destroys an error with extra parameters, freeing all of its associated memory.
- */
-extern void nr_error_destroy_additional_params(nr_error_t** error_ptr);
-
 /*
  * Purpose : Turn an error into the JSON format expected by the 'error_v1'
  *           command.  Returns NULL if an error occurs.