test(log): add unit testing

Author: lvan100

gs/internal/gs_conf/conf.go

@@ -285,7 +285,9 @@ func (p *PropertySources) getFiles(dir string, resolver conf.Properties) (_ []st
 				files = append(files, []string{
 					fmt.Sprintf("%s/%s-%s.properties", dir, p.configName, s),
 					fmt.Sprintf("%s/%s-%s.yaml", dir, p.configName, s),
+					fmt.Sprintf("%s/%s-%s.yml", dir, p.configName, s),
 					fmt.Sprintf("%s/%s-%s.toml", dir, p.configName, s),
+					fmt.Sprintf("%s/%s-%s.tml", dir, p.configName, s),
 					fmt.Sprintf("%s/%s-%s.json", dir, p.configName, s),
 				}...)
 			}

log/log_reader.go

@@ -104,14 +104,31 @@ func (r *XMLReader) Read(b []byte) (*Node, error) {
 		}
 		switch t := token.(type) {
 		case xml.StartElement:
-			curr := &Node{
-				Label:      t.Name.Local,
-				Attributes: make(map[string]string),
+			if t.Name.Local == "Property" {
+				var name string
+				for _, attr := range t.Attr {
+					if attr.Name.Local == "name" {
+						name = attr.Value
+						break
+					}
+				}
+				var value string
+				err = d.DecodeElement(&value, &t)
+				if err != nil {
+					return nil, err
+				}
+				curr := stack[len(stack)-1]
+				curr.Attributes[name] = value
+			} else {
+				curr := &Node{
+					Label:      t.Name.Local,
+					Attributes: make(map[string]string),
+				}
+				for _, attr := range t.Attr {
+					curr.Attributes[attr.Name.Local] = attr.Value
+				}
+				stack = append(stack, curr)
 			}
-			for _, attr := range t.Attr {
-				curr.Attributes[attr.Name.Local] = attr.Value
-			}
-			stack = append(stack, curr)
 		case xml.EndElement:
 			curr := stack[len(stack)-1]
 			parent := stack[len(stack)-2]

log/log_refresh.go

@@ -23,6 +23,7 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"strconv"
 	"strings"
 	"sync/atomic"
 
@@ -163,6 +164,24 @@ func RefreshReader(input io.Reader, ext string) error {
 		return errors.New("found no root logger")
 	}
 
+	var (
+		cfgMaxBufferSize int
+	)
+
+	if node := rootNode.getChild("Properties"); node != nil {
+		strMaxBufferSize, ok := node.Attributes["MaxBufferSize"]
+		if ok {
+			i, err := strconv.Atoi(strMaxBufferSize)
+			if err != nil {
+				return err
+			}
+			if i <= 0 {
+				return errors.New("RefreshReader: MaxBufferSize must be greater than 0")
+			}
+			cfgMaxBufferSize = i
+		}
+	}
+
 	var (
 		logArray []*Logger
 		tagArray []*regexp.Regexp
@@ -199,5 +218,7 @@ func RefreshReader(input io.Reader, ext string) error {
 		tag.SetLogger(logger)
 	}
 
+	maxBufferSize.Store(int32(cfgMaxBufferSize))
+
 	return nil
 }

log/log_test.go

@@ -22,6 +22,7 @@ import (
 	"testing"
 
 	"github.com/go-spring/spring-core/log"
+	"github.com/lvan100/go-assert"
 )
 
 var TagRequestIn = log.GetTag("_com_request_in")
@@ -30,15 +31,13 @@ var TagRequestOut = log.GetTag("_com_request_out")
 func TestLog(t *testing.T) {
 	ctx := t.Context()
 
+	log.StringFromContext = func(ctx context.Context) string {
+		return ""
+	}
+
 	log.FieldsFromContext = func(ctx context.Context) []log.Field {
 		traceID, _ := ctx.Value("trace_id").(string)
-		if traceID == "" {
-			traceID = "<<trace_id>>"
-		}
 		spanID, _ := ctx.Value("span_id").(string)
-		if spanID == "" {
-			spanID = "<<span_id>>"
-		}
 		return []log.Field{
 			log.String("trace_id", traceID),
 			log.String("span_id", spanID),
@@ -57,6 +56,9 @@ func TestLog(t *testing.T) {
 	xml := `
 		<?xml version="1.0" encoding="UTF-8"?>
 		<Configuration>
+			<Properties>
+				<Property name="MaxBufferSize">1048576</Property>
+			</Properties>
 			<Appenders>
 				<Console name="Console_JSON">
 					<JSONLayout/>
@@ -76,9 +78,7 @@ func TestLog(t *testing.T) {
 		</Configuration>
 	`
 	err := log.RefreshReader(strings.NewReader(xml), ".xml")
-	if err != nil {
-		t.Fatal(err)
-	}
+	assert.Nil(t, err)
 
 	ctx = context.WithValue(ctx, "trace_id", "0a882193682db71edd48044db54cae88")
 	ctx = context.WithValue(ctx, "span_id", "50ef0724418c0a66")

log/plugin_layout.go

@@ -21,13 +21,17 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	"sync/atomic"
 )
 
 func init() {
 	RegisterPlugin[TextLayout]("TextLayout", PluginTypeLayout)
 	RegisterPlugin[JSONLayout]("JSONLayout", PluginTypeLayout)
 }
 
+// maxBufferSize is the maximum size of a buffer in the pool.
+var maxBufferSize atomic.Int32
+
 var bufferPool = sync.Pool{
 	New: func() interface{} {
 		return bytes.NewBuffer(nil)
@@ -41,10 +45,11 @@ func GetBuffer() *bytes.Buffer {
 
 // PutBuffer returns a buffer to the pool after resetting it.
 func PutBuffer(buf *bytes.Buffer) {
-	buf.Reset()
-	if buf.Cap() > 1024*1024 { // 1MB
+	size := int(maxBufferSize.Load())
+	if size == 0 || buf.Cap() > size {
 		return
 	}
+	buf.Reset()
 	bufferPool.Put(buf)
 }