alibaba
diff --git a/‎api/api_test.go
Copy file name to clipboard
+24-8Lines changed: 24 additions & 8 deletions b/‎api/api_test.go
Copy file name to clipboard
+24-8Lines changed: 24 additions & 8 deletions
diff --git a/‎api/slot_chain.go
Copy file name to clipboard
+13-13Lines changed: 13 additions & 13 deletions b/‎api/slot_chain.go
Copy file name to clipboard
+13-13Lines changed: 13 additions & 13 deletions
diff --git a/‎core/base/slot_chain.go
Copy file name to clipboard
+34-29Lines changed: 34 additions & 29 deletions b/‎core/base/slot_chain.go
Copy file name to clipboard
+34-29Lines changed: 34 additions & 29 deletions
@@ -16,6 +16,10 @@ func (m *prepareSlotMock) Name() string {
 	return "mock-sentinel-prepare-slot"
 }
 
+func (m *prepareSlotMock) Order() uint32 {
+	return 0
+}
+
 func (m *prepareSlotMock) Prepare(ctx *base.EntryContext) {
 	m.Called(ctx)
 	return
@@ -29,6 +33,10 @@ func (m *mockRuleCheckSlot1) Name() string {
 	return "mock-sentinel-rule-check-slot1"
 }
 
+func (m *mockRuleCheckSlot1) Order() uint32 {
+	return 0
+}
+
 func (m *mockRuleCheckSlot1) Check(ctx *base.EntryContext) *base.TokenResult {
 	arg := m.Called(ctx)
 	return arg.Get(0).(*base.TokenResult)
@@ -42,6 +50,10 @@ func (m *mockRuleCheckSlot2) Name() string {
 	return "mock-sentinel-rule-check-slot2"
 }
 
+func (m *mockRuleCheckSlot2) Order() uint32 {
+	return 0
+}
+
 func (m *mockRuleCheckSlot2) Check(ctx *base.EntryContext) *base.TokenResult {
 	arg := m.Called(ctx)
 	return arg.Get(0).(*base.TokenResult)
@@ -55,6 +67,10 @@ func (m *statisticSlotMock) Name() string {
 	return "mock-sentinel-stat-check-slot"
 }
 
+func (m *statisticSlotMock) Order() uint32 {
+	return 0
+}
+
 func (m *statisticSlotMock) OnEntryPassed(ctx *base.EntryContext) {
 	m.Called(ctx)
 	return
@@ -74,10 +90,10 @@ func Test_entryWithArgsAndChainPass(t *testing.T) {
 	rcs1 := &mockRuleCheckSlot1{}
 	rcs2 := &mockRuleCheckSlot2{}
 	ssm := &statisticSlotMock{}
-	sc.AddStatPrepareSlotFirst(ps1)
-	sc.AddRuleCheckSlotFirst(rcs1)
-	sc.AddRuleCheckSlotFirst(rcs2)
-	sc.AddStatSlotFirst(ssm)
+	sc.AddStatPrepareSlot(ps1)
+	sc.AddRuleCheckSlot(rcs1)
+	sc.AddRuleCheckSlot(rcs2)
+	sc.AddStatSlot(ssm)
 
 	ps1.On("Prepare", mock.Anything).Return()
 	rcs1.On("Check", mock.Anything).Return(base.NewTokenResultPass())
@@ -111,10 +127,10 @@ func Test_entryWithArgsAndChainBlock(t *testing.T) {
 	rcs1 := &mockRuleCheckSlot1{}
 	rcs2 := &mockRuleCheckSlot2{}
 	ssm := &statisticSlotMock{}
-	sc.AddStatPrepareSlotFirst(ps1)
-	sc.AddRuleCheckSlotLast(rcs1)
-	sc.AddRuleCheckSlotLast(rcs2)
-	sc.AddStatSlotFirst(ssm)
+	sc.AddStatPrepareSlot(ps1)
+	sc.AddRuleCheckSlot(rcs1)
+	sc.AddRuleCheckSlot(rcs2)
+	sc.AddStatSlot(ssm)
 
 	blockType := base.BlockTypeFlow
 
 
@@ -20,19 +20,19 @@ func GlobalSlotChain() *base.SlotChain {
 
 func BuildDefaultSlotChain() *base.SlotChain {
 	sc := base.NewSlotChain()
-	sc.AddStatPrepareSlotLast(stat.DefaultResourceNodePrepareSlot)
-
-	sc.AddRuleCheckSlotLast(system.DefaultAdaptiveSlot)
-	sc.AddRuleCheckSlotLast(flow.DefaultSlot)
-	sc.AddRuleCheckSlotLast(isolation.DefaultSlot)
-	sc.AddRuleCheckSlotLast(circuitbreaker.DefaultSlot)
-	sc.AddRuleCheckSlotLast(hotspot.DefaultSlot)
-
-	sc.AddStatSlotLast(stat.DefaultSlot)
-	sc.AddStatSlotLast(log.DefaultSlot)
-	sc.AddStatSlotLast(circuitbreaker.DefaultMetricStatSlot)
-	sc.AddStatSlotLast(hotspot.DefaultConcurrencyStatSlot)
-	sc.AddStatSlotLast(flow.DefaultStandaloneStatSlot)
+	sc.AddStatPrepareSlot(stat.DefaultResourceNodePrepareSlot)
+
+	sc.AddRuleCheckSlot(system.DefaultAdaptiveSlot)
+	sc.AddRuleCheckSlot(flow.DefaultSlot)
+	sc.AddRuleCheckSlot(isolation.DefaultSlot)
+	sc.AddRuleCheckSlot(hotspot.DefaultSlot)
+	sc.AddRuleCheckSlot(circuitbreaker.DefaultSlot)
+
+	sc.AddStatSlot(stat.DefaultSlot)
+	sc.AddStatSlot(log.DefaultSlot)
+	sc.AddStatSlot(flow.DefaultStandaloneStatSlot)
+	sc.AddStatSlot(hotspot.DefaultConcurrencyStatSlot)
+	sc.AddStatSlot(circuitbreaker.DefaultMetricStatSlot)
 	return sc
 }
 
 
@@ -1,22 +1,28 @@
 package base
 
 import (
+	"sort"
 	"sync"
 
 	"github.com/alibaba/sentinel-golang/logging"
 	"github.com/alibaba/sentinel-golang/util"
 	"github.com/pkg/errors"
 )
 
-type NamedSlot interface {
-	// Name returns its slot name which should not be the same as other slots.
+type BaseSlot interface {
+	// Name returns it's slot name which should be global unique.
 	Name() string
+
+	// Order returns the sort value of the slot.
+	// SlotChain will sort all it's slots by ascending sort value in each bucket
+	// (StatPrepareSlot bucket、RuleCheckSlot bucket and StatSlot bucket)
+	Order() uint32
 }
 
 // StatPrepareSlot is responsible for some preparation before statistic
 // For example: init structure and so on
 type StatPrepareSlot interface {
-	NamedSlot
+	BaseSlot
 	// Prepare function do some initialization
 	// Such as: init statistic structure、node and etc
 	// The result of preparing would store in EntryContext
@@ -28,7 +34,7 @@ type StatPrepareSlot interface {
 // RuleCheckSlot is rule based checking strategy
 // All checking rule must implement this interface.
 type RuleCheckSlot interface {
-	NamedSlot
+	BaseSlot
 	// Check function do some validation
 	// It can break off the slot pipeline
 	// Each TokenResult will return check result
@@ -39,7 +45,7 @@ type RuleCheckSlot interface {
 // StatSlot is responsible for counting all custom biz metrics.
 // StatSlot would not handle any panic, and pass up all panic to slot chain
 type StatSlot interface {
-	NamedSlot
+	BaseSlot
 	// OnEntryPass function will be invoked when StatPrepareSlots and RuleCheckSlots execute pass
 	// StatSlots will do some statistic logic, such as QPS、log、etc
 	OnEntryPassed(ctx *EntryContext)
@@ -57,9 +63,12 @@ type StatSlot interface {
 // SlotChain hold all system slots and customized slot.
 // SlotChain support plug-in slots developed by developer.
 type SlotChain struct {
-	statPres   []StatPrepareSlot
+	// statPres is in ascending order by StatPrepareSlot.Order() value.
+	statPres []StatPrepareSlot
+	// ruleChecks is in ascending order by RuleCheckSlot.Order() value.
 	ruleChecks []RuleCheckSlot
-	stats      []StatSlot
+	// stats is in ascending order by StatSlot.Order() value.
+	stats []StatSlot
 	// EntryContext Pool, used for reuse EntryContext object
 	ctxPool *sync.Pool
 }
@@ -125,15 +134,13 @@ func (sc *SlotChain) RangeStatPrepareSlot(f func(slot StatPrepareSlot)) {
 	}
 }
 
-func (sc *SlotChain) AddStatPrepareSlotFirst(s StatPrepareSlot) {
-	ns := make([]StatPrepareSlot, 0, len(sc.statPres)+1)
-	// add to first
-	ns = append(ns, s)
-	sc.statPres = append(ns, sc.statPres...)
-}
-
-func (sc *SlotChain) AddStatPrepareSlotLast(s StatPrepareSlot) {
+// AddStatPrepareSlot adds the StatPrepareSlot slot to the StatPrepareSlot list of the SlotChain.
+// All StatPrepareSlot in the list will be sorted according to StatPrepareSlot.Order() in ascending order.
+func (sc *SlotChain) AddStatPrepareSlot(s StatPrepareSlot) {
 	sc.statPres = append(sc.statPres, s)
+	sort.SliceStable(sc.statPres, func(i, j int) bool {
+		return sc.statPres[i].Order() < sc.statPres[j].Order()
+	})
 }
 
 // ValidateRuleCheckSlotNaming checks whether the name of RuleCheckSlot exists in SlotChain.[]RuleCheckSlot
@@ -157,14 +164,13 @@ func (sc *SlotChain) RangeRuleCheckSlot(f func(slot RuleCheckSlot)) {
 	}
 }
 
-func (sc *SlotChain) AddRuleCheckSlotFirst(s RuleCheckSlot) {
-	ns := make([]RuleCheckSlot, 0, len(sc.ruleChecks)+1)
-	ns = append(ns, s)
-	sc.ruleChecks = append(ns, sc.ruleChecks...)
-}
-
-func (sc *SlotChain) AddRuleCheckSlotLast(s RuleCheckSlot) {
+// AddRuleCheckSlot adds the RuleCheckSlot to the RuleCheckSlot list of the SlotChain.
+// All RuleCheckSlot in the list will be sorted according to RuleCheckSlot.Order() in ascending order.
+func (sc *SlotChain) AddRuleCheckSlot(s RuleCheckSlot) {
 	sc.ruleChecks = append(sc.ruleChecks, s)
+	sort.SliceStable(sc.ruleChecks, func(i, j int) bool {
+		return sc.ruleChecks[i].Order() < sc.ruleChecks[j].Order()
+	})
 }
 
 // ValidateStatSlotNaming checks whether the name of StatSlot exists in SlotChain.[]StatSlot
@@ -188,14 +194,13 @@ func (sc *SlotChain) RangeStatSlot(f func(slot StatSlot)) {
 	}
 }
 
-func (sc *SlotChain) AddStatSlotFirst(s StatSlot) {
-	ns := make([]StatSlot, 0, len(sc.stats)+1)
-	ns = append(ns, s)
-	sc.stats = append(ns, sc.stats...)
-}
-
-func (sc *SlotChain) AddStatSlotLast(s StatSlot) {
+// AddStatSlot adds the StatSlot to the StatSlot list of the SlotChain.
+// All StatSlot in the list will be sorted according to StatSlot.Order() in ascending order.
+func (sc *SlotChain) AddStatSlot(s StatSlot) {
 	sc.stats = append(sc.stats, s)
+	sort.SliceStable(sc.stats, func(i, j int) bool {
+		return sc.stats[i].Order() < sc.stats[j].Order()
+	})
 }
 
 // The entrance of slot chain