fix: 修复应用日志异常膨胀

internal/apps/agent/sync/service.go

@@ -10,6 +10,7 @@ import (
 	"log/slog"
 	"sort"
 	"strings"
+	"sync"
 
 	openrestyrender "github.com/Rain-kl/Wavelet/pkg/render/openresty"
 
@@ -49,6 +50,7 @@ type Service struct {
 	nginxManager NginxManager
 	stateStore   *state.Store
 	pagesDir     string
+	syncMu       sync.Mutex
 }
 
 // SetPagesDir sets the local directory used for pages deployment packages.
@@ -76,6 +78,9 @@ func (s *Service) SyncOnStartup(ctx context.Context, target *protocol.ActiveConf
 }
 
 func (s *Service) sync(ctx context.Context, startup bool, target *protocol.ActiveConfigMeta) error {
+	s.syncMu.Lock()
+	defer s.syncMu.Unlock()
+
 	mode := syncMode(startup)
 	snapshot, currentChecksum, err := s.loadSyncState()
 	if err != nil {
@@ -94,6 +99,9 @@ func (s *Service) sync(ctx context.Context, startup bool, target *protocol.Activ
 
 // ForceSyncOnce clears any blocked target state then unconditionally fetches and applies the active config.
 func (s *Service) ForceSyncOnce(ctx context.Context, target *protocol.ActiveConfigMeta) error {
+	s.syncMu.Lock()
+	defer s.syncMu.Unlock()
+
 	snapshot, err := s.stateStore.Load()
 	if err != nil {
 		return err
@@ -161,12 +169,24 @@ func (s *Service) applyRenderedConfig(ctx context.Context, mode string, snapshot
 	mainConfigChecksum := checksumString(rendered.mainConfig)
 	routeConfigChecksum := checksumString(rendered.routeConfig)
 	slog.Info("applying new openresty config", "mode", mode, "from_version", snapshot.CurrentVersion, "to_version", config.Version, "old_checksum", currentChecksum, "new_checksum", config.Checksum)
+	alreadySynced := snapshotMatchesTarget(snapshot, config.Version, config.Checksum)
 	outcome, message := normalizeApplyOutcome(s.nginxManager.Apply(ctx, rendered.mainConfig, rendered.routeConfig, rendered.supportFiles))
 	applyResult := updateSnapshotFromApplyOutcome(mode, snapshot, config, outcome, message)
 
 	if err := s.stateStore.Save(snapshot); err != nil {
 		return err
 	}
+	if !shouldReportApplyLog(alreadySynced, applyResult.reportResult) {
+		slog.Debug("skipping duplicate apply log report", "version", config.Version, "checksum", config.Checksum, "result", applyResult.reportResult)
+		if applyResult.reportResult == ApplyResultFailed {
+			return outcomeError(config.Version, applyResult.message)
+		}
+		if err := s.syncReferencedWAFIPGroups(ctx, rendered.supportFiles); err != nil {
+			slog.Error("sync referenced waf ip groups failed", "version", config.Version, "error", err)
+			return err
+		}
+		return nil
+	}
 	if err := s.client.ReportApplyLog(ctx, protocol.ApplyLogPayload{
 		NodeID:              snapshot.NodeID,
 		Version:             config.Version,

internal/apps/agent/sync/service_test.go

@@ -479,6 +479,44 @@ func TestSyncOnceReportsNoopWhenVersionChangesButChecksumMatches(t *testing.T) {
 	}
 }
 
+func TestSyncOnStartupSkipsDuplicateSuccessReportWhenStateAlreadySynced(t *testing.T) {
+	client := &fakeClient{
+		config: protocol.ActiveConfigResponse{
+			Version:          "20260309-003",
+			Checksum:         "checksum-3",
+			SourceConfigJSON: testSourceConfigJSON("auto", 80),
+			CreatedAt:        time.Now().Format(time.RFC3339),
+		},
+	}
+	stateStore := state.NewStore(filepath.Join(t.TempDir(), "state.json"))
+	nodeID, err := stateStore.EnsureNodeID()
+	if err != nil {
+		t.Fatalf("EnsureNodeID failed: %v", err)
+	}
+	if err = stateStore.Save(&state.Snapshot{
+		NodeID:          nodeID,
+		CurrentVersion:  "20260309-003",
+		CurrentChecksum: "checksum-3",
+	}); err != nil {
+		t.Fatalf("failed to seed state: %v", err)
+	}
+
+	manager := &fakeManager{currentChecksum: "checksum-3"}
+	service := New(client, manager, stateStore)
+	if err = service.SyncOnStartup(context.Background(), &protocol.ActiveConfigMeta{
+		Version:  "20260309-003",
+		Checksum: "checksum-3",
+	}); err != nil {
+		t.Fatalf("SyncOnStartup failed: %v", err)
+	}
+	if len(client.reports) != 0 {
+		t.Fatalf("expected startup sync to skip duplicate success report, got %+v", client.reports)
+	}
+	if len(manager.applyMainContents) != 1 {
+		t.Fatal("expected startup sync to still refresh local config once")
+	}
+}
+
 func TestSyncOnceDoesNotRepeatNoopReportWhenStateAlreadyMatches(t *testing.T) {
 	client := &fakeClient{}
 	stateStore := state.NewStore(filepath.Join(t.TempDir(), "state.json"))

internal/apps/agent/sync/sync_helpers.go

@@ -203,3 +203,18 @@ func updateSnapshotFromApplyOutcome(mode string, snapshot *state.Snapshot, confi
 	}
 	return result
 }
+
+func snapshotMatchesTarget(snapshot *state.Snapshot, version string, checksum string) bool {
+	if snapshot == nil {
+		return false
+	}
+	return strings.TrimSpace(snapshot.CurrentVersion) == strings.TrimSpace(version) &&
+		strings.TrimSpace(snapshot.CurrentChecksum) == strings.TrimSpace(checksum)
+}
+
+func shouldReportApplyLog(alreadySynced bool, result string) bool {
+	if result != ApplyResultSuccess {
+		return true
+	}
+	return !alreadySynced
+}