wip

# Conflicts: # backend/controller/console/console.go # backend/controller/controller.go # backend/controller/timeline/events_async.go # backend/controller/timeline/events_call.go # backend/controller/timeline/events_cron.go # backend/controller/timeline/events_ingress.go # backend/controller/timeline/events_log.go # backend/controller/timeline/events_pubsub_consume.go # backend/controller/timeline/events_pubsub_publish.go # backend/controller/timeline/timeline.go # Conflicts: # backend/controller/controller.go # backend/controller/timeline/timeline.go
block · Dec 6, 2024 · 2b1dde0 · 2b1dde0
1 parent c5f8097
commit 2b1dde0
Show file tree

Hide file tree

Showing 15 changed files with 158 additions and 1,412 deletions.
diff --git a/backend/controller/console/console.go b/backend/controller/console/console.go
diff --git a/backend/controller/controller.go b/backend/controller/controller.go
@@ -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"
@@ -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)
 
@@ -209,7 +208,6 @@ type Service struct {
 	tasks                   *scheduledtask.Scheduler
 	pubSub                  *pubsub.Service
 	registry                artefacts.Service
-	timeline                *oldtimeline.Service
 	controllerListListeners []ControllerListListener
 
 	// Map from runnerKey.String() to client.
@@ -275,8 +273,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)
@@ -465,7 +461,7 @@ func (s *Service) StreamDeploymentLogs(ctx context.Context, stream *connect.Clie
 			requestKey = optional.Some(rkey)
 		}
 
-		timeline.Publish(ctx, &timeline.Log{
+		timeline.Publish(ctx, timeline.Log{
 			DeploymentKey: deploymentKey,
 			RequestKey:    requestKey,
 			Time:          msg.TimeStamp.AsTime(),
@@ -903,7 +899,7 @@ func (s *Service) PublishEvent(ctx context.Context, req *connect.Request[ftldepl
 	routes := s.routeTable.Current()
 	route, ok := routes.GetDeployment(module).Get()
 	if ok {
-		timeline.Publish(ctx, &timeline.PubSubPublish{
+		timeline.Publish(ctx, timeline.PubSubPublish{
 			DeploymentKey: route,
 			RequestKey:    requestKey,
 			Time:          now,
@@ -1261,7 +1257,7 @@ func (s *Service) executeAsyncCalls(ctx context.Context) (interval time.Duration
 			if e, ok := err.Get(); ok {
 				errStr = optional.Some(e.Error())
 			}
-			timeline.Publish(ctx, &timeline.AsyncExecute{
+			timeline.Publish(ctx, timeline.AsyncExecute{
 				DeploymentKey: deployment,
 				RequestKey:    call.ParentRequestKey,
 				EventType:     eventType,

diff --git a/backend/controller/timeline/events_async.go b/backend/controller/timeline/events_async.go
diff --git a/backend/controller/timeline/events_call.go b/backend/controller/timeline/events_call.go
diff --git a/backend/controller/timeline/events_cron.go b/backend/controller/timeline/events_cron.go
diff --git a/backend/controller/timeline/events_deployment.go b/backend/controller/timeline/events_deployment.go