uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Update stat metric *sum/*average/*distinct to use path

Browse Source
This commit is contained in:
TeoV
2020-02-20 18:37:14 +02:00
committed by Dan Christian Bogos
parent 35130763bc
commit 13b8c3d851
3 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/tariffplans/oldtutorial/Stats.csv
View File

@@ -1,4 +1,4 @@
#Tenant[0],Id[1],FilterIDs[2],ActivationInterval[3],QueueLength[4],TTL[5],MinItems[6],Metrics[7],MetricFilterIDs[8],Stored[9],Blocker[10],Weight[11],ThresholdIDs[12]
cgrates.org,Stats1,FLTR_STS1,2014-07-29T15:00:00Z,100,1s,2,*asr;*acc;*tcc;*acd;*tcd,,true,false,20,*none
cgrates.org,Stats1,,,,,,*sum:~Usage;*average:~Usage,,,,,
cgrates.org,Stats1,,,,,,*sum:~*req.Usage;*average:~*req.Usage,,,,,
cgrates.org,Stats1,,,,,,*pdd,*exists:~*req.PDD:,,,,
1 #Tenant[0] Id[1] FilterIDs[2] ActivationInterval[3] QueueLength[4] TTL[5] MinItems[6] Metrics[7] MetricFilterIDs[8] Stored[9] Blocker[10] Weight[11] ThresholdIDs[12]
2 cgrates.org Stats1 FLTR_STS1 2014-07-29T15:00:00Z 100 1s 2 *asr;*acc;*tcc;*acd;*tcd true false 20 *none
3 cgrates.org Stats1 *sum:~Usage;*average:~Usage *sum:~*req.Usage;*average:~*req.Usage
4 cgrates.org Stats1 *pdd *exists:~*req.PDD:

21
engine/statmetrics.go
View File

@@ -1037,16 +1037,17 @@ func (sum *StatSum) GetFloat64Value() (v float64) {
func (sum *StatSum) AddEvent(ev *utils.CGREvent) (err error) {
var val float64
if strings.HasPrefix(sum.FieldName, utils.DynamicDataPrefix) {
switch {
case strings.HasPrefix(sum.FieldName, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep): // ~*req.
//Remove the dynamic prefix and check in event for field
field := sum.FieldName[1:]
field := sum.FieldName[6:]
if val, err = ev.FieldAsFloat64(field); err != nil {
if err == utils.ErrNotFound {
err = utils.ErrPrefix(err, field)
}
return
}
} else { // in case we don't receive FieldName we consider that we receive a number
default:
val, err = utils.IfaceAsFloat64(sum.FieldName)
if err != nil {
return
@@ -1174,16 +1175,17 @@ func (avg *StatAverage) GetFloat64Value() (v float64) {
func (avg *StatAverage) AddEvent(ev *utils.CGREvent) (err error) {
var val float64
if strings.HasPrefix(avg.FieldName, utils.DynamicDataPrefix) {
switch {
case strings.HasPrefix(avg.FieldName, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep): // ~*req.
//Remove the dynamic prefix and check in event for field
field := avg.FieldName[1:]
field := avg.FieldName[6:]
if val, err = ev.FieldAsFloat64(field); err != nil {
if err == utils.ErrNotFound {
err = utils.ErrPrefix(err, field)
}
return
}
} else { // in case we don't receive FieldName we consider that we receive a number
default:
val, err = utils.IfaceAsFloat64(avg.FieldName)
if err != nil {
return
@@ -1303,8 +1305,11 @@ func (dst *StatDistinct) GetFloat64Value() (v float64) {
func (dst *StatDistinct) AddEvent(ev *utils.CGREvent) (err error) {
var fieldValue string
// simply remove the Dynamic prefix and do normal process
field := dst.FieldName[1:]
// simply remove the ~*req. prefix and do normal process
if !strings.HasPrefix(dst.FieldName, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep) {
return fmt.Errorf("Invalid format for field <%s>", dst.FieldName)
}
field := dst.FieldName[6:]
if fieldValue, err = ev.FieldAsString(field); err != nil {
return err
}

61
engine/statmetrics_test.go
View File

@@ -2077,7 +2077,7 @@ func TestDDCGetCompressFactor(t *testing.T) {
}
func TestStatSumGetFloat64Value(t *testing.T) {
statSum, _ := NewStatSum(2, "~Cost", []string{})
statSum, _ := NewStatSum(2, "~*req.Cost", []string{})
ev := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1",
Event: map[string]interface{}{
"Cost": "20",
@@ -2140,7 +2140,7 @@ func TestStatSumGetFloat64Value(t *testing.T) {
}
func TestStatSumGetStringValue(t *testing.T) {
statSum, _ := NewStatSum(2, "~Cost", []string{})
statSum, _ := NewStatSum(2, "~*req.Cost", []string{})
ev := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1",
Event: map[string]interface{}{
"Cost": "20",
@@ -2185,7 +2185,7 @@ func TestStatSumGetStringValue(t *testing.T) {
}
func TestStatSumGetStringValue2(t *testing.T) {
statSum, _ := NewStatSum(2, "~Cost", []string{})
statSum, _ := NewStatSum(2, "~*req.Cost", []string{})
ev1 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1",
Event: map[string]interface{}{"Cost": 12.3}}
if err := statSum.AddEvent(ev1); err != nil {
@@ -2209,7 +2209,7 @@ func TestStatSumGetStringValue2(t *testing.T) {
}
func TestStatSumGetStringValue3(t *testing.T) {
statSum := &StatSum{Events: make(map[string]*StatWithCompress), MinItems: 2, FilterIDs: []string{}, FieldName: "~Cost"}
statSum := &StatSum{Events: make(map[string]*StatWithCompress), MinItems: 2, FilterIDs: []string{}, FieldName: "~*req.Cost"}
expected := &StatSum{
Events: map[string]*StatWithCompress{
"EVENT_1": &StatWithCompress{Stat: 12.2, CompressFactor: 2},
@@ -2217,7 +2217,7 @@ func TestStatSumGetStringValue3(t *testing.T) {
},
MinItems: 2,
FilterIDs: []string{},
FieldName: "~Cost",
FieldName: "~*req.Cost",
Count: 3,
Sum: 42.7,
}
@@ -2255,7 +2255,7 @@ func TestStatSumGetStringValue3(t *testing.T) {
}
func TestStatSumCompress(t *testing.T) {
sum := &StatSum{Events: make(map[string]*StatWithCompress), FieldName: "~Cost",
sum := &StatSum{Events: make(map[string]*StatWithCompress), FieldName: "~*req.Cost",
MinItems: 2, FilterIDs: []string{}}
expected := &StatSum{
Events: map[string]*StatWithCompress{
@@ -2265,7 +2265,7 @@ func TestStatSumCompress(t *testing.T) {
MinItems: 2,
FilterIDs: []string{},
Sum: 24.4,
FieldName: "~Cost",
FieldName: "~*req.Cost",
Count: 2,
}
expected.GetStringValue("")
@@ -2293,7 +2293,7 @@ func TestStatSumCompress(t *testing.T) {
},
MinItems: 2,
FilterIDs: []string{},
FieldName: "~Cost",
FieldName: "~*req.Cost",
Sum: 24.4,
Count: 2,
}
@@ -2330,7 +2330,7 @@ func TestStatSumGetCompressFactor(t *testing.T) {
"EVENT_1": 1,
"EVENT_2": 1,
}
sum, _ := NewStatSum(2, "~Cost", []string{})
sum, _ := NewStatSum(2, "~*req.Cost", []string{})
ev := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1",
Event: map[string]interface{}{"Cost": 18.2}}
ev2 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_2",
@@ -2357,7 +2357,7 @@ func TestStatSumGetCompressFactor(t *testing.T) {
}
func TestStatAverageGetFloat64Value(t *testing.T) {
statAvg, _ := NewStatAverage(2, "~Cost", []string{})
statAvg, _ := NewStatAverage(2, "~*req.Cost", []string{})
ev := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1",
Event: map[string]interface{}{
"Cost": "20",
@@ -2418,7 +2418,7 @@ func TestStatAverageGetFloat64Value(t *testing.T) {
}
func TestStatAverageGetStringValue(t *testing.T) {
statAvg, _ := NewStatAverage(2, "~Cost", []string{})
statAvg, _ := NewStatAverage(2, "~*req.Cost", []string{})
ev := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1",
Event: map[string]interface{}{
"Cost": "20",
@@ -2463,7 +2463,7 @@ func TestStatAverageGetStringValue(t *testing.T) {
}
func TestStatAverageGetStringValue2(t *testing.T) {
statAvg, _ := NewStatAverage(2, "~Cost", []string{})
statAvg, _ := NewStatAverage(2, "~*req.Cost", []string{})
ev1 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1",
Event: map[string]interface{}{"Cost": 12.3}}
if err := statAvg.AddEvent(ev1); err != nil {
@@ -2487,7 +2487,8 @@ func TestStatAverageGetStringValue2(t *testing.T) {
}
func TestStatAverageGetStringValue3(t *testing.T) {
statAvg := &StatAverage{Events: make(map[string]*StatWithCompress), MinItems: 2, FilterIDs: []string{}, FieldName: "~Cost"}
statAvg := &StatAverage{Events: make(map[string]*StatWithCompress),
MinItems: 2, FilterIDs: []string{}, FieldName: "~*req.Cost"}
expected := &StatAverage{
Events: map[string]*StatWithCompress{
"EVENT_1": &StatWithCompress{Stat: 12.2, CompressFactor: 2},
@@ -2495,7 +2496,7 @@ func TestStatAverageGetStringValue3(t *testing.T) {
},
MinItems: 2,
FilterIDs: []string{},
FieldName: "~Cost",
FieldName: "~*req.Cost",
Count: 3,
Sum: 42.7,
}
@@ -2533,7 +2534,7 @@ func TestStatAverageGetStringValue3(t *testing.T) {
}
func TestStatAverageCompress(t *testing.T) {
avg := &StatAverage{Events: make(map[string]*StatWithCompress), FieldName: "~Cost",
avg := &StatAverage{Events: make(map[string]*StatWithCompress), FieldName: "~*req.Cost",
MinItems: 2, FilterIDs: []string{}}
expected := &StatAverage{
Events: map[string]*StatWithCompress{
@@ -2543,7 +2544,7 @@ func TestStatAverageCompress(t *testing.T) {
MinItems: 2,
FilterIDs: []string{},
Sum: 24.4,
FieldName: "~Cost",
FieldName: "~*req.Cost",
Count: 2,
}
expected.GetStringValue("")
@@ -2571,7 +2572,7 @@ func TestStatAverageCompress(t *testing.T) {
},
MinItems: 2,
FilterIDs: []string{},
FieldName: "~Cost",
FieldName: "~*req.Cost",
Sum: 24.4,
Count: 2,
}
@@ -2608,7 +2609,7 @@ func TestStatAverageGetCompressFactor(t *testing.T) {
"EVENT_1": 1,
"EVENT_2": 1,
}
avg, _ := NewStatAverage(2, "~Cost", []string{})
avg, _ := NewStatAverage(2, "~*req.Cost", []string{})
ev := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1",
Event: map[string]interface{}{"Cost": 18.2}}
ev2 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_2",
@@ -2635,7 +2636,7 @@ func TestStatAverageGetCompressFactor(t *testing.T) {
}
func TestStatDistinctGetFloat64Value(t *testing.T) {
statDistinct, _ := NewStatDistinct(2, "~Usage", []string{})
statDistinct, _ := NewStatDistinct(2, "~*req.Usage", []string{})
ev := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1",
Event: map[string]interface{}{"Usage": time.Duration(10 * time.Second)}}
statDistinct.AddEvent(ev)
@@ -2686,7 +2687,7 @@ func TestStatDistinctGetFloat64Value(t *testing.T) {
}
func TestStatDistinctGetStringValue(t *testing.T) {
statDistinct, _ := NewStatDistinct(2, "~Cost", []string{})
statDistinct, _ := NewStatDistinct(2, "~*req.Cost", []string{})
ev := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1",
Event: map[string]interface{}{"Cost": "20"}}
if strVal := statDistinct.GetStringValue(""); strVal != utils.NOT_AVAILABLE {
@@ -2721,7 +2722,7 @@ func TestStatDistinctGetStringValue(t *testing.T) {
}
func TestStatDistinctGetStringValue2(t *testing.T) {
statDistinct, _ := NewStatDistinct(2, "~Cost", []string{})
statDistinct, _ := NewStatDistinct(2, "~*req.Cost", []string{})
ev := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1",
Event: map[string]interface{}{"Cost": "20"}}
if strVal := statDistinct.GetStringValue(""); strVal != utils.NOT_AVAILABLE {
@@ -2750,7 +2751,7 @@ func TestStatDistinctCompress(t *testing.T) {
FieldValues: make(map[string]map[string]struct{}),
MinItems: 2,
FilterIDs: []string{},
FieldName: utils.DynamicDataPrefix + utils.Destination,
FieldName: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Destination,
}
expected := &StatDistinct{
Events: map[string]map[string]int64{
@@ -2771,7 +2772,7 @@ func TestStatDistinctCompress(t *testing.T) {
},
MinItems: 2,
FilterIDs: []string{},
FieldName: utils.DynamicDataPrefix + utils.Destination,
FieldName: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Destination,
Count: 3,
}
expected.GetStringValue("")
@@ -2811,7 +2812,7 @@ func TestStatDistinctGetCompressFactor(t *testing.T) {
"EVENT_1": 1,
"EVENT_2": 1,
}
ddc, _ := NewStatDistinct(2, utils.DynamicDataPrefix+utils.Destination, []string{})
ddc, _ := NewStatDistinct(2, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+utils.Destination, []string{})
ev := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1",
Event: map[string]interface{}{utils.Destination: "1002"}}
@@ -2983,7 +2984,7 @@ func TestDCCMarshal(t *testing.T) {
}
func TestStatSumMarshal(t *testing.T) {
statSum, _ := NewStatSum(2, "~Cost", []string{})
statSum, _ := NewStatSum(2, "~*req.Cost", []string{})
ev := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1",
Event: map[string]interface{}{
"Cost": "20",
@@ -2993,7 +2994,7 @@ func TestStatSumMarshal(t *testing.T) {
utils.Destination: "1002"}}
statSum.AddEvent(ev)
var nstatSum StatSum
expected := []byte(`{"FilterIDs":[],"Sum":20,"Count":1,"Events":{"EVENT_1":{"Stat":20,"CompressFactor":1}},"MinItems":2,"FieldName":"~Cost"}`)
expected := []byte(`{"FilterIDs":[],"Sum":20,"Count":1,"Events":{"EVENT_1":{"Stat":20,"CompressFactor":1}},"MinItems":2,"FieldName":"~*req.Cost"}`)
if b, err := statSum.Marshal(&jMarshaler); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(expected, b) {
@@ -3006,7 +3007,7 @@ func TestStatSumMarshal(t *testing.T) {
}
func TestStatAverageMarshal(t *testing.T) {
statAvg, _ := NewStatAverage(2, "~Cost", []string{})
statAvg, _ := NewStatAverage(2, "~*req.Cost", []string{})
ev := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1",
Event: map[string]interface{}{
"Cost": "20",
@@ -3016,7 +3017,7 @@ func TestStatAverageMarshal(t *testing.T) {
utils.Destination: "1002"}}
statAvg.AddEvent(ev)
var nstatAvg StatAverage
expected := []byte(`{"FilterIDs":[],"Sum":20,"Count":1,"Events":{"EVENT_1":{"Stat":20,"CompressFactor":1}},"MinItems":2,"FieldName":"~Cost"}`)
expected := []byte(`{"FilterIDs":[],"Sum":20,"Count":1,"Events":{"EVENT_1":{"Stat":20,"CompressFactor":1}},"MinItems":2,"FieldName":"~*req.Cost"}`)
if b, err := statAvg.Marshal(&jMarshaler); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(expected, b) {
@@ -3029,7 +3030,7 @@ func TestStatAverageMarshal(t *testing.T) {
}
func TestStatDistrictMarshal(t *testing.T) {
statDistinct, _ := NewStatDistinct(2, "~Usage", []string{})
statDistinct, _ := NewStatDistinct(2, "~*req.Usage", []string{})
ev := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1",
Event: map[string]interface{}{
"Cost": "20",
@@ -3039,7 +3040,7 @@ func TestStatDistrictMarshal(t *testing.T) {
utils.Destination: "1002"}}
statDistinct.AddEvent(ev)
var nStatDistinct StatDistinct
expected := []byte(`{"FilterIDs":[],"FieldValues":{"10s":{"EVENT_1":{}}},"Events":{"EVENT_1":{"10s":1}},"MinItems":2,"FieldName":"~Usage","Count":1}`)
expected := []byte(`{"FilterIDs":[],"FieldValues":{"10s":{"EVENT_1":{}}},"Events":{"EVENT_1":{"10s":1}},"MinItems":2,"FieldName":"~*req.Usage","Count":1}`)
if b, err := statDistinct.Marshal(&jMarshaler); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(expected, b) {