From ef4fb3ad1789e85b6e50fbc85be3c76600947614 Mon Sep 17 00:00:00 2001
From: Antoine Toulme <antoine@lunar-ocean.com>
Date: Tue, 19 Mar 2024 18:50:14 -0700
Subject: [PATCH] [receiver] Remove deprecated `ScraperControllerSettings` and
 `NewDefaultScraperControllerSettings` (#9783)

**Description:**
Remove deprecated `ScraperControllerSettings` and
`NewDefaultScraperControllerSettings`

**Link to tracking Issue:**
#6767
---
 ..._deprecated_scrapercontrollersettings.yaml | 25 +++++++++++++++++++
 receiver/scraperhelper/config.go              | 15 -----------
 2 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 .chloggen/remove_deprecated_scrapercontrollersettings.yaml

diff --git a/.chloggen/remove_deprecated_scrapercontrollersettings.yaml b/.chloggen/remove_deprecated_scrapercontrollersettings.yaml
new file mode 100644
index 00000000000..0b79bd2d523
--- /dev/null
+++ b/.chloggen/remove_deprecated_scrapercontrollersettings.yaml
@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: receiver
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Remove deprecated struct `ScraperControllerSettings` and function `NewDefaultScraperControllerSettings`
+
+# One or more tracking issues or pull requests related to the change
+issues: [6767]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [api]
diff --git a/receiver/scraperhelper/config.go b/receiver/scraperhelper/config.go
index 68f0a56297d..84b7cd2073e 100644
--- a/receiver/scraperhelper/config.go
+++ b/receiver/scraperhelper/config.go
@@ -9,20 +9,12 @@ import (
 	"time"
 
 	"go.uber.org/multierr"
-
-	"go.opentelemetry.io/collector/component"
 )
 
 var (
 	errNonPositiveInterval = errors.New("requires positive value")
 )
 
-// ScraperControllerSettings defines common settings for a scraper controller
-// configuration. Scraper controller receivers can embed this struct, instead
-// of receiver.Settings, and extend it with more fields if needed.
-// Deprecated: [v0.95.0] Use ControllerConfig instead
-type ScraperControllerSettings = ControllerConfig
-
 // ControllerConfig defines common settings for a scraper controller
 // configuration. Scraper controller receivers can embed this struct, instead
 // of receiver.Settings, and extend it with more fields if needed.
@@ -38,13 +30,6 @@ type ControllerConfig struct {
 	Timeout time.Duration `mapstructure:"timeout"`
 }
 
-// NewDefaultScraperControllerSettings returns default scraper controller
-// settings with a collection interval of one minute.
-// Deprecated: [v0.95.0] Use NewDefaultControllerConfig instead
-func NewDefaultScraperControllerSettings(component.Type) ControllerConfig {
-	return NewDefaultControllerConfig()
-}
-
 // NewDefaultControllerConfig returns default scraper controller
 // settings with a collection interval of one minute.
 func NewDefaultControllerConfig() ControllerConfig {