Detect running Java process after update (#1936)

Author: jefchien

internal/detector/kafkaclient/kafkaclient.go

@@ -6,11 +6,11 @@ package kafkaclient
 import (
 	"context"
 	"log/slog"
-	"path/filepath"
 	"strings"
 
 	"github.com/aws/amazon-cloudwatch-agent/internal/detector"
 	"github.com/aws/amazon-cloudwatch-agent/internal/detector/common"
+	"github.com/aws/amazon-cloudwatch-agent/internal/detector/util"
 )
 
 const (
@@ -80,11 +80,11 @@ func (d *loadedJarDetector) Detect(ctx context.Context, process detector.Process
 		return nil, err
 	}
 	for _, fd := range fds {
-		path := strings.TrimSuffix(fd.Path, " (deleted)")
-		if !strings.HasSuffix(path, common.ExtJAR) {
+		base := util.BaseName(fd.Path)
+		if !strings.HasSuffix(base, common.ExtJAR) {
 			continue
 		}
-		if strings.Contains(filepath.Base(path), kafkaClientsLibraryName) {
+		if strings.Contains(base, kafkaClientsLibraryName) {
 			return &detector.Metadata{Categories: []detector.Category{detector.CategoryKafkaClient}}, nil
 		}
 	}

internal/detector/util/util.go

@@ -11,13 +11,28 @@ import (
 	"github.com/aws/amazon-cloudwatch-agent/internal/detector"
 )
 
+const (
+	suffixDeleted = " (deleted)"
+)
+
+// BaseName returns the base filename from a path. Removes quotes and deleted file indicators. Preserves file
+// extensions and casing.
+func BaseName(path string) string {
+	trimmed := strings.Trim(path, "\"")
+	if trimmed == "" {
+		return ""
+	}
+	return strings.TrimSuffix(filepath.Base(trimmed), suffixDeleted)
+}
+
+// BaseExe returns the executable name from a path. Normalizes the name by removing file extensions and converting to
+// lowercase to support cross-platform comparisons.
 func BaseExe(exe string) string {
-	base := strings.Trim(exe, "\"")
-	if base != "" {
-		base = filepath.Base(base)
+	base := BaseName(exe)
+	if base == "" {
+		return ""
 	}
-	base = strings.TrimSuffix(base, filepath.Ext(base))
-	return strings.ToLower(base)
+	return strings.ToLower(strings.TrimSuffix(base, filepath.Ext(base)))
 }
 
 func AbsPath(ctx context.Context, process detector.Process, path string) (string, error) {

internal/detector/util/util_test.go

@@ -15,21 +15,60 @@ import (
 	"github.com/aws/amazon-cloudwatch-agent/internal/detector/detectortest"
 )
 
+func TestBaseName(t *testing.T) {
+	testCases := map[string]struct {
+		path string
+		want string
+	}{
+		"WithEmptyPath": {
+			path: "",
+			want: "",
+		},
+		"WithSimplePath": {
+			path: filepath.Join("usr", "bin", "test.jar"),
+			want: "test.jar",
+		},
+		"WithQuotedPath": {
+			path: fmt.Sprintf("%q", filepath.Join("usr", "bin", "TEST.jar")),
+			want: "TEST.jar",
+		},
+		"WithDeleted": {
+			path: filepath.Join("usr", "bin", "test.jar (deleted)"),
+			want: "test.jar",
+		},
+	}
+
+	for name, testCase := range testCases {
+		t.Run(name, func(t *testing.T) {
+			got := BaseName(testCase.path)
+			assert.Equal(t, testCase.want, got)
+		})
+	}
+}
+
 func TestBaseExe(t *testing.T) {
 	testCases := map[string]struct {
 		exe  string
 		want string
 	}{
-		"EmptyString": {
+		"WithEmptyPath": {
 			exe:  "",
 			want: "",
 		},
-		"SimpleExe": {
+		"WithSimplePath": {
 			exe:  filepath.Join("usr", "bin", "java"),
 			want: "java",
 		},
-		"QuotedPath": {
-			exe:  fmt.Sprintf("%q", filepath.Join("usr", "bin", "java")),
+		"WithQuotedPath": {
+			exe:  fmt.Sprintf("%q", filepath.Join("usr", "bin", "Java")),
+			want: "java",
+		},
+		"WithExtension": {
+			exe:  filepath.Join("usr", "bin", "java.exe"),
+			want: "java",
+		},
+		"WithDeleted": {
+			exe:  filepath.Join("usr", "bin", "java.exe (deleted)"),
 			want: "java",
 		},
 	}