Rebuild SCUM plugin-owned data flow

platform/service/log_ingest.go

@@ -22,7 +22,12 @@ func (svc *CoreService) IngestLogBatch(batch domain.LogBatchIngest) (domain.LogB
 	}
 	lock := svc.logIngestLock(batch.ServerInstanceID)
 	lock.Lock()
-	defer lock.Unlock()
+	locked := true
+	defer func() {
+		if locked {
+			lock.Unlock()
+		}
+	}()
 
 	stamp := svc.now()
 	stream, err := svc.store.LogStreams().Get(batch.LogStreamID)
@@ -44,6 +49,11 @@ func (svc *CoreService) IngestLogBatch(batch domain.LogBatchIngest) (domain.LogB
 			return domain.LogBatchIngestResult{}, err
 		}
 		if exists && record.LastSeq == batch.LastSeq && logBatchRecordMatches(record, batch) {
+			locked = false
+			lock.Unlock()
+			if err := svc.projectPluginLogBatch(stream, storedLogEntries(batch.Entries)); err != nil {
+				return domain.LogBatchIngestResult{}, err
+			}
 			return domain.LogBatchIngestResult{
 				Accepted:     true,
 				LogStreamID:  batch.LogStreamID,
@@ -76,6 +86,11 @@ func (svc *CoreService) IngestLogBatch(batch domain.LogBatchIngest) (domain.LogB
 	if err := svc.store.LogStreams().Update(stream); err != nil {
 		return domain.LogBatchIngestResult{}, err
 	}
+	locked = false
+	lock.Unlock()
+	if err := svc.projectPluginLogBatch(stream, storedBatch.Entries); err != nil {
+		return domain.LogBatchIngestResult{}, err
+	}
 	svc.publishLogEvents(stream, storedBatch.Entries)
 	return domain.LogBatchIngestResult{
 		Accepted:     true,
@@ -87,6 +102,13 @@ func (svc *CoreService) IngestLogBatch(batch domain.LogBatchIngest) (domain.LogB
 	}, nil
 }
 
+func storedLogEntries(entries []domain.LogEntry) []domain.LogEntry {
+	stored := domain.CopyLogEntries(entries)
+	batch := domain.LogBatchIngest{Entries: stored}
+	sanitizeLogNetworkFields(&batch)
+	return batch.Entries
+}
+
 func (svc *CoreService) ensureJobLogStreamForBatch(batch domain.LogBatchIngest, stamp time.Time) error {
 	jobID, ok := jobIDFromLogBatch(batch)
 	if !ok {