chore(sinks)!: remove deprecated headers option from http and opentelemetry sinks (#24994)

* chore(sinks): remove deprecated `headers` option from http and opentelemetry sinks

* Fix tests

Author: thomasqueirozb

benches/http.rs

@@ -55,7 +55,6 @@ fn benchmark_http(c: &mut Criterion) {
                                 compression: *compression,
                                 method: Default::default(),
                                 auth: Default::default(),
-                                headers: Default::default(),
                                 payload_prefix: Default::default(),
                                 payload_suffix: Default::default(),
                                 batch,

changelog.d/remove_deprecated_http_headers_option.breaking.md

@@ -0,0 +1,4 @@
+The `headers` option has been removed from the `http` and `opentelemetry` sinks.
+Use `request.headers` instead. This option has been deprecated since v0.33.0.
+
+authors: thomasqueirozb

src/sinks/axiom/config.rs

@@ -170,7 +170,6 @@ impl SinkConfig for AxiomConfig {
             request,
             acknowledgements: self.acknowledgements,
             batch: self.batch,
-            headers: None,
             encoding: EncodingConfigWithFraming::new(
                 Some(FramingConfig::NewlineDelimited),
                 SerializerConfig::Json(JsonSerializerConfig {

src/sinks/http/config.rs

@@ -57,13 +57,6 @@ pub struct HttpSinkConfig {
     #[configurable(derived)]
     pub auth: Option<Auth>,
 
-    /// A list of custom headers to add to each request.
-    #[configurable(deprecated = "This option has been deprecated, use `request.headers` instead.")]
-    #[configurable(metadata(
-        docs::additional_props_description = "An HTTP request header and it's value."
-    ))]
-    pub headers: Option<BTreeMap<String, String>>,
-
     #[configurable(derived)]
     #[serde(default)]
     pub compression: Compression,
@@ -242,8 +235,7 @@ impl SinkConfig for HttpSinkConfig {
         let encoder = self.build_encoder()?;
         let transformer = self.encoding.transformer();
 
-        let mut request = self.request.clone();
-        request.add_old_option(self.headers.clone());
+        let request = self.request.clone();
 
         validate_headers(&request.headers, self.auth.is_some())?;
         let (static_headers, template_headers) = request.split_headers();
@@ -406,7 +398,6 @@ mod tests {
                     Transformer::default(),
                 ),
                 auth: None,
-                headers: None,
                 compression: Compression::default(),
                 batch: BatchConfig::default(),
                 request: RequestConfig::default(),

src/sinks/http/tests.rs

@@ -59,7 +59,6 @@ fn default_cfg(encoding: EncodingConfigWithFraming) -> HttpSinkConfig {
         uri: Default::default(),
         method: Default::default(),
         auth: Default::default(),
-        headers: Default::default(),
         compression: Default::default(),
         encoding,
         payload_prefix: Default::default(),

src/sinks/opentelemetry/mod.rs

@@ -49,7 +49,6 @@ impl Default for Protocol {
             uri: Default::default(),
             method: HttpMethod::Post,
             auth: Default::default(),
-            headers: Default::default(),
             compression: Default::default(),
             payload_prefix: Default::default(),
             payload_suffix: Default::default(),

src/sinks/util/http.rs

@@ -684,13 +684,6 @@ fn headers_examples() -> BTreeMap<String, String> {
 }
 
 impl RequestConfig {
-    pub fn add_old_option(&mut self, headers: Option<BTreeMap<String, String>>) {
-        if let Some(headers) = headers {
-            warn!("Option `headers` has been deprecated. Use `request.headers` instead.");
-            self.headers.extend(headers);
-        }
-    }
-
     pub fn split_headers(&self) -> (BTreeMap<String, String>, BTreeMap<String, Template>) {
         let mut static_headers = BTreeMap::new();
         let mut template_headers = BTreeMap::new();

website/cue/reference/components/sinks/generated/http.cue

@@ -780,17 +780,6 @@ generated: components: sinks: http: configuration: {
 			}
 		}
 	}
-	headers: {
-		deprecated:         true
-		deprecated_message: "This option has been deprecated, use `request.headers` instead."
-		description:        "A list of custom headers to add to each request."
-		required:           false
-		type: object: options: "*": {
-			description: "An HTTP request header and it's value."
-			required:    true
-			type: string: {}
-		}
-	}
 	method: {
 		description: "The HTTP method to use when making the request."
 		required:    false

website/cue/reference/components/sinks/generated/opentelemetry.cue

@@ -783,17 +783,6 @@ generated: components: sinks: opentelemetry: configuration: protocol: {
 				}
 			}
 		}
-		headers: {
-			deprecated:         true
-			deprecated_message: "This option has been deprecated, use `request.headers` instead."
-			description:        "A list of custom headers to add to each request."
-			required:           false
-			type: object: options: "*": {
-				description: "An HTTP request header and it's value."
-				required:    true
-				type: string: {}
-			}
-		}
 		method: {
 			description: "The HTTP method to use when making the request."
 			required:    false