fix: only propagate FTL headers

TBD54566975 · Nov 7, 2024 · 80e8d89 · 80e8d89
1 parent f2c318c
commit 80e8d89
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/backend/controller/controller.go b/backend/controller/controller.go
@@ -853,7 +853,7 @@ func (s *Service) AcquireLease(ctx context.Context, stream *connect.BidiStream[f
 }
 
 func (s *Service) Call(ctx context.Context, req *connect.Request[ftlv1.CallRequest]) (*connect.Response[ftlv1.CallResponse], error) {
-	return s.callWithRequest(ctx, req, optional.None[model.RequestKey](), optional.None[model.RequestKey](), "")
+	return s.callWithRequest(ctx, headers.CopyRequest(req), optional.None[model.RequestKey](), optional.None[model.RequestKey](), "")
 }
 
 func (s *Service) PublishEvent(ctx context.Context, req *connect.Request[ftlv1.PublishEventRequest]) (*connect.Response[ftlv1.PublishEventResponse], error) {

diff --git a/internal/rpc/headers/headers.go b/internal/rpc/headers/headers.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
+	"connectrpc.com/connect"
 	"github.com/alecthomas/types/optional"
 
 	"github.com/TBD54566975/ftl/internal/model"
@@ -24,6 +25,19 @@ const (
 	ParentRequestIDHeader = "Ftl-Parent-Request-Id"
 )
 
+var headers = []string{DirectRoutingHeader, VerbHeader, RequestIDHeader, ParentRequestIDHeader}
+
+// CopyRequest creates a new request with the same message as the original, but with only the FTL specific headers
+func CopyRequest[T any](req *connect.Request[T]) *connect.Request[T] {
+	ret := connect.NewRequest(req.Msg)
+	for _, header := range headers {
+		if req.Header()[header] != nil {
+			ret.Header()[header] = req.Header()[header]
+		}
+	}
+	return ret
+}
+
 func IsDirectRouted(header http.Header) bool {
 	return header.Get(DirectRoutingHeader) != ""
 }