make validationRegex public

Author: mchrome

helper/tags/graphite.go

@@ -190,14 +190,14 @@ type TemplateDesc struct {
 }
 
 type TagConfig struct {
-	Enabled         bool              `toml:"enabled"`
-	Separator       string            `toml:"separator"`
-	validationRegex string            `toml:"validation-regex"`
-	ValidationRegex *regexp.Regexp    `toml:"-"`
-	Tags            []string          `toml:"tags"`
-	TagMap          map[string]string `toml:"-"`
-	Templates       []string          `toml:"templates"`
-	TemplateDescs   []TemplateDesc    `toml:"-"`
+	Enabled                 bool              `toml:"enabled"`
+	Separator               string            `toml:"separator"`
+	ValidationRegex         string            `toml:"validation-regex"`
+	ValidationRegexCompiled *regexp.Regexp    `toml:"-"`
+	Tags                    []string          `toml:"tags"`
+	TagMap                  map[string]string `toml:"-"`
+	Templates               []string          `toml:"templates"`
+	TemplateDescs           []TemplateDesc    `toml:"-"`
 }
 
 func DisabledTagConfig() TagConfig {
@@ -227,7 +227,7 @@ func (cfg *TagConfig) Configure() error {
 	makeTagMap(cfg.TagMap, cfg.Tags)
 
 	var err error
-	cfg.ValidationRegex, err = regexp.Compile(cfg.validationRegex)
+	cfg.ValidationRegexCompiled, err = regexp.Compile(cfg.ValidationRegex)
 	if err != nil {
 		return err
 	}

receiver/plain.go

@@ -75,7 +75,7 @@ func (base *Base) PlainParseLine(p []byte, now uint32, buf *tags.GraphiteBuf) ([
 		value float64
 	)
 
-	if base.Tags.ValidationRegex != nil && base.Tags.ValidationRegex.Match(p[:i1]) {
+	if base.Tags.ValidationRegexCompiled != nil && base.Tags.ValidationRegexCompiled.Match(p[:i1]) {
 		return nil, 0, 0, errors.New("message contains invalid characters: '" + unsafeString(p) + "'")
 	}
 

receiver/plain_test.go

@@ -309,7 +309,7 @@ func TestPlainParseLine(t *testing.T) {
 		{"app:service:metric;env=prod:primary 42.15 1422642189\n", "app:service:metric?env=prod%3Aprimary", 42.15, 1422642189},
 	}
 
-	baseWithValidation := &Base{Tags: tags.TagConfig{ValidationRegex: regexp.MustCompile(`[^a-zA-Z0-9.;\-_:=]{1}`)}}
+	baseWithValidation := &Base{Tags: tags.TagConfig{ValidationRegexCompiled: regexp.MustCompile(`[^a-zA-Z0-9.;\-_:=]{1}`)}}
 	for _, p := range tableWithValidation {
 		name, value, timestamp, err := baseWithValidation.PlainParseLine([]byte(p.b), now, &tagBuf)
 		if p.name == "" {