chore(agent): ensure transaction is always stopped when laravel horizon is used

Author: hahuja2

agent/fw_laravel.c

@@ -1193,6 +1193,21 @@ static nr_status_t nr_laravel_should_assign_generic_path(const nrtxn_t* txn,
   return NR_FAILURE;
 }
 
+/*
+ * Ensure that the transaction is properly stopped when Laravel Horizon is being
+ * used by wrapping the handle method of the HorizonCommand and
+ * SupervisorCommand class.
+ */
+NR_PHP_WRAPPER(nr_laravel_horizon_end_txn) {
+  NR_UNUSED_SPECIALFN;
+  (void)wraprec;
+
+  nr_php_txn_end(1, 0 TSRMLS_CC);
+
+  nrl_verbosedebug(NRL_TXN, "Ending Laravel Horizon Transaction");
+}
+NR_PHP_WRAPPER_END
+
 void nr_laravel_enable(TSRMLS_D) {
   /*
    * We set the path to 'unknown' to prevent having to name routing errors.
@@ -1231,6 +1246,19 @@ void nr_laravel_enable(TSRMLS_D) {
   nr_php_wrap_user_function_before_after_clean(
       NR_PSTR("Symfony\\Component\\Console\\Application::doRun"),
       nr_laravel_console_application_dorun, NULL, NULL);
+  
+  /*
+   * The following functions have been added to ensure that the transaction
+   * is properly stopped when Laravel Horizon is being used. This is
+   * accomplished by wrapping the handle method of the HorizonCommand class and
+   * the SupervisorCommand class.
+   */
+  nr_php_wrap_user_function_before_after_clean(
+      NR_PSTR("Laravel\\Horizon\\Console\\HorizonCommand::handle"),
+      nr_laravel_horizon_end_txn, NULL, NULL);
+  nr_php_wrap_user_function_before_after_clean(
+      NR_PSTR("Laravel\\Horizon\\Console\\SupervisorCommand::handle"),
+      nr_laravel_horizon_end_txn, NULL, NULL);
 #else
   nr_php_wrap_user_function(NR_PSTR("Symfony\\Component\\Console\\Application::doRun"),
                             nr_laravel_console_application_dorun TSRMLS_CC);

agent/fw_laravel_queue.c

@@ -839,21 +839,6 @@ NR_PHP_WRAPPER(nr_laravel_queue_queue_createpayload) {
 }
 NR_PHP_WRAPPER_END
 
-/*
- * Ensure that the transaction is properly stopped when Laravel Horizon is being
- * used by wrapping the handle method of the HorizonCommand and
- * SupervisorCommand class.
- */
-NR_PHP_WRAPPER(nr_laravel_horizon_end_txn) {
-  NR_UNUSED_SPECIALFN;
-  (void)wraprec;
-
-  nr_php_txn_end(1, 0 TSRMLS_CC);
-
-  nrl_verbosedebug(NRL_TXN, "Ending Laravel Horizon Transaction");
-}
-NR_PHP_WRAPPER_END
-
 void nr_laravel_queue_enable(TSRMLS_D) {
   /*
    * Hook the command class that implements Laravel's queue:work command so
@@ -886,20 +871,6 @@ void nr_laravel_queue_enable(TSRMLS_D) {
   nr_php_wrap_user_function_before_after_clean(
       NR_PSTR("Illuminate\\Queue\\SyncQueue::raiseAfterJobEvent"),
       nr_laravel_queue_worker_raiseAfterJobEvent_before, NULL, NULL);
-  
-  /*
-   * The following functions have been added to ensure that the transaction
-   * is properly stopped when Laravel Horizon is being used. This is
-   * accomplished by wrapping the handle method of the HorizonCommand class and
-   * the SupervisorCommand class.
-   */
-  nr_php_wrap_user_function_before_after_clean(
-      NR_PSTR("Laravel\\Horizon\\Console\\HorizonCommand::handle"),
-      nr_laravel_horizon_end_txn, NULL, NULL);
-  nr_php_wrap_user_function_before_after_clean(
-      NR_PSTR("Laravel\\Horizon\\Console\\SupervisorCommand::handle"),
-      nr_laravel_horizon_end_txn, NULL, NULL);
-
 #else
 
   /*

tests/integration/frameworks/laravel/test_horizon_disable_laravel_queue.php

@@ -0,0 +1,62 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+This test ensures that when the newrelic.special = disable_laravel_queue INI setting
+is set, the transaction is still properly stopped when HorizonCommand::handle is executed.
+This test verifies this behavior by first making sure the transaction exists and the
+transaction trace is not empty. Then it calls the HorizonCommand::handle method and
+verifies that the transaction has been stopped by checking that there was no harvest received.
+*/
+
+/*SKIPIF
+<?php
+if (version_compare(PHP_VERSION, "8.0", "<")) {
+  die("skip: PHP < 8.0 not supported\n");
+}
+*/
+
+/*INI
+newrelic.framework = laravel
+newrelic.special = disable_laravel_queue
+*/
+
+/*EXPECT_HARVEST
+no
+*/
+
+/*EXPECT
+foobar
+Custom/foobar
+handle function
+foobar
+*/
+
+require_once(__DIR__ . '/mock_horizon_happy_path.php');
+require_once(__DIR__.'/../../../include/integration.php');
+
+use Laravel\Horizon\Console\HorizonCommand;
+use NewRelic\Integration\Transaction;
+
+function foobar() {
+    echo "foobar\n";
+}
+function get_txn() {
+    return new Transaction;
+}
+
+newrelic_add_custom_tracer('foobar');
+foobar();
+
+$txn = get_txn();
+foreach ($txn->getTrace()->findSegmentsByName('Custom/foobar') as $segment) {
+    echo $segment->name;
+    echo "\n";
+}
+
+$horizon = new HorizonCommand();
+$horizon->handle();
+foobar();