define new category constants (#179)

* define new category constants

* update

* test: cover new categories and caller skip cache

* test: keep category tests compatible with go1.19

---------

Co-authored-by: vircoys <vircoys@gmail.com>

Author: zhyee

logger/logger.go

@@ -9,11 +9,10 @@ import (
 	"os"
 	"sync"
 
+	"github.com/GuanceCloud/cliutils"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"golang.org/x/time/rate"
-
-	"github.com/GuanceCloud/cliutils"
 )
 
 const (
@@ -73,6 +72,14 @@ func (l *Logger) Name() string {
 	return l.name
 }
 
+func (l *Logger) Sugar() *zap.SugaredLogger {
+	return l.zsl
+}
+
+func (l *Logger) SetSugar(sugar *zap.SugaredLogger) {
+	l.zsl = sugar
+}
+
 func (l *Logger) Infof(fmt string, args ...any) {
 	l.zsl.Infof(fmt, args...)
 }

logger/logger_test.go

@@ -523,6 +523,26 @@ func TestBasic(t *T.T) {
 	})
 }
 
+func TestDefaultSloggerSkipNUsesDistinctCacheKey(t *testing.T) {
+	Reset()
+
+	opt := &Option{
+		Path:  "stdout",
+		Level: DEBUG,
+		Flags: OPT_ENC_CONSOLE | OPT_SHORT_CALLER,
+	}
+
+	require.NoError(t, InitRoot(opt))
+
+	base := DefaultSLogger("same-name")
+	withSkip := DefaultSloggerSkipN("same-name", 3)
+
+	require.NotNil(t, base.Sugar())
+	require.NotNil(t, withSkip.Sugar())
+	assert.NotSame(t, base.Sugar(), withSkip.Sugar())
+	assert.Equal(t, int64(2), TotalSLoggers())
+}
+
 type BufferSync struct {
 	io.ReadWriter
 }

logger/slogger.go

@@ -73,6 +73,10 @@ func DefaultSLogger(name string) *Logger {
 	return &Logger{zsl: slogger(name, 1)}
 }
 
+func DefaultSloggerSkipN(name string, callerSkip int) *Logger {
+	return &Logger{zsl: slogger(name, callerSkip)}
+}
+
 func TotalSLoggers() int64 {
 	return atomic.LoadInt64(&totalSloggers)
 }
@@ -88,9 +92,10 @@ func slogger(name string, callerSkip int) *zap.SugaredLogger {
 		panic("should not been here")
 	}
 
+	cacheKey := sloggerCacheKey(name, callerSkip)
 	newlog := getSugarLogger(r, name, callerSkip)
 	if root != nil {
-		l, loaded := slogs.LoadOrStore(name, newlog)
+		l, loaded := slogs.LoadOrStore(cacheKey, newlog)
 		if !loaded {
 			atomic.AddInt64(&totalSloggers, 1)
 		}
@@ -108,3 +113,7 @@ func getSugarLogger(l *zap.Logger, name string, callerSkip int) *zap.SugaredLogg
 		return l.Sugar().Named(name)
 	}
 }
+
+func sloggerCacheKey(name string, callerSkip int) string {
+	return fmt.Sprintf("%s|skip=%d", name, callerSkip)
+}

point/category.go

@@ -24,15 +24,15 @@ func (c Category) URL() string {
 }
 
 func (c Category) Alias() string {
-	if x, ok := categoryAias[c]; !ok {
+	if x, ok := categoryAlias[c]; !ok {
 		return CUnknown
 	} else {
 		return x
 	}
 }
 
 func CatAlias(c string) Category {
-	for k, v := range categoryAias {
+	for k, v := range categoryAlias {
 		if c == v {
 			return k
 		}
@@ -73,6 +73,8 @@ func AllCategories() []Category {
 		Profiling,
 		DynamicDWCategory,
 		DialTesting,
+		ExecutionLog,
+		LLM,
 	}
 }
 
@@ -93,6 +95,8 @@ const (
 	Security
 	Profiling
 	DialTesting
+	ExecutionLog
+	LLM
 
 	SUnknownCategory   = "unknown"
 	SDynamicDWCategory = "dynamic_dw" // NOTE: not used
@@ -109,6 +113,8 @@ const (
 	SSecurity          = "security"
 	SProfiling         = "profiling"
 	SDialTesting       = "dialtesting"
+	SExecutionLog      = "execution_log"
+	SLlm               = "llm"
 
 	URLUnknownCategory   = "/v1/write/unknown"
 	URLDynamicDWCategory = "/v1/write/dynamic_dw" // NOTE: not used
@@ -125,6 +131,8 @@ const (
 	URLSecurity          = "/v1/write/security"
 	URLProfiling         = "/v1/write/profiling"
 	URLDialTesting       = "/v1/write/dialtesting" // NOTE: not used
+	URLExecutionLog      = "/v1/write/siem_logging"
+	URLLlm               = "/v1/write/langfuse-v2"
 
 	CUnknown   = "UNKNOWN"
 	CDynamicDW = "DYNAMIC_DW"
@@ -140,6 +148,8 @@ const (
 	CS         = "S"
 	CP         = "P"
 	CDT        = "DT"
+	CEL        = "EL"
+	CLlm       = "LLM"
 )
 
 var (
@@ -160,12 +170,15 @@ var (
 
 		DialTesting: URLDialTesting,
 
+		ExecutionLog: URLExecutionLog,
+		LLM:          URLLlm,
+
 		DynamicDWCategory: URLDynamicDWCategory,
 
 		UnknownCategory: URLUnknownCategory,
 	}
 
-	categoryAias = map[Category]string{
+	categoryAlias = map[Category]string{
 		Metric:            CM,
 		Network:           CN,
 		KeyEvent:          CE,
@@ -178,6 +191,8 @@ var (
 		Security:          CS,
 		Profiling:         CP,
 		DialTesting:       CDT,
+		ExecutionLog:      CEL,
+		LLM:               CLlm,
 		UnknownCategory:   CUnknown,
 		DynamicDWCategory: CDynamicDW,
 	}
@@ -196,6 +211,8 @@ var (
 		Security:          SSecurity,
 		Profiling:         SProfiling,
 		DialTesting:       SDialTesting,
+		ExecutionLog:      SExecutionLog,
+		LLM:               SLlm,
 		UnknownCategory:   SUnknownCategory,
 		DynamicDWCategory: SDynamicDWCategory,
 	}

point/category_test.go

@@ -28,6 +28,8 @@ func TestURL(t *testing.T) {
 		{c: "/v1/write/keyevent", expect: KeyEvent},
 		{c: "/v1/write/tracing", expect: Tracing},
 		{c: "/v1/write/dynamic_dw", expect: DynamicDWCategory},
+		{c: "/v1/write/siem_logging", expect: ExecutionLog},
+		{c: "/v1/write/langfuse-v2", expect: LLM},
 	}
 
 	for _, tc := range cases {
@@ -52,6 +54,8 @@ func TestAlias(t *testing.T) {
 		{c: "P", expect: Profiling},
 		{c: "E", expect: KeyEvent},
 		{c: "T", expect: Tracing},
+		{c: "EL", expect: ExecutionLog},
+		{c: "LLM", expect: LLM},
 		{c: "Dynamic_dw", expect: UnknownCategory},
 	}
 
@@ -79,6 +83,8 @@ func TestString(t *testing.T) {
 		{c: "keyevent", expect: KeyEvent},
 		{c: "tracing", expect: Tracing},
 		{c: "dynamic_dw", expect: DynamicDWCategory},
+		{c: "execution_log", expect: ExecutionLog},
+		{c: "llm", expect: LLM},
 	}
 
 	for _, tc := range cases {
@@ -87,3 +93,20 @@ func TestString(t *testing.T) {
 		})
 	}
 }
+
+func TestAllCategoriesIncludesNewCategories(t *testing.T) {
+	all := AllCategories()
+
+	assert.True(t, containsCategory(all, ExecutionLog))
+	assert.True(t, containsCategory(all, LLM))
+}
+
+func containsCategory(all []Category, target Category) bool {
+	for _, c := range all {
+		if c == target {
+			return true
+		}
+	}
+
+	return false
+}