Merge pull request #127 from prometheus/mr/update-dependencies

Update dependencies

go.mod

@@ -1,12 +1,12 @@
 module github.com/prometheus/graphite_exporter
 
 require (
-	github.com/go-kit/kit v0.9.0
+	github.com/go-kit/kit v0.10.0
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.5.1
-	github.com/prometheus/common v0.9.1
-	github.com/prometheus/statsd_exporter v0.14.1
-	github.com/stretchr/testify v1.4.0
+	github.com/prometheus/client_golang v1.6.0
+	github.com/prometheus/common v0.10.0
+	github.com/prometheus/statsd_exporter v0.16.0
+	github.com/stretchr/testify v1.6.0
 	golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3 // indirect
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 	gopkg.in/yaml.v2 v2.2.8 // indirect

main.go

@@ -48,6 +48,7 @@ var (
 	sampleExpiry    = kingpin.Flag("graphite.sample-expiry", "How long a sample is valid for.").Default("5m").Duration()
 	strictMatch     = kingpin.Flag("graphite.mapping-strict-match", "Only store metrics that match the mapping configuration.").Bool()
 	cacheSize       = kingpin.Flag("graphite.cache-size", "Maximum size of your metric mapping cache. Relies on least recently used replacement policy if max size is reached.").Default("1000").Int()
+	cacheType       = kingpin.Flag("graphite.cache-type", "Metric mapping cache type. Valid options are \"lru\" and \"random\"").Default("lru").Enum("lru", "random")
 	dumpFSMPath     = kingpin.Flag("debug.dump-fsm", "The path to dump internal FSM generated for glob matching as Dot file.").Default("").String()
 
 	lastProcessed = prometheus.NewGauge(
@@ -81,8 +82,8 @@ func (s graphiteSample) String() string {
 
 type metricMapper interface {
 	GetMapping(string, mapper.MetricType) (*mapper.MetricMapping, prometheus.Labels, bool)
-	InitFromFile(string, int) error
-	InitCache(cacheSize int)
+	InitFromFile(string, int, ...mapper.CacheOption) error
+	InitCache(int, ...mapper.CacheOption)
 }
 
 type graphiteCollector struct {
@@ -266,14 +267,16 @@ func main() {
 	prometheus.MustRegister(c)
 
 	c.mapper = &mapper.MetricMapper{}
+	cacheOption := mapper.WithCacheType(*cacheType)
+
 	if *mappingConfig != "" {
-		err := c.mapper.InitFromFile(*mappingConfig, *cacheSize)
+		err := c.mapper.InitFromFile(*mappingConfig, *cacheSize, cacheOption)
 		if err != nil {
 			level.Error(logger).Log("msg", "Error loading metric mapping config", "err", err)
 			os.Exit(1)
 		}
 	} else {
-		c.mapper.InitCache(0)
+		c.mapper.InitCache(*cacheSize, cacheOption)
 	}
 
 	if *dumpFSMPath != "" {

main_test.go

@@ -38,10 +38,10 @@ func (m *mockMapper) GetMapping(metricName string, metricType mapper.MetricType)
 
 }
 
-func (m *mockMapper) InitFromFile(string, int) error {
+func (m *mockMapper) InitFromFile(string, int, ...mapper.CacheOption) error {
 	return nil
 }
-func (m *mockMapper) InitCache(int) {
+func (m *mockMapper) InitCache(int, ...mapper.CacheOption) {
 
 }
 func TestProcessLine(t *testing.T) {