Skip to content

Commit 5ba629a

Browse files
ddelnanoddelnano
committed
Upgrade Go to 1.25
Signed-off-by: Dom Del Nano <ddelnano@gmail.com> (cherry picked from commit 60246ab) (cherry picked from commit df3aa5d17d53f47d2789b3cc6e0a281ccd09cae6)
1 parent ebd9ba5 commit 5ba629a

29 files changed

Lines changed: 159 additions & 94 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ test-tsan: ## Run all the tests, with thread sanitizer.
7070

7171
.PHONY: go-mod-tidy
7272
go-mod-tidy: ## Ensure that go are cleaned up.
73-
go mod tidy -compat=1.21
73+
go mod tidy -compat=1.24
7474

7575
.PHONY: go-mod-ensure
7676
go-mod-ensure: ## Ensure that go dependencies exist.

‎WORKSPACE‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pl_go_overrides()
4141

4242
go_download_sdk(
4343
name = "go_sdk",
44-
version = "1.24.6",
44+
version = "1.25.7",
4545
)
4646

4747
go_rules_dependencies()
@@ -220,8 +220,8 @@ load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
220220
gazelle_dependencies(go_sdk = "go_sdk")
221221

222222
go_download_sdk(
223-
name = "go_sdk_1_23",
224-
version = "1.23.12",
223+
name = "go_sdk_1_24",
224+
version = "1.24.13",
225225
)
226226

227227
# The go_sdk_boringcrypto SDK is used for testing boringcrypto specific functionality (TLS tracing).
@@ -234,7 +234,7 @@ go_download_sdk(
234234
go_download_sdk(
235235
name = "go_sdk_boringcrypto",
236236
experiments = ["boringcrypto"],
237-
version = "1.23.11",
237+
version = "1.24.12",
238238
)
239239

240240
pip_parse(

‎bazel/container_images.bzl‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,14 @@ def stirling_test_images():
328328
digest = "sha256:0f14818a1046dfdb7d5ac27e173d99e071219897a1d9969c8d7604acbd0d9541",
329329
)
330330

331+
# Tag: 1.0
332+
# Arch: linux/amd64
333+
_container_image(
334+
name = "golang_1_23_https_server_with_buildinfo",
335+
repository = "golang_1_23_https_server_with_buildinfo",
336+
digest = "sha256:df8ad6fd2cc2c45b7e6713dd365be908f77f006c190c7f79f74b38338b550544",
337+
)
338+
331339
# Tag: 1.0
332340
# Arch: linux/amd64
333341
_container_image(
@@ -367,3 +375,11 @@ def stirling_test_images():
367375
repository = "golang_1_22_grpc_server_with_buildinfo",
368376
digest = "sha256:67adba5e8513670fa37bd042862e7844f26239e8d2997ed8c3b0aa527bc04cc3",
369377
)
378+
379+
# Tag: 1.0
380+
# Arch: linux/amd64
381+
_container_image(
382+
name = "golang_1_23_grpc_server_with_buildinfo",
383+
repository = "golang_1_23_grpc_server_with_buildinfo",
384+
digest = "sha256:7950a79e492dbdbe18608db5829a129754df5b6b5cb9d6ba822cfd91c43ba61a",
385+
)

‎bazel/pl_build_system.bzl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
2323
load("@rules_python//python:defs.bzl", "py_test")
2424
load("//bazel:toolchain_transitions.bzl", "qemu_interactive_runner")
2525

26-
pl_boringcrypto_go_sdk = ["1.23.11"]
27-
pl_go_test_versions = ["1.18", "1.19", "1.20", "1.21", "1.22"]
28-
pl_supported_go_sdk_versions = ["1.23", "1.24"]
26+
pl_boringcrypto_go_sdk = ["1.24.12"]
27+
pl_go_test_versions = ["1.18", "1.19", "1.20", "1.21", "1.22", "1.23"]
28+
pl_supported_go_sdk_versions = ["1.24", "1.25"]
2929

3030
# The last version in this list corresponds to the boringcrypto go sdk version.
3131
# This list is used for generating container libraries and other version-specific targets.

‎bazel/repository_locations.bzl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -423,10 +423,10 @@ REPOSITORY_LOCATIONS = dict(
423423
urls = ["https://github.com/bazelbuild/rules_docker/archive/0e9c3b068d05f20adf7ccdea486fcb27e71593f3.tar.gz"],
424424
),
425425
io_bazel_rules_go = dict(
426-
sha256 = "f74c98d6df55217a36859c74b460e774abc0410a47cc100d822be34d5f990f16",
426+
sha256 = "68af54cb97fbdee5e5e8fe8d210d15a518f9d62abfd71620c3eaff3b26a5ff86",
427427
urls = [
428-
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.47.1/rules_go-v0.47.1.zip",
429-
"https://github.com/bazelbuild/rules_go/releases/download/v0.47.1/rules_go-v0.47.1.zip",
428+
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.59.0/rules_go-v0.59.0.zip",
429+
"https://github.com/bazelbuild/rules_go/releases/download/v0.59.0/rules_go-v0.59.0.zip",
430430
],
431431
),
432432
io_bazel_rules_k8s = dict(

‎docker.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
DOCKER_IMAGE_TAG=202512082352
2-
LINTER_IMAGE_DIGEST=441fc5a65697dab0b38627d5afde9e38da6812f1a5b98732b224161c23238e73
3-
DEV_IMAGE_DIGEST=cac2e8a1c3e70dde4e5089b2383b2e11cc022af467ee430c12416eb42066fbb7
4-
DEV_IMAGE_WITH_EXTRAS_DIGEST=e84f82d62540e1ca72650f8f7c9c4fe0b32b64a33f04cf0b913b9961527c9e30
1+
DOCKER_IMAGE_TAG=202602200429
2+
LINTER_IMAGE_DIGEST=78b2af6f23375e9b8f048d03c6cb1de139636104f31f8d5a0c7e7afaa12f2fae
3+
DEV_IMAGE_DIGEST=ca94c1abe72e89afed95ee1c6497604e5a65f36ac4f5221b9b19a890657c7f96
4+
DEV_IMAGE_WITH_EXTRAS_DIGEST=a0cf945bb588860f25229482503547ad1a390e7c42d91936cdaa79e2ee018b9f

‎go.mod‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module px.dev/pixie
22

3-
go 1.24.6
3+
go 1.25.7
44

55
require (
66
cloud.google.com/go v0.81.0
@@ -163,7 +163,7 @@ require (
163163
github.com/goccy/go-yaml v1.9.8 // indirect
164164
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
165165
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
166-
github.com/golang/protobuf v1.5.3 // indirect
166+
github.com/golang/protobuf v1.5.4 // indirect
167167
github.com/golang/snappy v0.0.4 // indirect
168168
github.com/google/btree v1.0.1 // indirect
169169
github.com/google/gnostic v0.6.9 // indirect
@@ -276,7 +276,7 @@ require (
276276
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
277277
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
278278
google.golang.org/appengine v1.6.7 // indirect
279-
google.golang.org/protobuf v1.29.1 // indirect
279+
google.golang.org/protobuf v1.36.3 // indirect
280280
gopkg.in/inf.v0 v0.9.1 // indirect
281281
gopkg.in/ini.v1 v1.67.0 // indirect
282282
gopkg.in/launchdarkly/go-jsonstream.v1 v1.0.1 // indirect
@@ -310,7 +310,6 @@ replace (
310310
github.com/go-openapi/strfmt => github.com/go-openapi/strfmt v0.20.0
311311
// Upgrade after https://github.com/golang/mock/pull/601 makes it into a release
312312
github.com/golang/mock => github.com/golang/mock v1.5.0
313-
github.com/golang/protobuf => github.com/golang/protobuf v1.5.2
314313
github.com/google/go-cmp => github.com/google/go-cmp v0.5.5
315314
google.golang.org/api => google.golang.org/api v0.43.0
316315
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa

‎go.sum‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -416,8 +416,25 @@ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l
416416
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
417417
github.com/golang/mock v1.5.0 h1:jlYHihg//f7RRwuPfptm04yp4s7O6Kw8EZiVYIGcH0g=
418418
github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
419-
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
419+
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
420+
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
421+
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
422+
github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
423+
github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
424+
github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
425+
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
426+
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
427+
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
428+
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
429+
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
430+
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
431+
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
432+
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
433+
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
434+
github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
420435
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
436+
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
437+
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
421438
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
422439
github.com/golang/snappy v0.0.2-0.20190904063534-ff6b7dc882cf/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
423440
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
@@ -1327,12 +1344,19 @@ google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa h1:I0YcKz0I7OAhddo
13271344
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
13281345
google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM=
13291346
google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
1347+
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
1348+
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
1349+
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
1350+
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
1351+
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
1352+
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
13301353
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
13311354
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
1355+
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
13321356
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
13331357
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
1334-
google.golang.org/protobuf v1.29.1 h1:7QBf+IK2gx70Ap/hDsOmam3GE0v9HicjfEdAxE62UoM=
1335-
google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
1358+
google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU=
1359+
google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
13361360
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
13371361
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
13381362
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎go_deps.bzl‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/stirling/obj_tools/dwarf_reader_test.cc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@
2424
#include "src/common/testing/testing.h"
2525
#include "src/stirling/utils/detect_application.h"
2626

27-
constexpr std::string_view kTestGo1_23Binary =
28-
"src/stirling/obj_tools/testdata/go/test_go_1_23_binary";
2927
constexpr std::string_view kTestGo1_24Binary =
30-
"src/stirling/obj_tools/testdata/go/test_go_1_23_binary";
28+
"src/stirling/obj_tools/testdata/go/test_go_1_24_binary";
29+
constexpr std::string_view kTestGo1_25Binary =
30+
"src/stirling/obj_tools/testdata/go/test_go_1_25_binary";
3131
constexpr std::string_view kGoGRPCServer =
3232
"src/stirling/testing/demo_apps/go_grpc_tls_pl/server/golang_1_24_grpc_tls_server_binary";
3333
constexpr std::string_view kCppBinary = "src/stirling/obj_tools/testdata/cc/test_exe_/test_exe";
3434
constexpr std::string_view kGoBinaryUnconventional =
3535
"src/stirling/obj_tools/testdata/go/sockshop_payments_service";
3636

3737
const auto kCPPBinaryPath = px::testing::BazelRunfilePath(kCppBinary);
38-
const auto kGo1_23BinaryPath = px::testing::BazelRunfilePath(kTestGo1_23Binary);
3938
const auto kGo1_24BinaryPath = px::testing::BazelRunfilePath(kTestGo1_24Binary);
39+
const auto kGo1_25BinaryPath = px::testing::BazelRunfilePath(kTestGo1_25Binary);
4040
const auto kGoServerBinaryPath = px::testing::BazelRunfilePath(kGoGRPCServer);
4141
const auto kGoBinaryUnconventionalPath = px::testing::BazelRunfilePath(kGoBinaryUnconventional);
4242

@@ -563,10 +563,10 @@ INSTANTIATE_TEST_SUITE_P(CppDwarfReaderParameterizedTest, CppDwarfReaderTest,
563563
DwarfReaderTestParam{kCPPBinaryPath, false}));
564564

565565
INSTANTIATE_TEST_SUITE_P(GolangDwarfReaderParameterizedTest, GolangDwarfReaderTest,
566-
::testing::Values(DwarfReaderTestParam{kGo1_23BinaryPath, true},
567-
DwarfReaderTestParam{kGo1_23BinaryPath, false},
568-
DwarfReaderTestParam{kGo1_24BinaryPath, true},
569-
DwarfReaderTestParam{kGo1_24BinaryPath, false}));
566+
::testing::Values(DwarfReaderTestParam{kGo1_24BinaryPath, true},
567+
DwarfReaderTestParam{kGo1_24BinaryPath, false},
568+
DwarfReaderTestParam{kGo1_25BinaryPath, true},
569+
DwarfReaderTestParam{kGo1_25BinaryPath, false}));
570570

571571
INSTANTIATE_TEST_SUITE_P(GolangDwarfReaderParameterizedIndexTest, GolangDwarfReaderIndexTest,
572572
::testing::Values(true, false));

0 commit comments

Comments
 (0)