fix(chronicle-udm-events): remove encoding config from udm-events config

vectordotdev · Jan 15, 2025 · d6315a5 · d6315a5
1 parent 8b65f82
commit d6315a5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/src/sinks/gcp_chronicle/config.rs b/src/sinks/gcp_chronicle/config.rs
@@ -3,7 +3,6 @@ use vector_lib::config::AcknowledgementsConfig;
 use vector_lib::configurable::configurable_component;
 
 use crate::{
-    codecs::EncodingConfig,
     gcp::GcpAuthConfig,
     sinks::{
         gcp_chronicle::{
@@ -127,9 +126,6 @@ pub struct ChronicleCommonConfig {
     #[serde(default)]
     pub batch: BatchConfig<ChronicleDefaultBatchSettings>,
 
-    #[configurable(derived)]
-    pub encoding: EncodingConfig,
-
     #[serde(default)]
     #[configurable(derived)]
     pub compression: ChronicleCompression,

diff --git a/src/sinks/gcp_chronicle/udm_events/sink.rs b/src/sinks/gcp_chronicle/udm_events/sink.rs
@@ -18,7 +18,6 @@ use vector_lib::{
 };
 
 use crate::{
-    codecs,
     gcp::GcpAuthenticator,
     http::HttpClient,
     sinks::{
@@ -45,7 +44,6 @@ struct ChronicleUDMEventsRequestBody {
 #[derive(Clone, Debug)]
 struct ChronicleUDMEventsEncoder {
     customer_id: String,
-    transformer: codecs::Transformer,
 }
 
 impl Encoder<Vec<Event>> for ChronicleUDMEventsEncoder {
@@ -58,7 +56,6 @@ impl Encoder<Vec<Event>> for ChronicleUDMEventsEncoder {
         let events = input
             .into_iter()
             .filter_map(|mut event| {
-                self.transformer.transform(&mut event);
                 if let Log(ref mut log_event) = event {
                     byte_size.add_event(log_event, log_event.estimated_json_encoded_size_of());
                     Some(log_event.clone())
@@ -90,11 +87,9 @@ struct ChronicleUDMEventsRequestBuilder {
 
 impl ChronicleUDMEventsRequestBuilder {
     fn new(config: &ChronicleUDMEventsConfig) -> crate::Result<Self> {
-        let transformer = config.chronicle_common.encoding.transformer();
         let compression = Compression::from(config.chronicle_common.compression);
         let encoder = ChronicleUDMEventsEncoder {
-            customer_id: config.chronicle_common.customer_id.clone(),
-            transformer,
+            customer_id: config.chronicle_common.customer_id.clone()
         };
         Ok(Self {
             encoder,

diff --git a/src/sinks/gcp_chronicle/unstructured_logs/config.rs b/src/sinks/gcp_chronicle/unstructured_logs/config.rs
@@ -10,6 +10,7 @@ use std::collections::HashMap;
 use vector_lib::configurable::configurable_component;
 
 use crate::{
+    codecs::EncodingConfig,
     config::{SinkConfig, SinkContext},
     http::HttpClient,
     schema,
@@ -46,6 +47,9 @@ pub struct ChronicleUnstructuredConfig {
     #[configurable(metadata(docs::additional_props_description = "A Chronicle label."))]
     pub labels: Option<HashMap<String, String>>,
 
+    #[configurable(derived)]
+    pub encoding: EncodingConfig,
+
     /// The type of log entries in a request.
     ///
     /// This must be one of the [supported log types][unstructured_log_types_doc], otherwise

diff --git a/src/sinks/gcp_chronicle/unstructured_logs/sink.rs b/src/sinks/gcp_chronicle/unstructured_logs/sink.rs
@@ -201,8 +201,8 @@ struct Label {
 
 impl ChronicleUnstructuredRequestBuilder {
     fn new(config: &ChronicleUnstructuredConfig) -> crate::Result<Self> {
-        let transformer = config.chronicle_common.encoding.transformer();
-        let serializer = config.chronicle_common.encoding.config().build()?;
+        let transformer = config.encoding.transformer();
+        let serializer = config.encoding.config().build()?;
         let compression = Compression::from(config.chronicle_common.compression);
         let encoder = crate::codecs::Encoder::<()>::new(serializer);
         let encoder = ChronicleUnstructuredEncoder {