Skip to content

Commit 959e7b5

Browse files
mknyszekgopherbot
authored andcommittedOct 3, 2024
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 <mpratt@google.com> Auto-Submit: Michael Knyszek <mknyszek@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
1 parent a0b6353 commit 959e7b5

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed
 

‎go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ require (
6363
golang.org/x/time v0.6.0
6464
golang.org/x/tools v0.25.0
6565
google.golang.org/api v0.136.0
66-
google.golang.org/appengine v1.6.8-0.20221117013220-504804fb50de
66+
google.golang.org/appengine/v2 v2.0.6
6767
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142
6868
google.golang.org/grpc v1.67.1
6969
google.golang.org/protobuf v1.34.2
@@ -155,6 +155,7 @@ require (
155155
golang.org/x/text v0.18.0 // indirect
156156
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
157157
gonum.org/v1/plot v0.10.0 // indirect
158+
google.golang.org/appengine v1.6.8-0.20221117013220-504804fb50de // indirect
158159
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
159160
google.golang.org/genproto/googleapis/bytestream v0.0.0-20230807174057-1744710a1577 // indirect
160161
google.golang.org/genproto/googleapis/rpc v0.0.0-20240930140551-af27646dc61f // indirect

‎go.sum

+3
Original file line numberDiff line numberDiff line change
@@ -1268,6 +1268,8 @@ google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
12681268
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
12691269
google.golang.org/appengine v1.6.8-0.20221117013220-504804fb50de h1:MvEeYmzkzk0Rsw+ceqy28aIJN7Mum+4aYqBwCMqYNug=
12701270
google.golang.org/appengine v1.6.8-0.20221117013220-504804fb50de/go.mod h1:BbwiCY3WCmCUKOJTrX5NwgQzew1c32w3kxa6Sxvs0cQ=
1271+
google.golang.org/appengine/v2 v2.0.6 h1:LvPZLGuchSBslPBp+LAhihBeGSiRh1myRoYK4NtuBIw=
1272+
google.golang.org/appengine/v2 v2.0.6/go.mod h1:WoEXGoXNfa0mLvaH5sV3ZSGXwVmy8yf7Z1JKf3J3wLI=
12711273
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
12721274
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
12731275
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
13731375
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
13741376
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
13751377
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
1378+
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
13761379
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
13771380
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
13781381
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=

‎perfdata/app/appengine.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"context"
1111
"net/http"
1212

13-
"google.golang.org/appengine"
14-
"google.golang.org/appengine/log"
13+
"google.golang.org/appengine/v2"
14+
"google.golang.org/appengine/v2/log"
1515
)
1616

1717
// requestContext returns the Context object for a given request.

‎perfdata/appengine/app.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
"golang.org/x/build/perfdata/db"
2121
"golang.org/x/build/perfdata/fs/gcs"
2222
oauth2 "google.golang.org/api/oauth2/v2"
23-
"google.golang.org/appengine"
24-
aelog "google.golang.org/appengine/log"
25-
"google.golang.org/appengine/user"
23+
"google.golang.org/appengine/v2"
24+
aelog "google.golang.org/appengine/v2/log"
25+
"google.golang.org/appengine/v2/user"
2626
)
2727

2828
// 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.

‎perfdata/appengine/app.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
# Use of this source code is governed by a BSD-style
33
# license that can be found in the LICENSE file.
44

5-
runtime: go113
5+
runtime: go122
66
service: perfdata
77
instance_class: F4_HIGHMEM
8+
app_engine_apis: true
89

910
handlers:
1011
- url: /_ah/remote_api

0 commit comments

Comments
 (0)