Skip to content

Commit

Permalink
feat: console and ftl replay use timeline service (#3652)
Browse files Browse the repository at this point in the history
closes #3623
closes #3624

Controller acts as a proxy for web console for the timeline service
  • Loading branch information
matt2e authored Dec 6, 2024
1 parent 246e0ea commit 7e9f9d6
Show file tree
Hide file tree
Showing 39 changed files with 1,215 additions and 4,571 deletions.
447 changes: 45 additions & 402 deletions backend/controller/console/console.go

Large diffs are not rendered by default.

7 changes: 2 additions & 5 deletions backend/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ import (
"github.com/TBD54566975/ftl/backend/controller/observability"
"github.com/TBD54566975/ftl/backend/controller/pubsub"
"github.com/TBD54566975/ftl/backend/controller/scheduledtask"
oldtimeline "github.com/TBD54566975/ftl/backend/controller/timeline"
"github.com/TBD54566975/ftl/backend/libdal"
"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/console/v1/pbconsoleconnect"
ftldeployment "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/deployment/v1"
Expand Down Expand Up @@ -160,7 +159,7 @@ func Start(
logger.Debugf("Advertising as %s", config.Advertise)

admin := admin.NewAdminService(cm, sm, svc.dal)
console := console.NewService(svc.dal, svc.timeline, admin)
console := console.NewService(svc.dal, admin)

g, ctx := errgroup.WithContext(ctx)

Expand All @@ -173,6 +172,7 @@ func Start(
rpc.GRPC(ftlv1connect.NewSchemaServiceHandler, svc),
rpc.GRPC(ftlv1connect.NewAdminServiceHandler, admin),
rpc.GRPC(pbconsoleconnect.NewConsoleServiceHandler, console),
rpc.GRPC(timelinev1connect.NewTimelineServiceHandler, console),
rpc.HTTP("/", consoleHandler),
rpc.PProf(),
)
Expand Down Expand Up @@ -209,7 +209,6 @@ type Service struct {
tasks *scheduledtask.Scheduler
pubSub *pubsub.Service
registry artefacts.Service
timeline *oldtimeline.Service
controllerListListeners []ControllerListListener

// Map from runnerKey.String() to client.
Expand Down Expand Up @@ -275,8 +274,6 @@ func New(
}
svc.registry = storage

timelineSvc := oldtimeline.New(ctx, conn, encryption)
svc.timeline = timelineSvc
pubSub := pubsub.New(ctx, conn, encryption, optional.Some[pubsub.AsyncCallListener](svc))
svc.pubSub = pubSub
svc.dal = dal.New(ctx, conn, encryption, pubSub, svc.registry)
Expand Down
49 changes: 0 additions & 49 deletions backend/controller/timeline/events_async.go

This file was deleted.

127 changes: 0 additions & 127 deletions backend/controller/timeline/events_call.go

This file was deleted.

43 changes: 0 additions & 43 deletions backend/controller/timeline/events_cron.go

This file was deleted.

43 changes: 0 additions & 43 deletions backend/controller/timeline/events_deployment.go

This file was deleted.

Loading

0 comments on commit 7e9f9d6

Please sign in to comment.