Merge pull request #223 from uptrace/fix/tagparser-braces

fix(tagparser): improve parsing options with brackets
uptrace · Sep 27, 2021 · cf07e55 · cf07e55
2 parents ad165cb + 0daa61e
commit cf07e55
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/internal/tagparser/parser.go b/internal/tagparser/parser.go
@@ -93,6 +93,8 @@ func (p *parser) parseValue() string {
 			return p.parseQuotedValue()
 		case ',':
 			return p.s[start : p.i-1]
+		case '(':
+			p.skipPairs('(', ')')
 		}
 	}
 
@@ -125,6 +127,23 @@ func (p *parser) parseQuotedValue() string {
 	return ""
 }
 
+func (p *parser) skipPairs(start, end byte) {
+	var lvl int
+	for p.valid() {
+		switch c := p.read(); c {
+		case '"':
+			_ = p.parseQuotedValue()
+		case start:
+			lvl++
+		case end:
+			if lvl == 0 {
+				return
+			}
+			lvl--
+		}
+	}
+}
+
 func (p *parser) valid() bool {
 	return p.i < len(p.s)
 }

diff --git a/internal/tagparser/parser_test.go b/internal/tagparser/parser_test.go
@@ -30,6 +30,7 @@ var tagTests = []struct {
 	{`hello:"D'Angelo, esquire",foo:bar`, "", map[string]string{"hello": "D'Angelo, esquire", "foo": "bar"}},
 	{`hello:"world('foo', 'bar')"`, "", map[string]string{"hello": "world('foo', 'bar')"}},
 	{" hello,foo: bar ", " hello", map[string]string{"foo": " bar "}},
+	{"type:geometry(POINT, 4326)", "", map[string]string{"type": "geometry(POINT, 4326)"}},
 }
 
 func TestTagParser(t *testing.T) {