fix(socket source): fix socket source ignoring global log_namespace w…

…hen computing outputs (#20966) * fix socket ignoring global log_namespace * use merge method instead of unwrap_or
vectordotdev · Jul 30, 2024 · ecce2ed · ecce2ed
1 parent 9121a7f
commit ecce2ed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/changelog.d/socket-not-respecting-global-log-namespace.fix.md b/changelog.d/socket-not-respecting-global-log-namespace.fix.md
@@ -0,0 +1,3 @@
+The `socket` source now respects global log_namespace setting.
+
+authors: Zettroke
diff --git a/src/sources/socket/mod.rs b/src/sources/socket/mod.rs
@@ -69,14 +69,14 @@ impl SocketConfig {
  }
  }
 
- fn log_namespace(&self) -> LogNamespace {
+ fn log_namespace(&self, global_log_namespace: LogNamespace) -> LogNamespace {
  match &self.mode {
- Mode::Tcp(config) => config.log_namespace.unwrap_or(false).into(),
- Mode::Udp(config) => config.log_namespace.unwrap_or(false).into(),
+ Mode::Tcp(config) => global_log_namespace.merge(config.log_namespace),
+ Mode::Udp(config) => global_log_namespace.merge(config.log_namespace),
  #[cfg(unix)]
- Mode::UnixDatagram(config) => config.log_namespace.unwrap_or(false).into(),
+ Mode::UnixDatagram(config) => global_log_namespace.merge(config.log_namespace),
  #[cfg(unix)]
- Mode::UnixStream(config) => config.log_namespace.unwrap_or(false).into(),
+ Mode::UnixStream(config) => global_log_namespace.merge(config.log_namespace),
  }
  }
 }
@@ -202,7 +202,7 @@ impl SourceConfig for SocketConfig {
  }
 
  fn outputs(&self, global_log_namespace: LogNamespace) -> Vec<SourceOutput> {
- let log_namespace = global_log_namespace.merge(Some(self.log_namespace()));
+ let log_namespace = self.log_namespace(global_log_namespace);
 
  let schema_definition = self
  .decoding()