cleanup

Author: sv-splunk

receiver/oracledbreceiver/factory.go

@@ -50,7 +50,7 @@ func createDefaultConfig() component.Config {
 		TopQueryCollection: TopQueryCollection{
 			MaxQuerySampleCount: 1000,
 			TopQueryCount:       200,
-			CollectionInterval:  10 * time.Second,
+			CollectionInterval:  time.Minute,
 		},
 	}
 }

receiver/oracledbreceiver/scraper.go

@@ -560,7 +560,7 @@ func (s *oracleScraper) collectTopNMetricData(ctx context.Context, logs plog.Log
 	lookbackTimeSeconds := s.calculateLookbackSeconds()
 
 	s.oracleQueryMetricsClient = s.clientProviderFunc(s.db, oracleQueryMetricsSQL, s.logger)
-	metricRows, metricError := s.oracleQueryMetricsClient.metricRows(ctx, lookbackTimeSeconds, lookbackTimeSeconds, s.topQueryCollectCfg.MaxQuerySampleCount)
+	metricRows, metricError := s.oracleQueryMetricsClient.metricRows(ctx, lookbackTimeSeconds, s.topQueryCollectCfg.MaxQuerySampleCount)
 
 	if metricError != nil {
 		return fmt.Errorf("error executing oracleQueryMetricsSQL: %w", metricError)
@@ -627,7 +627,6 @@ func (s *oracleScraper) collectTopNMetricData(ctx context.Context, logs plog.Log
 	s.logger.Debug("Cache update", zap.Int("update-count", cacheUpdates), zap.Int("new-size", s.metricCache.Len()))
 
 	s.lastExecutionTimestamp = collectionTime
-	fmt.Println(">>>>>> time set")
 	if len(hits) == 0 {
 		s.logger.Info("No log records for this scrape")
 		return errors.Join(errs...)

receiver/oracledbreceiver/templates/oracleQueryMetricsAndTextSql.tmpl

@@ -1,6 +1,5 @@
 /* otel-collector */ SELECT
 SYSDATE,
-SYSDATE - NUMTODSINTERVAL(:1, 'SECOND') AS START_POINT,
 SQL_ID,
 SQL_FULLTEXT,
 CHILD_NUMBER,
@@ -22,5 +21,5 @@ DISK_READS,
 DIRECT_WRITES,
 DIRECT_READS
 FROM V$SQL
-WHERE LAST_ACTIVE_TIME >= SYSDATE - NUMTODSINTERVAL(:2, 'SECOND')
-FETCH FIRST :3 ROWS ONLY
+WHERE LAST_ACTIVE_TIME >= SYSDATE - NUMTODSINTERVAL(:1, 'SECOND')
+FETCH FIRST :2 ROWS ONLY