From bdcdff4b4e676f05857456b3ca748c367ea28a5c Mon Sep 17 00:00:00 2001
From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>
Date: Thu, 22 Feb 2024 13:40:50 -0700
Subject: [PATCH] [confignet] Remove deprecated structs (#9614)

**Description:**
Removes deprecated structs

**Link to tracking Issue:** Closes https://github.com/open-telemetry/opentelemetry-collector/issues/9509
---
 .../confignet-remove-deprecated-structs.yaml  | 25 +++++++++++++++++++
 config/confignet/confignet.go                 |  8 ------
 2 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100755 .chloggen/confignet-remove-deprecated-structs.yaml

diff --git a/.chloggen/confignet-remove-deprecated-structs.yaml b/.chloggen/confignet-remove-deprecated-structs.yaml
new file mode 100755
index 00000000000..66874ed07ed
--- /dev/null
+++ b/.chloggen/confignet-remove-deprecated-structs.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: confignet
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Removes deprecated `NetAddr` and `TCPAddr`
+
+# One or more tracking issues or pull requests related to the change
+issues: [9614]
+
+# (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: []
diff --git a/config/confignet/confignet.go b/config/confignet/confignet.go
index bab71e7c16b..09f7ec24ff6 100644
--- a/config/confignet/confignet.go
+++ b/config/confignet/confignet.go
@@ -16,10 +16,6 @@ type DialerConfig struct {
 	Timeout time.Duration `mapstructure:"timeout"`
 }
 
-// NetAddr represents a network endpoint address.
-// Deprecated: [v0.95.0] Use AddrConfig instead.
-type NetAddr = AddrConfig
-
 // AddrConfig represents a network endpoint address.
 type AddrConfig struct {
 	// Endpoint configures the address for this network connection.
@@ -49,10 +45,6 @@ func (na *AddrConfig) Listen(ctx context.Context) (net.Listener, error) {
 	return lc.Listen(ctx, na.Transport, na.Endpoint)
 }
 
-// TCPAddr represents a TCP endpoint address.
-// Deprecated: [v0.95.0] Use TCPAddrConfig instead.
-type TCPAddr = TCPAddrConfig
-
 // TCPAddrConfig represents a TCP endpoint address.
 type TCPAddrConfig struct {
 	// Endpoint configures the address for this network connection.