optimize library/framework detection for PHPs 8.0+

Take advantage of observer API and new method of storing wraprecs and don't
install fcall_begin/fcall_end handlers for file execution - detect library/
framework and install wraprecs right in fcall_init!

Author: lavarou

agent/php_execute.c

@@ -987,7 +987,7 @@ static void nr_php_user_instrumentation_from_file(const char* filename,
  */
 #define METRIC_NAME_MAX_LEN 512
 
-static void nr_php_execute_file(const zend_op_array* op_array,
+void nr_php_execute_file(const zend_op_array* op_array,
                                 NR_EXECUTE_PROTO TSRMLS_DC) {
   const char* filename = nr_php_op_array_file_name(op_array);
   size_t filename_len = nr_php_op_array_file_name_len(op_array);
@@ -1012,7 +1012,9 @@ static void nr_php_execute_file(const zend_op_array* op_array,
     return;
   }
 
+#if ZEND_MODULE_API_NO < ZEND_8_0_X_API_NO
   nr_php_add_user_instrumentation(TSRMLS_C);
+#endif
 }
 
 /*
@@ -1910,16 +1912,7 @@ static void nr_php_instrument_func_begin(NR_EXECUTE_PROTO) {
 
   NRTXNGLOBAL(execute_count) += 1;
   txn_start_time = nr_txn_start_time(NRPRG(txn));
-  /*
-   * Handle here, but be aware the classes might not be loaded yet.
-   */
-  if (nrunlikely(OP_ARRAY_IS_A_FILE(NR_OP_ARRAY))) {
-    const char* filename = nr_php_op_array_file_name(NR_OP_ARRAY);
-    size_t filename_len = nr_php_op_array_file_name_len(NR_OP_ARRAY);
-    nr_execute_handle_framework(all_frameworks, num_all_frameworks,
-                                filename, filename_len TSRMLS_CC);
-    return;
-  }
+
   if (NULL != NRPRG(cufa_callback) && NRPRG(check_cufa)) {
     /*
      * For PHP 7+, call_user_func_array() is flattened into an inline by
@@ -2005,14 +1998,6 @@ static void nr_php_instrument_func_end(NR_EXECUTE_PROTO) {
   }
   txn_start_time = nr_txn_start_time(NRPRG(txn));
 
-  /*
-   * Let's get the framework info.
-   */
-  if (nrunlikely(OP_ARRAY_IS_A_FILE(NR_OP_ARRAY))) {
-    nr_php_execute_file(NR_OP_ARRAY, NR_EXECUTE_ORIG_ARGS TSRMLS_CC);
-    return;
-  }
-
   /*
    * Get the current segment and return if null.
    */

agent/php_execute.h

@@ -27,6 +27,9 @@
 #define OP_ARRAY_IS_METHOD(OP, FNAME) \
   (0 == nr_strcmp(nr_php_op_array_function_name(OP), (FNAME)))
 
+extern void nr_php_execute_file(const zend_op_array* op_array,
+                                NR_EXECUTE_PROTO TSRMLS_DC);
+
 /*
  * Purpose: Log information about the execute data in a given execution
  * context - either 'execute' (zend_execute) or 'observe' (fcall_init).

agent/php_observer.c

@@ -90,6 +90,14 @@ static zend_observer_fcall_handlers nr_php_fcall_register_handlers(
     nr_php_show_exec("observe", execute_data, NULL);
   }
 
+  if (OP_ARRAY_IS_A_FILE(NR_OP_ARRAY)) {
+    /*
+     * Let's get the framework info.
+     */
+    nr_php_execute_file(NR_OP_ARRAY, execute_data, NULL TSRMLS_CC);
+    return 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;

agent/tests/test_txn.c

@@ -50,7 +50,14 @@ static void test_handle_fpm_error(TSRMLS_D) {
 
   nr_txn_set_path(NULL, NRPRG(txn), "foo", NR_PATH_TYPE_URI,
                   NR_NOT_OK_TO_OVERWRITE);
+#if ZEND_MODULE_API_NO >= ZEND_8_0_X_API_NO /* PHP8+ */
+  // file execution no longer increments execute_count on PHPs 8.0+
+  // only user function calls do increment execute_count:
+  tlib_php_request_eval("function f() {$a = 1 + 1;}\n"
+                        "f(); // create a PHP call frame" TSRMLS_CC);
+#else
   tlib_php_request_eval("$a = 1 + 1; // create a PHP call frame" TSRMLS_CC);
+#endif
   nr_php_txn_handle_fpm_error(NRPRG(txn) TSRMLS_CC);
   tlib_pass_if_str_equal("transaction path should be unchanged", "foo",
                          NRTXN(path));