Add access log source

Author: andy-tier1app

internal/agent/m3/m3.go

@@ -503,6 +503,7 @@ func (m3 *M3App) uploadAccessLogM3(endpoint string, pid int, appName string) {
 
 	accessLogPath := ""
 	accessLogFormat := ""
+	accessLogSource := ""
 
 	searchToken := "$" + appName
 
@@ -518,6 +519,10 @@ func (m3 *M3App) uploadAccessLogM3(endpoint string, pid int, appName string) {
 		}
 	}
 
+	if accessLogPath == "" {
+		return
+	}
+
 	// Find the corresponding access log format
 	for _, configAccessLogFmt := range config.GlobalConfig.AccessLogFormats {
 		if !strings.Contains(string(configAccessLogFmt), "$") {
@@ -530,18 +535,27 @@ func (m3 *M3App) uploadAccessLogM3(endpoint string, pid int, appName string) {
 		}
 	}
 
-	if accessLogPath == "" {
-		return
-	}
-
 	if accessLogFormat == "" {
 		logger.Log("WARNING: Access log format is not set for path:%s, app:%s, ignoring", accessLogPath, appName)
 		return
 	}
 
+	// Find the corresponding access log source
+	for _, configAccessLogSrc := range config.GlobalConfig.AccessLogSources {
+		if !strings.Contains(string(configAccessLogSrc), "$") {
+			continue
+		}
+
+		beforeSearchToken, found := strings.CutSuffix(string(configAccessLogSrc), searchToken)
+		if found {
+			accessLogSource = beforeSearchToken
+		}
+	}
+
 	accessLogEntries = append(accessLogEntries, capture.AccessLogEntry{
 		Path:   config.AccessLogPath(accessLogPath),
 		Format: config.AccessLogFormat(accessLogFormat),
+		Source: config.AccessLogSource(accessLogSource),
 	})
 
 	paths := make(map[int][]capture.AccessLogEntry)

internal/capture/accesslogm3.go

@@ -30,6 +30,7 @@ type AccessLogM3 struct {
 type AccessLogEntry struct {
 	Path   config.AccessLogPath
 	Format config.AccessLogFormat
+	Source config.AccessLogSource
 }
 
 // accessLogM3ReadStat tracks the essential state needed for incremental log reading.
@@ -90,7 +91,7 @@ func (a *AccessLogM3) Run() (Result, error) {
 			}
 
 			for _, match := range matches {
-				r, e := a.CaptureSingleAccessLog(match, pid, string(path.Format))
+				r, e := a.CaptureSingleAccessLog(match, pid, string(path.Format), string(path.Source))
 
 				results = append(results, r)
 				errs = append(errs, e)
@@ -104,7 +105,7 @@ func (a *AccessLogM3) Run() (Result, error) {
 // captureSingleAccessLog processes a single access log file: it opens the file,
 // seeks to the last-read position (or initializes it on the first run),
 // copies new content to a uniquely named destination file, and posts it.
-func (a *AccessLogM3) CaptureSingleAccessLog(filePath string, pid int, format string) (Result, error) {
+func (a *AccessLogM3) CaptureSingleAccessLog(filePath string, pid int, format, source string) (Result, error) {
 	fileInfo, err := os.Stat(filePath)
 	if err != nil {
 		return Result{}, fmt.Errorf("failed to stat accesslog %q: %w", filePath, err)
@@ -166,6 +167,11 @@ func (a *AccessLogM3) CaptureSingleAccessLog(filePath string, pid int, format st
 	// Write the format header to the destination file)
 	dst.WriteString(format + "\n")
 
+	if source != "" {
+		// Write the source header
+		dst.WriteString("accessLogSource: " + source + "\n")
+	}
+
 	// Copy new content from the source log.
 	bytesCopied, err := io.Copy(dst, src)
 	if err != nil {

internal/config/config.go

@@ -100,6 +100,7 @@ type Options struct {
 	// Access log
 	AccessLogs       AccessLogs       `yaml:"accessLogs" usage:"Access log file paths"`
 	AccessLogFormats AccessLogFormats `yaml:"accessLogFormats" usage:"Access log formats corresponding to access log files"`
+	AccessLogSources AccessLogSources `yaml:"accessLogSources" usage:"Access log sources corresponding to access log files"`
 }
 
 type Command struct {
@@ -216,6 +217,9 @@ type AccessLogs []AccessLogPath
 type AccessLogFormat string
 type AccessLogFormats []AccessLogFormat
 
+type AccessLogSource string
+type AccessLogSources []AccessLogSource
+
 func defaultConfig() Config {
 	return Config{
 		Options: Options{