Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3,746 changed files
with
615,474 additions
and
579,696 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
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,135 @@ | ||
| // Copyright 2018 Oracle and/or its affiliates. All rights reserved. | ||
| // | ||
| // 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 logging | ||
|
|
||
| import ( | ||
| "flag" | ||
| "os" | ||
| "strings" | ||
| "sync" | ||
|
|
||
| "go.uber.org/zap" | ||
| "go.uber.org/zap/zapcore" | ||
| lumberjack "gopkg.in/natefinch/lumberjack.v2" | ||
| ) | ||
|
|
||
| var ( | ||
| lvl = zapcore.InfoLevel | ||
| logJSON = false | ||
| logfilePath = "" | ||
| config *zap.Config | ||
| mu sync.Mutex | ||
| ) | ||
|
|
||
| func init() { | ||
| flag.Var(&lvl, "log-level", "Adjusts the level of the logs that will be omitted.") | ||
| flag.BoolVar(&logJSON, "log-json", logJSON, "Log in json format.") | ||
| flag.StringVar(&logfilePath, "logfile-path", "", "If specified, write log messages to a file at this path.") | ||
| } | ||
|
|
||
| // Options holds the zap logger configuration. | ||
| type Options struct { | ||
| LogLevel *zapcore.Level | ||
| Config *zap.Config | ||
| } | ||
|
|
||
| // Level gets the current log level. | ||
| func Level() *zap.AtomicLevel { | ||
| return &config.Level | ||
| } | ||
|
|
||
| // Logger builds a new logger based on the given flags. | ||
| func Logger() *zap.Logger { | ||
| mu.Lock() | ||
| defer mu.Unlock() | ||
|
|
||
| var cfg zap.Config | ||
|
|
||
| if !logJSON { | ||
| cfg = zap.NewDevelopmentConfig() | ||
| } else { | ||
| cfg = zap.NewProductionConfig() | ||
| } | ||
|
|
||
| // Extract log fields from environment variables. | ||
| envFields := FieldsFromEnv(os.Environ()) | ||
|
|
||
| options := []zap.Option{ | ||
| zap.AddStacktrace(zapcore.FatalLevel), | ||
| zap.WrapCore(func(c zapcore.Core) zapcore.Core { | ||
| return c.With(envFields) | ||
| }), | ||
| } | ||
|
|
||
| if len(logfilePath) > 0 { | ||
| w := zapcore.AddSync(&lumberjack.Logger{ | ||
| Filename: logfilePath, | ||
| MaxSize: 10, // megabytes | ||
| MaxBackups: 3, | ||
| MaxAge: 28, // days | ||
| }) | ||
| var enc zapcore.Encoder | ||
| if logJSON { | ||
| enc = zapcore.NewJSONEncoder(cfg.EncoderConfig) | ||
| } else { | ||
| enc = zapcore.NewConsoleEncoder(cfg.EncoderConfig) | ||
| } | ||
| core := zapcore.NewCore(enc, w, lvl) | ||
| options = append(options, zap.WrapCore(func(zapcore.Core) zapcore.Core { | ||
| return core | ||
| })) | ||
| } | ||
|
|
||
| if config == nil { | ||
| config = &cfg | ||
| config.Level.SetLevel(lvl) | ||
| config.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder | ||
| } | ||
|
|
||
| logger, err := config.Build( | ||
| // We handle this via errors package for 99% of the stuff so only | ||
| // enable this at the fatal/panic level. | ||
| options..., | ||
| ) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
|
|
||
| return logger | ||
| } | ||
|
|
||
| // FieldsFromEnv extracts log fields from environment variables. | ||
| // If an environment variable starts with LOG_FIELD_, the suffix is extracted | ||
| // and split on =. The first part is used for the name and the second for the | ||
| // value. | ||
| // For example, LOG_FIELD_foo=bar would result in a field named "foo" with the | ||
| // value "bar". | ||
| func FieldsFromEnv(env []string) []zapcore.Field { | ||
| const logfieldPrefix = "LOG_FIELD_" | ||
|
|
||
| fields := []zapcore.Field{} | ||
| for _, s := range env { | ||
| if !strings.HasPrefix(s, logfieldPrefix) || len(s) < (len(logfieldPrefix)+1) { | ||
| continue | ||
| } | ||
| s = s[len(logfieldPrefix):] | ||
| parts := strings.SplitN(s, "=", 2) | ||
| if len(parts) != 2 { | ||
| continue | ||
| } | ||
| fields = append(fields, zap.String(parts[0], parts[1])) | ||
| } | ||
| return fields | ||
| } |
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,81 @@ | ||
| // Copyright 2018 Oracle and/or its affiliates. All rights reserved. | ||
| // | ||
| // 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 logging | ||
|
|
||
| import ( | ||
| "reflect" | ||
| "testing" | ||
|
|
||
| "go.uber.org/zap" | ||
| "go.uber.org/zap/zapcore" | ||
| ) | ||
|
|
||
| func TestFieldsFromEnv(t *testing.T) { | ||
| testCases := map[string]struct { | ||
| env []string | ||
| fields []zapcore.Field | ||
| }{ | ||
| "single": { | ||
| env: []string{"LOG_FIELD_foo=bar"}, | ||
| fields: []zapcore.Field{ | ||
| zap.String("foo", "bar"), | ||
| }, | ||
| }, | ||
| "multiple": { | ||
| env: []string{ | ||
| "LOG_FIELD_foo=bar", | ||
| "LOG_FIELD_bar=baz", | ||
| }, | ||
| fields: []zapcore.Field{ | ||
| zap.String("foo", "bar"), | ||
| zap.String("bar", "baz"), | ||
| }, | ||
| }, | ||
| "handles_equals_in_value": { | ||
| env: []string{ | ||
| "LOG_FIELD_foo=a=b", | ||
| }, | ||
| fields: []zapcore.Field{ | ||
| zap.String("foo", "a=b"), | ||
| }, | ||
| }, | ||
| "handles_empty_value": { | ||
| env: []string{ | ||
| "LOG_FIELD_foo=", | ||
| }, | ||
| fields: []zapcore.Field{ | ||
| zap.String("foo", ""), | ||
| }, | ||
| }, | ||
| "ignores_non_log_field": { | ||
| env: []string{ | ||
| "LOG_FIELD_foo=bar", | ||
| "NOT_A_FIELD=1", | ||
| }, | ||
| fields: []zapcore.Field{ | ||
| zap.String("foo", "bar"), | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for name, tc := range testCases { | ||
| t.Run(name, func(t *testing.T) { | ||
| fields := FieldsFromEnv(tc.env) | ||
| if !reflect.DeepEqual(fields, tc.fields) { | ||
| t.Errorf("Got incorrect fields:\nexpected=%+v\nactual=%+v", tc.fields, fields) | ||
| } | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.