Merge branch 'dev' of github.com:newrelic/newrelic-php-agent into dev

newrelic · Sep 10, 2024 · 393ca93 · 393ca93
2 parents 108af43 + 8a5c2f8
commit 393ca93
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-11.1.0
+11.2.0
diff --git a/axiom/nr_version.c b/axiom/nr_version.c
@@ -23,7 +23,6 @@
 /*
  * Current version naming scheme is flowers
  *
- *   cosmos             29Jun2022 (10.0)
  *   dahlia             19Sep2022 (10.1)
  *   echinacea          03Oct2022 (10.2)
  *   freesia            03Nov2022 (10.3)
@@ -47,8 +46,9 @@
  *   xerophyllum        20May2024 (10.21)
  *   yarrow             26Jun2024 (10.22)
  *   zinnia             30Jul2024 (11.0)
+ *   amethyst           26Aug2024 (11.1)
  */
-#define NR_CODENAME "amethyst"
+#define NR_CODENAME "bowenite"
 
 const char* nr_version(void) {
   return NR_STR2(NR_VERSION);

diff --git a/daemon/internal/newrelic/integration/test.go b/daemon/internal/newrelic/integration/test.go
@@ -549,7 +549,7 @@ func (t *Test) compareMetricsExist(harvest *newrelic.Harvest) {
 				// actually the "satisfied" count, not a total count of metric
 				// as it is for other types of metrics
 				apdex_metric := strings.HasPrefix(expected, "Apdex/")
-				if (count == -1 && (apdex_metric || actualCount > 0)) || (actualCount == count) {
+				if (apdex_metric || (count == -1 && actualCount > 0)) || (actualCount == count) {
 					metricPasses = true
 				}