Refactoring plan fetch error handling, and other cleanups

Author: sv-splunk

receiver/oracledbreceiver/scraper.go

@@ -984,7 +984,10 @@ func (s *oracleScraper) collectTopNMetricData(ctx context.Context, logs plog.Log
 	hits = hits[:maxHitsSize]
 
 	hits = s.obfuscateCacheHits(hits)
-	childAddressToPlanMap := s.getChildAddressToPlanMap(ctx, hits)
+	childAddressToPlanMap, err := s.getChildAddressToPlanMap(ctx, hits)
+	if err != nil {
+		errs = append(errs, err)
+	}
 
 	rb := s.setupResourceBuilder(s.lb.NewResourceBuilder())
 
@@ -1225,10 +1228,10 @@ func (s *oracleScraper) obfuscateCacheHits(hits []queryMetricCacheHit) []queryMe
 	return obfuscatedHits
 }
 
-func (s *oracleScraper) getChildAddressToPlanMap(ctx context.Context, hits []queryMetricCacheHit) map[string][]metricRow {
+func (s *oracleScraper) getChildAddressToPlanMap(ctx context.Context, hits []queryMetricCacheHit) (map[string][]metricRow, error) {
 	childAddressToPlanMap := map[string][]metricRow{}
 	if len(hits) == 0 {
-		return childAddressToPlanMap
+		return childAddressToPlanMap, nil
 	}
 
 	var childAddressSlice []any
@@ -1243,7 +1246,10 @@ func (s *oracleScraper) getChildAddressToPlanMap(ctx context.Context, hits []que
 
 	s.logger.Debug("Fetching execution plans")
 	s.oraclePlanDataClient = s.clientProviderFunc(s.db, sqlQuery, s.logger)
-	planData, _ := s.oraclePlanDataClient.metricRows(ctx, childAddressSlice...)
+	planData, err := s.oraclePlanDataClient.metricRows(ctx, childAddressSlice...)
+	if err != nil {
+		return childAddressToPlanMap, fmt.Errorf("failed to fetch Oracle execution plan data: %w", err)
+	}
 
 	for _, row := range planData {
 		currentChildAddress := row[childAddressAttr]
@@ -1257,7 +1263,7 @@ func (s *oracleScraper) getChildAddressToPlanMap(ctx context.Context, hits []que
 		}
 	}
 
-	return childAddressToPlanMap
+	return childAddressToPlanMap, nil
 }
 
 func (*oracleScraper) getTopNMetricNames() []string {

receiver/oracledbreceiver/scraper_test.go

@@ -120,6 +120,8 @@ var cacheValue = map[string]int64{
 	"PROCEDURE_EXECUTIONS":    200413,
 }
 
+const SqlPlanTable = "V$SQL_PLAN_STATISTICS_ALL"
+
 func TestScraper_Scrape(t *testing.T) {
 	tests := []struct {
 		name       string
@@ -409,7 +411,7 @@ func TestScraper_ScrapeTopNLogs(t *testing.T) {
 		{
 			name: "valid collection",
 			dbclientFn: func(_ *sql.DB, s string, _ *zap.Logger) dbClient {
-				if strings.Contains(s, "V$SQL_PLAN_STATISTICS_ALL") {
+				if strings.Contains(s, SqlPlanTable) {
 					metricRowFile := readFile("oracleQueryPlanData.txt")
 					unmarshalErr := json.Unmarshal(metricRowFile, &logRowData)
 					if unmarshalErr == nil {
@@ -1004,7 +1006,7 @@ func TestTopNLogsDiscardedWhenExecutionCountUnchanged(t *testing.T) {
 			return nil, nil
 		},
 		clientProviderFunc: func(_ *sql.DB, s string, _ *zap.Logger) dbClient {
-			if strings.Contains(s, "V$SQL_PLAN_STATISTICS_ALL") {
+			if strings.Contains(s, SqlPlanTable) {
 				metricRowFile := readFile("oracleQueryPlanData.txt")
 				_ = json.Unmarshal(metricRowFile, &logRowData)
 				return &fakeDbClient{Responses: [][]metricRow{logRowData}}
@@ -1095,7 +1097,7 @@ func TestTopNLogsProcedureNameEmpty(t *testing.T) {
 			return nil, nil
 		},
 		clientProviderFunc: func(_ *sql.DB, s string, _ *zap.Logger) dbClient {
-			if strings.Contains(s, "V$SQL_PLAN_STATISTICS_ALL") {
+			if strings.Contains(s, SqlPlanTable) {
 				return &fakeDbClient{Responses: [][]metricRow{planData}}
 			}
 			return &fakeDbClient{Responses: [][]metricRow{metricsData}}
@@ -1145,7 +1147,7 @@ func TestScrapesTopNLogsOnlyWhenIntervalHasElapsed(t *testing.T) {
 		{
 			name: "valid collection",
 			dbclientFn: func(_ *sql.DB, s string, _ *zap.Logger) dbClient {
-				if strings.Contains(s, "V$SQL_PLAN_STATISTICS_ALL") {
+				if strings.Contains(s, SqlPlanTable) {
 					metricRowFile := readFile("oracleQueryPlanData.txt")
 					unmarshalErr := json.Unmarshal(metricRowFile, &logRowData)
 					if unmarshalErr == nil {
@@ -1279,7 +1281,7 @@ func TestObfuscateCacheHitsHandlesTruncatedSQL(t *testing.T) {
 			return nil, nil
 		},
 		clientProviderFunc: func(_ *sql.DB, s string, _ *zap.Logger) dbClient {
-			if strings.Contains(s, "V$SQL_PLAN_STATISTICS_ALL") {
+			if strings.Contains(s, SqlPlanTable) {
 				return &fakeDbClient{Responses: [][]metricRow{{}}}
 			}
 			return &fakeDbClient{Responses: [][]metricRow{metricsData}}