Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
perf(activity): skip per-message visibility rereads and source lookups on the local stream (#4105)
Kyle Mendell423cd549b742
diff --git a/backend/internal/activity/handler.go b/backend/internal/activity/handler.goindex ce1464f3b..865f4d09b 100644--- a/backend/internal/activity/handler.go+++ b/backend/internal/activity/handler.go@@ -510,7 +510,7 @@ func (h *ActivityHandler) applyActivitySourceLabelInternal(ctx context.Context,}func (h *ActivityHandler) applyActivityStreamEventSourceLabelInternal(ctx context.Context, environmentID string, event *activitytypes.StreamEvent) {- if event == nil {+ if event == nil || (event.Activity == nil && len(event.Activities) == 0) {return}sourceID, sourceName := h.resolveActivitySourceInternal(ctx, environmentID)diff --git a/backend/internal/activity/service.go b/backend/internal/activity/service.goindex 0e8fe6683..c7ba2d340 100644--- a/backend/internal/activity/service.go+++ b/backend/internal/activity/service.go@@ -550,7 +550,7 @@ func (s *ActivityService) AppendMessages(ctx context.Context, activityID string,out := make([]activitytypes.Message, 0, len(messages))for _, message := range messages {dto := activityMessageToDTOInternal(message)- s.publishMessageInternal(current.EnvironmentID, dto)+ s.publishMessageInternal(current.EnvironmentID, current.Type, dto)out = append(out, dto)}s.publishActivityInternal(activityToDTOInternal(current))@@ -1358,12 +1358,13 @@ func (s *ActivityService) admitActivityPublishInternal(activity activitytypes.Acreturn true}-func (s *ActivityService) publishMessageInternal(environmentID string, message activitytypes.Message) {+func (s *ActivityService) publishMessageInternal(environmentID string, activityType activitytypes.Type, message activitytypes.Message) {s.publishInternal(environmentID, activitytypes.StreamEvent{- Type: "message",- ActivityID: message.ActivityID,- Message: &message,- Timestamp: time.Now(),+ Type: "message",+ ActivityID: message.ActivityID,+ ActivityType: activityType,+ Message: &message,+ Timestamp: time.Now(),})}diff --git a/backend/internal/activity/service_test.go b/backend/internal/activity/service_test.goindex 57b77eccd..b00a68752 100644--- a/backend/internal/activity/service_test.go+++ b/backend/internal/activity/service_test.go@@ -126,6 +126,7 @@ func TestActivityServiceStreamFanoutInternal(t *testing.T) {messageEvent := receiveActivityEventInternal(t, events)require.Equal(t, "message", messageEvent.Type)require.Equal(t, created.ID, messageEvent.ActivityID)+ require.Equal(t, activitytypes.TypeProjectDeploy, messageEvent.ActivityType)require.NotNil(t, messageEvent.Message)require.Equal(t, "Deploying services", messageEvent.Message.Message)}diff --git a/backend/internal/activity/visibility.go b/backend/internal/activity/visibility.goindex 4b168aca2..31e4feb7b 100644--- a/backend/internal/activity/visibility.go+++ b/backend/internal/activity/visibility.go@@ -58,6 +58,12 @@ func (h *ActivityHandler) canReadActivityStreamEventInternal(ctx context.Contextif event.ActivityID == "" {return true}+ // Only job activities are scoped by target environment. Events that carry a+ // type hint for any other activity type need no database reread; job+ // metadata is mutable, so job events are still checked against the row.+ if event.ActivityType != "" && event.ActivityType != activitytypes.TypeJobRun {+ return true+ }var model Activity// Message events carry no activity metadata. Check the owning row before output.if err := h.activityService.db.WithContext(ctx).Select("type", "environment_id", "metadata").Where("id = ? AND environment_id = ?", event.ActivityID, "0").First(&model).Error; err != nil {diff --git a/types/activity/activity.go b/types/activity/activity.goindex 495d812d1..3bdb819ed 100644--- a/types/activity/activity.go+++ b/types/activity/activity.go@@ -104,6 +104,10 @@ type StreamEvent struct {Message *Message `json:"message,omitempty"`Error string `json:"error,omitempty"`Timestamp time.Time `json:"timestamp"`+ // ActivityType is the type of the owning activity for events that carry no+ // activity payload. It is an internal hint used to skip visibility rereads+ // for ordinary activities and is never serialized.+ ActivityType Type `json:"-"`}type ClearHistoryResult struct {