From 7ee7014529c376d59e2373bb026764230b61919a Mon Sep 17 00:00:00 2001 From: samber Date: Sun, 22 Oct 2023 00:46:03 +0000 Subject: [PATCH] bump v1.2.0 --- example/example.go | 103 --------------------------------------------- go.mod | 7 +-- go.sum | 10 ----- main_test.go | 11 ----- 4 files changed, 2 insertions(+), 129 deletions(-) delete mode 100644 example/example.go delete mode 100644 main_test.go diff --git a/example/example.go b/example/example.go deleted file mode 100644 index 0163ea5..0000000 --- a/example/example.go +++ /dev/null @@ -1,103 +0,0 @@ -package main - -import ( - "context" - "fmt" - "os" - "sync/atomic" - "time" - - "log/slog" - - slogmulti "github.com/samber/slog-multi" - slogsampling "github.com/samber/slog-sampling" -) - -func main() { - var accepted atomic.Int64 - var dropped atomic.Int64 - - option := slogsampling.ThresholdSamplingOption{ - Tick: 5 * time.Second, - Threshold: 10, - Rate: 0.1, - - Matcher: func(ctx context.Context, record *slog.Record) string { - return record.Level.String() - }, - - OnAccepted: func(context.Context, slog.Record) { - accepted.Add(1) - }, - OnDropped: func(context.Context, slog.Record) { - dropped.Add(1) - }, - } - - // option := slogsampling.CustomSamplingOption{ - // Sampler: func(ctx context.Context, record slog.Record) float64 { - // switch record.Level { - // case slog.LevelError: - // return 0.5 - // case slog.LevelWarn: - // return 0.2 - // default: - // return 0.01 - // } - // }, - // OnAccepted: func(context.Context, slog.Record) { - // accepted.Add(1) - // }, - // OnDropped: func(context.Context, slog.Record) { - // dropped.Add(1) - // }, - // } - - // option := slogsampling.UniformSamplingOption{ - // Rate: 0.33, - // OnAccepted: func(context.Context, slog.Record) { - // accepted.Add(1) - // }, - // OnDropped: func(context.Context, slog.Record) { - // dropped.Add(1) - // }, - // } - - // option := slogsampling.AbsoluteSamplingOption{ - // Tick: 5 * time.Second, - // Max: 10, - - // Matcher: func(ctx context.Context, record *slog.Record) string { - // return record.Level.String() - // }, - - // OnAccepted: func(context.Context, slog.Record) { - // accepted.Add(1) - // }, - // OnDropped: func(context.Context, slog.Record) { - // dropped.Add(1) - // }, - // } - - logger := slog.New( - slogmulti. - Pipe(option.NewMiddleware()). - Handler(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{})), - ) - - l := logger. - With("email", "samuel@acme.org"). - With("environment", "dev"). - With("hello", "world") - - for i := 0; i < 100; i++ { - l.Error("Message 1") - l.Error("Message 2") - l.Info("Message 1") - time.Sleep(100 * time.Millisecond) - } - - fmt.Printf("\n\nResults:\n") - fmt.Printf("Accepted: %d\n", accepted.Load()) - fmt.Printf("Dropped: %d\n", dropped.Load()) -} diff --git a/go.mod b/go.mod index d6a04c7..6db4d90 100644 --- a/go.mod +++ b/go.mod @@ -4,12 +4,9 @@ go 1.21 require ( github.com/cornelk/hashmap v1.0.8 + github.com/samber/lo v1.38.1 github.com/samber/slog-common v0.13.0 github.com/samber/slog-multi v1.0.0 - go.uber.org/goleak v1.2.1 ) -require ( - github.com/samber/lo v1.38.1 // indirect - golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect -) +require golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect diff --git a/go.sum b/go.sum index ac68238..ac81d42 100644 --- a/go.sum +++ b/go.sum @@ -1,20 +1,10 @@ github.com/cornelk/hashmap v1.0.8 h1:nv0AWgw02n+iDcawr5It4CjQIAcdMMKRrs10HOJYlrc= github.com/cornelk/hashmap v1.0.8/go.mod h1:RfZb7JO3RviW/rT6emczVuC/oxpdz4UsSB2LJSclR1k= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM= github.com/samber/lo v1.38.1/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA= github.com/samber/slog-common v0.13.0 h1:WfUdlqs5l6juZ8y0cJkRXfY4VIXcvwunbmkA/Z2Qv0w= github.com/samber/slog-common v0.13.0/go.mod h1:Qjrfhwk79XiCIhBj8+jTq1Cr0u9rlWbjawh3dWXzaHk= github.com/samber/slog-multi v1.0.0 h1:snvP/P5GLQ8TQh5WSqdRaxDANW8AAA3egwEoytLsqvc= github.com/samber/slog-multi v1.0.0/go.mod h1:uLAvHpGqbYgX4FSL0p1ZwoLuveIAJvBECtE07XmYvFo= -github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= -go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc= golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/main_test.go b/main_test.go deleted file mode 100644 index c5fc99a..0000000 --- a/main_test.go +++ /dev/null @@ -1,11 +0,0 @@ -package slogsampling - -import ( - "testing" - - "go.uber.org/goleak" -) - -func TestMain(m *testing.M) { - goleak.VerifyTestMain(m) -}