fifth round of fixes

Make it possible for wraprecs to be created when INI is processed. For that
to be possible, two things are necessary:
- the wraprec hashmap needs to be created before INI processing starts
- the pid stored in wraprec needs to be set using the value returned by
  nr_getpid because per request global pid (NRPRG(pid)) is not initialized
  until rinit.

Author: lavarou

agent/php_minit.c

@@ -492,6 +492,18 @@ PHP_MINIT_FUNCTION(newrelic) {
    */
   nr_php_generate_internal_wrap_records();
 
+#if ZEND_MODULE_API_NO >= ZEND_8_0_X_API_NO
+  /* 
+   * The user function wraprec hashmap must be initialized before INI processing
+   * because INI processing adds wraprecs:
+   *  - newrelic.webtransaction.name.functions
+   *  - newrelic.transaction_tracer.custom
+  */
+  if (NR_SUCCESS != nr_php_user_instrument_wraprec_hashmap_init()) {
+    nrl_error(NRL_AGENT, "Failed to initialize user function instrumentation");
+  }
+#endif
+
   nr_php_register_ini_entries(module_number TSRMLS_CC);
 
   if (0 == NR_PHP_PROCESS_GLOBALS(enabled)) {
@@ -670,9 +682,6 @@ PHP_MINIT_FUNCTION(newrelic) {
   NR_ZEND_EXECUTE_HOOK = nr_php_execute;
 #else
   nr_php_observer_minit();
-  if (NR_SUCCESS != nr_php_user_instrument_wraprec_hashmap_init()) {
-    nrl_error(NRL_AGENT, "Failed to initialize user function instrumentation");
-  }
 #endif
 
   if (NR_PHP_PROCESS_GLOBALS(instrument_internal)) {

agent/php_user_instrument.c

@@ -13,6 +13,7 @@
 #include "util_logging.h"
 #include "util_memory.h"
 #include "util_strings.h"
+#include "util_syscalls.h"
 
 /*
  * The mechanism of zend_try .. zend_catch .. zend_end_try
@@ -318,7 +319,9 @@ static void nr_php_wrap_user_function_internal(nruserfn_t* wraprec TSRMLS_DC) {
 
 nruserfn_t* nr_php_user_wraprec_create(void) {
   nruserfn_t* wr = (nruserfn_t*)nr_zalloc(sizeof(nruserfn_t));
-  wr->pid = NRPRG(pid);
+  /* NRPRG(pid) is set in rinit but it's sometimes needed before rinit,
+  *  i.e. when wraprec is added via INI */
+  wr->pid = (0 != NRPRG(pid) ? NRPRG(pid) : nr_getpid());
   return wr;
 }