Fix connection info socket path that affects DEB/RPM installs (#5031)

elastic · Jul 2, 2024 · f858169 · f858169
1 parent 0e7a211
commit f858169
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/component/runtime/service.go b/pkg/component/runtime/service.go
@@ -312,7 +312,8 @@ func getConnInfoServerAddress(os string, isLocal bool, port int, socket string)
 		}
 
 		u.Scheme = "unix"
-		return u.JoinPath(paths.InstallPath(paths.DefaultBasePath), socket).String(), nil
+		// Use the path that is relative to path.top which corresponds to the agent binary directory in all installation types
+		return u.JoinPath(paths.Top(), socket).String(), nil
 	}
 
 	return fmt.Sprintf("127.0.0.1:%d", port), nil

diff --git a/pkg/component/runtime/service_test.go b/pkg/component/runtime/service_test.go
@@ -236,7 +236,7 @@ func TestGetConnInfoServerAddress(t *testing.T) {
 				u := url.URL{}
 				u.Path = "/"
 				u.Scheme = "unix"
-				return u.JoinPath(paths.InstallPath(paths.DefaultBasePath), "test.sock").String()
+				return u.JoinPath(paths.Top(), "test.sock").String()
 			}(),
 		},
 	}