zlei6/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2026-05-14 02:10:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: refactor (#5137)

Browse Source
This commit is contained in:
Kevin Wan
2025-08-31 17:35:52 +08:00
committed by GitHub
parent 870e8352c1
commit 2ec7e432dd
4 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

4
core/logx/logs_test.go
View File

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

41
gateway/internal/eventhandler.go
View File

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

2
zrpc/resolver/internal/kube/eventhandler.go
View File

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