fix conflicts

juanhotencoding · juanhotencoding · commit f428e6ad47d7 · 2025-04-15T09:41:05.000-06:00
diff --git a/receiver/splunkenterprisereceiver/scraper.go b/receiver/splunkenterprisereceiver/scraper.go
@@ -1802,7 +1802,7 @@ func (s *splunkScraper) traverseHealthDetailFeatures(details healthDetails, now
 			s.settings.Logger.Debug(feature.Health)
 			s.mb.RecordSplunkHealthDataPoint(now, 0, k, feature.Health, i.Build, i.Version)
 		}
-		s.traverseHealthDetailFeatures(feature, now)
+		s.traverseHealthDetailFeatures(feature, now, i)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1802,7 +1802,7 @@ func (s *splunkScraper) traverseHealthDetailFeatures(details healthDetails, now`
`1802`	`1802`	`s.settings.Logger.Debug(feature.Health)`
`1803`	`1803`	`s.mb.RecordSplunkHealthDataPoint(now, 0, k, feature.Health, i.Build, i.Version)`
`1804`	`1804`	`}`
`1805`		`- s.traverseHealthDetailFeatures(feature, now)`
	`1805`	`+ s.traverseHealthDetailFeatures(feature, now, i)`
`1806`	`1806`	`}`
`1807`	`1807`	`}`
`1808`	`1808`