chore:rule.Equals add ParamKey check;

chore:ParamKey add supplementary explanation
chore:adjust the order of extraction parameters, give priority to paramkey, and avoid the problem of paramIndex default value 0;update test unit

Author: cafra

core/hotspot/rule.go

@@ -82,7 +82,7 @@ type Rule struct {
 	ParamIndex int `json:"paramIndex"`
 	// ParamKey is the key in context attachments map.
 	// ParamKey can be used as a supplement to ParamIndex to facilitate rules to quickly obtain parameter from a large number of parameters
-	// Mutually exclusive with ParamIndex
+	// Mutually exclusive with ParamIndex,The extraction priority is higher than ParamIndex to avoid the problem of ParamIndex default value 0
 	ParamKey string `json:"paramKey"`
 	// Threshold is the threshold to trigger rejection
 	Threshold int64 `json:"threshold"`
@@ -120,7 +120,7 @@ func (r *Rule) IsStatReusable(newRule *Rule) bool {
 
 // Equals checks whether current rule is consistent with the given rule.
 func (r *Rule) Equals(newRule *Rule) bool {
-	baseCheck := r.Resource == newRule.Resource && r.MetricType == newRule.MetricType && r.ControlBehavior == newRule.ControlBehavior && r.ParamsMaxCapacity == newRule.ParamsMaxCapacity && r.ParamIndex == newRule.ParamIndex && r.Threshold == newRule.Threshold && r.DurationInSec == newRule.DurationInSec && reflect.DeepEqual(r.SpecificItems, newRule.SpecificItems)
+	baseCheck := r.Resource == newRule.Resource && r.MetricType == newRule.MetricType && r.ControlBehavior == newRule.ControlBehavior && r.ParamsMaxCapacity == newRule.ParamsMaxCapacity && r.ParamIndex == newRule.ParamIndex && r.ParamKey == newRule.ParamKey && r.Threshold == newRule.Threshold && r.DurationInSec == newRule.DurationInSec && reflect.DeepEqual(r.SpecificItems, newRule.SpecificItems)
 	if !baseCheck {
 		return false
 	}

core/hotspot/rule_test.go

@@ -62,6 +62,7 @@ func Test_Rule_Equals(t *testing.T) {
 			MetricType:        Concurrency,
 			ControlBehavior:   Reject,
 			ParamIndex:        0,
+			ParamKey:          "testKey",
 			Threshold:         110.0,
 			MaxQueueingTimeMs: 5,
 			BurstCount:        10,
@@ -79,6 +80,7 @@ func Test_Rule_Equals(t *testing.T) {
 			MetricType:        Concurrency,
 			ControlBehavior:   Reject,
 			ParamIndex:        0,
+			ParamKey:          "testKey",
 			Threshold:         110.0,
 			MaxQueueingTimeMs: 5,
 			BurstCount:        10,

core/hotspot/traffic_shaping.go

@@ -165,11 +165,11 @@ func (c *baseTrafficShapingController) ExtractArgs(ctx *base.EntryContext) (valu
 	if c == nil {
 		return nil
 	}
-	value = c.extractArgs(ctx)
+	value = c.extractAttachmentArgs(ctx)
 	if value != nil {
 		return
 	}
-	value = c.extractAttachmentArgs(ctx)
+	value = c.extractArgs(ctx)
 	if value != nil {
 		return
 	}

core/hotspot/traffic_shaping_test.go

@@ -345,20 +345,21 @@ func Test_baseTrafficShapingController_ExtractArgs(t *testing.T) {
 		// set data
 		args[0] = 1
 		args[1] = 2
-		attachments["test1"] = "v1"
+		value1 := "v1"
+		attachments["test1"] = value1
 
 		// set index or key
 		// exist
 		c.paramIndex = 0
 		c.paramKey = "test1"
 		ret = c.ExtractArgs(ctx)
-		assert.True(t, reflect.DeepEqual(ret, 1), ret)
+		assert.True(t, reflect.DeepEqual(ret, value1), ret)
 
 		// part exist 1
 		c.paramIndex = 10
 		c.paramKey = "test1"
 		ret = c.ExtractArgs(ctx)
-		assert.True(t, reflect.DeepEqual(ret, "v1"), ret)
+		assert.True(t, reflect.DeepEqual(ret, value1), ret)
 
 		// part exist 2
 		c.paramIndex = 1