Merge pull request #1022 from newrelic/dev

Release 11.6

Author: zsistla

.github/workflows/test-agent.yml

@@ -44,6 +44,39 @@ jobs:
             echo "$GOFMT_REPORTED_FILES" >> $GITHUB_STEP_SUMMARY
             exit 1
           fi
+  govet:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Checkout newrelic-php-agent code
+        uses: actions/checkout@v4
+        with:
+          path: php-agent
+      - name: Get go version
+        id: get-go-version
+        run: |
+          echo "go toolchain version required to build the daemon:"
+          toolchain="$(awk '/^toolchain */ {gsub(/^go/, "", $2); print $2}' ./php-agent/daemon/go.mod)"
+          echo "[${toolchain}]"
+          echo "go-toolchain-version=${toolchain}" >> $GITHUB_OUTPUT
+      - name: Setup go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ steps.get-go-version.outputs.go-toolchain-version }}
+          cache-dependency-path: "**/*.sum"
+      - name: Verify go version
+        run: |
+          echo "Verify correct go toolchain version is used"
+          actual="$(go version)"
+          echo "Actual: [$actual]"
+          expected="go version go${{ steps.get-go-version.outputs.go-toolchain-version }} linux/amd64"
+          echo "Expected: [$expected]"
+          if [ "$actual" != "$expected" ]; then
+            exit 1
+          fi
+      - name: Run go vet
+        run: go vet -C ./php-agent/daemon ./...
+        shell: bash
   daemon-unit-tests:
     runs-on: ubuntu-latest
     env:

VERSION

@@ -1 +1 @@
-11.5.0
+11.6.0

agent/Makefile.frag

@@ -93,6 +93,7 @@ TEST_BINARIES = \
 	tests/test_internal_instrument \
 	tests/test_hash \
 	tests/test_lib_aws_sdk_php \
+        tests/test_lib_php_amqplib \
 	tests/test_memcached \
 	tests/test_mongodb \
 	tests/test_monolog \

agent/config.m4

@@ -231,7 +231,7 @@ if test "$PHP_NEWRELIC" = "yes"; then
   LIBRARIES="lib_aws_sdk_php.c lib_monolog.c lib_doctrine2.c lib_guzzle3.c \
   lib_guzzle4.c lib_guzzle6.c lib_guzzle_common.c \
   lib_mongodb.c lib_phpunit.c lib_predis.c lib_zend_http.c \
-  lib_composer.c"
+  lib_composer.c lib_php_amqplib.c"
   PHP_NEW_EXTENSION(newrelic, $FRAMEWORKS $LIBRARIES $NEWRELIC_AGENT, $ext_shared,, $(NEWRELIC_CFLAGS))
 
   PHP_SUBST(NEWRELIC_CFLAGS)

agent/fw_hooks.h

@@ -46,6 +46,7 @@ extern void nr_guzzle4_enable(TSRMLS_D);
 extern void nr_guzzle6_enable(TSRMLS_D);
 extern void nr_laminas_http_enable(TSRMLS_D);
 extern void nr_mongodb_enable(TSRMLS_D);
+extern void nr_php_amqplib_enable();
 extern void nr_phpunit_enable(TSRMLS_D);
 extern void nr_predis_enable(TSRMLS_D);
 extern void nr_zend_http_enable(TSRMLS_D);

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);