chore: refactor (#5137)

Author: kevwan

.gitignore

@@ -17,6 +17,7 @@
 **/logs
 **/adhoc
 **/coverage.txt
+**/WARP.md
 
 # for test purpose
 go.work

core/logx/logs_test.go

@@ -18,7 +18,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"go.opentelemetry.io/otel"
-	sdktrace "go.opentelemetry.io/otel/sdk/trace"
+	"go.opentelemetry.io/otel/sdk/trace"
 )
 
 var (
@@ -1192,7 +1192,7 @@ func TestLogKey(t *testing.T) {
 	defer writer.Store(old)
 
 	otp := otel.GetTracerProvider()
-	tp := sdktrace.NewTracerProvider(sdktrace.WithSampler(sdktrace.AlwaysSample()))
+	tp := trace.NewTracerProvider(trace.WithSampler(trace.AlwaysSample()))
 	otel.SetTracerProvider(tp)
 	defer otel.SetTracerProvider(otp)
 

gateway/internal/eventhandler.go

@@ -1,7 +1,6 @@
 package internal
 
 import (
-	"fmt"
 	"io"
 	"net/http"
 
@@ -13,21 +12,15 @@ import (
 	"google.golang.org/grpc/status"
 )
 
-// MetadataHeaderPrefix is the http prefix that represents custom metadata
-// parameters to or from a gRPC call.
-const MetadataHeaderPrefix = "Grpc-Metadata-"
+const (
+	// MetadataHeaderPrefix is the http prefix that represents custom metadata
+	// parameters to or from a gRPC call.
+	MetadataHeaderPrefix = "Grpc-Metadata-"
 
-// MetadataTrailerPrefix is prepended to gRPC metadata as it is converted to
-// HTTP headers in a response handled by go-zero gateway
-const MetadataTrailerPrefix = "Grpc-Trailer-"
-
-func defaultOutgoingHeaderMatcher(key string) (string, bool) {
-	return fmt.Sprintf("%s%s", MetadataHeaderPrefix, key), true
-}
-
-func defaultOutgoingTrailerMatcher(key string) (string, bool) {
-	return fmt.Sprintf("%s%s", MetadataTrailerPrefix, key), true
-}
+	// MetadataTrailerPrefix is prepended to gRPC metadata as it is converted to
+	// HTTP headers in a response handled by go-zero gateway
+	MetadataTrailerPrefix = "Grpc-Trailer-"
+)
 
 type EventHandler struct {
 	Status    *status.Status
@@ -49,10 +42,9 @@ func (h *EventHandler) OnReceiveHeaders(md metadata.MD) {
 	w, ok := h.writer.(http.ResponseWriter)
 	if ok {
 		for k, vs := range md {
-			if h, ok := defaultOutgoingHeaderMatcher(k); ok {
-				for _, v := range vs {
-					w.Header().Add(h, v)
-				}
+			header := defaultOutgoingHeaderMatcher(k)
+			for _, v := range vs {
+				w.Header().Add(header, v)
 			}
 		}
 	}
@@ -68,10 +60,9 @@ func (h *EventHandler) OnReceiveTrailers(status *status.Status, md metadata.MD)
 	w, ok := h.writer.(http.ResponseWriter)
 	if ok {
 		for k, vs := range md {
-			if h, ok := defaultOutgoingTrailerMatcher(k); ok {
-				for _, v := range vs {
-					w.Header().Add(h, v)
-				}
+			header := defaultOutgoingTrailerMatcher(k)
+			for _, v := range vs {
+				w.Header().Add(header, v)
 			}
 		}
 	}
@@ -84,3 +75,11 @@ func (h *EventHandler) OnResolveMethod(_ *desc.MethodDescriptor) {
 
 func (h *EventHandler) OnSendHeaders(_ metadata.MD) {
 }
+
+func defaultOutgoingHeaderMatcher(key string) string {
+	return MetadataHeaderPrefix + key
+}
+
+func defaultOutgoingTrailerMatcher(key string) string {
+	return MetadataTrailerPrefix + key
+}

zrpc/resolver/internal/kube/eventhandler.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/zeromicro/go-zero/core/lang"
 	"github.com/zeromicro/go-zero/core/logx"
-	v1 "k8s.io/api/core/v1"
+	"k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/cache"
 )