From 091a39c7f1a4bd7cb66a75c7dc990db75b2f87e5 Mon Sep 17 00:00:00 2001
From: Amber Sistla <asistla@newrelic.com>
Date: Thu, 4 Sep 2025 07:35:46 -0700
Subject: [PATCH 1/3] security(daemon): upgrade golang to 1.25.1

---
 daemon/go.mod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/daemon/go.mod b/daemon/go.mod
index a913dbd87..2548fbb62 100644
--- a/daemon/go.mod
+++ b/daemon/go.mod
@@ -1,7 +1,7 @@
 module github.com/newrelic/newrelic-php-agent/daemon
 
 go 1.24.0
-toolchain go1.24.4
+toolchain go1.25.1
 
 require (
 	github.com/golang/protobuf v1.5.3

From 9516dd273f9def68c288ab99ce71e5b0f14309fe Mon Sep 17 00:00:00 2001
From: Michal Nowacki <mnowacki@newrelic.com>
Date: Fri, 5 Sep 2025 13:13:37 -0400
Subject: [PATCH 2/3] chore(build): force golang toolchain from daemon/go.mod
 (#1115)

Set `GOTOOLCHAIN` to `auto` to ensure go toolchain from `daemon/go.mod`
will always be used.
---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index dd630354e..916c51336 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,8 @@ GCOV  ?= gcov
 SHELL = /bin/bash
 GCOVR ?= gcovr
 GIT   ?= git
+# make sure go toolchain defined in daemon/go.mod is always used
+GOTOOLCHAIN=auto
 
 include make/config.mk
 include make/vendor.mk

From 0cc9de63a0434b393165574a24c82d8df2c03876 Mon Sep 17 00:00:00 2001
From: Michal Nowacki <mnowacki@newrelic.com>
Date: Fri, 5 Sep 2025 23:29:53 -0400
Subject: [PATCH 3/3] build: verify daemon was built using toolchain defined in
 go.mod (#1117)

---
 Makefile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Makefile b/Makefile
index 916c51336..5cccaf721 100644
--- a/Makefile
+++ b/Makefile
@@ -167,9 +167,17 @@ agent-valgrind: agent/Makefile
 # Configure the target directory for go install
 export GOBIN=$(CURDIR)/bin
 
+.PHONY: daemon-golang-verify
+daemon-golang-verify:
+	@golang_in_binary=$$(go version -m bin/daemon | awk '/^bin\/daemon/ {print $$2;}') \
+	&& golang_from_toolchain=$$(awk '/^toolchain/ {print $$2;}' daemon/go.mod) \
+	&& [ "$$golang_in_binary" = "$$golang_from_toolchain" ] && echo "daemon built using: $$golang_from_toolchain" \
+	|| { echo "ERROR: daemon built using go: $$golang_in_binary, required: $$golang_from_toolchain"; exit 1; }
+
 .PHONY: daemon
 daemon:
 	$(MAKE) -C daemon
+	$(MAKE) daemon-golang-verify
 
 .PHONY: daemon_race
 daemon_race: