orcl collection window

Author: sv-splunk

receiver/oracledbreceiver/config.go

@@ -9,6 +9,7 @@ import (
 	"net"
 	"net/url"
 	"strconv"
+	"time"
 
 	"go.opentelemetry.io/collector/scraper/scraperhelper"
 	"go.uber.org/multierr"
@@ -29,8 +30,10 @@ var (
 )
 
 type TopQueryCollection struct {
-	MaxQuerySampleCount uint `mapstructure:"max_query_sample_count"`
-	TopQueryCount       uint `mapstructure:"top_query_count"`
+	MaxQuerySampleCount uint          `mapstructure:"max_query_sample_count"`
+	TopQueryCount       uint          `mapstructure:"top_query_count"`
+	CollectionInterval  time.Duration `mapstructure:"collection_interval"`
+	LookbackTime        time.Duration `mapstructure:"lookback_time"`
 }
 
 type QuerySample struct {
@@ -106,3 +109,10 @@ func (c Config) Validate() error {
 	}
 	return allErrs
 }
+
+func (cfg *Config) EffectiveLookbackTime() time.Duration {
+	if cfg.LookbackTime <= 0 {
+		return 2 * cfg.ControllerConfig.CollectionInterval
+	}
+	return cfg.LookbackTime
+}

receiver/oracledbreceiver/scraper.go

@@ -133,19 +133,21 @@ type oracleScraper struct {
 	obfuscator                 *obfuscator
 	querySampleCfg             QuerySample
 	serviceInstanceID          string
+	lastExecutionTimestamp     time.Time
 }
 
 func newScraper(metricsBuilder *metadata.MetricsBuilder, metricsBuilderConfig metadata.MetricsBuilderConfig, scrapeCfg scraperhelper.ControllerConfig, logger *zap.Logger, providerFunc dbProviderFunc, clientProviderFunc clientProviderFunc, instanceName, hostName string) (scraper.Metrics, error) {
 	s := &oracleScraper{
-		mb:                   metricsBuilder,
-		metricsBuilderConfig: metricsBuilderConfig,
-		scrapeCfg:            scrapeCfg,
-		logger:               logger,
-		dbProviderFunc:       providerFunc,
-		clientProviderFunc:   clientProviderFunc,
-		instanceName:         instanceName,
-		hostName:             hostName,
-		serviceInstanceID:    getInstanceID(instanceName, logger),
+		mb:                     metricsBuilder,
+		metricsBuilderConfig:   metricsBuilderConfig,
+		scrapeCfg:              scrapeCfg,
+		logger:                 logger,
+		dbProviderFunc:         providerFunc,
+		clientProviderFunc:     clientProviderFunc,
+		instanceName:           instanceName,
+		hostName:               hostName,
+		serviceInstanceID:      getInstanceID(instanceName, logger),
+		lastExecutionTimestamp: time.Unix(0, 0),
 	}
 	return scraper.NewMetrics(s.scrape, scraper.WithShutdown(s.shutdown), scraper.WithStart(s.start))
 }
@@ -529,9 +531,11 @@ func (s *oracleScraper) scrapeLogs(ctx context.Context) (plog.Logs, error) {
 	var scrapeErrors []error
 
 	if s.logsBuilderConfig.Events.DbServerTopQuery.Enabled {
-		topNCollectionErrors := s.collectTopNMetricData(ctx, logs)
-		if topNCollectionErrors != nil {
-			scrapeErrors = append(scrapeErrors, topNCollectionErrors)
+		if s.isTopNMetricsCollectionDue() {
+			topNCollectionErrors := s.collectTopNMetricData(ctx, logs)
+			if topNCollectionErrors != nil {
+				scrapeErrors = append(scrapeErrors, topNCollectionErrors)
+			}
 		}
 	}
 
@@ -545,6 +549,10 @@ func (s *oracleScraper) scrapeLogs(ctx context.Context) (plog.Logs, error) {
 	return logs, errors.Join(scrapeErrors...)
 }
 
+func (s *oracleScraper) isTopNMetricsCollectionDue() bool {
+
+}
+
 func (s *oracleScraper) collectTopNMetricData(ctx context.Context, logs plog.Logs) error {
 	var errs []error
 	// get metrics and query texts from DB