From 2951a9ef80858809fcf87d674d069dd5310b1d36 Mon Sep 17 00:00:00 2001
From: Calle Pettersson <carlpett@users.noreply.github.com>
Date: Tue, 15 May 2018 20:52:11 +0200
Subject: [PATCH] Strip carriage-returns from textfile input

---
 collector/textfile.go      | 28 +++++++++++++++++++++++++++-
 collector/textfile_test.go | 20 ++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 collector/textfile_test.go

diff --git a/collector/textfile.go b/collector/textfile.go
index a3219d9d..e3fdf094 100644
--- a/collector/textfile.go
+++ b/collector/textfile.go
@@ -17,6 +17,7 @@ package collector
 
 import (
 	"fmt"
+	"io"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -185,6 +186,30 @@ func (c *textFileCollector) exportMTimes(mtimes map[string]time.Time, ch chan<-
 	}
 }
 
+type carriageReturnFilteringReader struct {
+	r io.Reader
+}
+
+// Read returns data from the underlying io.Reader, but with \r filtered out
+func (cr carriageReturnFilteringReader) Read(p []byte) (int, error) {
+	buf := make([]byte, len(p))
+	n, err := cr.r.Read(buf)
+
+	if err != nil && err != io.EOF {
+		return n, err
+	}
+
+	pi := 0
+	for i := 0; i < n; i++ {
+		if buf[i] != '\r' {
+			p[pi] = buf[i]
+			pi++
+		}
+	}
+
+	return pi, err
+}
+
 // Update implements the Collector interface.
 func (c *textFileCollector) Collect(ch chan<- prometheus.Metric) error {
 	error := 0.0
@@ -203,6 +228,7 @@ fileLoop:
 			continue
 		}
 		path := filepath.Join(c.path, f.Name())
+		log.Debugf("Processing file %q", path)
 		file, err := os.Open(path)
 		if err != nil {
 			log.Errorf("Error opening %q: %v", path, err)
@@ -210,7 +236,7 @@ fileLoop:
 			continue
 		}
 		var parser expfmt.TextParser
-		parsedFamilies, err := parser.TextToMetricFamilies(file)
+		parsedFamilies, err := parser.TextToMetricFamilies(carriageReturnFilteringReader{r: file})
 		file.Close()
 		if err != nil {
 			log.Errorf("Error parsing %q: %v", path, err)
diff --git a/collector/textfile_test.go b/collector/textfile_test.go
new file mode 100644
index 00000000..231aefff
--- /dev/null
+++ b/collector/textfile_test.go
@@ -0,0 +1,20 @@
+package collector
+
+import (
+	"testing"
+	"strings"
+	"io/ioutil"
+)
+
+func TestCRFilter(t *testing.T) {
+	sr := strings.NewReader("line 1\r\nline 2")
+	cr := carriageReturnFilteringReader{ r: sr }
+	b, err := ioutil.ReadAll(cr)
+	if err != nil {
+		t.Error(err)
+	}
+
+	if string(b) != "line 1\nline 2" {
+		t.Errorf("Unexpected output %q", b)
+	}
+}
\ No newline at end of file