diff options
| author | apocelipes <seve3r@outlook.com> | 2026-02-13 10:51:30 +0000 |
|---|---|---|
| committer | David Chase <drchase@google.com> | 2026-02-24 12:48:35 -0800 |
| commit | 4afaf67ab44508258995371b09d16efd3c29edb0 (patch) | |
| tree | 9575f37920a8adca9bf681d96d23a362aa5ccecb /src | |
| parent | 19c994cc0c28489bf25c37c5dd7477be10a07609 (diff) | |
| download | go-4afaf67ab44508258995371b09d16efd3c29edb0.tar.xz | |
log/slog: use B.Loop to simplify the code
Simplify the code and remove some unnecessary calls of ResetTimer.
Updates #61515
Change-Id: Ifbcd8deb1aa818b3ee190dab537250ba15b4cdc0
GitHub-Last-Rev: 397c230a35d928e9c22ab8ead354e2c73ea8b98c
GitHub-Pull-Request: golang/go#77592
Reviewed-on: https://go-review.googlesource.com/c/go/+/744881
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Jonathan Amsterdam <jba@google.com>
Reviewed-by: David Chase <drchase@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/log/slog/handler_test.go | 3 | ||||
| -rw-r--r-- | src/log/slog/json_handler_test.go | 6 | ||||
| -rw-r--r-- | src/log/slog/level_test.go | 1 | ||||
| -rw-r--r-- | src/log/slog/value_access_benchmark_test.go | 3 | ||||
| -rw-r--r-- | src/log/slog/value_test.go | 3 |
5 files changed, 5 insertions, 11 deletions
diff --git a/src/log/slog/handler_test.go b/src/log/slog/handler_test.go index 3c4c36912c..04c851d731 100644 --- a/src/log/slog/handler_test.go +++ b/src/log/slog/handler_test.go @@ -760,9 +760,8 @@ func TestWriteTimeRFC3339(t *testing.T) { func BenchmarkWriteTime(b *testing.B) { tm := time.Date(2022, 3, 4, 5, 6, 7, 823456789, time.Local) - b.ResetTimer() var buf []byte - for i := 0; i < b.N; i++ { + for b.Loop() { buf = appendRFC3339Millis(buf[:0], tm) } } diff --git a/src/log/slog/json_handler_test.go b/src/log/slog/json_handler_test.go index fd6b2e39d4..7eacffe8dd 100644 --- a/src/log/slog/json_handler_test.go +++ b/src/log/slog/json_handler_test.go @@ -214,8 +214,7 @@ func BenchmarkJSONHandler(b *testing.B) { String("traceID", "2039232309232309"), String("URL", "https://pkg.go.dev/golang.org/x/log/slog")) b.ReportAllocs() - b.ResetTimer() - for i := 0; i < b.N; i++ { + for b.Loop() { l.LogAttrs(ctx, LevelInfo, "this is a typical log message", String("module", "github.com/google/go-cmp"), String("version", "v1.23.4"), @@ -276,8 +275,7 @@ func BenchmarkPreformatting(b *testing.B) { b.Run(bench.name, func(b *testing.B) { l := New(NewJSONHandler(bench.wc, nil)).With(bench.attrs...) b.ReportAllocs() - b.ResetTimer() - for i := 0; i < b.N; i++ { + for b.Loop() { l.LogAttrs(ctx, LevelInfo, "this is a typical log message", String("module", "github.com/google/go-cmp"), String("version", "v1.23.4"), diff --git a/src/log/slog/level_test.go b/src/log/slog/level_test.go index c9a1c16c03..e050657dfc 100644 --- a/src/log/slog/level_test.go +++ b/src/log/slog/level_test.go @@ -230,7 +230,6 @@ func BenchmarkLevelString(b *testing.B) { LevelDebug, LevelDebug - 2, } - b.ResetTimer() for b.Loop() { for _, level := range levels { _ = level.String() diff --git a/src/log/slog/value_access_benchmark_test.go b/src/log/slog/value_access_benchmark_test.go index 3bd70716ee..266598ce12 100644 --- a/src/log/slog/value_access_benchmark_test.go +++ b/src/log/slog/value_access_benchmark_test.go @@ -100,8 +100,7 @@ func BenchmarkDispatch(b *testing.B) { b.Run("Visit", func(b *testing.B) { v := &setVisitor{} - b.ResetTimer() - for i := 0; i < b.N; i++ { + for b.Loop() { for _, kv := range vs { kv.Visit(v) } diff --git a/src/log/slog/value_test.go b/src/log/slog/value_test.go index 4f405938ce..54e09aa049 100644 --- a/src/log/slog/value_test.go +++ b/src/log/slog/value_test.go @@ -289,9 +289,8 @@ func BenchmarkUnsafeStrings(b *testing.B) { for i := range src { src[i] = StringValue(fmt.Sprintf("string#%d", i)) } - b.ResetTimer() var d string - for i := 0; i < b.N; i++ { + for b.Loop() { copy(dst, src) for _, a := range dst { d = a.String() |