Skip to content

Commit 551e257

Browse files
committed
Add missing go 1.23 container_images and fix protobuf build by upgrading go module
Signed-off-by: Dom Del Nano <[email protected]>
1 parent 322954c commit 551e257

File tree

6 files changed

+21
-11
lines changed

6 files changed

+21
-11
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1331,8 +1331,8 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
13311331
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
13321332
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
13331333
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=
1334+
google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU=
1335+
google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
13361336
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
13371337
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
13381338
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

go_deps.bzl

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

src/stirling/source_connectors/socket_tracer/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,11 +304,11 @@ pl_cc_bpf_test(
304304
timeout = "moderate",
305305
srcs = ["grpc_trace_bpf_test.cc"],
306306
data = [
307-
"//src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_client:golang_1_23_grpc_client",
308307
"//src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_client:golang_1_24_grpc_client",
308+
"//src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_client:golang_1_25_grpc_client",
309309
"//src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_client:golang_boringcrypto_grpc_client",
310-
"//src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_server:golang_1_23_grpc_server_with_certs",
311310
"//src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_server:golang_1_24_grpc_server_with_certs",
311+
"//src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_server:golang_1_25_grpc_server_with_certs",
312312
"//src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_server:golang_boringcrypto_grpc_server_with_certs",
313313
],
314314
flaky = True,

src/stirling/source_connectors/socket_tracer/testing/container_images/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,29 +21,29 @@ package(default_visibility = ["//src/stirling:__subpackages__"])
2121

2222
# Generate all Go container library permutations for supported Go versions.
2323
go_container_libraries(
24-
container_type = "grpc_server",
2524
bazel_sdk_versions = pl_all_supported_go_sdk_versions,
25+
container_type = "grpc_server",
2626
prebuilt_container_versions = pl_go_test_versions,
2727
)
2828

2929
# Stirling test cases usually test server side tracing. Therefore
3030
# we only need to provide the bazel SDK versions for the client containers.
3131
go_container_libraries(
32-
container_type = "grpc_client",
3332
bazel_sdk_versions = pl_all_supported_go_sdk_versions,
33+
container_type = "grpc_client",
3434
)
3535

3636
go_container_libraries(
37-
container_type = "tls_server",
3837
bazel_sdk_versions = pl_all_supported_go_sdk_versions,
38+
container_type = "tls_server",
3939
prebuilt_container_versions = pl_go_test_versions,
4040
)
4141

4242
# Stirling test cases usually test server side tracing. Therefore
4343
# we only need to provide the bazel SDK versions for the client containers.
4444
go_container_libraries(
45-
container_type = "tls_client",
4645
bazel_sdk_versions = pl_all_supported_go_sdk_versions,
46+
container_type = "tls_client",
4747
)
4848

4949
pl_cc_test_library(

src/stirling/source_connectors/socket_tracer/testing/containers/BUILD.bazel

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,11 @@ container_image(
156156
base = "@golang_1_22_https_server_with_buildinfo//image",
157157
)
158158

159+
container_image(
160+
name = "golang_1_23_https_server_with_buildinfo",
161+
base = "@golang_1_23_https_server_with_buildinfo//image",
162+
)
163+
159164
container_image(
160165
name = "golang_1_18_grpc_server_with_buildinfo",
161166
base = "@golang_1_18_grpc_server_with_buildinfo//image",
@@ -181,6 +186,11 @@ container_image(
181186
base = "@golang_1_22_grpc_server_with_buildinfo//image",
182187
)
183188

189+
container_image(
190+
name = "golang_1_23_grpc_server_with_buildinfo",
191+
base = "@golang_1_23_grpc_server_with_buildinfo//image",
192+
)
193+
184194
container_image(
185195
name = "amqp_image",
186196
base = "@rabbitmq_3_management//image",

0 commit comments

Comments
 (0)