locks: remove redundant beatPaths parameter

Now that Paths lives in beat.Info, there is no need to pass it
as a separate argument alongside Info.

Author: orestisfl

libbeat/cmd/instance/beat.go

@@ -430,7 +430,7 @@ func (b *Beat) launch(settings Settings, bt beat.Creator) error {
 	// Try to acquire exclusive lock on data path to prevent another beat instance
 	// sharing same data path. This is disabled under elastic-agent.
 	if !management.UnderAgent() {
-		bl := locks.New(b.Info, b.Info.Paths)
+		bl := locks.New(b.Info)
 		err := bl.Lock()
 		if err != nil {
 			return err

libbeat/cmd/instance/locks/lock.go

@@ -42,13 +42,13 @@ type Locker struct {
 var ErrAlreadyLocked = fmt.Errorf("data path already locked by another beat. Please make sure that multiple beats are not sharing the same data path (path.data)")
 
 // New returns a new file locker
-func New(beatInfo beat.Info, beatPaths *paths.Path) *Locker {
-	return NewWithRetry(beatInfo, beatPaths, 4, time.Millisecond*400)
+func New(beatInfo beat.Info) *Locker {
+	return NewWithRetry(beatInfo, 4, time.Millisecond*400)
 }
 
 // NewWithRetry returns a new file locker with the given settings
-func NewWithRetry(beatInfo beat.Info, beatPaths *paths.Path, retryCount int, retrySleep time.Duration) *Locker {
-	lockfilePath := beatPaths.Resolve(paths.Data, beatInfo.Beat+".lock")
+func NewWithRetry(beatInfo beat.Info, retryCount int, retrySleep time.Duration) *Locker {
+	lockfilePath := beatInfo.Paths.Resolve(paths.Data, beatInfo.Beat+".lock")
 	return &Locker{
 		fileLock:   flock.New(lockfilePath),
 		retryCount: retryCount,

libbeat/cmd/instance/locks/lock_test.go

@@ -65,20 +65,20 @@ func TestLocker(t *testing.T) {
 
 	logger := logptest.NewTestingLogger(t, "")
 
-	b1 := beat.Info{Logger: logger}
+	b1 := beat.Info{Logger: logger, Paths: tmpPaths}
 	b1.Beat = beatName
 
-	b2 := beat.Info{Logger: logger}
+	b2 := beat.Info{Logger: logger, Paths: tmpPaths}
 	b2.Beat = beatName
 
 	// Try to get a lock for the first beat. Expect it to succeed.
-	bl1 := New(b1, tmpPaths)
+	bl1 := New(b1)
 	err = bl1.Lock()
 	require.NoError(t, err)
 
 	// Try to get a lock for the second beat. Expect it to fail because the
 	// first beat already has the lock.
-	bl2 := New(b2, tmpPaths)
+	bl2 := New(b2)
 	err = bl2.Lock()
 	require.Error(t, err)
 }
@@ -92,15 +92,15 @@ func TestUnlock(t *testing.T) {
 	err := tmpPaths.InitPaths(tmpPaths)
 	require.NoError(t, err, "error initializaing paths")
 
-	b1 := beat.Info{Logger: logger}
+	b1 := beat.Info{Logger: logger, Paths: tmpPaths}
 	b1.Beat = beatName
 
-	b2 := beat.Info{}
+	b2 := beat.Info{Paths: tmpPaths}
 	b2.Beat = beatName
-	bl2 := New(b2, tmpPaths)
+	bl2 := New(b2)
 
 	// Try to get a lock for the first beat. Expect it to succeed.
-	bl1 := New(b1, tmpPaths)
+	bl1 := New(b1)
 	err = bl1.Lock()
 	require.NoError(t, err)
 
@@ -122,15 +122,15 @@ func TestUnlockWithRemainingFile(t *testing.T) {
 	err := tmpPaths.InitPaths(tmpPaths)
 	require.NoError(t, err, "error initializaing paths")
 
-	b1 := beat.Info{Logger: logger}
+	b1 := beat.Info{Logger: logger, Paths: tmpPaths}
 	b1.Beat = beatName
 
-	b2 := beat.Info{}
+	b2 := beat.Info{Paths: tmpPaths}
 	b2.Beat = beatName
-	bl2 := New(b2, tmpPaths)
+	bl2 := New(b2)
 
 	// Try to get a lock for the first beat. Expect it to succeed.
-	bl1 := New(b1, tmpPaths)
+	bl1 := New(b1)
 	err = bl1.Lock()
 	require.NoError(t, err)