refactor grpc (#28)

grpc/log/buffer.go → grpc/internal/buffer.go

@@ -1,7 +1,7 @@
 // Copyright (c) 2024 The nilgo authors
 // Use of this source code is governed by a MIT license found in the LICENSE file.
 
-package log
+package internal
 
 import (
 	"context"
@@ -49,7 +49,7 @@ type serverStream struct {
 
 func (s serverStream) Context() context.Context { return s.ctx }
 
-func isSamplingHandler(handler slog.Handler) bool {
+func IsSamplingHandler(handler slog.Handler) bool {
 	switch handler.(type) {
 	case sampling.Handler, *sampling.Handler:
 		return true
@@ -71,7 +71,7 @@ func isSamplingHandler(handler slog.Handler) bool {
 		if v := valueCopy.FieldByName(name); v.IsValid() {
 			v = reflect.NewAt(v.Type(), unsafe.Pointer(v.UnsafeAddr())).Elem()
 			if h, ok := v.Interface().(slog.Handler); ok {
-				return isSamplingHandler(h)
+				return IsSamplingHandler(h)
 			}
 		}
 	}

grpc/log/buffer_test.go → grpc/internal/buffer_test.go

@@ -1,7 +1,7 @@
 // Copyright (c) 2024 The nilgo authors
 // Use of this source code is governed by a MIT license found in the LICENSE file.
 
-package log_test
+package internal_test
 
 import (
 	"bytes"
@@ -15,7 +15,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
 
-	"github.com/nil-go/nilgo/grpc/log"
+	"github.com/nil-go/nilgo/grpc/internal"
 )
 
 func TestBufferUnaryInterceptor(t *testing.T) {
@@ -56,7 +56,7 @@ level=ERROR msg=error
 				func(context.Context) bool { return false },
 			)
 
-			resp, err := log.BufferUnaryInterceptor(context.Background(), nil, nil, func(ctx context.Context, _ any) (any, error) {
+			resp, err := internal.BufferUnaryInterceptor(context.Background(), nil, nil, func(ctx context.Context, _ any) (any, error) {
 				for _, record := range testcase.records {
 					_ = handler.Handle(ctx, record)
 				}
@@ -108,7 +108,7 @@ level=ERROR msg=error
 				func(context.Context) bool { return false },
 			)
 
-			err := log.BufferStreamInterceptor(nil, serverStream{}, nil, func(_ any, stream grpc.ServerStream) error {
+			err := internal.BufferStreamInterceptor(nil, serverStream{}, nil, func(_ any, stream grpc.ServerStream) error {
 				for _, record := range testcase.records {
 					_ = handler.Handle(stream.Context(), record)
 				}
@@ -124,3 +124,81 @@ level=ERROR msg=error
 type serverStream struct{ grpc.ServerStream }
 
 func (s serverStream) Context() context.Context { return context.Background() }
+
+func TestIsSamplingHandler(t *testing.T) {
+	t.Parallel()
+
+	testcases := []struct {
+		description string
+		handler     slog.Handler
+		expected    bool
+	}{
+		{
+			description: "nil handler",
+		},
+		{
+			description: "sampling handler",
+			handler:     sampling.Handler{},
+			expected:    true,
+		},
+		{
+			description: "sampling handler (pointer)",
+			handler:     &sampling.Handler{},
+			expected:    true,
+		},
+		{
+			description: "embed sampling handler",
+			handler:     handlerEmbed{sampling.Handler{}},
+			expected:    true,
+		},
+		{
+			description: "embed sampling handler (pointer)",
+			handler:     &handlerEmbed{sampling.Handler{}},
+			expected:    true,
+		},
+		{
+			description: "nested sampling handler",
+			handler:     handlerWrapper{handler: sampling.Handler{}},
+			expected:    true,
+		},
+		{
+			description: "nested sampling handler (pointer)",
+			handler:     &handlerWrapper{handler: sampling.Handler{}},
+			expected:    true,
+		},
+		{
+			description: "deep nested sampling handler",
+			handler:     handlerWrapper{handler: handlerWrapper{handler: sampling.Handler{}}},
+			expected:    true,
+		},
+		{
+			description: "non sampling handler",
+			handler:     slogDiscard{},
+		},
+	}
+
+	for _, testcase := range testcases {
+		testcase := testcase
+		t.Run(testcase.description, func(t *testing.T) {
+			t.Parallel()
+
+			assert.Equal(t, testcase.expected, internal.IsSamplingHandler(testcase.handler))
+		})
+	}
+}
+
+type handlerWrapper struct {
+	slogDiscard
+	handler slog.Handler
+}
+
+type slogDiscard struct{}
+
+func (slogDiscard) Enabled(context.Context, slog.Level) bool  { return false }
+func (slogDiscard) Handle(context.Context, slog.Record) error { return nil }
+func (slogDiscard) WithAttrs([]slog.Attr) slog.Handler        { return slogDiscard{} }
+func (slogDiscard) WithGroup(string) slog.Handler             { return slogDiscard{} }
+
+type handlerEmbed struct {
+	slog.Handler
+}

grpc/config.go → grpc/internal/config.go

@@ -1,7 +1,7 @@
 // Copyright (c) 2024 The nilgo authors
 // Use of this source code is governed by a MIT license found in the LICENSE file.
 
-package grpc
+package internal
 
 import (
 	"context"
@@ -19,6 +19,11 @@ type ConfigServiceServer struct {
 	configs []*konf.Config
 }
 
+// NewConfigServiceServer creates a new ConfigServiceServer with the provided configs.
+func NewConfigServiceServer(configs []*konf.Config) *ConfigServiceServer {
+	return &ConfigServiceServer{configs: configs}
+}
+
 func (c ConfigServiceServer) Explain(_ context.Context, request *pb.ExplainRequest) (*pb.ExplainResponse, error) {
 	if len(c.configs) == 0 {
 		return &pb.ExplainResponse{Explanation: konf.Explain(request.GetPath())}, nil

grpc/log/recovery.go → grpc/internal/recovery.go

@@ -1,7 +1,7 @@
 // Copyright (c) 2024 The nilgo authors
 // Use of this source code is governed by a MIT license found in the LICENSE file.
 
-package log
+package internal
 
 import (
 	"context"

grpc/log/recovery_test.go → grpc/internal/recovery_test.go

@@ -1,7 +1,7 @@
 // Copyright (c) 2024 The nilgo authors
 // Use of this source code is governed by a MIT license found in the LICENSE file.
 
-package log_test
+package internal_test
 
 import (
 	"bytes"
@@ -15,7 +15,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
 
-	"github.com/nil-go/nilgo/grpc/log"
+	"github.com/nil-go/nilgo/grpc/internal"
 )
 
 func TestRecoveryUnaryInterceptor(t *testing.T) {
@@ -62,7 +62,7 @@ func TestRecoveryUnaryInterceptor(t *testing.T) {
 				},
 			})
 
-			resp, err := log.RecoveryUnaryInterceptor(handler)(context.Background(), nil, nil, testcase.handler)
+			resp, err := internal.RecoveryUnaryInterceptor(handler)(context.Background(), nil, nil, testcase.handler)
 			if testcase.err == "" {
 				require.NoError(t, err)
 				assert.Equal(t, "", resp)
@@ -119,7 +119,7 @@ func TestRecoveryStreamInterceptor(t *testing.T) {
 				},
 			})
 
-			err := log.RecoveryStreamInterceptor(handler)(nil, serverStream{}, nil, testcase.handler)
+			err := internal.RecoveryStreamInterceptor(handler)(nil, serverStream{}, nil, testcase.handler)
 			if testcase.err == "" {
 				require.NoError(t, err)
 			} else {

grpc/log/slog.go → grpc/internal/slog.go

@@ -1,7 +1,7 @@
 // Copyright (c) 2024 The nilgo authors
 // Use of this source code is governed by a MIT license found in the LICENSE file.
 
-package log
+package internal
 
 import (
 	"context"

grpc/log/slog_test.go → grpc/internal/slog_test.go

@@ -1,7 +1,7 @@
 // Copyright (c) 2024 The nilgo authors
 // Use of this source code is governed by a MIT license found in the LICENSE file.
 
-package log_test
+package internal_test
 
 import (
 	"bytes"
@@ -13,15 +13,15 @@ import (
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc/grpclog"
 
-	"github.com/nil-go/nilgo/grpc/log"
+	"github.com/nil-go/nilgo/grpc/internal"
 )
 
 func TestSlogger(t *testing.T) {
 	t.Setenv("GRPC_GO_LOG_SEVERITY_LEVEL", "info")
 	t.Setenv("GRPC_GO_LOG_VERBOSITY_LEVEL", "1")
 
 	buf := new(bytes.Buffer)
-	logger := log.NewSlogger(slog.NewTextHandler(buf, &slog.HandlerOptions{
+	logger := internal.NewSlogger(slog.NewTextHandler(buf, &slog.HandlerOptions{
 		AddSource: true,
 		ReplaceAttr: func(groups []string, attr slog.Attr) slog.Attr {
 			if len(groups) == 0 && attr.Key == slog.TimeKey {