fix: only propagate FTL headers #3358
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stuartwdouglas
added
the
run-all
This was referenced Nov 7, 2024
Open
Open
matt2e
reviewed
Nov 7, 2024
internal/rpc/headers/headers.go
Outdated
| 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] { |
There was a problem hiding this comment.
Small nit, this sounds like a complete copy rather than what it is? Maybe CopyRequestForForwarding?
matt2e
approved these changes
Nov 7, 2024
wesbillman
reviewed
Nov 7, 2024
backend/controller/controller.go
Outdated
| @@ -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](), "") | |||
wesbillman
approved these changes
Nov 7, 2024
stuartwdouglas
force-pushed
the
stuartwdouglas/really-fix-rbac-for-real-this-time
branch
from
80e8d89 to
244adf6
Compare
stuartwdouglas
deleted the
stuartwdouglas/really-fix-rbac-for-real-this-time
branch
|
This isn't going to break OTEL tracing is it? |
|
Actually that is a good point, the logic should probably be to strip protocol level headers rather than just preserving known ones. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.