Reuse the go version from GoOffsetLocator to avoid parsing build info multiple times

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

Author: ddelnano

src/stirling/source_connectors/socket_tracer/uprobe_manager.cc

@@ -198,9 +198,9 @@ Status UProbeManager::UpdateGoHTTP2SymAddrs(ElfReader* elf_reader, GoOffsetLocat
   return Status::OK();
 }
 
-Status UProbeManager::UpdateGoTLSSymAddrs(ElfReader* elf_reader, GoOffsetLocator* offset_locator,
+Status UProbeManager::UpdateGoTLSSymAddrs(GoOffsetLocator* offset_locator,
                                           const std::vector<int32_t>& pids) {
-  PX_ASSIGN_OR_RETURN(struct go_tls_symaddrs_t symaddrs, GoTLSSymAddrs(elf_reader, offset_locator));
+  PX_ASSIGN_OR_RETURN(struct go_tls_symaddrs_t symaddrs, GoTLSSymAddrs(offset_locator));
 
   for (auto& pid : pids) {
     PX_RETURN_IF_ERROR(go_tls_symaddrs_map_->SetValue(pid, symaddrs));
@@ -527,7 +527,7 @@ StatusOr<int> UProbeManager::AttachGoTLSUProbes(const std::string& binary,
                                                 GoOffsetLocator* offset_locator,
                                                 const std::vector<int32_t>& pids) {
   // Step 1: Update BPF symbols_map on all new PIDs.
-  Status s = UpdateGoTLSSymAddrs(elf_reader, offset_locator, pids);
+  Status s = UpdateGoTLSSymAddrs(offset_locator, pids);
   if (!s.ok()) {
     // Doesn't appear to be a binary with the mandatory symbols.
     // Might not even be a golang binary.

src/stirling/source_connectors/socket_tracer/uprobe_manager.h

@@ -583,8 +583,7 @@ class UProbeManager {
                                 const std::vector<int32_t>& pids);
   Status UpdateGoHTTP2SymAddrs(obj_tools::ElfReader* elf_reader, GoOffsetLocator* offset_locator,
                                const std::vector<int32_t>& pids);
-  Status UpdateGoTLSSymAddrs(obj_tools::ElfReader* elf_reader, GoOffsetLocator* offset_locator,
-                             const std::vector<int32_t>& pids);
+  Status UpdateGoTLSSymAddrs(GoOffsetLocator* offset_locator, const std::vector<int32_t>& pids);
   Status UpdateNodeTLSWrapSymAddrs(int32_t pid, const std::filesystem::path& node_exe,
                                    const SemVer& ver);
 

src/stirling/source_connectors/socket_tracer/uprobe_symaddrs.cc

@@ -471,10 +471,9 @@ Status PopulateHTTP2DebugSymbols(GoOffsetLocator* offset_locator, std::string_vi
 
 }  // namespace
 
-Status PopulateGoTLSDebugSymbols(ElfReader* elf_reader, GoOffsetLocator* offset_locator,
+Status PopulateGoTLSDebugSymbols(GoOffsetLocator* offset_locator,
                                  struct go_tls_symaddrs_t* symaddrs) {
-  PX_ASSIGN_OR_RETURN(auto build_info, ReadGoBuildInfo(elf_reader));
-  PX_ASSIGN_OR_RETURN(SemVer go_version, GetSemVer(build_info.first, false));
+  PX_ASSIGN_OR_RETURN(SemVer go_version, GetSemVer(offset_locator->go_version(), false));
   std::string retval0_arg = "~r1";
   std::string retval1_arg = "~r2";
 
@@ -541,11 +540,10 @@ StatusOr<struct go_http2_symaddrs_t> GoHTTP2SymAddrs(ElfReader* elf_reader,
   return symaddrs;
 }
 
-StatusOr<struct go_tls_symaddrs_t> GoTLSSymAddrs(ElfReader* elf_reader,
-                                                 GoOffsetLocator* offset_locator) {
+StatusOr<struct go_tls_symaddrs_t> GoTLSSymAddrs(GoOffsetLocator* offset_locator) {
   struct go_tls_symaddrs_t symaddrs;
 
-  PX_RETURN_IF_ERROR(PopulateGoTLSDebugSymbols(elf_reader, offset_locator, &symaddrs));
+  PX_RETURN_IF_ERROR(PopulateGoTLSDebugSymbols(offset_locator, &symaddrs));
 
   return symaddrs;
 }

src/stirling/source_connectors/socket_tracer/uprobe_symaddrs.h

@@ -87,6 +87,8 @@ class GoOffsetLocator {
     return GetStructMemberOffsetFromOffsets(struct_name, member_name);
   }
 
+  const std::string& go_version() const { return go_version_; }
+
  private:
   StatusOr<std::map<std::string, obj_tools::ArgInfo>> GetFunctionArgInfoFromOffsets(
       std::string_view function_symbol_name) {
@@ -175,8 +177,7 @@ StatusOr<struct go_http2_symaddrs_t> GoHTTP2SymAddrs(obj_tools::ElfReader* elf_r
  * Uses ELF and DWARF information to return the locations of all relevant symbols for Go TLS
  * uprobe deployment.
  */
-StatusOr<struct go_tls_symaddrs_t> GoTLSSymAddrs(obj_tools::ElfReader* elf_reader,
-                                                 GoOffsetLocator* offset_locator);
+StatusOr<struct go_tls_symaddrs_t> GoTLSSymAddrs(GoOffsetLocator* offset_locator);
 
 /**
  * Detects the version of OpenSSL to return the locations of all relevant symbols for OpenSSL uprobe
@@ -194,8 +195,7 @@ StatusOr<struct openssl_symaddrs_t> OpenSSLSymAddrs(obj_tools::RawFptrManager* f
 StatusOr<struct node_tlswrap_symaddrs_t> NodeTLSWrapSymAddrs(const std::filesystem::path& node_exe,
                                                              const SemVer& ver);
 
-px::Status PopulateGoTLSDebugSymbols(obj_tools::ElfReader* elf_reader,
-                                     GoOffsetLocator* offset_locator,
+px::Status PopulateGoTLSDebugSymbols(GoOffsetLocator* offset_locator,
                                      struct go_tls_symaddrs_t* symaddrs);
 
 }  // namespace stirling

src/stirling/source_connectors/socket_tracer/uprobe_symaddrs_test.cc

@@ -87,8 +87,7 @@ TEST_F(UprobeSymaddrsTest, GoHTTP2SymAddrs) {
 }
 
 TEST_F(UprobeSymaddrsTest, GoTLSSymAddrs) {
-  ASSERT_OK_AND_ASSIGN(struct go_tls_symaddrs_t symaddrs,
-                       GoTLSSymAddrs(elf_reader_.get(), offset_locator_.get()));
+  ASSERT_OK_AND_ASSIGN(struct go_tls_symaddrs_t symaddrs, GoTLSSymAddrs(offset_locator_.get()));
 
   // Check some member offsets.
   // The values may change when golang version is updated.