Removing support for options

receiver/scraperhelper/scrapercontroller.go

@@ -177,7 +177,9 @@ func (sc *controller) startScraping() {
 		for {
 			select {
 			case <-sc.tickerCh:
-				sc.scrapeMetricsAndReport(context.Background())
+				ctx, done = withScrapeContext(sc.timeout)
+				sc.scrapeMetricsAndReport(ctx)
+				done()
 			case <-sc.done:
 				sc.terminated <- struct{}{}
 				return

receiver/scraperhelper/scrapercontroller_test.go

@@ -407,10 +407,10 @@ func TestScrapeControllerInitialDelay(t *testing.T) {
 
 	var (
 		elapsed = make(chan time.Time, 1)
-		cfg     = NewDefaultScraperControllerSettingsWithOptions(
-			WithCollectionInterval(time.Second),
-			WithTimeout(300*time.Millisecond),
-		)
+		cfg     = ScraperControllerSettings{
+			CollectionInterval: time.Second,
+			Timeout:            300 * time.Millisecond,
+		}
 	)
 
 	scp, err := NewScraper("timed", func(ctx context.Context) (pmetric.Metrics, error) {

receiver/scraperhelper/settings.go

@@ -34,27 +34,12 @@ type ScraperControllerSettings struct {
 
 // NewDefaultScraperControllerSettings returns default scraper controller
 // settings with a collection interval of one minute.
-//
-// Deprecated: Use `NewDefaultScraperControllerSettingsWithOptions` instead
 func NewDefaultScraperControllerSettings(component.Type) ScraperControllerSettings {
-	return NewDefaultScraperControllerSettingsWithOptions()
-}
-
-// NewDefaultScraperControllerSettingsWithOptions returns a default scraper controller settings
-// settings with a collection interval of one minute.
-// The options are applied in order and will override the set defaults.
-func NewDefaultScraperControllerSettingsWithOptions(options ...Option) ScraperControllerSettings {
-	set := ScraperControllerSettings{
+	return ScraperControllerSettings{
 		CollectionInterval: time.Minute,
 		InitialDelay:       time.Second,
 		Timeout:            0,
 	}
-
-	for _, opt := range options {
-		opt.apply(&set)
-	}
-
-	return set
 }
 
 func (set *ScraperControllerSettings) Validate() (errs error) {

receiver/scraperhelper/settings_test.go

@@ -5,6 +5,7 @@ package scraperhelper
 
 import (
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -19,7 +20,7 @@ func TestScrapeControllerSettings(t *testing.T) {
 	}{
 		{
 			name:   "default configuration",
-			set:    NewDefaultScraperControllerSettingsWithOptions(),
+			set:    NewDefaultScraperControllerSettings(""),
 			errVal: "",
 		},
 		{
@@ -28,8 +29,11 @@ func TestScrapeControllerSettings(t *testing.T) {
 			errVal: `"collection_interval": requires positive value`,
 		},
 		{
-			name:   "invalid timeout",
-			set:    NewDefaultScraperControllerSettingsWithOptions(WithTimeout(-10)),
+			name: "invalid timeout",
+			set: ScraperControllerSettings{
+				CollectionInterval: time.Minute,
+				Timeout:            -1 * time.Minute,
+			},
 			errVal: `"timeout": requires positive value`,
 		},
 	} {