add drupal exception handler

newrelic · Nov 22, 2024 · fd5d581 · fd5d581
1 parent 2d73c33
commit fd5d581
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/agent/fw_drupal8.c b/agent/fw_drupal8.c
@@ -21,14 +21,16 @@
 
 #define PHP_PACKAGE_NAME "drupal/core"
 
-NR_PHP_WRAPPER(nr_symfony4_exception) {
+NR_PHP_WRAPPER(nr_drupal_exception) {
   int priority = nr_php_error_get_priority(E_ERROR);
   zval* event = NULL;
   zval* exception = NULL;
 
   /* Warning avoidance */
   (void)wraprec;
 
+  NR_PHP_WRAPPER_REQUIRE_FRAMEWORK(NR_FW_DRUPAL8);
+
   if (NR_SUCCESS != nr_txn_record_error_worthy(NRPRG(txn), priority)) {
     NR_PHP_WRAPPER_CALL;
     goto end;
@@ -785,10 +787,9 @@ void nr_drupal8_enable(TSRMLS_D) {
 
   nr_php_error_install_exception_handler();
 
-  nr_php_wrap_user_function(
-      NR_PSTR("Symfony\\Component\\HttpKernel\\"
-              "EventListener\\ErrorListener::onKernelException"),
-      nr_symfony4_exception TSRMLS_CC);
+  nr_php_wrap_user_function(NR_PSTR("Drupal\\Core\\EventSubscriber\\HttpExcepti"
+                                    "onSubscriberBase::onException"),
+                            nr_drupal_exception TSRMLS_CC);
   /*
    * The drupal_modules config setting controls instrumentation of modules,
    * hooks, and views.