forked from kubernetes/klog
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
LogSink.Enabled is sensitive to stack unwinding. logr v1.2.0 gets this wrong by calling LogSink.Enabled at different depths for Logger.Info and Logger.Enabled, therefore this test fails with that version. logr v1.3.0 changes the behavior to the more sane "LogSink.Enabled needs to skip one level, regardless where it is called". The Discard log sink implementation changed such that a discard logger doesn't have a sink at all anymore. Go < 1.18 is no longer supported by logr.
- Loading branch information
Showing
11 changed files
with
113 additions
and
15 deletions.
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
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
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 |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE= | ||
| github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= | ||
| github.com/go-logr/logr v1.2.5-0.20230911064754-b75243e1a278 h1:BOXlp9BH2ptqvvDESrD159bFGSHogMpgREsBNEEhogM= | ||
| github.com/go-logr/logr v1.2.5-0.20230911064754-b75243e1a278/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= |
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
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,35 @@ | ||
| /* | ||
| Copyright 2023 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package klog_test | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "k8s.io/klog/v2" | ||
| ) | ||
|
|
||
| func testVerbosity(t *testing.T, logger klog.Logger) { | ||
| // This runs with -v=5 -vmodule=klog_helper_test=10. | ||
| logger.V(11).Info("v11 not visible from klogr_helper_test.go") | ||
| if logger.V(11).Enabled() { | ||
| t.Error("V(11).Enabled() in klogr_helper_test.go should have returned false.") | ||
| } | ||
| logger.V(10).Info("v10 visible from klogr_helper_test.go") | ||
| if !logger.V(10).Enabled() { | ||
| t.Error("V(10).Enabled() in klogr_helper_test.go should have returned true.") | ||
| } | ||
| } |
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,67 @@ | ||
| /* | ||
| Copyright 2023 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package klog_test | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "flag" | ||
| "regexp" | ||
| "testing" | ||
|
|
||
| "k8s.io/klog/v2" | ||
| ) | ||
|
|
||
| func TestVerbosity(t *testing.T) { | ||
| state := klog.CaptureState() | ||
| defer state.Restore() | ||
|
|
||
| var fs flag.FlagSet | ||
| klog.InitFlags(&fs) | ||
| if err := fs.Set("v", "5"); err != nil { | ||
| t.Fatalf("unexpected error: %v", err) | ||
| } | ||
| if err := fs.Set("vmodule", "klogr_helper_test=10"); err != nil { | ||
| t.Fatalf("unexpected error: %v", err) | ||
| } | ||
| if err := fs.Set("logtostderr", "false"); err != nil { | ||
| t.Fatalf("unexpected error: %v", err) | ||
| } | ||
| var buffer bytes.Buffer | ||
| klog.SetOutput(&buffer) | ||
| logger := klog.Background() | ||
|
|
||
| // -v=5 is in effect here. | ||
| logger.V(6).Info("v6 not visible from klogr_test.go") | ||
| if logger.V(6).Enabled() { | ||
| t.Error("V(6).Enabled() in klogr_test.go should have returned false.") | ||
| } | ||
| logger.V(5).Info("v5 visible from klogr_test.go") | ||
| if !logger.V(5).Enabled() { | ||
| t.Error("V(5).Enabled() in klogr_test.go should have returned true.") | ||
| } | ||
|
|
||
| // Now test with -v=5 -vmodule=klogr_helper_test=10. | ||
| testVerbosity(t, logger) | ||
|
|
||
| klog.Flush() | ||
| expected := `^.*v5 visible from klogr_test.go.* | ||
| .*v10 visible from klogr_helper_test.go.* | ||
| ` | ||
| if !regexp.MustCompile(expected).Match(buffer.Bytes()) { | ||
| t.Errorf("Output did not match regular expression.\nOutput:\n%s\n\nRegular expression:\n%s\n", buffer.String(), expected) | ||
| } | ||
| } |
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