bump dependencies

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

vendor/github.com/prometheus/alertmanager/pkg/labels/matcher.go

@@ -18,7 +18,9 @@ import (
 	"encoding/json"
 	"fmt"
 	"regexp"
+	"strconv"
 	"strings"
+	"unicode"
 
 	"github.com/prometheus/common/model"
 )
@@ -74,6 +76,9 @@ func NewMatcher(t MatchType, n, v string) (*Matcher, error) {
 }
 
 func (m *Matcher) String() string {
+	if strings.ContainsFunc(m.Name, isReserved) {
+		return fmt.Sprintf(`%s%s%s`, strconv.Quote(m.Name), m.Type, strconv.Quote(m.Value))
+	}
 	return fmt.Sprintf(`%s%s"%s"`, m.Name, m.Type, openMetricsEscape(m.Value))
 }
 
@@ -199,3 +204,13 @@ func (ms Matchers) String() string {
 
 	return buf.String()
 }
+
+// This is copied from matchers/parse/lexer.go. It will be removed when
+// the transition window from classic matchers to UTF-8 matchers is complete,
+// as then we can use double quotes when printing the label name for all
+// matchers. Until then, the classic parser does not understand double quotes
+// around the label name, so we use this function as a heuristic to tell if
+// the matcher was parsed with the UTF-8 parser or the classic parser.
+func isReserved(r rune) bool {
+	return unicode.IsSpace(r) || strings.ContainsRune("{}!=~,\\\"'`", r)
+}

vendor/github.com/prometheus/alertmanager/pkg/labels/parse.go

@@ -14,11 +14,10 @@
 package labels
 
 import (
+	"fmt"
 	"regexp"
 	"strings"
 	"unicode/utf8"
-
-	"github.com/pkg/errors"
 )
 
 var (
@@ -118,7 +117,7 @@ func ParseMatchers(s string) ([]*Matcher, error) {
 func ParseMatcher(s string) (_ *Matcher, err error) {
 	ms := re.FindStringSubmatch(s)
 	if len(ms) == 0 {
-		return nil, errors.Errorf("bad matcher format: %s", s)
+		return nil, fmt.Errorf("bad matcher format: %s", s)
 	}
 
 	var (
@@ -134,7 +133,7 @@ func ParseMatcher(s string) (_ *Matcher, err error) {
 	}
 
 	if !utf8.ValidString(rawValue) {
-		return nil, errors.Errorf("matcher value not valid UTF-8: %s", ms[3])
+		return nil, fmt.Errorf("matcher value not valid UTF-8: %s", ms[3])
 	}
 
 	// Unescape the rawValue:
@@ -163,7 +162,7 @@ func ParseMatcher(s string) (_ *Matcher, err error) {
 			value.WriteByte('\\')
 		case '"':
 			if !expectTrailingQuote || i < len(rawValue)-1 {
-				return nil, errors.Errorf("matcher value contains unescaped double quote: %s", ms[3])
+				return nil, fmt.Errorf("matcher value contains unescaped double quote: %s", ms[3])
 			}
 			expectTrailingQuote = false
 		default:
@@ -172,7 +171,7 @@ func ParseMatcher(s string) (_ *Matcher, err error) {
 	}
 
 	if expectTrailingQuote {
-		return nil, errors.Errorf("matcher value contains unescaped double quote: %s", ms[3])
+		return nil, fmt.Errorf("matcher value contains unescaped double quote: %s", ms[3])
 	}
 
 	return NewMatcher(typeMap[ms[2]], ms[1], value.String())