Fix counter initialization errors and mesh change detection logic

Author: WyRainBow

pkg/console/counter/component.go

@@ -22,6 +22,7 @@ import (
 	"math"
 
 	"github.com/apache/dubbo-admin/pkg/core/events"
+	"github.com/apache/dubbo-admin/pkg/core/logger"
 	meshresource "github.com/apache/dubbo-admin/pkg/core/resource/apis/mesh/v1alpha1"
 	resmodel "github.com/apache/dubbo-admin/pkg/core/resource/model"
 	"github.com/apache/dubbo-admin/pkg/core/runtime"
@@ -76,7 +77,9 @@ func (c *managerComponent) Start(rt runtime.Runtime, _ <-chan struct{}) error {
 		return fmt.Errorf("component %s does not implement store.Router", runtime.ResourceStore)
 	}
 
-	c.initializeCountsFromStore(storeRouter)
+	if err := c.initializeCountsFromStore(storeRouter); err != nil {
+		logger.Warnf("Failed to initialize counter manager from store: %v", err)
+	}
 
 	component, err := rt.GetComponent(runtime.EventBus)
 	if err != nil {
@@ -112,9 +115,7 @@ func (c *managerComponent) initializeResourceCount(storeRouter store.Router, kin
 	}
 
 	allResources := resourceStore.List()
-
-	meshCounts := make(map[string]int64)
-	meshDistributions := make(map[string]map[string]int64)
+	cm := c.manager.(*counterManager)
 
 	for _, obj := range allResources {
 		resource, ok := obj.(resmodel.Resource)
@@ -127,66 +128,29 @@ func (c *managerComponent) initializeResourceCount(storeRouter store.Router, kin
 			mesh = "default"
 		}
 
-		meshCounts[mesh]++
+		if counter, exists := cm.simpleCounters[kind]; exists {
+			counter.Increment(mesh)
+		}
 
 		if kind == meshresource.InstanceKind {
 			instance, ok := resource.(*meshresource.InstanceResource)
 			if ok && instance.Spec != nil {
 				protocol := instance.Spec.GetProtocol()
 				if protocol != "" {
-					if meshDistributions[mesh] == nil {
-						meshDistributions[mesh] = make(map[string]int64)
+					if cfg := cm.getDistributionConfig(kind, ProtocolCounter); cfg != nil {
+						cfg.counter.Increment(mesh, protocol)
 					}
-					meshDistributions[mesh]["protocol:"+protocol]++
 				}
 
 				releaseVersion := instance.Spec.GetReleaseVersion()
 				if releaseVersion != "" {
-					if meshDistributions[mesh] == nil {
-						meshDistributions[mesh] = make(map[string]int64)
+					if cfg := cm.getDistributionConfig(kind, ReleaseCounter); cfg != nil {
+						cfg.counter.Increment(mesh, releaseVersion)
 					}
-					meshDistributions[mesh]["release:"+releaseVersion]++
 				}
 
-				if meshDistributions[mesh] == nil {
-					meshDistributions[mesh] = make(map[string]int64)
-				}
-				meshDistributions[mesh]["discovery:"+mesh]++
-			}
-		}
-	}
-
-	cm := c.manager.(*counterManager)
-
-	if counter, exists := cm.simpleCounters[kind]; exists {
-		for mesh, count := range meshCounts {
-			for i := int64(0); i < count; i++ {
-				counter.Increment(mesh)
-			}
-		}
-	}
-
-	if kind == meshresource.InstanceKind {
-		for mesh, distributions := range meshDistributions {
-			for key, count := range distributions {
-				if len(key) > 9 && key[:9] == "protocol:" {
-					if cfg := cm.getDistributionConfig(kind, ProtocolCounter); cfg != nil {
-						for i := int64(0); i < count; i++ {
-							cfg.counter.Increment(mesh, key[9:])
-						}
-					}
-				} else if len(key) > 8 && key[:8] == "release:" {
-					if cfg := cm.getDistributionConfig(kind, ReleaseCounter); cfg != nil {
-						for i := int64(0); i < count; i++ {
-							cfg.counter.Increment(mesh, key[8:])
-						}
-					}
-				} else if len(key) > 11 && key[:11] == "discovery:" {
-					if cfg := cm.getDistributionConfig(kind, DiscoveryCounter); cfg != nil {
-						for i := int64(0); i < count; i++ {
-							cfg.counter.Increment(mesh, key[11:])
-						}
-					}
+				if cfg := cm.getDistributionConfig(kind, DiscoveryCounter); cfg != nil {
+					cfg.counter.Increment(mesh, mesh)
 				}
 			}
 		}
@@ -198,3 +162,4 @@ func (c *managerComponent) initializeResourceCount(storeRouter store.Router, kin
 func (c *managerComponent) CounterManager() CounterManager {
 	return c.manager
 }
+

pkg/console/counter/manager.go

@@ -285,11 +285,11 @@ func (cfg *distributionCounterConfig) extractFrom(res resmodel.Resource) string
 func (cfg *distributionCounterConfig) update(oldObj, newObj resmodel.Resource) {
 	oldKey := normalizeDistributionKey(cfg.extractFrom(oldObj))
 	newKey := normalizeDistributionKey(cfg.extractFrom(newObj))
-	if oldKey == newKey {
-		return
-	}
 	oldMesh := extractMeshName(oldObj)
 	newMesh := extractMeshName(newObj)
+	if oldKey == newKey && oldMesh == newMesh {
+		return
+	}
 	if oldObj != nil {
 		cfg.counter.Decrement(oldMesh, oldKey)
 	}