Fix bpf tests

Signed-off-by: Dom Del Nano <ddelnano@gmail.com>

Author: ddelnano

src/stirling/source_connectors/socket_tracer/go_tls_trace_bpf_test.cc

@@ -114,28 +114,26 @@ struct Go1_22TLSClientServerContainers {
   static constexpr std::string_view server_image_tar = GoTLSServerContainer::kBazelImageTar;
   static const bool disable_dwarf = false;
 };
-
-struct Go1_23TLSClientServerContainers {
-  using GoTLSServerContainer = ::px::stirling::testing::Go1_23_TLSServerContainer;
-  using GoTLSClientContainer = ::px::stirling::testing::Go1_23_TLSClientContainer;
+struct Go1_22TLSClientServerContainersNoDWARFContainers {
+  using GoTLSClientContainer = ::px::stirling::testing::Go1_24_TLSClientContainer;
+  using GoTLSClientContainer = ::px::stirling::testing::Go1_22_TLSClientContainer;
 
   static constexpr std::string_view server_image_tar = GoTLSServerContainer::kBazelImageTar;
-  static const bool disable_dwarf = false;
+  static const bool disable_dwarf = true;
 };
 
-struct Go1_23TLSClientServerNoDWARFContainers {
+struct Go1_23TLSClientServerContainers {
   using GoTLSServerContainer = ::px::stirling::testing::Go1_23_TLSServerContainer;
   using GoTLSClientContainer = ::px::stirling::testing::Go1_23_TLSClientContainer;
 
-  static constexpr std::string_view server_image_tar =
-      "src/stirling/source_connectors/socket_tracer/testing/containers/"
-      "golang_1_23_0_https_server_with_buildinfo.tar";
-  static const bool disable_dwarf = true;
+  static constexpr std::string_view server_image_tar = GoTLSServerContainer::kBazelImageTar;
+  static const bool disable_dwarf = false;
 };
 
 struct Go1_24TLSClientServerContainers {
   using GoTLSServerContainer = ::px::stirling::testing::Go1_24_TLSServerContainer;
   using GoTLSClientContainer = ::px::stirling::testing::Go1_24_TLSClientContainer;
+  static const bool disable_dwarf = false;
 };
 
 struct GoBoringCryptoTLSClientServerContainers {
@@ -149,7 +147,7 @@ struct GoBoringCryptoTLSClientServerContainers {
 typedef ::testing::Types<GoBoringCryptoTLSClientServerContainers, Go1_18TLSClientServerContainers,
                          Go1_19TLSClientServerContainers, Go1_20TLSClientServerContainers,
                          Go1_21TLSClientServerContainers, Go1_22TLSClientServerContainers,
-                         Go1_23TLSClientServerContainers, Go1_23TLSClientServerNoDWARFContainers,
+                         Go1_23TLSClientServerContainers, Go1_22TLSClientServerNoDWARFContainers,
                          Go1_24TLSClientServerContainers>
     GoVersions;
 TYPED_TEST_SUITE(GoTLSTraceTest, GoVersions);

src/stirling/source_connectors/socket_tracer/http2_trace_bpf_test.cc

@@ -118,27 +118,26 @@ struct Go1_22GRPCClientServerContainers {
   static const bool disable_dwarf = false;
 };
 
-struct Go1_23GRPCClientServerContainers {
-  using ServerContainer = ::px::stirling::testing::Go1_23_GRPCServerContainer;
-  using ClientContainer = ::px::stirling::testing::Go1_23_GRPCClientContainer;
+struct Go1_22GRPCClientServerContainersNoDWARF {
+  using ServerContainer = ::px::stirling::testing::Go1_22_GRPCServerContainer;
+  using ClientContainer = ::px::stirling::testing::Go1_24_GRPCClientContainer;
 
   static constexpr std::string_view server_image_tar = ServerContainer::kBazelImageTar;
-  static const bool disable_dwarf = false;
+  static const bool disable_dwarf = true;
 };
 
-struct Go1_23GRPCClientServerContainersNoDWARF {
+struct Go1_23GRPCClientServerContainers {
   using ServerContainer = ::px::stirling::testing::Go1_23_GRPCServerContainer;
   using ClientContainer = ::px::stirling::testing::Go1_23_GRPCClientContainer;
 
-  static constexpr std::string_view server_image_tar =
-      "src/stirling/source_connectors/socket_tracer/testing/containers/"
-      "go_1_23_grpc_server_with_mod_info.tar";
-  static const bool disable_dwarf = true;
+  static constexpr std::string_view server_image_tar = ServerContainer::kBazelImageTar;
+  static const bool disable_dwarf = false;
 };
 
 struct Go1_24GRPCClientServerContainers {
   using ServerContainer = ::px::stirling::testing::Go1_24_GRPCServerContainer;
   using ClientContainer = ::px::stirling::testing::Go1_24_GRPCClientContainer;
+  static const bool disable_dwarf = false;
 };
 
 struct GoBoringCryptoGRPCClientServerContainers {
@@ -152,12 +151,8 @@ struct GoBoringCryptoGRPCClientServerContainers {
 typedef ::testing::Types<GoBoringCryptoGRPCClientServerContainers, Go1_18GRPCClientServerContainers,
                          Go1_19GRPCClientServerContainers, Go1_20GRPCClientServerContainers,
                          Go1_21GRPCClientServerContainers, Go1_22GRPCClientServerContainers,
-<<<<<<< HEAD
                          Go1_23GRPCClientServerContainers, Go1_24GRPCClientServerContainers>
-=======
-                         Go1_23GRPCClientServerContainers, Go1_23GRPCClientServerContainersNoDWARF>
->>>>>>> 345dddc7b (Include offsetgen case in http2_trace_bpf_test)
-    GoVersions;
+    Go1_23GRPCClientServerContainers, Go1_22GRPCClientServerContainersNoDWARF > GoVersions;
 TYPED_TEST_SUITE(HTTP2TraceTest, GoVersions);
 
 TYPED_TEST(HTTP2TraceTest, Basic) {