fix: resolve jolokia2 panic on null response (#11397)

PapaPiya · web-flow · commit eb77bddde2f4 · 2022-06-29T07:17:33.000-06:00
diff --git a/plugins/inputs/jolokia2/common/gatherer.go b/plugins/inputs/jolokia2/common/gatherer.go
@@ -94,7 +94,13 @@ func (g *Gatherer) generatePoints(metric Metric, responses []ReadResponse) ([]po
 		}
 
 		pb := NewPointBuilder(metric, response.RequestAttributes, response.RequestPath)
-		for _, point := range pb.Build(metric.Mbean, response.Value) {
+		ps, err := pb.Build(metric.Mbean, response.Value)
+		if err != nil {
+			errors = append(errors, err)
+			continue
+		}
+
+		for _, point := range ps {
 			if response.RequestTarget != "" {
 				point.Tags["jolokia_agent_url"] = response.RequestTarget
 			}
diff --git a/plugins/inputs/jolokia2/common/point_builder.go b/plugins/inputs/jolokia2/common/point_builder.go
@@ -27,15 +27,15 @@ func NewPointBuilder(metric Metric, attributes []string, path string) *pointBuil
 }
 
 // Build generates a point for a given mbean name/pattern and value object.
-func (pb *pointBuilder) Build(mbean string, value interface{}) []point {
+func (pb *pointBuilder) Build(mbean string, value interface{}) ([]point, error) {
 	hasPattern := strings.Contains(mbean, "*")
-	if !hasPattern {
+	if !hasPattern || value == nil {
 		value = map[string]interface{}{mbean: value}
 	}
 
 	valueMap, ok := value.(map[string]interface{})
-	if !ok { // FIXME: log it and move on.
-		panic(fmt.Sprintf("There should be a map here for %s!\n", mbean))
+	if !ok {
+		return nil, fmt.Errorf("the response of %s's value should be a map", mbean)
 	}
 
 	points := make([]point, 0)
@@ -46,7 +46,7 @@ func (pb *pointBuilder) Build(mbean string, value interface{}) []point {
 		})
 	}
 
-	return compactPoints(points)
+	return compactPoints(points), nil
 }
 
 // extractTags generates the map of tags for a given mbean name/pattern.

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,13 @@ func (g *Gatherer) generatePoints(metric Metric, responses []ReadResponse) ([]po`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`pb := NewPointBuilder(metric, response.RequestAttributes, response.RequestPath)`
`97`		`- for _, point := range pb.Build(metric.Mbean, response.Value) {`
	`97`	`+ ps, err := pb.Build(metric.Mbean, response.Value)`
	`98`	`+ if err != nil {`
	`99`	`+ errors = append(errors, err)`
	`100`	`+ continue`
	`101`	`+ }`
	`102`	`+`
	`103`	`+ for _, point := range ps {`
`98`	`104`	`if response.RequestTarget != "" {`
`99`	`105`	`point.Tags["jolokia_agent_url"] = response.RequestTarget`
`100`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,15 +27,15 @@ func NewPointBuilder(metric Metric, attributes []string, path string) *pointBuil`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`// Build generates a point for a given mbean name/pattern and value object.`
`30`		`-func (pb *pointBuilder) Build(mbean string, value interface{}) []point {`
	`30`	`+func (pb *pointBuilder) Build(mbean string, value interface{}) ([]point, error) {`
`31`	`31`	`hasPattern := strings.Contains(mbean, "*")`
`32`		`- if !hasPattern {`
	`32`	`+ if !hasPattern \|\| value == nil {`
`33`	`33`	`value = map[string]interface{}{mbean: value}`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`valueMap, ok := value.(map[string]interface{})`
`37`		`- if !ok { // FIXME: log it and move on.`
`38`		`- panic(fmt.Sprintf("There should be a map here for %s!\n", mbean))`
	`37`	`+ if !ok {`
	`38`	`+ return nil, fmt.Errorf("the response of %s's value should be a map", mbean)`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`points := make([]point, 0)`
`@@ -46,7 +46,7 @@ func (pb *pointBuilder) Build(mbean string, value interface{}) []point {`
`46`	`46`	`})`
`47`	`47`	`}`
`48`	`48`
`49`		`- return compactPoints(points)`
	`49`	`+ return compactPoints(points), nil`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`// extractTags generates the map of tags for a given mbean name/pattern.`