Merge pull request #8 from wavefrontHQ/sliu/fix-prefix-issue

fix prefix issue
wavefrontHQ · Jul 26, 2018 · 539b183 · 539b183
2 parents 75f94d7 + 7e28f73
commit 539b183
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/direct.go b/direct.go
@@ -19,7 +19,7 @@ func writeSingleMetricToDirect(c *WavefrontConfig, name string, metric interface
 	var points []string
 	key := EncodeKey(name, tags)
 
-	if c.Prefix != "" {
+	if !strings.HasSuffix(c.Prefix, ".") {
 		c.Prefix = strings.Join([]string{c.Prefix, "."}, "")
 	}
 	points = appendMetric(metric, key, c, points)
@@ -30,7 +30,7 @@ func writeRegistryAndFlushToDirect(c *WavefrontConfig) error {
 	var points []string
 	var retErr error // the last encountered error
 
-	if c.Prefix != "" {
+	if !strings.HasSuffix(c.Prefix, ".") {
 		c.Prefix = strings.Join([]string{c.Prefix, "."}, "")
 	}
 	c.Registry.Each(func(key string, metric interface{}) {

diff --git a/proxy.go b/proxy.go
@@ -18,7 +18,7 @@ func writeRegistryAndFlushToProxy(c *WavefrontConfig) error {
 	}
 	defer conn.Close()
 	w := bufio.NewWriter(conn)
-	if c.Prefix != "" {
+	if !strings.HasSuffix(c.Prefix, ".") {
 		c.Prefix = strings.Join([]string{c.Prefix, "."}, "")
 	}
 	c.Registry.Each(func(key string, metric interface{}) {
@@ -38,7 +38,7 @@ func writeSingleMetricToProxy(c *WavefrontConfig, name string, metric interface{
 	w := bufio.NewWriter(conn)
 
 	key := EncodeKey(name, tags)
-	if c.Prefix != "" {
+	if !strings.HasSuffix(c.Prefix, ".") {
 		c.Prefix = strings.Join([]string{c.Prefix, "."}, "")
 	}
 	WriteMetricAndFlush(w, metric, key, now, c)