forked from milvus-io/milvus
-
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.
enhance: improve log encoding performance on proxy nodes (milvus-io#3…
…6123) See milvus-io#36122 This PR is designed to enhance log performance through two improvements: 1. Optimize JSON encoding by switching JSON serializer to `json-iterator`. 2. Adding support of lazy initialization `WithLazy`. --------- Signed-off-by: Ted Xu <ted.xu@zilliz.com>
- Loading branch information
Showing
11 changed files
with
181 additions
and
22 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| // Licensed to the LF AI & Data foundation under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you 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 log | ||
|
|
||
| import ( | ||
| "sync" | ||
| "sync/atomic" | ||
|
|
||
| "go.uber.org/zap/zapcore" | ||
| ) | ||
|
|
||
| // lazyWithCore wraps zapcore.Core with lazy initialization. | ||
| // Copied from https://github.com/uber-go/zap/issues/1426 to avoid data race. | ||
| type lazyWithCore struct { | ||
| corePtr atomic.Pointer[zapcore.Core] | ||
| once sync.Once | ||
| fields []zapcore.Field | ||
| } | ||
|
|
||
| var _ zapcore.Core = (*lazyWithCore)(nil) | ||
|
|
||
| func NewLazyWith(core zapcore.Core, fields []zapcore.Field) zapcore.Core { | ||
| d := lazyWithCore{fields: fields} | ||
| d.corePtr.Store(&core) | ||
| return &d | ||
| } | ||
|
|
||
| func (d *lazyWithCore) initOnce() zapcore.Core { | ||
| core := *d.corePtr.Load() | ||
| d.once.Do(func() { | ||
| core = core.With(d.fields) | ||
| d.corePtr.Store(&core) | ||
| }) | ||
| return core | ||
| } | ||
|
|
||
| func (d *lazyWithCore) Enabled(level zapcore.Level) bool { | ||
| // Init not needed | ||
| return (*d.corePtr.Load()).Enabled(level) | ||
| } | ||
|
|
||
| func (d *lazyWithCore) Sync() error { | ||
| // Init needed | ||
| return d.initOnce().Sync() | ||
| } | ||
|
|
||
| // Write implements zapcore.Core. | ||
| func (d *lazyWithCore) Write(entry zapcore.Entry, fields []zapcore.Field) error { | ||
| return (*d.corePtr.Load()).Write(entry, fields) | ||
| } | ||
|
|
||
| func (d *lazyWithCore) With(fields []zapcore.Field) zapcore.Core { | ||
| d.initOnce() | ||
| return (*d.corePtr.Load()).With(fields) | ||
| } | ||
|
|
||
| func (d *lazyWithCore) Check(e zapcore.Entry, ce *zapcore.CheckedEntry) *zapcore.CheckedEntry { | ||
| d.initOnce() | ||
| return (*d.corePtr.Load()).Check(e, ce) | ||
| } |
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,82 @@ | ||
| // Licensed to the LF AI & Data foundation under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you 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 log | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "testing" | ||
|
|
||
| "go.uber.org/zap" | ||
| ) | ||
|
|
||
| type foo struct { | ||
| Key string | ||
| Value string | ||
| } | ||
|
|
||
| func BenchmarkZapReflect(b *testing.B) { | ||
| payload := make([]foo, 10) | ||
| for i := 0; i < len(payload); i++ { | ||
| payload[i] = foo{Key: fmt.Sprintf("key%d", i), Value: fmt.Sprintf("value%d", i)} | ||
| } | ||
| b.ResetTimer() | ||
|
|
||
| for i := 0; i < b.N; i++ { | ||
| With(zap.Any("payload", payload)) | ||
| } | ||
| } | ||
|
|
||
| func BenchmarkZapWithLazy(b *testing.B) { | ||
| payload := make([]foo, 10) | ||
| for i := 0; i < len(payload); i++ { | ||
| payload[i] = foo{Key: fmt.Sprintf("key%d", i), Value: fmt.Sprintf("value%d", i)} | ||
| } | ||
| b.ResetTimer() | ||
|
|
||
| for i := 0; i < b.N; i++ { | ||
| L().WithLazy(zap.Any("payload", payload)) | ||
| } | ||
| } | ||
|
|
||
| // The following two benchmarks are validations if `WithLazy` has the same performance as `With` in the worst case. | ||
| func BenchmarkWithLazyLog(b *testing.B) { | ||
| payload := make([]foo, 10) | ||
| for i := 0; i < len(payload); i++ { | ||
| payload[i] = foo{Key: fmt.Sprintf("key%d", i), Value: fmt.Sprintf("value%d", i)} | ||
| } | ||
| b.ResetTimer() | ||
|
|
||
| for i := 0; i < b.N; i++ { | ||
| log := L().WithLazy(zap.Any("payload", payload)) | ||
| log.Info("test") | ||
| log.Warn("test") | ||
| } | ||
| } | ||
|
|
||
| func BenchmarkWithLog(b *testing.B) { | ||
| payload := make([]foo, 10) | ||
| for i := 0; i < len(payload); i++ { | ||
| payload[i] = foo{Key: fmt.Sprintf("key%d", i), Value: fmt.Sprintf("value%d", i)} | ||
| } | ||
| b.ResetTimer() | ||
|
|
||
| for i := 0; i < b.N; i++ { | ||
| log := L().With(zap.Any("payload", payload)) | ||
| log.Info("test") | ||
| log.Warn("test") | ||
| } | ||
| } |