Skip to content

Commit a2980b6

Browse files
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 f00bc58 commit a2980b6

3 files changed

Lines changed: 7 additions & 11 deletions

File tree

src/stirling/source_connectors/socket_tracer/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,7 @@ pl_cc_bpf_test(
359359
"//src/stirling/source_connectors/socket_tracer/testing/container_images:go_1_20_grpc_server_container",
360360
"//src/stirling/source_connectors/socket_tracer/testing/container_images:go_1_21_grpc_server_container",
361361
"//src/stirling/source_connectors/socket_tracer/testing/container_images:go_1_22_grpc_server_container",
362+
"//src/stirling/source_connectors/socket_tracer/testing/container_images:go_1_23_grpc_client_container",
362363
"//src/stirling/source_connectors/socket_tracer/testing/container_images:go_1_23_grpc_server_container",
363364
"//src/stirling/source_connectors/socket_tracer/testing/container_images:go_1_24_grpc_client_container",
364365
"//src/stirling/source_connectors/socket_tracer/testing/container_images:go_1_24_grpc_server_container",

src/stirling/source_connectors/socket_tracer/http2_trace_bpf_test.cc

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,10 @@
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"
@@ -79,27 +74,27 @@ class HTTP2TraceTest : public testing::SocketTraceBPFTestFixture</* TClientSideT
7974

8075
struct Go1_18GRPCClientServerContainers {
8176
using ServerContainer = ::px::stirling::testing::Go1_18_GRPCServerContainer;
82-
using ClientContainer = ::px::stirling::testing::Go1_18_GRPCClientContainer;
77+
using ClientContainer = ::px::stirling::testing::Go1_24_GRPCClientContainer;
8378
};
8479

8580
struct Go1_19GRPCClientServerContainers {
8681
using ServerContainer = ::px::stirling::testing::Go1_19_GRPCServerContainer;
87-
using ClientContainer = ::px::stirling::testing::Go1_19_GRPCClientContainer;
82+
using ClientContainer = ::px::stirling::testing::Go1_24_GRPCClientContainer;
8883
};
8984

9085
struct Go1_20GRPCClientServerContainers {
9186
using ServerContainer = ::px::stirling::testing::Go1_20_GRPCServerContainer;
92-
using ClientContainer = ::px::stirling::testing::Go1_20_GRPCClientContainer;
87+
using ClientContainer = ::px::stirling::testing::Go1_24_GRPCClientContainer;
9388
};
9489

9590
struct Go1_21GRPCClientServerContainers {
9691
using ServerContainer = ::px::stirling::testing::Go1_21_GRPCServerContainer;
97-
using ClientContainer = ::px::stirling::testing::Go1_21_GRPCClientContainer;
92+
using ClientContainer = ::px::stirling::testing::Go1_24_GRPCClientContainer;
9893
};
9994

10095
struct Go1_22GRPCClientServerContainers {
10196
using ServerContainer = ::px::stirling::testing::Go1_22_GRPCServerContainer;
102-
using ClientContainer = ::px::stirling::testing::Go1_22_GRPCClientContainer;
97+
using ClientContainer = ::px::stirling::testing::Go1_24_GRPCClientContainer;
10398
};
10499

105100
struct Go1_23GRPCClientServerContainers {

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)