fixups

agent/fw_drupal_common.c

@@ -60,7 +60,9 @@ NR_PHP_WRAPPER(nr_drupal_wrap_module_hook) {
    * function such as a_b_c is ambiguous (is the module a or a_b?). Instead,
    * we'll see if they're defined in the wraprec.
    */
+#if ZEND_MODULE_API_NO >= ZEND_8_2_X_API_NO
   wraprec = nr_php_get_wraprec(execute_data->func);
+#endif
   if ((NULL != wraprec->drupal_hook) && (NULL != wraprec->drupal_module)) {
     nr_drupal_create_metric(auto_segment, NR_PSTR(NR_DRUPAL_MODULE_PREFIX),
                             wraprec->drupal_module, wraprec->drupal_module_len);

agent/fw_wordpress.c

@@ -357,7 +357,6 @@ NR_PHP_WRAPPER(nr_wordpress_wrap_hook_plugin) {
   char* plugin = NULL;
 
   NR_UNUSED_SPECIALFN;
-  (void)wraprec;
 
   /*
    * We only want to hook the function being called if this is a WordPress
@@ -370,7 +369,10 @@ NR_PHP_WRAPPER(nr_wordpress_wrap_hook_plugin) {
   if ((0 == NRINI(wordpress_hooks)) || (NULL == tag)) {
     NR_PHP_WRAPPER_LEAVE;
   }
-  plugin = nr_wordpress_plugin_from_function(execute_data->func);
+  // Use optimized wraprec hashmap over plugin hashmap
+  wraprec = nr_php_get_wraprec(execute_data->func);
+  plugin = wraprec->wordpress_plugin_theme;
+  //plugin = nr_wordpress_plugin_from_function(execute_data->func);
 
   NR_PHP_WRAPPER_CALL;
   if (NULL != plugin) {