From 0ebe168ea050f426cca63b34a0d7401c0f977661 Mon Sep 17 00:00:00 2001 From: Peter Bourgon Date: Sat, 26 Nov 2016 15:58:27 +0100 Subject: [PATCH 1/2] log/experimental_level: level key should be prefixed --- log/experimental_level/level.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/log/experimental_level/level.go b/log/experimental_level/level.go index 6210d5c14..92e780db9 100644 --- a/log/experimental_level/level.go +++ b/log/experimental_level/level.go @@ -49,22 +49,22 @@ func AllowNone() []string { // Error returns a logger with the level key set to ErrorLevelValue. func Error(logger log.Logger) log.Logger { - return log.NewContext(logger).With(levelKey, errorLevelValue) + return log.NewContext(logger).WithPrefix(levelKey, errorLevelValue) } // Warn returns a logger with the level key set to WarnLevelValue. func Warn(logger log.Logger) log.Logger { - return log.NewContext(logger).With(levelKey, warnLevelValue) + return log.NewContext(logger).WithPrefix(levelKey, warnLevelValue) } // Info returns a logger with the level key set to InfoLevelValue. func Info(logger log.Logger) log.Logger { - return log.NewContext(logger).With(levelKey, infoLevelValue) + return log.NewContext(logger).WithPrefix(levelKey, infoLevelValue) } // Debug returns a logger with the level key set to DebugLevelValue. func Debug(logger log.Logger) log.Logger { - return log.NewContext(logger).With(levelKey, debugLevelValue) + return log.NewContext(logger).WithPrefix(levelKey, debugLevelValue) } // Config parameterizes the leveled logger. From e80c5e3d10612e26ff0e2a7a198bd2e21ee29020 Mon Sep 17 00:00:00 2001 From: Peter Bourgon Date: Sat, 26 Nov 2016 16:23:19 +0100 Subject: [PATCH 2/2] log/experimental_level: fix tests --- log/experimental_level/level_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/log/experimental_level/level_test.go b/log/experimental_level/level_test.go index 741d3980c..09674f23f 100644 --- a/log/experimental_level/level_test.go +++ b/log/experimental_level/level_test.go @@ -132,7 +132,7 @@ func TestLevelContext(t *testing.T) { logger = log.NewContext(logger).With("caller", log.DefaultCaller) level.Info(logger).Log("foo", "bar") - if want, have := `caller=level_test.go:134 level=info foo=bar`, strings.TrimSpace(buf.String()); want != have { + if want, have := `level=info caller=level_test.go:134 foo=bar`, strings.TrimSpace(buf.String()); want != have { t.Errorf("want %q, have %q", want, have) } }