chore: expose more logging functions

flanksource · Jan 15, 2024 · bd71eea · bd71eea
1 parent 3dec7d6
commit bd71eea
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/context/context.go b/context/context.go
@@ -172,6 +172,30 @@ func (c Context) Errorf(err error, format string, args ...interface{}) {
 	c.logger.Errorf(fmt.Sprintf(format, args...))
 }
 
+func (c Context) Infof(format string, args ...interface{}) {
+	if c.IsDebug() {
+		// info level logs should only be pushed for debug traces
+		c.GetSpan().AddEvent(fmt.Sprintf(format, args...), trace.WithAttributes(attribute.String("level", "info")))
+	}
+	c.logger.Infof(fmt.Sprintf(format, args...))
+}
+
+func (c Context) Warnf(format string, args ...interface{}) {
+	if c.IsDebug() {
+		// info level logs should only be pushed for debug traces
+		c.GetSpan().AddEvent(fmt.Sprintf(format, args...), trace.WithAttributes(attribute.String("level", "warn")))
+	}
+	c.logger.Warnf(fmt.Sprintf(format, args...))
+}
+
+func (c Context) Logf(level int, format string, args ...interface{}) {
+	if c.IsTrace() {
+		// info level logs should only be pushed for debug traces
+		c.GetSpan().AddEvent(fmt.Sprintf(format, args...), trace.WithAttributes(attribute.String("level", fmt.Sprintf("%d", level))))
+	}
+	c.logger.V(level).Infof(format, args...)
+}
+
 func (c Context) GetSpan() trace.Span {
 	return trace.SpanFromContext(c)
 }

diff --git a/logger/zap.go b/logger/zap.go
@@ -62,7 +62,7 @@ func UseZap() {
 	currentLogger = newZap(level)
 }
 
-func newZap(level int) ZapLogger {
+func NewZapEncoder() zapcore.Encoder {
 	var encoder zapcore.Encoder
 
 	capitalColorLevelEncoder := func(level zapcore.Level, enc zapcore.PrimitiveArrayEncoder) {
@@ -93,9 +93,12 @@ func newZap(level int) ZapLogger {
 		encoder = zapcore.NewConsoleEncoder(config)
 
 	}
+	return encoder
+}
 
+func newZap(level int) ZapLogger {
 	atomicLevel := zap.NewAtomicLevelAt(zapcore.InfoLevel - zapcore.Level(level))
-	zapCore := zapcore.NewCore(encoder, zapcore.AddSync(os.Stderr), atomicLevel)
+	zapCore := zapcore.NewCore(NewZapEncoder(), zapcore.AddSync(os.Stderr), atomicLevel)
 	var opts []zapapi.Option
 	if reportCaller {
 		opts = append(opts, zap.AddCaller(), zap.AddCallerSkip(2))