Merge pull request #388 from spiral/enhancement/testsv2.0.0-alpha15

Tests for the new plugins

2 files changed, 72 insertions, 0 deletions

diff --git a/log/interface.go b/log/interface.go
new file mode 100644
index 00000000..e2f2ce31
--- /dev/null
+++ b/log/interface.go
@@ -0,0 +1,16 @@
+package log
+
+type (
+	// Logger is an general RR log interface
+	Logger interface {
+		Debug(msg string, keyvals ...interface{})
+		Info(msg string, keyvals ...interface{})
+		Warn(msg string, keyvals ...interface{})
+		Error(msg string, keyvals ...interface{})
+	}
+)
+
+// With creates a child logger and adds structured context to it
+type WithLogger interface {
+	With(keyvals ...interface{}) Logger
+}
diff --git a/log/zap_adapter.go b/log/zap_adapter.go
new file mode 100644
index 00000000..65f8d04b
--- /dev/null
+++ b/log/zap_adapter.go
@@ -0,0 +1,56 @@
+package log
+
+import (
+	"fmt"
+
+	"go.uber.org/zap"
+)
+
+type ZapAdapter struct {
+	zl *zap.Logger
+}
+
+// Create NewZapAdapter which uses general log interface
+func NewZapAdapter(zapLogger *zap.Logger) *ZapAdapter {
+	return &ZapAdapter{
+		zl: zapLogger.WithOptions(zap.AddCallerSkip(1)),
+	}
+}
+
+func (log *ZapAdapter) fields(keyvals []interface{}) []zap.Field {
+	// we should have even number of keys and values
+	if len(keyvals)%2 != 0 {
+		return []zap.Field{zap.Error(fmt.Errorf("odd number of keyvals pairs: %v", keyvals))}
+	}
+
+	var fields []zap.Field
+	for i := 0; i < len(keyvals); i += 2 {
+		key, ok := keyvals[i].(string)
+		if !ok {
+			key = fmt.Sprintf("%v", keyvals[i])
+		}
+		fields = append(fields, zap.Any(key, keyvals[i+1]))
+	}
+
+	return fields
+}
+
+func (log *ZapAdapter) Debug(msg string, keyvals ...interface{}) {
+	log.zl.Debug(msg, log.fields(keyvals)...)
+}
+
+func (log *ZapAdapter) Info(msg string, keyvals ...interface{}) {
+	log.zl.Info(msg, log.fields(keyvals)...)
+}
+
+func (log *ZapAdapter) Warn(msg string, keyvals ...interface{}) {
+	log.zl.Warn(msg, log.fields(keyvals)...)
+}
+
+func (log *ZapAdapter) Error(msg string, keyvals ...interface{}) {
+	log.zl.Error(msg, log.fields(keyvals)...)
+}
+
+func (log *ZapAdapter) With(keyvals ...interface{}) Logger {
+	return NewZapAdapter(log.zl.With(log.fields(keyvals)...))
+}