From 959e7b51fa11807b3991d5ccec5639a3859c5379 Mon Sep 17 00:00:00 2001 From: Michael Anthony Knyszek Date: Thu, 3 Oct 2024 16:40:48 +0000 Subject: [PATCH] perfdata: upgrade app to Go 1.22 and fix some errors This change upgrades perfdata to Go 1.22, explicitly enables the legacy appengine APIs, and switches to the v2 SDK. This results in a bunch of logging-related failures from disappearing in the latest deployment. Change-Id: I44a12ecb4bfee3aeef40a7ce09c84ec89be0f2c8 Reviewed-on: https://go-review.googlesource.com/c/build/+/617578 Reviewed-by: Michael Pratt Auto-Submit: Michael Knyszek LUCI-TryBot-Result: Go LUCI --- go.mod | 3 ++- go.sum | 3 +++ perfdata/app/appengine.go | 4 ++-- perfdata/appengine/app.go | 6 +++--- perfdata/appengine/app.yaml | 3 ++- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 20de1dd9..52ac95da 100644 --- a/go.mod +++ b/go.mod @@ -63,7 +63,7 @@ require ( golang.org/x/time v0.6.0 golang.org/x/tools v0.25.0 google.golang.org/api v0.136.0 - google.golang.org/appengine v1.6.8-0.20221117013220-504804fb50de + google.golang.org/appengine/v2 v2.0.6 google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 google.golang.org/grpc v1.67.1 google.golang.org/protobuf v1.34.2 @@ -155,6 +155,7 @@ require ( golang.org/x/text v0.18.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect gonum.org/v1/plot v0.10.0 // indirect + google.golang.org/appengine v1.6.8-0.20221117013220-504804fb50de // indirect google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/genproto/googleapis/bytestream v0.0.0-20230807174057-1744710a1577 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240930140551-af27646dc61f // indirect diff --git a/go.sum b/go.sum index cf841f11..7133a8eb 100644 --- a/go.sum +++ b/go.sum @@ -1268,6 +1268,8 @@ google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.8-0.20221117013220-504804fb50de h1:MvEeYmzkzk0Rsw+ceqy28aIJN7Mum+4aYqBwCMqYNug= google.golang.org/appengine v1.6.8-0.20221117013220-504804fb50de/go.mod h1:BbwiCY3WCmCUKOJTrX5NwgQzew1c32w3kxa6Sxvs0cQ= +google.golang.org/appengine/v2 v2.0.6 h1:LvPZLGuchSBslPBp+LAhihBeGSiRh1myRoYK4NtuBIw= +google.golang.org/appengine/v2 v2.0.6/go.mod h1:WoEXGoXNfa0mLvaH5sV3ZSGXwVmy8yf7Z1JKf3J3wLI= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -1373,6 +1375,7 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= diff --git a/perfdata/app/appengine.go b/perfdata/app/appengine.go index ebe42108..132b0a3e 100644 --- a/perfdata/app/appengine.go +++ b/perfdata/app/appengine.go @@ -10,8 +10,8 @@ import ( "context" "net/http" - "google.golang.org/appengine" - "google.golang.org/appengine/log" + "google.golang.org/appengine/v2" + "google.golang.org/appengine/v2/log" ) // requestContext returns the Context object for a given request. diff --git a/perfdata/appengine/app.go b/perfdata/appengine/app.go index b78b76ce..01d67634 100644 --- a/perfdata/appengine/app.go +++ b/perfdata/appengine/app.go @@ -20,9 +20,9 @@ import ( "golang.org/x/build/perfdata/db" "golang.org/x/build/perfdata/fs/gcs" oauth2 "google.golang.org/api/oauth2/v2" - "google.golang.org/appengine" - aelog "google.golang.org/appengine/log" - "google.golang.org/appengine/user" + "google.golang.org/appengine/v2" + aelog "google.golang.org/appengine/v2/log" + "google.golang.org/appengine/v2/user" ) // connectDB returns a DB initialized from the environment variables set in app.yaml. CLOUDSQL_CONNECTION_NAME, CLOUDSQL_USER, and CLOUDSQL_DATABASE must be set to point to the Cloud SQL instance. CLOUDSQL_PASSWORD can be set if needed. diff --git a/perfdata/appengine/app.yaml b/perfdata/appengine/app.yaml index ba7f6a11..b5fef422 100644 --- a/perfdata/appengine/app.yaml +++ b/perfdata/appengine/app.yaml @@ -2,9 +2,10 @@ # Use of this source code is governed by a BSD-style # license that can be found in the LICENSE file. -runtime: go113 +runtime: go122 service: perfdata instance_class: F4_HIGHMEM +app_engine_apis: true handlers: - url: /_ah/remote_api