second round of fixes

Author: lavarou

agent/fw_drupal8.c

@@ -171,8 +171,6 @@ static void nr_drupal8_add_method_callback_before_after_clean(
         clean_callback);
 
     nr_free(class_method);
-  } else {
-    nrl_always("%s::%s already has wraprec", nr_php_class_entry_name(ce), method);
   }
 }
 #endif  // OAPI

agent/php_minit.c

@@ -19,6 +19,7 @@
 #include "php_internal_instrument.h"
 #include "php_samplers.h"
 #include "php_user_instrument.h"
+#include "php_user_instrument_wraprec_hashmap.h"
 #include "php_vm.h"
 #include "php_wrapper.h"
 #include "fw_laravel.h"

agent/php_observer.c

@@ -93,7 +93,7 @@ static zend_observer_fcall_handlers nr_php_fcall_register_handlers(
   if (OP_ARRAY_IS_A_METHOD(&execute_data->func->op_array)) {
     scope_name = execute_data->func->op_array.scope->name;
     func_name = execute_data->func->op_array.function_name;
-#if 1
+#if 0
     zend_long cn_hash = zend_hash_func(ZSTR_VAL(scope_name), ZSTR_LEN(scope_name));
     zend_long fn_hash = zend_hash_func(ZSTR_VAL(func_name), ZSTR_LEN(func_name));
     nrl_always("class_name=%s, class_name->h=%zu, cn_hash=%zu, function_name=%s, function_name->h=%zu, fn_hash=%zu",
@@ -102,22 +102,23 @@ static zend_observer_fcall_handlers nr_php_fcall_register_handlers(
 #endif
   } else if (OP_ARRAY_IS_A_FUNCTION(&execute_data->func->op_array)){
     func_name = execute_data->func->op_array.function_name;
-#if 1
+#if 0
     zend_long fn_hash = zend_hash_func(ZSTR_VAL(func_name), ZSTR_LEN(func_name));
     nrl_always("function_name=%s, function_name->h=%zu, fn_hash=%zu", ZSTR_VAL(func_name), func_name->h, fn_hash);
 #endif
   }
 
   if (!ZEND_OP_ARRAY_EXTENSION(&execute_data->func->op_array, NR_PHP_PROCESS_GLOBALS(op_array_extension_handle))) {
-    nrl_always("wraprec not installed yet");
+    // nrl_always("wraprec not installed yet");
     wr = nr_php_user_instrument_wraprec_hashmap_get(func_name, scope_name);
-    nrl_always("found wraprec=%p", wr);
+    // nrl_always("found wraprec=%p", wr);
 
     // store the wraprec in the op_array extension for the duration of the request for later lookup
     ZEND_OP_ARRAY_EXTENSION(&execute_data->func->op_array, NR_PHP_PROCESS_GLOBALS(op_array_extension_handle)) = wr;
-  } else {
-    nrl_always("wraprec already installed");
   }
+  //  else {
+  //   nrl_always("wraprec already installed");
+  // }
 
   handlers.begin = nr_php_observer_fcall_begin;
   handlers.end = nr_php_observer_fcall_end;