[#1437] logger: Use context to log trace id

Signed-off-by: Dmitrii Stepanov

pkg/util/logger/logger.go

@@ -12,7 +12,7 @@ import (
 // Logger represents a component
 // for writing messages to log.
 type Logger struct {
-	*zap.Logger
+	z   *zap.Logger
 	lvl zap.AtomicLevel
 }
 
@@ -136,7 +136,7 @@ func newConsoleLogger(prm *Prm) (*Logger, error) {
 		return nil, err
 	}
 
-	l := &Logger{Logger: lZap, lvl: lvl}
+	l := &Logger{z: lZap, lvl: lvl}
 	prm._log = l
 
 	return l, nil
@@ -169,7 +169,7 @@ func newJournaldLogger(prm *Prm) (*Logger, error) {
 
 	lZap := zap.New(coreWithContext, zap.AddStacktrace(zap.NewAtomicLevelAt(zap.FatalLevel)))
 
-	l := &Logger{Logger: lZap, lvl: lvl}
+	l := &Logger{z: lZap, lvl: lvl}
 	prm._log = l
 
 	return l, nil
@@ -179,3 +179,13 @@ func (l *Logger) reload(prm Prm) error {
 	l.lvl.SetLevel(prm.level)
 	return nil
 }
+
+func (l *Logger) WithOptions(options ...zap.Option) {
+	l.z = l.z.WithOptions(options...)
+}
+
+func NewLoggerWrapper(z *zap.Logger) *Logger {
+	return &Logger{
+		z: z,
+	}
+}