From eaf22fd8352762f0ff3e3721c5134815e81986f6 Mon Sep 17 00:00:00 2001 From: Kuisong Tong Date: Thu, 16 May 2024 15:23:59 -0700 Subject: [PATCH] upgrade dependency (#65) --- gcp/gcp.go | 6 +++--- gcp/gcp_test.go | 2 +- grpc/go.mod | 10 +++++----- grpc/go.sum | 20 ++++++++++---------- grpc/server_test.go | 7 ++++--- option.go | 8 ++++++++ 6 files changed, 31 insertions(+), 22 deletions(-) diff --git a/gcp/gcp.go b/gcp/gcp.go index 512c37e..7058a87 100644 --- a/gcp/gcp.go +++ b/gcp/gcp.go @@ -17,11 +17,11 @@ import ( "github.com/nil-go/nilgo/gcp/profiler" ) -// Logger returns a slog.Logger integrated with [Cloud Logging] and [Cloud Error Reporting]. +// LogHandler returns a slog.Handler integrated with [Cloud Logging] and [Cloud Error Reporting]. // // [Cloud Logging]: https://cloud.google.com/logging // [Cloud Error Reporting]: https://cloud.google.com/error-reporting -func Logger(opts ...Option) *slog.Logger { +func LogHandler(opts ...Option) slog.Handler { option := options{} option.apply(opts) logOpts := append( @@ -43,7 +43,7 @@ func Logger(opts ...Option) *slog.Logger { ) handler = otel.New(handler) - return slog.New(handler) + return handler } // Profiler returns a function to start [Cloud Profiler]. diff --git a/gcp/gcp_test.go b/gcp/gcp_test.go index dd3b263..ff1e87c 100644 --- a/gcp/gcp_test.go +++ b/gcp/gcp_test.go @@ -15,7 +15,7 @@ import ( func TestLogHandler(t *testing.T) { t.Parallel() - assert.NotNil(t, gcp.Logger( + assert.NotNil(t, gcp.LogHandler( gcp.WithService("test"), gcp.WithVersion("dev"), gcp.WithProject("project"), diff --git a/grpc/go.mod b/grpc/go.mod index 35196cb..dbea7e4 100644 --- a/grpc/go.mod +++ b/grpc/go.mod @@ -6,23 +6,23 @@ require ( github.com/nil-go/konf v1.1.1 github.com/nil-go/sloth v0.3.0 github.com/stretchr/testify v1.9.0 - google.golang.org/grpc v1.63.2 + google.golang.org/grpc v1.64.0 google.golang.org/protobuf v1.34.1 ) require ( - cloud.google.com/go/compute v1.24.0 // indirect + cloud.google.com/go/compute v1.25.1 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa // indirect + github.com/cncf/xds/go v0.0.0-20240318125728-8a4994d93e50 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect golang.org/x/net v0.25.0 // indirect - golang.org/x/oauth2 v0.17.0 // indirect + golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sys v0.20.0 // indirect golang.org/x/text v0.15.0 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/grpc/go.sum b/grpc/go.sum index 052dd4b..403eaab 100644 --- a/grpc/go.sum +++ b/grpc/go.sum @@ -1,9 +1,9 @@ -cloud.google.com/go/compute v1.24.0 h1:phWcR2eWzRJaL/kOiJwfFsPs4BaKq1j6vnpZrc1YlVg= -cloud.google.com/go/compute v1.24.0/go.mod h1:kw1/T+h/+tK2LJK0wiPPx1intgdAM3j/g3hFDlscY40= +cloud.google.com/go/compute v1.25.1 h1:ZRpHJedLtTpKgr3RV1Fx23NuaAEN1Zfx9hw1u4aJdjU= +cloud.google.com/go/compute v1.25.1/go.mod h1:oopOIR53ly6viBYxaDhBfJwzUAxf1zE//uf3IB011ls= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= +github.com/cncf/xds/go v0.0.0-20240318125728-8a4994d93e50 h1:DBmgJDC9dTfkVyGgipamEh2BpGYxScCH1TOF1LL1cXc= +github.com/cncf/xds/go v0.0.0-20240318125728-8a4994d93e50/go.mod h1:5e1+Vvlzido69INQaVO6d87Qn543Xr6nooe9Kz7oBFM= 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/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= @@ -32,8 +32,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= -golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -58,10 +58,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 h1:DujSIu+2tC9Ht0aPNA7jgj23Iq8Ewi5sgkQ++wdvonE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= -google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 h1:AgADTJarZTBqgjiUzRgfaBchgYB3/WFTC80GPwsMcRI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= +google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= diff --git a/grpc/server_test.go b/grpc/server_test.go index a9c5d33..967ca59 100644 --- a/grpc/server_test.go +++ b/grpc/server_test.go @@ -6,6 +6,7 @@ package grpc_test import ( "context" "testing" + "time" "github.com/nil-go/konf" "github.com/stretchr/testify/assert" @@ -116,10 +117,10 @@ func TestRun(t *testing.T) { err := ngrpc.Run(testcase.server(), append(testcase.opts, ngrpc.WithAddress("unix://"+endpoint))...)(ctx) assert.NoError(t, err) }() + time.Sleep(100 * time.Millisecond) // wait for server to start - conn, err := grpc.DialContext( - ctx, "unix://"+endpoint, - grpc.WithBlock(), + conn, err := grpc.NewClient( + "unix://"+endpoint, grpc.WithTransportCredentials(insecure.NewCredentials()), ) require.NoError(t, err) diff --git a/option.go b/option.go index f45a976..aa3e027 100644 --- a/option.go +++ b/option.go @@ -50,6 +50,14 @@ func WithStopGate(gates ...func(context.Context) error) Option { } } +// WithLogHandler provides a slog.Handler to handle logs. +func WithLogHandler(handler slog.Handler) Option { + return func(*options) { + slog.SetDefault(slog.New(handler)) + slog.Info("Log handler has been initialized.") + } +} + // WithTraceProvider provides OpenTelemetry trace provider. func WithTraceProvider(provider trace.TracerProvider) Option { return func(options *options) {