textfile collector: Skip BOM when present

Signed-off-by: Dave Henderson <dhenderson@gmail.com>
This commit is contained in:
Dave Henderson
2018-11-18 10:23:15 -05:00
parent cb9da1ae22
commit 700bbb37c5
8 changed files with 435 additions and 743 deletions

View File

@@ -25,6 +25,7 @@ import (
"strings"
"time"
"github.com/dimchansky/utfbom"
"github.com/prometheus/client_golang/prometheus"
dto "github.com/prometheus/client_model/go"
"github.com/prometheus/common/expfmt"
@@ -236,7 +237,8 @@ fileLoop:
continue
}
var parser expfmt.TextParser
parsedFamilies, err := parser.TextToMetricFamilies(carriageReturnFilteringReader{r: file})
r := utfbom.SkipOnly(carriageReturnFilteringReader{r: file})
parsedFamilies, err := parser.TextToMetricFamilies(r)
file.Close()
if err != nil {
log.Errorf("Error parsing %q: %v", path, err)