refactor(stackable-telemetry): Revert SettingsDouble/SettingsTriple

Note: They will appear in a future PR

Author: NickLarsenNZ

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

@@ -487,8 +487,20 @@ mod test {
                     .enabled(true)
                     .build(),
             )
-            .with_otlp_log_exporter(("ABC_OTLP_LOG", LevelFilter::DEBUG).into())
-            .with_otlp_trace_exporter(("ABC_OTLP_TRACE", LevelFilter::TRACE).into())
+            .with_otlp_log_exporter(
+                Settings::builder()
+                    .with_environment_variable("ABC_OTLP_LOG")
+                    .with_default_level(LevelFilter::DEBUG)
+                    .enabled(true)
+                    .build(),
+            )
+            .with_otlp_trace_exporter(
+                Settings::builder()
+                    .with_environment_variable("ABC_OTLP_TRACE")
+                    .with_default_level(LevelFilter::TRACE)
+                    .enabled(true)
+                    .build(),
+            )
             .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, SettingsDouble, SettingsTriple};
+use super::{Build, CommonSettings, Settings, SettingsBuilder};
 
 #[derive(Debug, Default, PartialEq)]
 pub struct ConsoleLogSettings {
@@ -73,24 +73,6 @@ 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

@@ -108,31 +108,6 @@ 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, SettingsDouble, SettingsTriple};
+use super::{Build, CommonSettings, Settings, SettingsBuilder};
 
 #[derive(Debug, Default, PartialEq)]
 pub struct OtlpLogSettings {
@@ -56,24 +56,6 @@ 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, SettingsDouble, SettingsTriple};
+use super::{Build, CommonSettings, Settings, SettingsBuilder};
 
 #[derive(Debug, Default, PartialEq)]
 pub struct OtlpTraceSettings {
@@ -56,24 +56,6 @@ 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;