Skip to content

Commit 13cfdf7

Browse files
committed
chore: convert admin log endpoint to a generic endpoint
1 parent 455d0a8 commit 13cfdf7

File tree

29 files changed

+1885
-1754
lines changed

29 files changed

+1885
-1754
lines changed

backend/admin/service.go

+3-12
Original file line numberDiff line numberDiff line change
@@ -618,18 +618,9 @@ func (s *Service) FailChangeset(ctx context.Context, c *connect.Request[ftlv1.Fa
618618
return connect.NewResponse(res.Msg), nil
619619
}
620620

621-
func (s *Service) StreamChangesetLogs(ctx context.Context, req *connect.Request[adminpb.StreamChangesetLogsRequest], resp *connect.ServerStream[adminpb.StreamChangesetLogsResponse]) error {
621+
func (s *Service) StreamLogs(ctx context.Context, req *connect.Request[adminpb.StreamLogsRequest], resp *connect.ServerStream[adminpb.StreamLogsResponse]) error {
622622
timeline, err := s.timelineClient.StreamTimeline(ctx, connect.NewRequest(&timelinepb.StreamTimelineRequest{
623-
Query: &timelinepb.GetTimelineRequest{
624-
Limit: 100000,
625-
Filters: []*timelinepb.GetTimelineRequest_Filter{{
626-
Filter: &timelinepb.GetTimelineRequest_Filter_Changesets{
627-
Changesets: &timelinepb.GetTimelineRequest_ChangesetFilter{
628-
Changesets: []string{req.Msg.ChangesetKey},
629-
},
630-
},
631-
}},
632-
},
623+
Query: req.Msg.Query,
633624
}))
634625
if err != nil {
635626
return fmt.Errorf("failed to get timeline: %w", err)
@@ -643,7 +634,7 @@ func (s *Service) StreamChangesetLogs(ctx context.Context, req *connect.Request[
643634
logs = append(logs, log)
644635
}
645636
}
646-
if err := resp.Send(&adminpb.StreamChangesetLogsResponse{
637+
if err := resp.Send(&adminpb.StreamLogsResponse{
647638
Logs: logs,
648639
}); err != nil {
649640
return fmt.Errorf("failed to send logs: %w", err)

backend/protos/xyz/block/ftl/admin/v1/admin.pb.go

+486-483
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/protos/xyz/block/ftl/admin/v1/admin.proto

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package xyz.block.ftl.admin.v1;
44

55
import "xyz/block/ftl/schema/v1/schema.proto";
66
import "xyz/block/ftl/timeline/v1/event.proto";
7+
import "xyz/block/ftl/timeline/v1/timeline.proto";
78
import "xyz/block/ftl/v1/ftl.proto";
89
import "xyz/block/ftl/v1/schemaservice.proto";
910

@@ -196,11 +197,11 @@ message ClusterInfoResponse {
196197
string arch = 2;
197198
}
198199

199-
message StreamChangesetLogsRequest {
200-
string changeset_key = 1;
200+
message StreamLogsRequest {
201+
timeline.v1.TimelineQuery query = 1;
201202
}
202203

203-
message StreamChangesetLogsResponse {
204+
message StreamLogsResponse {
204205
repeated timeline.v1.LogEvent logs = 1;
205206
}
206207

@@ -283,5 +284,5 @@ service AdminService {
283284
// Upload an artefact to the server.
284285
rpc UploadArtefact(stream UploadArtefactRequest) returns (UploadArtefactResponse);
285286

286-
rpc StreamChangesetLogs(StreamChangesetLogsRequest) returns (stream StreamChangesetLogsResponse);
287+
rpc StreamLogs(StreamLogsRequest) returns (stream StreamLogsResponse);
287288
}

backend/protos/xyz/block/ftl/admin/v1/adminpbconnect/admin.connect.go

+17-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)