Skip to content

Commit 95b17cf

Browse files
committed
Add missing Go client server container classes
Signed-off-by: Dom Del Nano <[email protected]>
1 parent 8d9fe9d commit 95b17cf

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

src/stirling/source_connectors/socket_tracer/go_tls_trace_bpf_test.cc

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,20 @@ struct Go1_22TLSClientServerContainers {
8686

8787
struct Go1_23TLSClientServerContainers {
8888
using GoTLSServerContainer = ::px::stirling::testing::Go1_23_TLSServerContainer;
89-
using GoTLSClientContainer = ::px::stirling::testing::Go1_23_TLSClientContainer;
89+
// Go 1.23 client container is no longer built; use 1.24 client instead.
90+
using GoTLSClientContainer = ::px::stirling::testing::Go1_24_TLSClientContainer;
9091
};
9192

9293
struct Go1_24TLSClientServerContainers {
9394
using GoTLSServerContainer = ::px::stirling::testing::Go1_24_TLSServerContainer;
9495
using GoTLSClientContainer = ::px::stirling::testing::Go1_24_TLSClientContainer;
9596
};
9697

98+
struct Go1_25TLSClientServerContainers {
99+
using GoTLSServerContainer = ::px::stirling::testing::Go1_25_TLSServerContainer;
100+
using GoTLSClientContainer = ::px::stirling::testing::Go1_25_TLSClientContainer;
101+
};
102+
97103
struct GoBoringCryptoTLSClientServerContainers {
98104
using GoTLSServerContainer = ::px::stirling::testing::GoBoringCryptoTLSServerContainer;
99105
using GoTLSClientContainer = ::px::stirling::testing::GoBoringCryptoTLSClientContainer;
@@ -102,7 +108,8 @@ struct GoBoringCryptoTLSClientServerContainers {
102108
typedef ::testing::Types<GoBoringCryptoTLSClientServerContainers, Go1_18TLSClientServerContainers,
103109
Go1_19TLSClientServerContainers, Go1_20TLSClientServerContainers,
104110
Go1_21TLSClientServerContainers, Go1_22TLSClientServerContainers,
105-
Go1_23TLSClientServerContainers, Go1_24TLSClientServerContainers>
111+
Go1_23TLSClientServerContainers, Go1_24TLSClientServerContainers,
112+
Go1_25TLSClientServerContainers>
106113
GoVersions;
107114
TYPED_TEST_SUITE(GoTLSTraceTest, GoVersions);
108115

src/stirling/source_connectors/socket_tracer/http2_trace_bpf_test.cc

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,20 @@ struct Go1_22GRPCClientServerContainers {
9090

9191
struct Go1_23GRPCClientServerContainers {
9292
using ServerContainer = ::px::stirling::testing::Go1_23_GRPCServerContainer;
93-
using ClientContainer = ::px::stirling::testing::Go1_23_GRPCClientContainer;
93+
// Go 1.23 client container is no longer built; use 1.24 client instead.
94+
using ClientContainer = ::px::stirling::testing::Go1_24_GRPCClientContainer;
9495
};
9596

9697
struct Go1_24GRPCClientServerContainers {
9798
using ServerContainer = ::px::stirling::testing::Go1_24_GRPCServerContainer;
9899
using ClientContainer = ::px::stirling::testing::Go1_24_GRPCClientContainer;
99100
};
100101

102+
struct Go1_25GRPCClientServerContainers {
103+
using ServerContainer = ::px::stirling::testing::Go1_25_GRPCServerContainer;
104+
using ClientContainer = ::px::stirling::testing::Go1_25_GRPCClientContainer;
105+
};
106+
101107
struct GoBoringCryptoGRPCClientServerContainers {
102108
using ServerContainer = ::px::stirling::testing::GoBoringCryptoGRPCServerContainer;
103109
using ClientContainer = ::px::stirling::testing::GoBoringCryptoGRPCClientContainer;
@@ -106,7 +112,8 @@ struct GoBoringCryptoGRPCClientServerContainers {
106112
typedef ::testing::Types<GoBoringCryptoGRPCClientServerContainers, Go1_18GRPCClientServerContainers,
107113
Go1_19GRPCClientServerContainers, Go1_20GRPCClientServerContainers,
108114
Go1_21GRPCClientServerContainers, Go1_22GRPCClientServerContainers,
109-
Go1_23GRPCClientServerContainers, Go1_24GRPCClientServerContainers>
115+
Go1_23GRPCClientServerContainers, Go1_24GRPCClientServerContainers,
116+
Go1_25GRPCClientServerContainers>
110117
GoVersions;
111118
TYPED_TEST_SUITE(HTTP2TraceTest, GoVersions);
112119

0 commit comments

Comments
 (0)