Support for structured logging (JSON) txpipe#437

 - Added json_logs feature and made the used logging library dependend on the current feature flag setting.

Cargo.toml

@@ -21,6 +21,7 @@ bech32 = "0.9.1"
 clap = "3.2.22"
 log = "0.4.17"
 env_logger = "0.9.1"
+json_env_logger2 = { version = "0.2", features = ["iso-timestamps", "backtrace"], optional = true }
 crossterm = "0.25"
 merge = "0.1.0"
 config = { version = "0.13.2", default-features = false, features = [
@@ -79,3 +80,4 @@ fingerprint = ["murmur3"]
 aws = ["aws-config", "aws-sdk-sqs", "aws-sdk-lambda", "aws-sdk-s3", "tokio"]
 redissink = ["redis", "tokio"]
 gcp = ["cloud-pubsub", "tokio", "web"]
+json_logs = ["json_env_logger2"]

src/bin/oura/daemon.rs

@@ -5,6 +5,12 @@ use config::{Config, ConfigError, Environment, File};
 use log::debug;
 use serde::Deserialize;
 
+#[cfg(not(feature = "json_logs"))]
+use env_logger as logger;
+
+#[cfg(feature = "json_logs")]
+use json_env_logger2 as logger;
+
 use oura::{
     pipelining::{
         BootstrapResult, FilterProvider, PartialBootstrapResult, SinkProvider, SourceProvider,
@@ -293,7 +299,7 @@ fn bootstrap(
 }
 
 pub fn run(args: &ArgMatches) -> Result<(), Error> {
-    env_logger::init();
+    logger::init();
 
     let explicit_config = match args.is_present("config") {
         true => Some(args.value_of_t("config")?),

src/bin/oura/dump.rs

@@ -14,6 +14,12 @@ use oura::sinks::stdout::Config as StdoutConfig;
 use oura::sources::n2c::Config as N2CConfig;
 use oura::sources::n2n::Config as N2NConfig;
 
+#[cfg(not(feature = "json_logs"))]
+use env_logger as logger;
+
+#[cfg(feature = "json_logs")]
+use json_env_logger2 as logger;
+
 #[cfg(feature = "logs")]
 use oura::sinks::logs::Config as LogsConfig;
 
@@ -58,7 +64,7 @@ fn bootstrap_sink(sink: DumpSink, input: StageReceiver, utils: Arc<Utils>) -> Bo
 }
 
 pub fn run(args: &ArgMatches) -> Result<(), Error> {
-    env_logger::builder()
+    logger::builder()
         .filter_module("oura::dump", log::LevelFilter::Info)
         .init();
 

src/bin/oura/watch.rs

@@ -15,6 +15,12 @@ use oura::sources::n2n::Config as N2NConfig;
 
 use crate::Error;
 
+#[cfg(not(feature = "json_logs"))]
+use env_logger as logger;
+
+#[cfg(feature = "json_logs")]
+use json_env_logger2 as logger;
+
 #[derive(Clone, Debug, Deserialize)]
 pub enum PeerMode {
     AsNode,
@@ -39,7 +45,7 @@ enum WatchSource {
 }
 
 pub fn run(args: &ArgMatches) -> Result<(), Error> {
-    env_logger::builder()
+    logger::builder()
         .filter_level(log::LevelFilter::Error)
         .init();