Improve error for "instance lock is already locked" (#33788) (#33883)

(cherry picked from commit 451f75b)

Co-authored-by: Anderson Queiroz <anderson.queiroz@elastic.co>

CHANGELOG-developer.next.asciidoc

@@ -146,6 +146,9 @@ The list below covers the major changes between 7.0.0-rc2 and main only.
 - Improve compatibility and reduce flakyness of Python tests {pull}31588[31588]
 - Added `.python-version` file {pull}32323[32323]
 - Add support for multiple regions in GCP {pull}32964[32964]
+- Use `T.TempDir` to create temporary test directory {pull}33082[33082]
+- Add an option to disable event normalization when creating a `beat.Client`. {pull}33657[33657]
+- Add the file path of the instance lock on the error when it's is already locked {pull}33788[33788]
 
 ==== Deprecated
 

libbeat/cmd/instance/locks/lock.go

@@ -50,7 +50,7 @@ var (
 	// ErrAlreadyLocked is returned when a lock on the data path is attempted but
 	// unsuccessful because another Beat instance already has the lock on the same
 	// data path.
-	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).")
+	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)")
 
 	// ErrLockfileEmpty is returned by readExistingPidfile() when an existing pidfile is found, but the file is empty.
 	ErrLockfileEmpty = fmt.Errorf("lockfile is empty")
@@ -112,7 +112,7 @@ func (lock *Locker) Lock() error {
 	// case: lock could not be obtained.
 	if !isLocked {
 		// if we're here, things are probably unrecoverable, as we've previously checked for a lockfile. Exit.
-		return ErrAlreadyLocked
+		return fmt.Errorf("%s: %w", lock.filePath, ErrAlreadyLocked)
 	}
 
 	return nil