Merge branch 'dev' into patch-1

jaimemasson · web-flow · commit 05d5c2afcb1c · 2025-09-02T10:48:53.000-07:00
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-12.0.0
+12.1.0
diff --git a/agent/php_observer.c b/agent/php_observer.c
@@ -84,6 +84,10 @@ static zend_observer_fcall_handlers nr_php_fcall_register_handlers(
     return handlers;
   }
 
+  if (0 == nr_php_recording()) {
+    return handlers;
+  }
+
   if (nrunlikely(NR_PHP_PROCESS_GLOBALS(special_flags).show_executes)) {
     nr_php_show_exec("observe", execute_data, NULL);
   }
diff --git a/axiom/nr_version.c b/axiom/nr_version.c
@@ -23,7 +23,6 @@
 /*
  * Current version naming scheme is gemstones
  *
- *   jasmine            08Mar2023 (10.7)
  *   kalmia             27Mar2023 (10.8)
  *   lilac              05Apr2023 (10.9)
  *   marigold           30May2023 (10.10)
@@ -50,8 +49,9 @@
  *   hiddenite          21Apr2025 (11.8)
  *   indicolite         13May2025 (11.9)
  *   jade               25Jun2025 (11.10)
+ *   kernite            11Aug2025 (12.0)
  */
-#define NR_CODENAME "kernite"
+#define NR_CODENAME "lizardite"
 
 const char* nr_version(void) {
   return NR_STR2(NR_VERSION);

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,10 @@ static zend_observer_fcall_handlers nr_php_fcall_register_handlers(`
`84`	`84`	`return handlers;`
`85`	`85`	`}`
`86`	`86`
	`87`	`+ if (0 == nr_php_recording()) {`
	`88`	`+ return handlers;`
	`89`	`+ }`
	`90`	`+`
`87`	`91`	`if (nrunlikely(NR_PHP_PROCESS_GLOBALS(special_flags).show_executes)) {`
`88`	`92`	`nr_php_show_exec("observe", execute_data, NULL);`
`89`	`93`	`}`