NewServer now has optional publicAddr argument

Author: nexcode

internal/grpcinject/opentelemetry.go

@@ -31,7 +31,7 @@ import (
 	"google.golang.org/grpc"
 )
 
-func OpenTelemetry(config *config.Config, addr net.Addr) error {
+func OpenTelemetry(config *config.Config, localAddr net.Addr, publicAddr string) error {
 	resOptions := []resource.Option{
 		resource.WithHost(),
 		resource.WithOS(),
@@ -40,8 +40,8 @@ func OpenTelemetry(config *config.Config, addr net.Addr) error {
 		resource.WithAttributes(semconv.ServiceName(config.OpenTelemetry.ServiceName)),
 	}
 
-	if addr != nil {
-		host, port, err := net.SplitHostPort(addr.String())
+	if localAddr != nil {
+		host, port, err := net.SplitHostPort(localAddr.String())
 		if err != nil {
 			return err
 		}
@@ -52,10 +52,27 @@ func OpenTelemetry(config *config.Config, addr net.Addr) error {
 		}
 
 		resOptions = append(resOptions,
-			resource.WithAttributes(semconv.NetworkTransportKey.String(addr.Network())),
+			resource.WithAttributes(semconv.NetworkTransportKey.String(localAddr.Network())),
 			resource.WithAttributes(semconv.NetworkLocalAddress(host)),
 			resource.WithAttributes(semconv.NetworkLocalPort(portInt)),
 		)
+
+		if publicAddr != localAddr.String() {
+			host, port, err = net.SplitHostPort(publicAddr)
+			if err != nil {
+				return err
+			}
+
+			portInt, err = strconv.Atoi(port)
+			if err != nil {
+				return err
+			}
+		}
+
+		resOptions = append(resOptions,
+			resource.WithAttributes(semconv.ServerAddress(host)),
+			resource.WithAttributes(semconv.ServerPort(portInt)),
+		)
 	}
 
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
@@ -83,7 +100,7 @@ func OpenTelemetry(config *config.Config, addr net.Addr) error {
 		propagation.NewCompositeTextMapPropagator(propagation.TraceContext{}, propagation.Baggage{}),
 	)
 
-	if addr != nil {
+	if localAddr != nil {
 		config.GRPCOptions.Server = append(config.GRPCOptions.Server,
 			grpc.StatsHandler(otelgrpc.NewServerHandler(tracerProvider, propagators)),
 		)

rpcplatform_grpcinject.go

@@ -22,9 +22,9 @@ import (
 	"github.com/nexcode/rpcplatform/internal/grpcinject"
 )
 
-func (p *RPCPlatform) grpcinject(addr net.Addr) error {
+func (p *RPCPlatform) grpcinject(localAddr net.Addr, publicAddr string) error {
 	if p.config.OpenTelemetry != nil {
-		if err := grpcinject.OpenTelemetry(p.config, addr); err != nil {
+		if err := grpcinject.OpenTelemetry(p.config, localAddr, publicAddr); err != nil {
 			return err
 		}
 	}

rpcplatform_newclient.go

@@ -40,7 +40,7 @@ func (p *RPCPlatform) NewClient(target string, attributes *ClientAttributes) (*C
 		grpc.WithDefaultServiceConfig(`{"loadBalancingConfig":[{"`+balancerName+`":{}}]}`),
 	)
 
-	if err := p.grpcinject(nil); err != nil {
+	if err := p.grpcinject(nil, ""); err != nil {
 		return nil, err
 	}
 

rpcplatform_newserver.go

@@ -24,8 +24,9 @@ import (
 )
 
 // NewServer creates a new server. You need to provide the server name, listening address and attributes.
+// Optional param `publicAddr` used if server can't reachable by listening address.
 // If no additional settings are needed, attributes can be nil.
-func (p *RPCPlatform) NewServer(name, addr string, attributes *ServerAttributes) (*Server, error) {
+func (p *RPCPlatform) NewServer(name, addr string, attributes *ServerAttributes, publicAddr ...string) (*Server, error) {
 	if attributes == nil {
 		attributes = Attributes().Server()
 	}
@@ -35,7 +36,13 @@ func (p *RPCPlatform) NewServer(name, addr string, attributes *ServerAttributes)
 		return nil, err
 	}
 
-	if err = p.grpcinject(listener.Addr()); err != nil {
+	if len(publicAddr) != 0 {
+		addr = publicAddr[0]
+	} else {
+		addr = listener.Addr().String()
+	}
+
+	if err = p.grpcinject(listener.Addr(), addr); err != nil {
 		return nil, err
 	}
 
@@ -45,5 +52,6 @@ func (p *RPCPlatform) NewServer(name, addr string, attributes *ServerAttributes)
 		server:     grpc.NewServer(p.config.GRPCOptions.Server...),
 		listener:   listener,
 		attributes: attributes,
+		publicAddr: addr,
 	}, nil
 }

server.go

@@ -29,4 +29,5 @@ type Server struct {
 	server     *grpc.Server
 	listener   net.Listener
 	attributes *ServerAttributes
+	publicAddr string
 }

server_serve.go

@@ -53,7 +53,7 @@ func (s *Server) Serve() error {
 			}
 
 			ctx, cancel = context.WithTimeout(global, 4*time.Second)
-			_, err = s.etcd.Put(ctx, path, s.listener.Addr().String(), etcd.WithLease(lease.ID))
+			_, err = s.etcd.Put(ctx, path, s.publicAddr, etcd.WithLease(lease.ID))
 			cancel()
 
 			if err != nil {