From 5e6df6d6db8544a3d27d71cff7f4705acc659647 Mon Sep 17 00:00:00 2001
From: u5surf <u5.horie@gmail.com>
Date: Mon, 3 Jul 2023 20:35:54 +0900
Subject: [PATCH] Move out ltsv parse func

---
 src/core/tailer/tailer.go                     | 36 +++++++++----------
 src/core/tailer/tailer_test.go                |  4 +--
 .../nginx/agent/v2/src/core/tailer/tailer.go  | 36 +++++++++----------
 3 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/src/core/tailer/tailer.go b/src/core/tailer/tailer.go
index e3d86096ae..de287f8393 100644
--- a/src/core/tailer/tailer.go
+++ b/src/core/tailer/tailer.go
@@ -68,8 +68,7 @@ type PatternTailer struct {
 }
 
 type LTSVTailer struct {
-	handle          *tail.Tail
-	ltsvParseString func(line string) map[string]string
+	handle *tail.Tail
 }
 
 func NewTailer(file string) (*Tailer, error) {
@@ -102,25 +101,11 @@ func NewPatternTailer(file string, patterns map[string]string) (*PatternTailer,
 }
 
 func NewLTSVTailer(file string) (*LTSVTailer, error) {
-	ltsvParseString := func(line string) map[string]string {
-		columns := strings.Split(line, "\t")
-		lvs := make(map[string]string)
-		for _, column := range columns {
-			lv := strings.SplitN(column, ":", 2)
-			if len(lv) < 2 {
-				continue
-			}
-			label, value := strings.TrimSpace(lv[0]), strings.TrimSpace(lv[1])
-			lvs[label] = value
-		}
-		return lvs
-	}
 	t, err := tail.TailFile(file, tailConfig)
 	if err != nil {
 		return nil, err
 	}
-
-	return &LTSVTailer{t, ltsvParseString}, nil
+	return &LTSVTailer{t}, nil
 }
 
 func (t *Tailer) Tail(ctx context.Context, data chan<- string) {
@@ -189,8 +174,7 @@ func (t *LTSVTailer) Tail(ctx context.Context, data chan<- map[string]string) {
 			if line.Err != nil {
 				continue
 			}
-
-			l := t.ltsvParseString(line.Text)
+			l := t.parse(line.Text)
 			if l != nil {
 				data <- l
 			}
@@ -207,3 +191,17 @@ func (t *LTSVTailer) Tail(ctx context.Context, data chan<- map[string]string) {
 		}
 	}
 }
+
+func (t *LTSVTailer) parse(line string) map[string]string {
+	columns := strings.Split(line, "\t")
+	lineMap := make(map[string]string)
+	for _, column := range columns {
+		labelValue := strings.SplitN(column, ":", 2)
+		if len(labelValue) < 2 {
+			continue
+		}
+		label, value := strings.TrimSpace(labelValue[0]), strings.TrimSpace(labelValue[1])
+		lineMap[label] = value
+	}
+	return lineMap
+}
diff --git a/src/core/tailer/tailer_test.go b/src/core/tailer/tailer_test.go
index ae7acbf1a0..251838ecf4 100644
--- a/src/core/tailer/tailer_test.go
+++ b/src/core/tailer/tailer_test.go
@@ -160,12 +160,12 @@ func TestLTSVTailer(t *testing.T) {
 	accessLogFile.Close()
 
 	var count int
-        var res map[string]string
+	var res map[string]string
 T:
 	for {
 		select {
 		case r := <-data:
-                        res = r
+			res = r
 			count++
 		case <-time.After(timeoutDuration):
 			break T
diff --git a/test/performance/vendor/github.com/nginx/agent/v2/src/core/tailer/tailer.go b/test/performance/vendor/github.com/nginx/agent/v2/src/core/tailer/tailer.go
index e3d86096ae..de287f8393 100644
--- a/test/performance/vendor/github.com/nginx/agent/v2/src/core/tailer/tailer.go
+++ b/test/performance/vendor/github.com/nginx/agent/v2/src/core/tailer/tailer.go
@@ -68,8 +68,7 @@ type PatternTailer struct {
 }
 
 type LTSVTailer struct {
-	handle          *tail.Tail
-	ltsvParseString func(line string) map[string]string
+	handle *tail.Tail
 }
 
 func NewTailer(file string) (*Tailer, error) {
@@ -102,25 +101,11 @@ func NewPatternTailer(file string, patterns map[string]string) (*PatternTailer,
 }
 
 func NewLTSVTailer(file string) (*LTSVTailer, error) {
-	ltsvParseString := func(line string) map[string]string {
-		columns := strings.Split(line, "\t")
-		lvs := make(map[string]string)
-		for _, column := range columns {
-			lv := strings.SplitN(column, ":", 2)
-			if len(lv) < 2 {
-				continue
-			}
-			label, value := strings.TrimSpace(lv[0]), strings.TrimSpace(lv[1])
-			lvs[label] = value
-		}
-		return lvs
-	}
 	t, err := tail.TailFile(file, tailConfig)
 	if err != nil {
 		return nil, err
 	}
-
-	return &LTSVTailer{t, ltsvParseString}, nil
+	return &LTSVTailer{t}, nil
 }
 
 func (t *Tailer) Tail(ctx context.Context, data chan<- string) {
@@ -189,8 +174,7 @@ func (t *LTSVTailer) Tail(ctx context.Context, data chan<- map[string]string) {
 			if line.Err != nil {
 				continue
 			}
-
-			l := t.ltsvParseString(line.Text)
+			l := t.parse(line.Text)
 			if l != nil {
 				data <- l
 			}
@@ -207,3 +191,17 @@ func (t *LTSVTailer) Tail(ctx context.Context, data chan<- map[string]string) {
 		}
 	}
 }
+
+func (t *LTSVTailer) parse(line string) map[string]string {
+	columns := strings.Split(line, "\t")
+	lineMap := make(map[string]string)
+	for _, column := range columns {
+		labelValue := strings.SplitN(column, ":", 2)
+		if len(labelValue) < 2 {
+			continue
+		}
+		label, value := strings.TrimSpace(labelValue[0]), strings.TrimSpace(labelValue[1])
+		lineMap[label] = value
+	}
+	return lineMap
+}