Skip to content

Commit 15b75d4

Browse files
committedDec 7, 2022
feat: use message and timestamp keys in log
1 parent d1cae84 commit 15b75d4

File tree

2 files changed

+43
-1
lines changed

2 files changed

+43
-1
lines changed
 

Diff for: ‎internal/utils/zap.go

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
// Copyright (C) 2015 The Gravitee team (http://gravitee.io)
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
package utils
16+
17+
import (
18+
"go.uber.org/zap/zapcore"
19+
"sigs.k8s.io/controller-runtime/pkg/log/zap"
20+
)
21+
22+
func NewEncoderConfigOption() []zap.EncoderConfigOption {
23+
return []zap.EncoderConfigOption{
24+
func(config *zapcore.EncoderConfig) {
25+
config.MessageKey = "message"
26+
config.TimeKey = "timestamp"
27+
config.LevelKey = "level"
28+
config.NameKey = "logger"
29+
config.CallerKey = "caller"
30+
config.FunctionKey = zapcore.OmitKey
31+
config.StacktraceKey = "stacktrace"
32+
config.LineEnding = zapcore.DefaultLineEnding
33+
config.EncodeLevel = zapcore.LowercaseLevelEncoder
34+
config.EncodeTime = zapcore.EpochTimeEncoder
35+
config.EncodeDuration = zapcore.SecondsDurationEncoder
36+
config.EncodeCaller = zapcore.ShortCallerEncoder
37+
},
38+
}
39+
}

Diff for: ‎main.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import (
2121
"flag"
2222
"os"
2323

24+
"github.com/gravitee-io/gravitee-kubernetes-operator/internal/utils"
25+
2426
// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
2527
// to ensure that exec-entrypoint and run can make use of them.
2628
_ "k8s.io/client-go/plugin/pkg/client/auth"
@@ -67,7 +69,8 @@ func main() {
6769
"Enabling this will ensure there is only one active controller manager.")
6870

6971
opts := zap.Options{
70-
Development: os.Getenv("DEV_MODE") == "true",
72+
Development: os.Getenv("DEV_MODE") == "true",
73+
EncoderConfigOptions: utils.NewEncoderConfigOption(),
7174
}
7275

7376
opts.BindFlags(flag.CommandLine)

0 commit comments

Comments
 (0)