chore(stackable-telemetry): Add SettingsDouble and SettingsTriple tuple and From impls as a config shortcut similar to before this PR

Author: NickLarsenNZ

crates/stackable-telemetry/src/tracing/mod.rs

@@ -44,7 +44,7 @@ pub enum Error {
 ///
 /// # Usage:
 /// ```
-/// use stackable_telemetry::tracing::{Tracing, Error};
+/// use stackable_telemetry::tracing::{Tracing, Error, settings::{Build as _, Settings}};
 /// use tracing_subscriber::filter::LevelFilter;
 ///
 /// #[tokio::main]
@@ -53,9 +53,15 @@ pub enum Error {
 ///     // `let _ =`, as that will drop immediately.
 ///     let _tracing_guard = Tracing::builder()
 ///         .service_name("test")
-///         .with_console_output("TEST_CONSOLE", LevelFilter::INFO)
-///         .with_otlp_log_exporter("TEST_OTLP_LOG", LevelFilter::DEBUG)
-///         .with_otlp_trace_exporter("TEST_OTLP_TRACE", LevelFilter::TRACE)
+///         .with_console_output(
+///             Settings::builder()
+///                 .environment_variable("TEST_CONSOLE")
+///                 .default_level(LevelFilter::INFO)
+///                 .enabled(true)
+///                 .build()
+///         )
+///         .with_otlp_log_exporter(("TEST_OTLP_LOG", LevelFilter::DEBUG).into())
+///         .with_otlp_trace_exporter(("TEST_OTLP_TRACE", LevelFilter::TRACE).into())
 ///         .build()
 ///         .init()?;
 ///
@@ -483,20 +489,8 @@ mod test {
                     .enabled(true)
                     .build(),
             )
-            .with_otlp_log_exporter(
-                Settings::builder()
-                    .env_var("ABC_OTLP_LOG")
-                    .default_level(LevelFilter::DEBUG)
-                    .enabled(true)
-                    .build(),
-            )
-            .with_otlp_trace_exporter(
-                Settings::builder()
-                    .env_var("ABC_OTLP_TRACE")
-                    .default_level(LevelFilter::TRACE)
-                    .enabled(true)
-                    .build(),
-            )
+            .with_otlp_log_exporter(("ABC_OTLP_LOG", LevelFilter::DEBUG).into())
+            .with_otlp_trace_exporter(("ABC_OTLP_TRACE", LevelFilter::TRACE).into())
             .build();
 
         assert_eq!(

crates/stackable-telemetry/src/tracing/settings/console_log.rs

@@ -1,6 +1,6 @@
 use tracing::level_filters::LevelFilter;
 
-use super::{Build, CommonSettings, Settings, SettingsBuilder};
+use super::{Build, CommonSettings, Settings, SettingsBuilder, SettingsDouble, SettingsTriple};
 
 #[derive(Debug, Default, PartialEq)]
 pub struct ConsoleLogSettings {
@@ -73,6 +73,24 @@ impl CommonSettings for ConsoleLogSettings {
     }
 }
 
+impl From<SettingsDouble> for ConsoleLogSettings {
+    fn from(value: SettingsDouble) -> Self {
+        Self {
+            common_settings: value.into(),
+            ..Default::default()
+        }
+    }
+}
+
+impl From<SettingsTriple> for ConsoleLogSettings {
+    fn from(value: SettingsTriple) -> Self {
+        Self {
+            common_settings: value.into(),
+            ..Default::default()
+        }
+    }
+}
+
 #[cfg(test)]
 mod test {
     use tracing::level_filters::LevelFilter;

crates/stackable-telemetry/src/tracing/settings/mod.rs

@@ -102,6 +102,31 @@ impl From<SettingsBuilder> for Settings {
     }
 }
 
+pub(crate) type SettingsDouble = (&'static str, LevelFilter);
+pub(crate) type SettingsTriple = (&'static str, LevelFilter, bool);
+
+// for enabling a subscriber in one line with no extra settings
+impl From<SettingsDouble> for Settings {
+    fn from((environment_variable, default_level): SettingsDouble) -> Self {
+        Settings {
+            environment_variable,
+            default_level,
+            enabled: true,
+        }
+    }
+}
+
+// for configuring a subscriber in one line with no extra settings
+impl From<SettingsTriple> for Settings {
+    fn from((environment_variable, default_level, enabled): SettingsTriple) -> Self {
+        Settings {
+            environment_variable,
+            default_level,
+            enabled,
+        }
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;

crates/stackable-telemetry/src/tracing/settings/otlp_log.rs

@@ -1,6 +1,6 @@
 use tracing::level_filters::LevelFilter;
 
-use super::{Build, CommonSettings, Settings, SettingsBuilder};
+use super::{Build, CommonSettings, Settings, SettingsBuilder, SettingsDouble, SettingsTriple};
 
 #[derive(Debug, Default, PartialEq)]
 pub struct OtlpLogSettings {
@@ -56,6 +56,24 @@ impl CommonSettings for OtlpLogSettings {
     }
 }
 
+impl From<SettingsDouble> for OtlpLogSettings {
+    fn from(value: SettingsDouble) -> Self {
+        Self {
+            common_settings: value.into(),
+            ..Default::default()
+        }
+    }
+}
+
+impl From<SettingsTriple> for OtlpLogSettings {
+    fn from(value: SettingsTriple) -> Self {
+        Self {
+            common_settings: value.into(),
+            ..Default::default()
+        }
+    }
+}
+
 #[cfg(test)]
 mod test {
     use tracing::level_filters::LevelFilter;

crates/stackable-telemetry/src/tracing/settings/otlp_trace.rs

@@ -1,6 +1,6 @@
 use tracing::level_filters::LevelFilter;
 
-use super::{Build, CommonSettings, Settings, SettingsBuilder};
+use super::{Build, CommonSettings, Settings, SettingsBuilder, SettingsDouble, SettingsTriple};
 
 #[derive(Debug, Default, PartialEq)]
 pub struct OtlpTraceSettings {
@@ -56,6 +56,24 @@ impl CommonSettings for OtlpTraceSettings {
     }
 }
 
+impl From<SettingsDouble> for OtlpTraceSettings {
+    fn from(value: SettingsDouble) -> Self {
+        Self {
+            common_settings: value.into(),
+            ..Default::default()
+        }
+    }
+}
+
+impl From<SettingsTriple> for OtlpTraceSettings {
+    fn from(value: SettingsTriple) -> Self {
+        Self {
+            common_settings: value.into(),
+            ..Default::default()
+        }
+    }
+}
+
 #[cfg(test)]
 mod test {
     use tracing::level_filters::LevelFilter;