From a294491e0b23c16082719e1584aa97b9725b925b Mon Sep 17 00:00:00 2001 From: Matthias Rampke Date: Wed, 15 May 2019 13:17:17 +0000 Subject: [PATCH] Resolve merge conflicts of #198 with #212 and #213 In #198 the signature for setting up the exporter changed slightly, a change that #212 and #213 didn't have. This doesn't change anything substantial. Signed-off-by: Matthias Rampke --- exporter_test.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/exporter_test.go b/exporter_test.go index 3aa0665..7e85120 100644 --- a/exporter_test.go +++ b/exporter_test.go @@ -347,7 +347,7 @@ mappings: for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { testMapper := &mapper.MetricMapper{} - err := testMapper.InitFromYAMLString(config) + err := testMapper.InitFromYAMLString(config, 0) if err != nil { t.Fatalf("Config load error: %s %s", config, err) } @@ -456,7 +456,10 @@ func TestSummaryWithQuantilesEmptyMapping(t *testing.T) { // Start exporter with a synchronous channel events := make(chan Events) go func() { - ex := NewExporter(&mapper.MetricMapper{}) + testMapper := mapper.MetricMapper{} + testMapper.InitCache(0) + + ex := NewExporter(&testMapper) ex.Listen(events) }()