Fix dynamic_tracing tests

Signed-off-by: Dom Del Nano <[email protected]>

Author: ddelnano

src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/autogen_test.cc

@@ -22,7 +22,7 @@
 #include "src/common/testing/testing.h"
 #include "src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/autogen.h"
 
-constexpr std::string_view kBinaryPath = "src/stirling/obj_tools/testdata/go/test_go_1_21_binary";
+constexpr std::string_view kBinaryPath = "src/stirling/obj_tools/testdata/go/test_go_1_24_binary";
 
 namespace px {
 namespace stirling {

src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/dwarvifier_test.cc

@@ -22,7 +22,7 @@
 #include "src/common/testing/testing.h"
 #include "src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/dwarvifier.h"
 
-constexpr std::string_view kBinaryPath = "src/stirling/obj_tools/testdata/go/test_go_1_21_binary";
+constexpr std::string_view kBinaryPath = "src/stirling/obj_tools/testdata/go/test_go_1_24_binary";
 constexpr std::string_view kCPPBinaryPath = "src/stirling/obj_tools/testdata/cc/test_exe/test_exe";
 
 namespace px {
@@ -1721,6 +1721,19 @@ structs {
         path: "/len"
       }
     }
+    blob_decoders {
+      entries {
+        size: 8
+        type: VOID_POINTER
+        path: "/str"
+      }
+      entries {
+        offset: 8
+        size: 8
+        type: INT
+        path: "/len"
+      }
+    }
     blob_decoders {
     }
   }
@@ -1807,21 +1820,28 @@ probes {
     scalar_var {
       name: "main__IntStruct_sym_addr1"
       type: UINT64
-      constant: "4989632"
+      constant: "5103904"
     }
   }
   vars {
     scalar_var {
       name: "runtime__errorString_sym_addr2"
       type: UINT64
-      constant: "4989824"
+      constant: "5104192"
+    }
+  }
+  vars {
+    scalar_var {
+      name: "runtime__plainError_sym_addr3"
+      type: UINT64
+      constant: "5104224"
     }
   }
   vars {
     scalar_var {
-      name: "internal___poll__errNetClosing_sym_addr3"
+      name: "internal___poll__errNetClosing_sym_addr4"
       type: UINT64
-      constant: "4989856"
+      constant: "5104256"
     }
   }
   vars {
@@ -1896,7 +1916,7 @@ probes {
     cond {
       op: EQUAL
       vars: "retval_intf_tab"
-      vars: "internal___poll__errNetClosing_sym_addr3"
+      vars: "runtime__plainError_sym_addr3"
     }
     vars {
       scalar_var {
@@ -1911,6 +1931,25 @@ probes {
       }
     }
   }
+  cond_blocks {
+    cond {
+      op: EQUAL
+      vars: "retval_intf_tab"
+      vars: "internal___poll__errNetClosing_sym_addr4"
+    }
+    vars {
+      scalar_var {
+        name: "retval"
+        type: STRUCT_BLOB
+        memory {
+          base: "retval_intf_data"
+          size: 16
+          decoder_idx: 4
+          op: ASSIGN_ONLY
+        }
+      }
+    }
+  }
 }
 language: GOLANG
 arrays {

src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/dynamic_tracer_test.cc

@@ -26,7 +26,7 @@
 #include "src/common/testing/testing.h"
 #include "src/stirling/testing/common.h"
 
-constexpr std::string_view kBinaryPath = "src/stirling/obj_tools/testdata/go/test_go_1_21_binary";
+constexpr std::string_view kBinaryPath = "src/stirling/obj_tools/testdata/go/test_go_1_24_binary";
 
 namespace px {
 namespace stirling {
@@ -45,15 +45,15 @@ using ::testing::SizeIs;
 
 constexpr char kClientPath[] =
     "src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_client/"
-    "golang_1_21_grpc_client";
+    "golang_1_24_grpc_client";
 
 constexpr char kClientPathExpected[] =
     "src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_client/"
     "client_/client";
 
 constexpr char kServerPath[] =
     "src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_server/"
-    "golang_1_21_grpc_server";
+    "golang_1_24_grpc_server";
 
 constexpr char kServerPathExpected[] =
     "src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_server/"
@@ -389,7 +389,7 @@ const std::vector<std::string> kExpectedBCC = {
     "void* goid_X_;",
     "bpf_probe_read(&goid_X_, sizeof(void*), parm__ + 0);",
     "uint64_t goid;",
-    "bpf_probe_read(&goid, sizeof(uint64_t), goid_X_ + 152);",
+    "bpf_probe_read(&goid, sizeof(uint64_t), goid_X_ + 160);",
     "uint32_t newval;",
     "bpf_probe_read(&newval, sizeof(uint32_t), parm__ + 16);",
     "struct pid_goid_map_value_t pid_goid_map_value = {};",
@@ -476,7 +476,7 @@ TEST(DynamicTracerTest, Compile) {
 
   const auto& spec = bcc_program.uprobe_specs[0];
 
-  EXPECT_THAT(spec, Field(&UProbeSpec::binary_path, ::testing::EndsWith("test_go_1_21_binary")));
+  EXPECT_THAT(spec, Field(&UProbeSpec::binary_path, ::testing::EndsWith("test_go_1_24_binary")));
   EXPECT_THAT(spec, Field(&UProbeSpec::symbol, "runtime.casgstatus"));
   EXPECT_THAT(spec, Field(&UProbeSpec::attach_type, bpf_tools::BPFProbeAttachType::kEntry));
   EXPECT_THAT(spec, Field(&UProbeSpec::probe_fn, "probe_entry_runtime_casgstatus"));