Adding limit for query samples collection

Author: sv-splunk

receiver/oracledbreceiver/config.go

@@ -35,6 +35,13 @@ type TopQueryCollection struct {
 	QueryCacheSize      int  `mapstructure:"query_cache_size"`
 }
 
+type QuerySample struct {
+	MaxRowsPerQuery uint64 `mapstructure:"max_rows_per_query"`
+
+	// prevent unkeyed literal initialization
+	_ struct{}
+}
+
 type Config struct {
 	DataSource                     string `mapstructure:"datasource"`
 	Endpoint                       string `mapstructure:"endpoint"`
@@ -46,6 +53,7 @@ type Config struct {
 	metadata.LogsBuilderConfig     `mapstructure:",squash"`
 
 	TopQueryCollection `mapstructure:"top_query_collection"`
+	QuerySample        `mapstructure:"query_sample_collection"`
 }
 
 func (c Config) Validate() error {

receiver/oracledbreceiver/factory.go

@@ -44,6 +44,9 @@ func createDefaultConfig() component.Config {
 		ControllerConfig:     cfg,
 		MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(),
 		LogsBuilderConfig:    metadata.DefaultLogsBuilderConfig(),
+		QuerySample: QuerySample{
+			MaxRowsPerQuery: 100,
+		},
 		TopQueryCollection: TopQueryCollection{
 			MaxQuerySampleCount: 1000,
 			TopQueryCount:       200,
@@ -120,7 +123,7 @@ func createLogsReceiverFunc(sqlOpenerFunc sqlOpenerFunc, clientProviderFunc clie
 
 		mp, err := newLogsScraper(logsBuilder, sqlCfg.LogsBuilderConfig, sqlCfg.ControllerConfig, settings.Logger, func() (*sql.DB, error) {
 			return sqlOpenerFunc(getDataSource(*sqlCfg))
-		}, clientProviderFunc, instanceName, metricCache, sqlCfg.TopQueryCollection, hostName)
+		}, clientProviderFunc, instanceName, metricCache, sqlCfg.TopQueryCollection, sqlCfg.QuerySample, hostName)
 		if err != nil {
 			return nil, err
 		}

receiver/oracledbreceiver/scraper.go

@@ -128,6 +128,7 @@ type oracleScraper struct {
 	logsBuilderConfig          metadata.LogsBuilderConfig
 	metricCache                *lru.Cache[string, map[string]int64]
 	topQueryCollectCfg         TopQueryCollection
+	querySampleCfg             QuerySample
 }
 
 func newScraper(metricsBuilder *metadata.MetricsBuilder, metricsBuilderConfig metadata.MetricsBuilderConfig, scrapeCfg scraperhelper.ControllerConfig, logger *zap.Logger, providerFunc dbProviderFunc, clientProviderFunc clientProviderFunc, instanceName string, hostName string) (scraper.Metrics, error) {
@@ -146,7 +147,7 @@ func newScraper(metricsBuilder *metadata.MetricsBuilder, metricsBuilderConfig me
 
 func newLogsScraper(logsBuilder *metadata.LogsBuilder, logsBuilderConfig metadata.LogsBuilderConfig, scrapeCfg scraperhelper.ControllerConfig,
 	logger *zap.Logger, providerFunc dbProviderFunc, clientProviderFunc clientProviderFunc, instanceName string, metricCache *lru.Cache[string, map[string]int64],
-	topQueryCollectCfg TopQueryCollection, hostName string,
+	topQueryCollectCfg TopQueryCollection, querySampleCfg QuerySample, hostName string,
 ) (scraper.Logs, error) {
 	s := &oracleScraper{
 		lb:                 logsBuilder,
@@ -158,6 +159,7 @@ func newLogsScraper(logsBuilder *metadata.LogsBuilder, logsBuilderConfig metadat
 		instanceName:       instanceName,
 		metricCache:        metricCache,
 		topQueryCollectCfg: topQueryCollectCfg,
+		querySampleCfg:     querySampleCfg,
 		hostName:           hostName,
 	}
 	return scraper.NewLogs(s.scrapeLogs, scraper.WithShutdown(s.shutdown), scraper.WithStart(s.start))
@@ -562,7 +564,7 @@ func (s *oracleScraper) collectQuerySamples(ctx context.Context) (plog.Logs, err
 	dbClients := s.samplesQueryClient
 	timestamp := pcommon.NewTimestampFromTime(time.Now())
 
-	rows, err := dbClients.metricRows(ctx)
+	rows, err := dbClients.metricRows(ctx, s.querySampleCfg.MaxRowsPerQuery)
 	if err != nil {
 		scrapeErrors = append(scrapeErrors, fmt.Errorf("error executing %s: %w", samplesQuery, err))
 	}

receiver/oracledbreceiver/templates/oracleQuerySampleSql.tmpl

@@ -27,4 +27,5 @@ CASE WHEN S.PLSQL_ENTRY_OBJECT_ID IS NOT NULL
 FROM V$SESSION S LEFT JOIN DBA_PROCEDURES P ON S.PLSQL_ENTRY_OBJECT_ID = P.OBJECT_ID
       AND S.PLSQL_ENTRY_SUBPROGRAM_ID = P.SUBPROGRAM_ID
       LEFT JOIN V$SQL Q ON S.SQL_ID = Q.SQL_ID
-      WHERE S.SQL_ID IS NOT NULL AND S.STATUS = 'ACTIVE'
+      WHERE S.SQL_ID IS NOT NULL AND S.STATUS = 'ACTIVE'
+FETCH FIRST :1 ROWS ONLY

receiver/oracledbreceiver/testdata/config.yaml

@@ -6,6 +6,12 @@ oracledb:
   username: otel
   # Refer to Oracle Go Driver go_ora documentation for full connection string options
   datasource: "oracle://otel:password@localhost:51521/XE"
+  top_query_collection:
+    max_query_sample_count: 222
+    top_query_count: 200
+    query_cache_size: 1000
+  query_sample_collection:
+    max_rows_per_query: 200
   metrics:
     oracledb.exchange_deadlocks:
       enabled: false