support runtime.ServeMux opts for grpc-gateway

pkg/srv/grpc/gateway.go

@@ -18,7 +18,7 @@ func (a *appGRPCServer) registerServiceGatewayHandlers(ctx context.Context, serv
 	if len(service.GwRegistrationFuncs) < 1 {
 		return
 	} else if a.gatewayMux == nil {
-		a.gatewayMux = runtime.NewServeMux()
+		a.gatewayMux = runtime.NewServeMux(a.opts.GRPCGatewayOpts...)
 	}
 
 	ctx, span := a.tracer.Start(ctx, "appgrpc.init.prepare.service.gwHandlers", trace.WithAttributes(
@@ -50,6 +50,7 @@ func (a *appGRPCServer) GetClientConn(ctx context.Context) *grpc.ClientConn {
 	if err != nil {
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())
+		panic(err)
 	}
 
 	return clientConn

pkg/srv/grpc/opts/config.go

@@ -19,7 +19,8 @@ type AppGRPC struct {
 	UnaryInterceptors  []grpc.UnaryServerInterceptor
 	StreamInterceptors []grpc.StreamServerInterceptor
 	GRPCOpts           []grpc.ServerOption
-	GRPCDialOpts       []grpc.DialOption // Map ServerOptions to DialOpts for GRPC Gateway support
+	GRPCDialOpts       []grpc.DialOption        // Map ServerOptions to DialOpts for GRPC Gateway support
+	GRPCGatewayOpts    []runtime.ServeMuxOption // Configure grpc-gateway ServeMux
 	GRPCDone           <-chan error
 	gatewayMux         *runtime.ServeMux
 }

pkg/srv/http/http.go

@@ -7,6 +7,7 @@ import (
 	"net"
 	"net/http"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus/promhttp"
@@ -60,6 +61,13 @@ func prepHTTPServer(opts *opts.AppHTTP) *http.Server {
 	// Inject extra handlers if given
 	// Used for grpc-gateway runtime.ServeMux handlers
 	for _, h := range opts.Handlers {
+		// prefix must end in / to route sub-paths
+		if !strings.HasSuffix(h.Prefix, "/") {
+			h.Prefix = h.Prefix + "/"
+		}
+
+		// if enabled, the path prefix is stripped before
+		// requests are sent to the handler
 		if h.StripPrefix {
 			h.Handler = http.StripPrefix(h.Prefix, h.Handler)
 		}