Merge branch 'feat/rabbitmq_instrumentation' of github.com:newrelic/newrelic-php-agent into feat/rabbitmq_instrumentation

Author: zsistla

agent/fw_laravel_queue.c

@@ -136,7 +136,6 @@ static void nr_laravel_queue_set_cat_txn(zval* job TSRMLS_DC) {
   }
 
   if (headers.dt_payload || headers.traceparent) {
-
     nr_hashmap_t* header_map = nr_header_create_distributed_trace_map(
         headers.dt_payload, headers.traceparent, headers.tracestate);
 
@@ -225,6 +224,11 @@ static char* nr_laravel_queue_job_txn_name(zval* job TSRMLS_DC) {
 
   name = nr_formatf("%s (%s:%s)", resolve_name, connection_name, queue_name);
 
+  nr_free(connection_name);
+  nr_free(resolve_name);
+  nr_free(queue_name);
+
+  /* Caller is responsible for freeing name. */
   return name;
 }
 
@@ -252,6 +256,7 @@ NR_PHP_WRAPPER(nr_laravel_queue_syncqueue_raiseBeforeJobEvent_before) {
 
   job = nr_php_arg_get(1, NR_EXECUTE_ORIG_ARGS);
 
+  /* txn_name needs to be freed by the caller. */
   txn_name = nr_laravel_queue_job_txn_name(job);
 
   /*
@@ -271,6 +276,7 @@ NR_PHP_WRAPPER(nr_laravel_queue_syncqueue_raiseBeforeJobEvent_before) {
                     NR_OK_TO_OVERWRITE);
   }
   nr_php_arg_release(&job);
+  nr_free(txn_name);
   NR_PHP_WRAPPER_CALL;
 }
 NR_PHP_WRAPPER_END
@@ -317,6 +323,7 @@ NR_PHP_WRAPPER(nr_laravel_queue_worker_raiseBeforeJobEvent_after) {
     nr_txn_set_path("Laravel", NRPRG(txn), txn_name, NR_PATH_TYPE_CUSTOM,
                     NR_OK_TO_OVERWRITE);
   }
+  nr_free(txn_name);
   nr_php_arg_release(&job);
   NR_PHP_WRAPPER_CALL;
 }
@@ -574,7 +581,7 @@ NR_PHP_WRAPPER(nr_laravel_queue_worker_process) {
      * as the first parameter.
      */
     char* connection_name = NULL;
-    char* job_name;
+    char* job_name = NULL;
     char* txn_name = NULL;
 
     connection = nr_php_arg_get(1, NR_EXECUTE_ORIG_ARGS TSRMLS_CC);

agent/lib_php_amqplib.c

@@ -200,7 +200,11 @@ static inline void nr_php_amqplib_get_host_and_port(
 }
 
 /*
+<<<<<<< HEAD
  * Purpose : Applies DT headers to an inbound AMQPMessage.
+=======
+ * Purpose : Applies DT headers to an outbound AMQPMessage.
+>>>>>>> ba45e6c624f8575435f798c92b85808924e32bfb
  * Note:
  * The DT header 'newrelic' will only be added if both
  * newrelic.distributed_tracing_enabled is enabled and

axiom/nr_header.c

@@ -48,7 +48,8 @@ nr_hashmap_t* nr_header_create_distributed_trace_map(const char* nr_header,
     return NULL;
   }
 
-  header_map = nr_hashmap_create(NULL);
+  header_map = nr_hashmap_create((nr_hashmap_dtor_func_t)nr_hashmap_dtor_str);
+
   if (nr_header) {
     nr_hashmap_set(header_map, NR_PSTR(NEWRELIC), nr_strdup(nr_header));
   }

axiom/tests/test_header.c

@@ -1702,6 +1702,75 @@ static void test_account_id_from_cross_process_id(void) {
       nr_header_account_id_from_cross_process_id("10#10"));
 }
 
+static void test_nr_header_create_distributed_trace_map(void) {
+  nr_hashmap_t* header_map = NULL;
+  char* tracestate = "tracestate";
+  char* traceparent = "traceparent";
+  char* dt_payload = "newrelic";
+
+  header_map = nr_header_create_distributed_trace_map(NULL, NULL, NULL);
+  tlib_pass_if_null(
+      "NULL payload and NULL traceparent should return NULL header map",
+      header_map);
+
+  header_map = nr_header_create_distributed_trace_map(NULL, NULL, tracestate);
+  tlib_pass_if_null(
+      "NULL payload and NULL traceparent should return NULL header map",
+      header_map);
+
+  header_map = nr_header_create_distributed_trace_map(dt_payload, NULL, NULL);
+  tlib_pass_if_not_null("if valid dt_payload should return a header map",
+                        header_map);
+  tlib_pass_if_size_t_equal(
+      "1 header passed in so should expect headers hashmap size of 1", 1,
+      nr_hashmap_count(header_map));
+  nr_hashmap_destroy(&header_map);
+
+  header_map
+      = nr_header_create_distributed_trace_map(dt_payload, traceparent, NULL);
+  tlib_pass_if_not_null("if valid dt_payload should return a header map",
+                        header_map);
+  tlib_pass_if_size_t_equal(
+      "2 headers passed in so should expect headers hashmap size of 2", 2,
+      nr_hashmap_count(header_map));
+  nr_hashmap_destroy(&header_map);
+
+  header_map
+      = nr_header_create_distributed_trace_map(dt_payload, NULL, tracestate);
+  tlib_pass_if_not_null("if valid dt_payload should return a header map",
+                        header_map);
+  tlib_pass_if_size_t_equal(
+      "2 headers passed in so should expect headers hashmap size of 2", 2,
+      nr_hashmap_count(header_map));
+  nr_hashmap_destroy(&header_map);
+
+  header_map = nr_header_create_distributed_trace_map(dt_payload, traceparent,
+                                                      tracestate);
+  tlib_pass_if_not_null("if valid dt_payload should return a header map",
+                        header_map);
+  tlib_pass_if_size_t_equal(
+      "3 headers passed in so should expect headers hashmap size of 3", 3,
+      nr_hashmap_count(header_map));
+  nr_hashmap_destroy(&header_map);
+
+  header_map
+      = nr_header_create_distributed_trace_map(NULL, traceparent, tracestate);
+  tlib_pass_if_not_null("if valid traceparent should return a header map",
+                        header_map);
+  tlib_pass_if_size_t_equal(
+      "Two headers passed in so should expect headers hashmap size of 2", 2,
+      nr_hashmap_count(header_map));
+  nr_hashmap_destroy(&header_map);
+
+  header_map = nr_header_create_distributed_trace_map(NULL, traceparent, NULL);
+  tlib_pass_if_not_null("if valid traceparent should return a header map",
+                        header_map);
+  tlib_pass_if_size_t_equal(
+      "1 header passed in so should expect headers hashmap size of 1", 1,
+      nr_hashmap_count(header_map));
+  nr_hashmap_destroy(&header_map);
+}
+
 tlib_parallel_info_t parallel_info = {.suggested_nthreads = 2, .state_size = 0};
 
 void test_main(void* p NRUNUSED) {
@@ -1721,4 +1790,5 @@ void test_main(void* p NRUNUSED) {
   test_set_cat_txn();
   test_set_synthetics_txn();
   test_account_id_from_cross_process_id();
+  test_nr_header_create_distributed_trace_map();
 }