Cache composer api packages so these are considered each requst

Author: mfulb

agent/lib_composer.c

@@ -162,6 +162,23 @@ static void nr_execute_handle_autoload_composer_get_packages_information(
       }
     }
     ZEND_HASH_FOREACH_END();
+
+    /* cache Composer packages if only running once per process */
+    if (NR_PHP_PROCESS_GLOBALS(composer_api_per_process_detection)) {
+      nr_php_packages_destroy(&NR_PHP_PROCESS_GLOBALS(composer_php_packages));
+      NR_PHP_PROCESS_GLOBALS(composer_php_packages)
+          = nr_php_packages_clone(NRPRG(txn)->php_packages);
+      if (NULL == NR_PHP_PROCESS_GLOBALS(composer_php_packages)) {
+        nrl_verbosedebug(NRL_INSTRUMENT,
+                         "%s - unable to clone composer packages", __func__);
+      } else {
+        nrl_verbosedebug(NRL_INSTRUMENT, "%s - cloned %zu composer packages",
+                         __func__,
+                         nr_php_packages_count(
+                             NR_PHP_PROCESS_GLOBALS(composer_php_packages)));
+      }
+    }
+
   } else {
     char strbuf[80];
     nr_format_zval_for_debug(&retval, strbuf, 0, sizeof(strbuf) - 1, 0);

agent/php_globals.c

@@ -42,6 +42,7 @@ static void nr_php_per_process_globals_dispose(void) {
   nr_free(nr_php_per_process_globals.env_labels);
   nr_free(nr_php_per_process_globals.apache_add);
   nr_free(nr_php_per_process_globals.docker_id);
+  nr_php_packages_destroy(&nr_php_per_process_globals.composer_php_packages);
 
   nr_memset(&nr_php_per_process_globals, 0, sizeof(nr_php_per_process_globals));
 }

agent/php_globals.h

@@ -82,6 +82,8 @@ typedef struct _nrphpglobals_t {
                                     detection has run. Used in conjunction with
                                     composer_api_per_process_detection. */
   char* docker_id; /* 64 byte hex docker ID parsed from /proc/self/mountinfo */
+  nr_php_packages_t* composer_php_packages; /* Cache of PHP packages detected in
+                                      the current process. */
 
   /* Original PHP callback pointer contents */
   nrphperrfn_t orig_error_cb;

agent/php_txn.c

@@ -1151,6 +1151,17 @@ nr_status_t nr_php_txn_begin(const char* appnames,
     }
   }
 
+  /* preload cached composer packages if present */
+  if (NR_PHP_PROCESS_GLOBALS(composer_packages_detected)
+      && (NULL != NR_PHP_PROCESS_GLOBALS(composer_php_packages))) {
+    nrl_verbosedebug(NRL_FRAMEWORK,
+                     "composer packages already detected, using cached values");
+    nr_php_packages_destroy(&NRPRG(txn)->php_packages);
+    NRPRG(txn)->php_packages
+        = nr_php_packages_clone(NR_PHP_PROCESS_GLOBALS(composer_php_packages));
+    nrl_verbosedebug(NRL_FRAMEWORK, "composer packages cloned from cache");
+  }
+
   return NR_SUCCESS;
 }
 

axiom/nr_php_packages.c

@@ -92,6 +92,56 @@ nr_php_packages_t* nr_php_packages_create() {
   }
   return h;
 }
+static void clone_callback(void* value,
+                           const char* key,
+                           size_t key_len,
+                           void* userdata) {
+  nr_php_packages_t* dest = NULL;
+  nr_php_package_t* orig_pkg = NULL;
+  nr_php_package_t* new_pkg = NULL;
+
+  (void)key_len;  // Unused parameter
+  (void)key;      // Unused parameter
+
+  if (NULL == value || NULL == userdata) {
+    return;
+  }
+
+  if (NULL == ((nr_php_packages_t*)userdata)->data) {
+    return;
+  }
+
+  /* Clone the package and add it to the destination hashmap */
+  // userdata is a pointer to nr_php_packages_t
+  // value is a pointer to nr_php_package_t
+  // we will clone the package and add it to the destination hashmap
+  dest = (nr_php_packages_t*)userdata;
+  orig_pkg = (nr_php_package_t*)value;
+  if (NULL == orig_pkg) {
+    return;
+  }
+  new_pkg = nr_php_package_create_with_source(orig_pkg->package_name,
+                                              orig_pkg->package_version,
+                                              orig_pkg->source_priority);
+  nr_php_packages_add_package(dest, new_pkg);
+}
+
+nr_php_packages_t* nr_php_packages_clone(nr_php_packages_t* pkgs) {
+  nr_php_packages_t* h = NULL;
+
+  if (NULL == pkgs) {
+    return NULL;
+  }
+
+  h = nr_php_packages_create();
+  if (NULL == h) {
+    return NULL;
+  }
+
+  nr_hashmap_apply(pkgs->data, clone_callback, h);
+
+  return h;
+}
 
 nr_php_package_t* nr_php_packages_add_package(nr_php_packages_t* h,
                                               nr_php_package_t* p) {

axiom/nr_php_packages.h

@@ -70,6 +70,14 @@ extern nr_php_package_t* nr_php_package_create_with_source(
 extern nr_php_package_t* nr_php_package_create(const char* name,
                                                const char* version);
 
+/* Purpose : Clone a collection of php packages
+ *
+ * Params  : 1. A pointer to nr_php_packages_t
+ *
+ * Returns : A new nr_php_packages_t that is a copy of the original
+ */
+nr_php_packages_t* nr_php_packages_clone(nr_php_packages_t* pkgs);
+
 /*
  * Purpose : Destroy/free php package
  *