Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: initial protos + skeleton for timeline service #3610

Merged
merged 7 commits into from
Dec 4, 2024
Merged

refactor: initial protos + skeleton for timeline service #3610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d129739
refactor: initial protos + skeleton for timeline service
worstell Dec 3, 2024
d91615c
chore(autofmt): Automated formatting
github-actions[bot] Dec 3, 2024
b2a6e97
fix imports
matt2e Dec 4, 2024
9cf5bf6
chore(autofmt): Automated formatting
github-actions[bot] Dec 4, 2024
e40e5c8
lint
matt2e Dec 4, 2024
9271802
minor fixes
matt2e Dec 4, 2024
9d06a62
move protos to separate directory
matt2e Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,13 @@ EXTENSION_OUT := "frontend/vscode/dist/extension.js"
PROTOS_IN := "backend/protos"
PROTOS_OUT := "backend/protos/xyz/block/ftl/console/v1/console.pb.go " + \
"backend/protos/xyz/block/ftl//v1/ftl.pb.go " + \
"backend/protos/xyz/block/ftl/timeline/v1/timeline.pb.go " + \
"backend/protos/xyz/block/ftl//timeline/v1/schemaservice.pb.go " + \
"backend/protos/xyz/block/ftl/schema/v1/schema.pb.go " + \
CONSOLE_ROOT + "/src/protos/xyz/block/ftl/console/v1/console_pb.ts " + \
CONSOLE_ROOT + "/src/protos/xyz/block/ftl/v1/ftl_pb.ts " + \
CONSOLE_ROOT + "/src/protos/xyz/block/ftl/timeline/v1/timeline_pb.ts " + \
CONSOLE_ROOT + "/src/protos/xyz/block/ftl/timeline/v1/schemaservice_pb.ts " + \
CONSOLE_ROOT + "/src/protos/xyz/block/ftl/schema/v1/schema_pb.ts " + \
CONSOLE_ROOT + "/src/protos/xyz/block/ftl/publish/v1/publish_pb.ts"
GO_SCHEMA_ROOTS := "./internal/schema.Schema ./internal/schema.ModuleRuntimeEvent"
Expand Down
67 changes: 35 additions & 32 deletions backend/controller/console/console.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
pbconsole "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/console/v1"
"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/console/v1/pbconsoleconnect"
schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/schema/v1"
pbtimeline "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/timeline/v1"
ftlv1 "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1"
"github.com/TBD54566975/ftl/internal/buildengine"
"github.com/TBD54566975/ftl/internal/log"
Expand Down Expand Up @@ -554,6 +555,7 @@ func (c *ConsoleService) StreamEvents(ctx context.Context, req *connect.Request[
}
}

//nolint:maintidx
func eventsQueryProtoToDAL(query *pbconsole.GetEventsRequest) ([]timeline.TimelineFilter, error) {
var result []timeline.TimelineFilter

Expand Down Expand Up @@ -622,7 +624,8 @@ func eventsQueryProtoToDAL(query *pbconsole.GetEventsRequest) ([]timeline.Timeli
return result, nil
}

func eventDALToProto(event timeline.Event) *pbconsole.Event {
//nolint:maintidx
func eventDALToProto(event timeline.Event) *pbtimeline.Event {
switch event := event.(type) {
case *timeline.CallEvent:
var requestKey *string
Expand All @@ -634,11 +637,11 @@ func eventDALToProto(event timeline.Event) *pbconsole.Event {
if sourceVerb, ok := event.SourceVerb.Get(); ok {
sourceVerbRef = sourceVerb.ToProto().(*schemapb.Ref) //nolint:forcetypeassert
}
return &pbconsole.Event{
return &pbtimeline.Event{
TimeStamp: timestamppb.New(event.Time),
Id: event.ID,
Entry: &pbconsole.Event_Call{
Call: &pbconsole.CallEvent{
Entry: &pbtimeline.Event_Call{
Call: &pbtimeline.CallEvent{
RequestKey: requestKey,
DeploymentKey: event.DeploymentKey.String(),
TimeStamp: timestamppb.New(event.Time),
Expand All @@ -662,11 +665,11 @@ func eventDALToProto(event timeline.Event) *pbconsole.Event {
rstr := r.String()
requestKey = &rstr
}
return &pbconsole.Event{
return &pbtimeline.Event{
TimeStamp: timestamppb.New(event.Time),
Id: event.ID,
Entry: &pbconsole.Event_Log{
Log: &pbconsole.LogEvent{
Entry: &pbtimeline.Event_Log{
Log: &pbtimeline.LogEvent{
DeploymentKey: event.DeploymentKey.String(),
RequestKey: requestKey,
TimeStamp: timestamppb.New(event.Time),
Expand All @@ -684,11 +687,11 @@ func eventDALToProto(event timeline.Event) *pbconsole.Event {
rstr := r.String()
replaced = &rstr
}
return &pbconsole.Event{
return &pbtimeline.Event{
TimeStamp: timestamppb.New(event.Time),
Id: event.ID,
Entry: &pbconsole.Event_DeploymentCreated{
DeploymentCreated: &pbconsole.DeploymentCreatedEvent{
Entry: &pbtimeline.Event_DeploymentCreated{
DeploymentCreated: &pbtimeline.DeploymentCreatedEvent{
Key: event.DeploymentKey.String(),
Language: event.Language,
ModuleName: event.ModuleName,
Expand All @@ -698,11 +701,11 @@ func eventDALToProto(event timeline.Event) *pbconsole.Event {
},
}
case *timeline.DeploymentUpdatedEvent:
return &pbconsole.Event{
return &pbtimeline.Event{
TimeStamp: timestamppb.New(event.Time),
Id: event.ID,
Entry: &pbconsole.Event_DeploymentUpdated{
DeploymentUpdated: &pbconsole.DeploymentUpdatedEvent{
Entry: &pbtimeline.Event_DeploymentUpdated{
DeploymentUpdated: &pbtimeline.DeploymentUpdatedEvent{
Key: event.DeploymentKey.String(),
MinReplicas: int32(event.MinReplicas),
PrevMinReplicas: int32(event.PrevMinReplicas),
Expand All @@ -717,11 +720,11 @@ func eventDALToProto(event timeline.Event) *pbconsole.Event {
requestKey = &rstr
}

return &pbconsole.Event{
return &pbtimeline.Event{
TimeStamp: timestamppb.New(event.Time),
Id: event.ID,
Entry: &pbconsole.Event_Ingress{
Ingress: &pbconsole.IngressEvent{
Entry: &pbtimeline.Event_Ingress{
Ingress: &pbtimeline.IngressEvent{
DeploymentKey: event.DeploymentKey.String(),
RequestKey: requestKey,
VerbRef: &schemapb.Ref{
Expand All @@ -743,11 +746,11 @@ func eventDALToProto(event timeline.Event) *pbconsole.Event {
}

case *timeline.CronScheduledEvent:
return &pbconsole.Event{
return &pbtimeline.Event{
TimeStamp: timestamppb.New(event.Time),
Id: event.ID,
Entry: &pbconsole.Event_CronScheduled{
CronScheduled: &pbconsole.CronScheduledEvent{
Entry: &pbtimeline.Event_CronScheduled{
CronScheduled: &pbtimeline.CronScheduledEvent{
DeploymentKey: event.DeploymentKey.String(),
VerbRef: &schemapb.Ref{
Module: event.Verb.Module,
Expand All @@ -768,21 +771,21 @@ func eventDALToProto(event timeline.Event) *pbconsole.Event {
requestKey = &rstr
}

var asyncEventType pbconsole.AsyncExecuteEventType
var asyncEventType pbtimeline.AsyncExecuteEventType
switch event.EventType {
case timeline.AsyncExecuteEventTypeUnkown:
asyncEventType = pbconsole.AsyncExecuteEventType_ASYNC_EXECUTE_EVENT_TYPE_UNSPECIFIED
asyncEventType = pbtimeline.AsyncExecuteEventType_ASYNC_EXECUTE_EVENT_TYPE_UNSPECIFIED
case timeline.AsyncExecuteEventTypeCron:
asyncEventType = pbconsole.AsyncExecuteEventType_ASYNC_EXECUTE_EVENT_TYPE_CRON
asyncEventType = pbtimeline.AsyncExecuteEventType_ASYNC_EXECUTE_EVENT_TYPE_CRON
case timeline.AsyncExecuteEventTypePubSub:
asyncEventType = pbconsole.AsyncExecuteEventType_ASYNC_EXECUTE_EVENT_TYPE_PUBSUB
asyncEventType = pbtimeline.AsyncExecuteEventType_ASYNC_EXECUTE_EVENT_TYPE_PUBSUB
}

return &pbconsole.Event{
return &pbtimeline.Event{
TimeStamp: timestamppb.New(event.Time),
Id: event.ID,
Entry: &pbconsole.Event_AsyncExecute{
AsyncExecute: &pbconsole.AsyncExecuteEvent{
Entry: &pbtimeline.Event_AsyncExecute{
AsyncExecute: &pbtimeline.AsyncExecuteEvent{
DeploymentKey: event.DeploymentKey.String(),
RequestKey: requestKey,
TimeStamp: timestamppb.New(event.Time),
Expand All @@ -803,11 +806,11 @@ func eventDALToProto(event timeline.Event) *pbconsole.Event {
requestKey = &r
}

return &pbconsole.Event{
return &pbtimeline.Event{
TimeStamp: timestamppb.New(event.Time),
Id: event.ID,
Entry: &pbconsole.Event_PubsubPublish{
PubsubPublish: &pbconsole.PubSubPublishEvent{
Entry: &pbtimeline.Event_PubsubPublish{
PubsubPublish: &pbtimeline.PubSubPublishEvent{
DeploymentKey: event.DeploymentKey.String(),
RequestKey: requestKey,
VerbRef: event.SourceVerb.ToProto().(*schemapb.Ref), //nolint:forcetypeassert
Expand All @@ -833,11 +836,11 @@ func eventDALToProto(event timeline.Event) *pbconsole.Event {
destVerbName = destVerb.Name
}

return &pbconsole.Event{
return &pbtimeline.Event{
TimeStamp: timestamppb.New(event.Time),
Id: event.ID,
Entry: &pbconsole.Event_PubsubConsume{
PubsubConsume: &pbconsole.PubSubConsumeEvent{
Entry: &pbtimeline.Event_PubsubConsume{
PubsubConsume: &pbtimeline.PubSubConsumeEvent{
DeploymentKey: event.DeploymentKey.String(),
RequestKey: requestKey,
DestVerbModule: &destVerbModule,
Expand Down
5 changes: 3 additions & 2 deletions backend/controller/encryption/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

"github.com/TBD54566975/ftl/backend/controller/encryption/api"
pbconsole "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/console/v1"
pbtimeline "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/timeline/v1"
in "github.com/TBD54566975/ftl/internal/integration"
"github.com/TBD54566975/ftl/internal/log"
"github.com/TBD54566975/ftl/internal/slices"
Expand Down Expand Up @@ -43,8 +44,8 @@ func TestEncryptionForLogs(t *testing.T) {
Limit: 10,
}))
assert.NoError(t, err, "could not get events")
_, ok := slices.Find(resp.Msg.Events, func(e *pbconsole.Event) bool {
call, ok := e.Entry.(*pbconsole.Event_Call)
_, ok := slices.Find(resp.Msg.Events, func(e *pbtimeline.Event) bool {
call, ok := e.Entry.(*pbtimeline.Event_Call)
if !ok {
return false
}
Expand Down
Loading
Loading