Incorporating benchmark test

elastic · Mar 17, 2020 · 7bdccfd · 7bdccfd
1 parent 62734b7
commit 7bdccfd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/metricbeat/module/elasticsearch/index/data_xpack.go b/metricbeat/module/elasticsearch/index/data_xpack.go
@@ -121,19 +121,14 @@ type shardStats struct {
 }
 
 func eventsMappingXPack(r mb.ReporterV2, m *MetricSet, info elasticsearch.Info, content []byte) error {
-	var indicesStruct IndicesStruct
-	if err := parseAPIResponse(content, &indicesStruct); err != nil {
-		return errors.Wrap(err, "failure parsing Indices Stats Elasticsearch API response")
-	}
-
 	clusterStateMetrics := []string{"metadata", "routing_table"}
 	clusterState, err := elasticsearch.GetClusterState(m.HTTP, m.HTTP.GetURI(), clusterStateMetrics)
 	if err != nil {
 		return errors.Wrap(err, "failure retrieving cluster state from Elasticsearch")
 	}
 
 	var indicesStats stats
-	if err := json.Unmarshal(content, &indicesStats); err != nil {
+	if err := parseAPIResponse(content, &indicesStats); err != nil {
 		return errors.Wrap(err, "failure parsing Indices Stats Elasticsearch API response")
 	}
 
@@ -167,8 +162,8 @@ func eventsMappingXPack(r mb.ReporterV2, m *MetricSet, info elasticsearch.Info,
 	return nil
 }
 
-func parseAPIResponse(content []byte, indicesStruct *IndicesStruct) error {
-	return json.Unmarshal(content, indicesStruct)
+func parseAPIResponse(content []byte, indicesStats *stats) error {
+	return json.Unmarshal(content, indicesStats)
 }
 
 // Fields added here are based on same fields being added by internal collection in

diff --git a/metricbeat/module/elasticsearch/index/data_xpack_test.go b/metricbeat/module/elasticsearch/index/data_xpack_test.go
@@ -31,10 +31,10 @@ func BenchmarkParseAPIResponse(b *testing.B) {
 	content, err := ioutil.ReadFile("_meta/test/stats.800.bench.json")
 	require.NoError(b, err)
 
-	var indicesStruct IndicesStruct
+	var indicesStats stats
 
 	for i := 0; i < b.N; i++ {
-		err = parseAPIResponse(content, &indicesStruct)
+		err = parseAPIResponse(content, &indicesStats)
 		require.NoError(b, err)
 	}