feat(php): add support for php 8.5 (#491)

Co-authored-by: Philip-R-Beckwith <74079252+Philip-R-Beckwith@users.noreply.github.com>

Author: bduranleau-nr

api/v1alpha2/instrumentation_webhook.go

@@ -107,7 +107,7 @@ var acceptableLangs = []string{
 	"go",
 	"java",
 	"nodejs",
-	"php-7.2", "php-7.3", "php-7.4", "php-8.0", "php-8.1", "php-8.2", "php-8.3", "php-8.4",
+	"php-7.2", "php-7.3", "php-7.4", "php-8.0", "php-8.1", "php-8.2", "php-8.3", "php-8.4", "php-8.5",
 	"python",
 	"ruby",
 }

api/v1beta1/instrumentation_webhook.go

@@ -107,7 +107,7 @@ var acceptableLangs = []string{
 	"go",
 	"java",
 	"nodejs",
-	"php-7.2", "php-7.3", "php-7.4", "php-8.0", "php-8.1", "php-8.2", "php-8.3", "php-8.4",
+	"php-7.2", "php-7.3", "php-7.4", "php-8.0", "php-8.1", "php-8.2", "php-8.3", "php-8.4", "php-8.5",
 	"python",
 	"ruby",
 }

api/v1beta2/instrumentation_webhook.go

@@ -152,7 +152,7 @@ var acceptableLangs = []string{
 	"go",
 	"java",
 	"nodejs",
-	"php-7.2", "php-7.3", "php-7.4", "php-8.0", "php-8.1", "php-8.2", "php-8.3", "php-8.4",
+	"php-7.2", "php-7.3", "php-7.4", "php-8.0", "php-8.1", "php-8.2", "php-8.3", "php-8.4", "php-8.5",
 	"python",
 	"ruby",
 }

api/v1beta3/instrumentation_webhook.go

@@ -152,7 +152,7 @@ var acceptableLangs = []string{
 	"go",
 	"java",
 	"nodejs",
-	"php-7.2", "php-7.3", "php-7.4", "php-8.0", "php-8.1", "php-8.2", "php-8.3", "php-8.4",
+	"php-7.2", "php-7.3", "php-7.4", "php-8.0", "php-8.1", "php-8.2", "php-8.3", "php-8.4", "php-8.5",
 	"python",
 	"ruby",
 }

instrumentation.md

@@ -503,6 +503,7 @@ The supported language agents.  PHP being an exception, and currently requires s
 | php-8.2             |
 | php-8.3             |
 | php-8.4             |
+| php-8.5             |
 | python              |
 | ruby                |
 
@@ -526,6 +527,7 @@ Custom-built images can be used and specified.
 | php-8.2             | newrelic/newrelic-php-init:latest                | amd64,arm64 | linux   | glibc |
 | php-8.3             | newrelic/newrelic-php-init:latest                | amd64,arm64 | linux   | glibc |
 | php-8.4             | newrelic/newrelic-php-init:latest                | amd64,arm64 | linux   | glibc |
+| php-8.5             | newrelic/newrelic-php-init:latest                | amd64,arm64 | linux   | glibc |
 | php-7.2             | newrelic/newrelic-php-init:musl                  | amd64       | linux   | musl  |
 | php-7.3             | newrelic/newrelic-php-init:musl                  | amd64       | linux   | musl  |
 | php-7.4             | newrelic/newrelic-php-init:musl                  | amd64       | linux   | musl  |
@@ -534,6 +536,7 @@ Custom-built images can be used and specified.
 | php-8.2             | newrelic/newrelic-php-init:musl                  | amd64,arm64 | linux   | musl  |
 | php-8.3             | newrelic/newrelic-php-init:musl                  | amd64,arm64 | linux   | musl  |
 | php-8.4             | newrelic/newrelic-php-init:musl                  | amd64,arm64 | linux   | musl  |
+| php-8.5             | newrelic/newrelic-php-init:musl                  | amd64,arm64 | linux   | musl  |
 | python              | newrelic/newrelic-python-init:latest             |             | linux   |       |
 | ruby                | newrelic/newrelic-ruby-init:latest               |             | linux   |       |
 

internal/apm/php.go

@@ -48,6 +48,7 @@ const (
 	php82 acceptVersion = "php-8.2"
 	php83 acceptVersion = "php-8.3"
 	php84 acceptVersion = "php-8.4"
+	php85 acceptVersion = "php-8.5"
 )
 
 var phpApiMap = map[acceptVersion]string{
@@ -59,9 +60,10 @@ var phpApiMap = map[acceptVersion]string{
 	php82: "20220829",
 	php83: "20230831",
 	php84: "20240924",
+	php85: "20250925",
 }
 
-var phpAcceptVersions = []acceptVersion{php72, php73, php74, php80, php81, php82, php83, php84}
+var phpAcceptVersions = []acceptVersion{php72, php73, php74, php80, php81, php82, php83, php84, php85}
 
 type acceptVersion string
 

internal/instrumentation/mutator.go

@@ -292,6 +292,7 @@ var langRoots = map[string]string{
 	"php-8.2":            "php",
 	"php-8.3":            "php",
 	"php-8.4":            "php",
+	"php-8.5":            "php",
 	"python":             "python",
 	"ruby":               "ruby",
 }

tests/e2e/v1beta2/e2e-instrumentation-php85.yml

@@ -0,0 +1,18 @@
+apiVersion: newrelic.com/v1beta2
+kind: Instrumentation
+metadata:
+  labels:
+    app.kubernetes.io/name: instrumentation
+    app.kubernetes.io/created-by: k8s-agents-operator
+  name: newrelic-instrumentation-php85
+spec:
+  podLabelSelector:
+    matchExpressions:
+      - key: "app.newrelic.instrumentation"
+        operator: "In"
+        values: ["newrelic-php-agent"]
+  containerSelector:
+    namesFromPodAnnotation: mycompany.annotation
+  agent:
+    language: php-8.5
+    image: newrelic/newrelic-php-init:musl