From b65021d7a590810164d99afd99a13915e6ea38ec Mon Sep 17 00:00:00 2001 From: Arianna Vespri Date: Sun, 17 Dec 2023 14:09:14 +0100 Subject: [PATCH] Get conditional right Signed-off-by: Arianna Vespri --- model/textparse/protobufparse.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/model/textparse/protobufparse.go b/model/textparse/protobufparse.go index 21329e2a0..685ad08f1 100644 --- a/model/textparse/protobufparse.go +++ b/model/textparse/protobufparse.go @@ -421,8 +421,13 @@ func (p *ProtobufParser) Next() (Entry, error) { } unit := p.mf.GetUnit() fmt.Println("This is the unit:", unit) + fmt.Println("This is the name:", name) if len(unit) > 0 { - if !strings.HasSuffix(name, fmt.Sprintf("_%s_total", unit)) || !strings.HasSuffix(name, fmt.Sprintf("_%s", unit)) || len(name) < len(unit)+1 { + sfx := fmt.Sprintf("_%s", unit) + if p.mf.GetType() == dto.MetricType_COUNTER { + sfx = fmt.Sprintf("_%s_total", unit) + } + if !strings.HasSuffix(name, sfx) { return EntryInvalid, fmt.Errorf("invalid unit for metric %q: %s", name, unit) } } @@ -443,8 +448,6 @@ func (p *ProtobufParser) Next() (Entry, error) { if err := p.updateMetricBytes(); err != nil { return EntryInvalid, err } - // case EntryUnit: - // p.state = EntryType // what is the right state and place for this? case EntryHistogram, EntrySeries: if p.redoClassic { p.redoClassic = false