[Metricbeat] Migrate ETCD leader to use ReporterV2 interface

metricbeat/module/etcd/leader/_meta/data.json

@@ -1,6 +1,6 @@
 {
     "@timestamp": "2017-10-12T08:05:34.853Z",
-    "beat": {
+    "agent": {
         "hostname": "host.example.com",
         "name": "host.example.com"
     },
@@ -10,10 +10,16 @@
             "leader": "8e9e05c52164694d"
         }
     },
+    "event": {
+        "dataset": "etcd.leader",
+        "duration": 115000,
+        "module": "etcd"
+    },
     "metricset": {
-        "host": "etcd:2379",
-        "module": "etcd",
-        "name": "leader",
-        "rtt": 115
+        "name": "leader"
+    },
+    "service": {
+        "address": "127.0.0.1:2379",
+        "type": "etcd"
     }
 }

metricbeat/module/etcd/leader/leader.go

@@ -18,7 +18,7 @@
 package leader
 
 import (
-	"github.com/elastic/beats/libbeat/common"
+	"github.com/elastic/beats/libbeat/logp"
 	"github.com/elastic/beats/metricbeat/helper"
 	"github.com/elastic/beats/metricbeat/mb"
 	"github.com/elastic/beats/metricbeat/mb/parse"
@@ -36,6 +36,8 @@ var (
 	}.Build()
 )
 
+var logger = logp.NewLogger("etcd.leader")
+
 func init() {
 	mb.Registry.MustAddMetricSet("etcd", "leader", New,
 		mb.WithHostParser(hostParser),
@@ -64,10 +66,18 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
 	}, nil
 }
 
-func (m *MetricSet) Fetch() (common.MapStr, error) {
+// Fetch methods implements the data gathering and data conversion to the right
+// format. It publishes the event which is then forwarded to the output. In case
+// of an error set the Error field of mb.Event or simply call report.Error().
+func (m *MetricSet) Fetch(reporter mb.ReporterV2) {
 	content, err := m.http.FetchContent()
 	if err != nil {
-		return nil, err
+		logger.Error(err)
+		reporter.Error(err)
+		return
 	}
-	return eventMapping(content), nil
+
+	reporter.Event(mb.Event{
+		MetricSetFields: eventMapping(content),
+	})
 }

metricbeat/module/etcd/leader/leader_integration_test.go

@@ -25,31 +25,39 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"github.com/elastic/beats/libbeat/logp"
+
 	"github.com/elastic/beats/libbeat/tests/compose"
 	mbtest "github.com/elastic/beats/metricbeat/mb/testing"
 )
 
-func TestData(t *testing.T) {
+func TestFetch(t *testing.T) {
+	logp.TestingSetup()
+
 	compose.EnsureUp(t, "etcd")
 
-	f := mbtest.NewEventFetcher(t, getConfig())
-	err := mbtest.WriteEvent(f, t)
-	if err != nil {
-		t.Fatal("write", err)
+	f := mbtest.NewReportingMetricSetV2(t, getConfig())
+	events, errs := mbtest.ReportingFetchV2(f)
+	if len(errs) > 0 {
+		t.Fatalf("Expected 0 error, had %d. %v\n", len(errs), errs)
 	}
+	assert.NotEmpty(t, events)
+	t.Logf("%s/%s event: %+v", f.Module().Name(), f.Name(), events[0])
 }
 
-func TestFetch(t *testing.T) {
+func TestData(t *testing.T) {
 	compose.EnsureUp(t, "etcd")
 
-	f := mbtest.NewEventFetcher(t, getConfig())
-	event, err := f.Fetch()
-	if !assert.NoError(t, err) {
-		t.FailNow()
+	f := mbtest.NewReportingMetricSetV2(t, getConfig())
+	events, errs := mbtest.ReportingFetchV2(f)
+	if len(errs) > 0 {
+		t.Fatalf("Expected 0 error, had %d. %v\n", len(errs), errs)
 	}
+	assert.NotEmpty(t, events)
 
-	assert.NotNil(t, event)
-	t.Logf("%s/%s event: %+v", f.Module().Name(), f.Name(), event)
+	if err := mbtest.WriteEventsReporterV2(f, t, ""); err != nil {
+		t.Fatal("write", err)
+	}
 }
 
 func getConfig() map[string]interface{} {

metricbeat/module/etcd/leader/leader_test.go

@@ -25,9 +25,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	mbtest "github.com/elastic/beats/metricbeat/mb/testing"
-
 	"testing"
+
+	mbtest "github.com/elastic/beats/metricbeat/mb/testing"
 )
 
 func TestEventMapping(t *testing.T) {
@@ -41,6 +41,7 @@ func TestEventMapping(t *testing.T) {
 
 func TestFetchEventContent(t *testing.T) {
 	absPath, err := filepath.Abs("../_meta/test/")
+	assert.NoError(t, err)
 
 	response, err := ioutil.ReadFile(absPath + "/leaderstats.json")
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -55,11 +56,13 @@ func TestFetchEventContent(t *testing.T) {
 		"metricsets": []string{"leader"},
 		"hosts":      []string{server.URL},
 	}
-	f := mbtest.NewEventFetcher(t, config)
-	event, err := f.Fetch()
-	if err != nil {
-		t.Fatal(err)
+
+	f := mbtest.NewReportingMetricSetV2(t, config)
+	events, errs := mbtest.ReportingFetchV2(f)
+	if len(errs) > 0 {
+		t.Fatalf("Expected 0 error, had %d. %v\n", len(errs), errs)
 	}
+	assert.NotEmpty(t, events)
 
-	t.Logf("%s/%s event: %+v", f.Module().Name(), f.Name(), event)
+	t.Logf("%s/%s event: %+v", f.Module().Name(), f.Name(), events[0])
 }