Make service display name unique on Windows.

Author: cmacknz

internal/pkg/agent/application/paths/common_development_mode.go

@@ -9,7 +9,13 @@ import "path/filepath"
 
 // DevelopmentInstallDirName is the name of the directory agent will be installed to within the base path.
 // For example it is $BasePath/$DevelopmentInstallDirName, on MacOS it is /Library/Elastic/$DevelopmentInstallDirName.
-const DevelopmentInstallDirName string = "DevelopmentAgent"
+const (
+	DevelopmentInstallDirName = "DevelopmentAgent"
+
+	// Service display names. Must be different from the ServiceName() on Windows.
+	serviceDisplayName                = "Elastic Agent"
+	serviceDisplayNameDevelopmentMode = "Elastic Development Agent"
+)
 
 var isDevelopmentMode bool
 
@@ -49,6 +55,14 @@ func ServiceName() string {
 	return serviceName
 }
 
+// ServiceDisplayName returns the service display name accounting for development mode.
+func ServiceDisplayName() string {
+	if IsDevelopmentMode() {
+		return serviceDisplayNameDevelopmentMode
+	}
+	return serviceDisplayName
+}
+
 // ShellWrapperPath returns the shell wrapper path accounting for development mode.
 func ShellWrapperPath() string {
 	if IsDevelopmentMode() {

internal/pkg/agent/install/svc.go

@@ -15,9 +15,6 @@ import (
 )
 
 const (
-	// ServiceDisplayName is the service display name for the service.
-	ServiceDisplayName = "Elastic Agent"
-
 	// ServiceDescription is the description for the service.
 	ServiceDescription = "Elastic Agent is a unified agent to observe, monitor and protect your system."
 
@@ -76,7 +73,7 @@ func newService(topPath string, opt ...serviceOpt) (service.Service, error) {
 
 	cfg := &service.Config{
 		Name:             paths.ServiceName(),
-		DisplayName:      ServiceDisplayName,
+		DisplayName:      paths.ServiceDisplayName(),
 		Description:      ServiceDescription,
 		Executable:       ExecutablePath(topPath),
 		WorkingDirectory: topPath,