Skip to content

Commit 4ba9b64

Browse files
ddelnanoddelnano
committed
Squash with second commit both http2_trace_bpf_test and go_tls_trace_bpf_test pass except for new 1.24 test cases
Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
1 parent 999ab44 commit 4ba9b64

3 files changed

Lines changed: 17 additions & 12 deletions

File tree

‎src/stirling/source_connectors/socket_tracer/BUILD.bazel‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,10 @@ pl_cc_bpf_test(
357357
"//src/stirling/source_connectors/socket_tracer/testing/container_images:go_1_20_grpc_server_container",
358358
"//src/stirling/source_connectors/socket_tracer/testing/container_images:go_1_21_grpc_server_container",
359359
"//src/stirling/source_connectors/socket_tracer/testing/container_images:go_1_22_grpc_server_container",
360+
"//src/stirling/source_connectors/socket_tracer/testing/container_images:go_1_23_grpc_client_container",
360361
"//src/stirling/source_connectors/socket_tracer/testing/container_images:go_1_23_grpc_server_container",
362+
"//src/stirling/source_connectors/socket_tracer/testing/container_images:go_1_24_grpc_client_container",
363+
"//src/stirling/source_connectors/socket_tracer/testing/container_images:go_1_24_grpc_server_container",
361364
"//src/stirling/source_connectors/socket_tracer/testing/container_images:go_boringcrypto_grpc_client_container",
362365
"//src/stirling/source_connectors/socket_tracer/testing/container_images:go_boringcrypto_grpc_server_container",
363366
"//src/stirling/source_connectors/socket_tracer/testing/container_images:product_catalog_client_container",

‎src/stirling/source_connectors/socket_tracer/http2_trace_bpf_test.cc‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,15 @@
2121

2222
#include "src/common/exec/subprocess.h"
2323
#include "src/stirling/core/output.h"
24-
#include "src/stirling/source_connectors/socket_tracer/testing/container_images/go_1_18_grpc_client_container.h"
2524
#include "src/stirling/source_connectors/socket_tracer/testing/container_images/go_1_18_grpc_server_container.h"
26-
#include "src/stirling/source_connectors/socket_tracer/testing/container_images/go_1_19_grpc_client_container.h"
2725
#include "src/stirling/source_connectors/socket_tracer/testing/container_images/go_1_19_grpc_server_container.h"
28-
#include "src/stirling/source_connectors/socket_tracer/testing/container_images/go_1_20_grpc_client_container.h"
2926
#include "src/stirling/source_connectors/socket_tracer/testing/container_images/go_1_20_grpc_server_container.h"
30-
#include "src/stirling/source_connectors/socket_tracer/testing/container_images/go_1_21_grpc_client_container.h"
3127
#include "src/stirling/source_connectors/socket_tracer/testing/container_images/go_1_21_grpc_server_container.h"
32-
#include "src/stirling/source_connectors/socket_tracer/testing/container_images/go_1_22_grpc_client_container.h"
3328
#include "src/stirling/source_connectors/socket_tracer/testing/container_images/go_1_22_grpc_server_container.h"
3429
#include "src/stirling/source_connectors/socket_tracer/testing/container_images/go_1_23_grpc_client_container.h"
3530
#include "src/stirling/source_connectors/socket_tracer/testing/container_images/go_1_23_grpc_server_container.h"
31+
#include "src/stirling/source_connectors/socket_tracer/testing/container_images/go_1_24_grpc_client_container.h"
32+
#include "src/stirling/source_connectors/socket_tracer/testing/container_images/go_1_24_grpc_server_container.h"
3633
#include "src/stirling/source_connectors/socket_tracer/testing/container_images/go_boringcrypto_grpc_client_container.h"
3734
#include "src/stirling/source_connectors/socket_tracer/testing/container_images/go_boringcrypto_grpc_server_container.h"
3835
#include "src/stirling/source_connectors/socket_tracer/testing/container_images/product_catalog_client_container.h"
@@ -77,34 +74,39 @@ class HTTP2TraceTest : public testing::SocketTraceBPFTestFixture</* TClientSideT
7774

7875
struct Go1_18GRPCClientServerContainers {
7976
using ServerContainer = ::px::stirling::testing::Go1_18_GRPCServerContainer;
80-
using ClientContainer = ::px::stirling::testing::Go1_18_GRPCClientContainer;
77+
using ClientContainer = ::px::stirling::testing::Go1_24_GRPCClientContainer;
8178
};
8279

8380
struct Go1_19GRPCClientServerContainers {
8481
using ServerContainer = ::px::stirling::testing::Go1_19_GRPCServerContainer;
85-
using ClientContainer = ::px::stirling::testing::Go1_19_GRPCClientContainer;
82+
using ClientContainer = ::px::stirling::testing::Go1_24_GRPCClientContainer;
8683
};
8784

8885
struct Go1_20GRPCClientServerContainers {
8986
using ServerContainer = ::px::stirling::testing::Go1_20_GRPCServerContainer;
90-
using ClientContainer = ::px::stirling::testing::Go1_20_GRPCClientContainer;
87+
using ClientContainer = ::px::stirling::testing::Go1_24_GRPCClientContainer;
9188
};
9289

9390
struct Go1_21GRPCClientServerContainers {
9491
using ServerContainer = ::px::stirling::testing::Go1_21_GRPCServerContainer;
95-
using ClientContainer = ::px::stirling::testing::Go1_21_GRPCClientContainer;
92+
using ClientContainer = ::px::stirling::testing::Go1_24_GRPCClientContainer;
9693
};
9794

9895
struct Go1_22GRPCClientServerContainers {
9996
using ServerContainer = ::px::stirling::testing::Go1_22_GRPCServerContainer;
100-
using ClientContainer = ::px::stirling::testing::Go1_22_GRPCClientContainer;
97+
using ClientContainer = ::px::stirling::testing::Go1_24_GRPCClientContainer;
10198
};
10299

103100
struct Go1_23GRPCClientServerContainers {
104101
using ServerContainer = ::px::stirling::testing::Go1_23_GRPCServerContainer;
105102
using ClientContainer = ::px::stirling::testing::Go1_23_GRPCClientContainer;
106103
};
107104

105+
struct Go1_24GRPCClientServerContainers {
106+
using ServerContainer = ::px::stirling::testing::Go1_24_GRPCServerContainer;
107+
using ClientContainer = ::px::stirling::testing::Go1_24_GRPCClientContainer;
108+
};
109+
108110
struct GoBoringCryptoGRPCClientServerContainers {
109111
using ServerContainer = ::px::stirling::testing::GoBoringCryptoGRPCServerContainer;
110112
using ClientContainer = ::px::stirling::testing::GoBoringCryptoGRPCClientContainer;
@@ -113,7 +115,7 @@ struct GoBoringCryptoGRPCClientServerContainers {
113115
typedef ::testing::Types<GoBoringCryptoGRPCClientServerContainers, Go1_18GRPCClientServerContainers,
114116
Go1_19GRPCClientServerContainers, Go1_20GRPCClientServerContainers,
115117
Go1_21GRPCClientServerContainers, Go1_22GRPCClientServerContainers,
116-
Go1_23GRPCClientServerContainers>
118+
Go1_23GRPCClientServerContainers, Go1_24GRPCClientServerContainers>
117119
GoVersions;
118120
TYPED_TEST_SUITE(HTTP2TraceTest, GoVersions);
119121

‎src/stirling/source_connectors/socket_tracer/testing/container_images/go_1_22_grpc_server_container.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Go1_22_GRPCServerContainer : public ContainerRunner {
3535

3636
static constexpr std::string_view kBazelImageTar =
3737
"src/stirling/source_connectors/socket_tracer/testing/"
38-
"containers:golang_1_22_grpc_server_with_buildinfo.tar";
38+
"containers/golang_1_22_grpc_server_with_buildinfo.tar";
3939

4040
private:
4141
static constexpr std::string_view kContainerNamePrefix = "grpc_server";

0 commit comments

Comments
 (0)