Moving metric naming to it's own package

This commit is contained in:
John Delivuk 2019-02-10 15:58:55 -05:00
parent c2e176bb23
commit 6030912cc0
No known key found for this signature in database
GPG key ID: 8597474A0655625E
12 changed files with 93 additions and 227 deletions

View file

@ -92,11 +92,11 @@ func (n *queryBuilder) processQueryParts(queryParts []queryPart) ([]string, map[
// We obviously can't generate label filters for these cases.
fmt.Println("This is queryPart", qPart.labelName, qPart.operator, qPart.values)
if qPart.labelName == "" {
return nil, nil, NewLabelNotSpecifiedError()
return nil, nil, ErrorNewLabelNotSpecified
}
if !n.operatorIsSupported(qPart.operator) {
return nil, nil, NewOperatorNotSupportedByPrometheusError()
return nil, nil, ErrorNewOperatorNotSupportedByPrometheus
}
matcher, err := n.selectMatcher(qPart.operator, qPart.values)
@ -128,7 +128,7 @@ func (n *queryBuilder) selectMatcher(operator selection.Operator, values []strin
case selection.DoesNotExist:
return prom.LabelEq, nil
case selection.Equals, selection.DoubleEquals, selection.NotEquals, selection.In, selection.NotIn:
return nil, NewOperatorRequiresValuesError()
return nil, ErrorNewOperatorRequiresValues
}
} else if numValues == 1 {
switch operator {
@ -168,7 +168,7 @@ func (n *queryBuilder) selectTargetValue(operator selection.Operator, values []s
// whose value is NOT "".
return "", nil
case selection.Equals, selection.DoubleEquals, selection.NotEquals, selection.In, selection.NotIn:
return "", NewOperatorRequiresValuesError()
return "", ErrorNewOperatorRequiresValues
}
} else if numValues == 1 {
switch operator {
@ -194,7 +194,7 @@ func (n *queryBuilder) selectTargetValue(operator selection.Operator, values []s
// for their label selector.
return strings.Join(values, "|"), nil
case selection.Exists, selection.DoesNotExist:
return "", NewOperatorDoesNotSupportValuesError()
return "", ErrorNewOperatorDoesNotSupportValues
}
}