forked from vitessio/vitess
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add structure logging to Vitess (vitessio#11960)
* Create a function to replace glog with PlanetScale log Signed-off-by: Emad Habib <[email protected]> * Add test case for replacing glog Signed-off-by: Emad Habib <[email protected]> * Remove one test Signed-off-by: Emad Habib <[email protected]> * Add flag for PS Logger usage Signed-off-by: Emad Habib <[email protected]> * Update the usage test files and replace _ with - for the flag Signed-off-by: Emad Habib <[email protected]> * Apply code review comments Signed-off-by: Emad Habib <[email protected]> * Add copyrights and release notes Signed-off-by: Emad Habib <[email protected]> * Update the year in the copyrights Signed-off-by: Emad Habib <[email protected]> * Fix typo Signed-off-by: Emad Habib <[email protected]> * Empty Commit Signed-off-by: Emad Habib <[email protected]> Signed-off-by: Emad Habib <[email protected]>
- Loading branch information
1 parent
66147a9
commit 1977d49
Showing
12 changed files
with
224 additions
and
7 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
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 |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| Copyright 2023 The Vitess 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 logutil | ||
|
|
||
| import ( | ||
| pslog "github.com/planetscale/log" | ||
| noglog "github.com/slok/noglog" | ||
|
|
||
| "vitess.io/vitess/go/vt/log" | ||
| ) | ||
|
|
||
| type PSLogger pslog.SugaredLogger | ||
|
|
||
| // SetPlanetScaleLogger in-place noglog replacement with PlanetScale's logger. | ||
| func SetPlanetScaleLogger(conf *pslog.Config) (psLogger *pslog.SugaredLogger, err error) { | ||
| // Use the passed configuration instead of the default configuration | ||
| if conf != nil { | ||
| configLogger, err := conf.Build() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| psLogger = configLogger.Sugar() | ||
| } else { | ||
| psLogger = pslog.NewPlanetScaleSugarLogger() | ||
| } | ||
|
|
||
| noglog.SetLogger(&noglog.LoggerFunc{ | ||
| DebugfFunc: func(f string, a ...interface{}) { psLogger.Debugf(f, a...) }, | ||
| InfofFunc: func(f string, a ...interface{}) { psLogger.Infof(f, a...) }, | ||
| WarnfFunc: func(f string, a ...interface{}) { psLogger.Warnf(f, a...) }, | ||
| ErrorfFunc: func(f string, a ...interface{}) { psLogger.Errorf(f, a...) }, | ||
| }) | ||
|
|
||
| log.Flush = noglog.Flush | ||
| log.Info = noglog.Info | ||
| log.Infof = noglog.Infof | ||
| log.InfoDepth = noglog.InfoDepth | ||
| log.Warning = noglog.Warning | ||
| log.Warningf = noglog.Warningf | ||
| log.WarningDepth = noglog.WarningDepth | ||
| log.Error = noglog.Error | ||
| log.Errorf = noglog.Errorf | ||
| log.ErrorDepth = noglog.ErrorDepth | ||
| log.Exit = noglog.Exit | ||
| log.Exitf = noglog.Exitf | ||
| log.ExitDepth = noglog.ExitDepth | ||
| log.Fatal = noglog.Fatal | ||
| log.Fatalf = noglog.Fatalf | ||
| log.FatalDepth = noglog.FatalDepth | ||
|
|
||
| return | ||
| } |
Oops, something went wrong.