forked from golang/glog
-
Notifications
You must be signed in to change notification settings - Fork 218
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
contextual logging: enable by default again
Commit 3c90bf9 accidentally changed the default for contextual logging from "enabled" to "disabled". The intention always was and still is to make the new API do something useful by default and only be more cautious in key Kubernetes binaries which have a feature gate.
- Loading branch information
Showing
2 changed files
with
61 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
/* | ||
Copyright 2019 The Kubernetes Authors. | ||
Copyright 2020 Intel Coporation. | ||
SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
package ktesting_test | ||
|
||
import ( | ||
"context" | ||
"testing" | ||
|
||
"k8s.io/klog/v2" | ||
"k8s.io/klog/v2/ktesting" | ||
) | ||
|
||
func TestContextual(t *testing.T) { | ||
logger, ctx := ktesting.NewTestContext(t) | ||
|
||
doSomething(ctx) | ||
|
||
// When contextual logging is disabled, the output goes to klog | ||
// instead of the testing logger. | ||
state := klog.CaptureState() | ||
defer state.Restore() | ||
klog.EnableContextualLogging(false) | ||
doSomething(ctx) | ||
|
||
testingLogger, ok := logger.GetSink().(ktesting.Underlier) | ||
if !ok { | ||
t.Fatal("Should have had a ktesting LogSink!?") | ||
} | ||
|
||
actual := testingLogger.GetBuffer().String() | ||
expected := `INFO hello world | ||
INFO foo: hello also from me | ||
` | ||
if actual != expected { | ||
t.Errorf("mismatch in captured output, expected:\n%s\ngot:\n%s\n", expected, actual) | ||
} | ||
} | ||
|
||
func doSomething(ctx context.Context) { | ||
logger := klog.FromContext(ctx) | ||
logger.Info("hello world") | ||
|
||
logger = logger.WithName("foo") | ||
ctx = klog.NewContext(ctx, logger) | ||
doSomeMore(ctx) | ||
} | ||
|
||
func doSomeMore(ctx context.Context) { | ||
logger := klog.FromContext(ctx) | ||
logger.Info("hello also from me") | ||
} |