Skip to content

Commit 9d1c011

Browse files
committed
refactor: builtin tpl
1 parent 7ea31b5 commit 9d1c011

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

center/integration/init.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ func (b *BuiltinPayloadInFileType) BuiltinMetricGets(metricsInDB []*models.Built
448448
if filteredMetrics[i].Typ != filteredMetrics[j].Typ {
449449
return filteredMetrics[i].Typ < filteredMetrics[j].Typ
450450
}
451-
return filteredMetrics[i].Name < filteredMetrics[j].Name
451+
return filteredMetrics[i].Expression < filteredMetrics[j].Expression
452452
})
453453

454454
totalCount := len(filteredMetrics)

models/builtin_metrics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (bm *BuiltinMetric) Verify() error {
6262

6363
func BuiltinMetricExists(ctx *ctx.Context, bm *BuiltinMetric) (bool, error) {
6464
var count int64
65-
err := DB(ctx).Model(bm).Where("lang = ? and collector = ? and typ = ? and name = ?", bm.Lang, bm.Collector, bm.Typ, bm.Name).Count(&count).Error
65+
err := DB(ctx).Model(bm).Where("expression = ? and collector = ? and typ = ?", bm.Expression, bm.Collector, bm.Typ).Count(&count).Error
6666
if err != nil {
6767
return false, err
6868
}

0 commit comments

Comments
 (0)