Merge pull request #1120 from newrelic/dev

Release 12.1

Author: ZNeumann

Makefile

@@ -10,6 +10,8 @@ GCOV  ?= gcov
 SHELL = /bin/bash
 GCOVR ?= gcovr
 GIT   ?= git
+# make sure go toolchain defined in daemon/go.mod is always used
+GOTOOLCHAIN=auto
 
 include make/config.mk
 include make/vendor.mk
@@ -165,9 +167,17 @@ agent-valgrind: agent/Makefile
 # Configure the target directory for go install
 export GOBIN=$(CURDIR)/bin
 
+.PHONY: daemon-golang-verify
+daemon-golang-verify:
+	@golang_in_binary=$$(go version -m bin/daemon | awk '/^bin\/daemon/ {print $$2;}') \
+	&& golang_from_toolchain=$$(awk '/^toolchain/ {print $$2;}' daemon/go.mod) \
+	&& [ "$$golang_in_binary" = "$$golang_from_toolchain" ] && echo "daemon built using: $$golang_from_toolchain" \
+	|| { echo "ERROR: daemon built using go: $$golang_in_binary, required: $$golang_from_toolchain"; exit 1; }
+
 .PHONY: daemon
 daemon:
 	$(MAKE) -C daemon
+	$(MAKE) daemon-golang-verify
 
 .PHONY: daemon_race
 daemon_race:

VERSION

@@ -1 +1 @@
-12.0.0
+12.1.0

agent/fw_cakephp.c

@@ -173,10 +173,12 @@ void nr_cakephp_enable(TSRMLS_D) {
   nr_php_wrap_user_function(
       NR_PSTR("Cake\\Controller\\Controller::invokeAction"),
       nr_cakephp_name_the_wt_4);
-  nr_php_wrap_user_function(
-      NR_PSTR(
-          "Cake\\Error\\Middleware\\ErrorHandlerMiddleware::handleException"),
-      nr_cakephp_error_handler_wrapper);
+  if (!NRINI(ignore_framework_error_exception_handler)) {
+    nr_php_wrap_user_function(
+        NR_PSTR(
+            "Cake\\Error\\Middleware\\ErrorHandlerMiddleware::handleException"),
+        nr_cakephp_error_handler_wrapper);
+  }
   nr_txn_suggest_package_supportability_metric(NRPRG(txn), PHP_PACKAGE_NAME,
                                                PHP_PACKAGE_VERSION_UNKNOWN);
 }

agent/fw_drupal8.c

@@ -898,14 +898,16 @@ void nr_drupal8_enable(TSRMLS_D) {
   /*
    * Log exceptions without further handling.
    */
-  nr_php_wrap_user_function(NR_PSTR("Drupal\\Core\\EventSubscriber\\ExceptionLoggingSubscriber::onException"),
-                            nr_drupal_exception);
+  if (!NRINI(ignore_framework_error_exception_handler)) {
+    nr_php_wrap_user_function(NR_PSTR("Drupal\\Core\\EventSubscriber\\ExceptionLoggingSubscriber::onException"),
+                              nr_drupal_exception);
 
-  /*
-   * Last-chance handler for exceptions: the final exception subscriber.
-   */
-  nr_php_wrap_user_function(NR_PSTR("Drupal\\Core\\EventSubscriber\\FinalExceptionSubscriber::onException"),
-                            nr_drupal_exception);
+    /*
+     * Last-chance handler for exceptions: the final exception subscriber.
+     */
+    nr_php_wrap_user_function(NR_PSTR("Drupal\\Core\\EventSubscriber\\FinalExceptionSubscriber::onException"),
+                              nr_drupal_exception);
+  }
   // clang-format on
 
   /*

agent/fw_laravel.c

@@ -865,19 +865,21 @@ NR_PHP_WRAPPER(nr_laravel5_application_boot) {
    * to sensibly name transactions when an exception is thrown during routing
    * and also to record the error.
    */
-  exception_handler = nr_php_call_offsetGet(
-      this_var, "Illuminate\\Contracts\\Debug\\ExceptionHandler" TSRMLS_CC);
-  if (nr_php_is_zval_valid_object(exception_handler)) {
-    nr_laravel_add_callback_method(Z_OBJCE_P(exception_handler),
-                                   NR_PSTR("render"),
-                                   nr_laravel5_exception_render TSRMLS_CC);
-
-    nr_laravel_add_callback_method(Z_OBJCE_P(exception_handler),
-                                   NR_PSTR("report"),
-                                   nr_laravel5_exception_report TSRMLS_CC);
-  } else {
-    nrl_verbosedebug(NRL_FRAMEWORK, "%s: cannot get exception handler",
-                     __func__);
+  if (!NRINI(ignore_framework_error_exception_handler)) {
+    exception_handler = nr_php_call_offsetGet(
+        this_var, "Illuminate\\Contracts\\Debug\\ExceptionHandler" TSRMLS_CC);
+    if (nr_php_is_zval_valid_object(exception_handler)) {
+      nr_laravel_add_callback_method(Z_OBJCE_P(exception_handler),
+                                     NR_PSTR("render"),
+                                     nr_laravel5_exception_render TSRMLS_CC);
+
+      nr_laravel_add_callback_method(Z_OBJCE_P(exception_handler),
+                                     NR_PSTR("report"),
+                                     nr_laravel5_exception_report TSRMLS_CC);
+    } else {
+      nrl_verbosedebug(NRL_FRAMEWORK, "%s: cannot get exception handler",
+                       __func__);
+    }
   }
 
 end:

agent/fw_lumen.c

@@ -218,16 +218,18 @@ void nr_lumen_enable(TSRMLS_D) {
   nr_php_wrap_user_function(
       NR_PSTR("Laravel\\Lumen\\Application::handleFoundRoute"),
       nr_lumen_handle_found_route TSRMLS_CC);
+  if (!NRINI(ignore_framework_error_exception_handler)) {
 #if ZEND_MODULE_API_NO >= ZEND_8_0_X_API_NO \
     && !defined OVERWRITE_ZEND_EXECUTE_DATA
-  nr_php_wrap_user_function_before_after_clean(
-      NR_PSTR("Laravel\\Lumen\\Application::sendExceptionToHandler"),
-      nr_lumen_exception, NULL, NULL);
+    nr_php_wrap_user_function_before_after_clean(
+        NR_PSTR("Laravel\\Lumen\\Application::sendExceptionToHandler"),
+        nr_lumen_exception, NULL, NULL);
 #else
-  nr_php_wrap_user_function(
-      NR_PSTR("Laravel\\Lumen\\Application::sendExceptionToHandler"),
-      nr_lumen_exception TSRMLS_CC);
+    nr_php_wrap_user_function(
+        NR_PSTR("Laravel\\Lumen\\Application::sendExceptionToHandler"),
+        nr_lumen_exception TSRMLS_CC);
 #endif
+  }
 
   if (NRINI(vulnerability_management_package_detection_enabled)) {
     nr_txn_add_php_package(NRPRG(txn), PHP_PACKAGE_NAME,

agent/fw_symfony4.c

@@ -250,19 +250,21 @@ void nr_symfony4_enable(TSRMLS_D) {
    * nr_txn_record_error and pass the exception message. Now we get errors in
    * the error analytics page.
    */
-  nr_php_wrap_user_function(
-      NR_PSTR("Symfony\\Component\\HttpKernel\\"
-              "EventListener\\ExceptionListener::onKernelException"),
-      nr_symfony4_exception TSRMLS_CC);
+  if (!NRINI(ignore_framework_error_exception_handler)) {
+    nr_php_wrap_user_function(
+        NR_PSTR("Symfony\\Component\\HttpKernel\\"
+                "EventListener\\ExceptionListener::onKernelException"),
+        nr_symfony4_exception TSRMLS_CC);
 
-  /*
-   * In Symfony 5 listener that catch errors was changed to ErrorListener,
-   * we try to hook into it
-   */
-  nr_php_wrap_user_function(
-      NR_PSTR("Symfony\\Component\\HttpKernel\\"
-              "EventListener\\ErrorListener::onKernelException"),
-      nr_symfony4_exception TSRMLS_CC);
+    /*
+     * In Symfony 5 listener that catch errors was changed to ErrorListener,
+     * we try to hook into it
+     */
+    nr_php_wrap_user_function(
+        NR_PSTR("Symfony\\Component\\HttpKernel\\"
+                "EventListener\\ErrorListener::onKernelException"),
+        nr_symfony4_exception TSRMLS_CC);
+  }
 
   /*
    * Listen for Symfony commands so we can name those appropriately.

agent/fw_yii.c

@@ -219,8 +219,10 @@ void nr_yii2_enable(TSRMLS_D) {
    * allowing default PHP error handler to be intercepted by the NewRelic agent
    * implementation.
    */
-  nr_php_wrap_user_function(NR_PSTR("yii\\base\\ErrorHandler::logException"),
-                            nr_yii2_error_handler_wrapper TSRMLS_CC);
+  if (!NRINI(ignore_framework_error_exception_handler)) {
+    nr_php_wrap_user_function(NR_PSTR("yii\\base\\ErrorHandler::logException"),
+                              nr_yii2_error_handler_wrapper TSRMLS_CC);
+  }
 #endif
 
   if (NRINI(vulnerability_management_package_detection_enabled)) {

agent/php_mysqli.c

@@ -688,3 +688,28 @@ const char* nr_php_mysqli_strip_persistent_prefix(const char* host) {
 
   return host;
 }
+
+void nr_php_mysqli_rshutdown() {
+  /*
+   * This frees mysqli metadata stored in the transaction.
+   *
+   * `mysqli_queries` contains duplicates of zvals. If
+   * `nr_php_txn_end` is called from the post-deactivate callback, request
+   * shutdown functions have already been called; and the Zend VM has already
+   * forcefully freed all dangling zvals that are not referenced by the global
+   * scope (regardless of their reference count), thus leaving the zvals stored
+   * in the mysqli_queries metadata in an "undefined" state. Consequently,
+   * freeing the zvals in `nr_php_txn_end` at this stage can result in undefined
+   * behavior.
+   *
+   * Calling this function during the RSHUTDOWN phase ensures that the zvals in
+   * `mysqli_queries` are cleaned up before Zend winds down the VM and
+   * forcefully frees zvals.
+   *
+   * If `nr_php_txn_end` is called outside the post-deactivate callback,
+   * it frees `mysqli_queries` by itself.
+   */
+  if (nrlikely(NRPRG(txn))) {
+    nr_hashmap_destroy(&NRTXNGLOBAL(mysqli_queries));
+  }
+}

agent/php_mysqli.h

@@ -163,4 +163,10 @@ extern nr_datastore_instance_t* nr_php_mysqli_retrieve_datastore_instance(
 extern void nr_php_mysqli_remove_datastore_instance(
     const zval* mysqli_obj TSRMLS_DC);
 
+/*
+ * Purpose : Frees reference incremented, transaction global zvals
+ *           that must be cleaned up prior to postdeactivate
+ */
+extern void nr_php_mysqli_rshutdown();
+
 #endif /* PHP_MYSQLI_HDR */