Merge pull request #49 from newrelic/bug/node-ingest-segfault

Fix segfault for non-existant node ingests

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.0.1 - 2019-05-20
+### Fixed
+- Segfault on blank node ingests
+
 ## 4.0.0 - 2019-04-22
 ### Changed
 - Prefixed namespace to provide better uniqueness

src/elasticsearch.go

@@ -28,7 +28,7 @@ type argumentList struct {
 
 const (
 	integrationName    = "com.newrelic.elasticsearch"
-	integrationVersion = "4.0.0"
+	integrationVersion = "4.0.1"
 )
 
 var (

src/inventory.go

@@ -168,6 +168,11 @@ func parsePluginsAndModules(entity *integration.Entity, stats *LocalNode) {
 }
 
 func parseNodeIngests(entity *integration.Entity, stats *LocalNode) []string {
+	if stats.Ingest == nil || stats.Ingest.Processors == nil {
+		log.Error("No ingest stats defined for node. Skipping processor list collection", stats.Name)
+		return []string{}
+	}
+
 	processorList := stats.Ingest.Processors
 	typeList := []string{}
 

src/inventory_test.go

@@ -260,3 +260,15 @@ func writeGoldenFile(t *testing.T, goldenPath string, data []byte) {
 		assert.NoError(t, err)
 	}
 }
+
+func Test_parseNodeIngests_Nil(t *testing.T) {
+	_, e := getTestingEntity(t)
+	nodeName := "test"
+	testNode := LocalNode{
+		Name:   &nodeName,
+		Ingest: nil,
+	}
+
+	types := parseNodeIngests(e, &testNode)
+	assert.Equal(t, []string{}, types)
+}