Compare commits

...

6 Commits

Author SHA1 Message Date
9e0a58405f Merge pull request 'copy incoming content-type' (#169) from ct into v3
Some checks failed
build / test (push) Failing after 1m27s
build / lint (push) Failing after 2m31s
codeql / analyze (go) (push) Failing after 2m38s
Reviewed-on: #169
2023-12-20 09:24:16 +03:00
ee3f978683 copy incoming content-type
Some checks failed
codeql / analyze (go) (pull_request) Failing after 2m46s
prbuild / test (pull_request) Failing after 1m28s
prbuild / lint (pull_request) Failing after 2m44s
autoapprove / autoapprove (pull_request) Failing after 1m24s
automerge / automerge (pull_request) Failing after 4s
dependabot-automerge / automerge (pull_request) Has been skipped
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2023-12-20 09:23:42 +03:00
46891c397f add more metadata
Some checks failed
build / test (push) Failing after 1m27s
build / lint (push) Failing after 2m38s
codeql / analyze (go) (push) Failing after 2m46s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2023-11-04 00:05:33 +03:00
6856038abe add Path metadata
Some checks failed
build / test (push) Failing after 1m28s
build / lint (push) Failing after 2m38s
codeql / analyze (go) (push) Failing after 2m44s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2023-11-03 19:33:49 +03:00
786bbb7185 Merge pull request 'dont init twice tls listener' (#167) from tls into v3
Reviewed-on: #167
2023-06-12 18:30:41 +03:00
95207c9617 dont init twice tls listener
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2023-06-12 18:29:07 +03:00
4 changed files with 34 additions and 1048 deletions

18
go.mod
View File

@@ -1,11 +1,17 @@
module go.unistack.org/micro-server-grpc/v3 module go.unistack.org/micro-server-grpc/v3
go 1.16 go 1.20
require ( require (
github.com/golang/protobuf v1.5.2 github.com/golang/protobuf v1.5.3
go.unistack.org/micro/v3 v3.10.14 go.unistack.org/micro/v3 v3.10.31
golang.org/x/net v0.5.0 golang.org/x/net v0.17.0
google.golang.org/grpc v1.52.3 google.golang.org/grpc v1.59.0
google.golang.org/protobuf v1.28.1 google.golang.org/protobuf v1.31.0
)
require (
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
) )

1045
go.sum

File diff suppressed because it is too large Load Diff

16
grpc.go
View File

@@ -26,7 +26,6 @@ import (
"golang.org/x/net/netutil" "golang.org/x/net/netutil"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/encoding" "google.golang.org/grpc/encoding"
gmetadata "google.golang.org/grpc/metadata" gmetadata "google.golang.org/grpc/metadata"
"google.golang.org/grpc/peer" "google.golang.org/grpc/peer"
@@ -140,10 +139,6 @@ func (g *Server) configure(opts ...server.Option) error {
grpc.UnknownServiceHandler(g.handler), grpc.UnknownServiceHandler(g.handler),
} }
if creds := g.getCredentials(); creds != nil {
gopts = append(gopts, grpc.Creds(creds))
}
if opts := g.getGrpcOptions(); opts != nil { if opts := g.getGrpcOptions(); opts != nil {
gopts = append(opts, gopts...) gopts = append(opts, gopts...)
} }
@@ -180,13 +175,6 @@ func (g *Server) getMaxMsgSize() int {
return s return s
} }
func (g *Server) getCredentials() credentials.TransportCredentials {
if g.opts.TLSConfig != nil {
return credentials.NewTLS(g.opts.TLSConfig)
}
return nil
}
func (g *Server) getGrpcOptions() []grpc.ServerOption { func (g *Server) getGrpcOptions() []grpc.ServerOption {
if g.opts.Context == nil { if g.opts.Context == nil {
return nil return nil
@@ -246,6 +234,10 @@ func (g *Server) handler(srv interface{}, stream grpc.ServerStream) (err error)
for k, v := range gmd { for k, v := range gmd {
md.Set(k, strings.Join(v, ", ")) md.Set(k, strings.Join(v, ", "))
} }
md.Set("Path", fullMethod)
md.Set("Micro-Server", "grpc")
md.Set(metadata.HeaderEndpoint, methodName)
md.Set(metadata.HeaderService, serviceName)
var td string var td string
// timeout for server deadline // timeout for server deadline

View File

@@ -132,9 +132,6 @@ func (g *Server) createSubHandler(sb *subscriber, opts server.Options) broker.Ha
hdr := make(map[string]string, len(msg.Header)) hdr := make(map[string]string, len(msg.Header))
for k, v := range msg.Header { for k, v := range msg.Header {
if k == "Content-Type" {
continue
}
hdr[k] = v hdr[k] = v
} }