feat(stackable-telemetry): Add a settings builder for the otlp log exporter

Author: NickLarsenNZ

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

@@ -14,7 +14,7 @@ use opentelemetry_sdk::{
     trace, Resource,
 };
 use opentelemetry_semantic_conventions::resource;
-use settings::{ConsoleLogSettings, OtlpTraceSettings};
+use settings::{ConsoleLogSettings, OtlpLogSettings, OtlpTraceSettings};
 use snafu::{ResultExt as _, Snafu};
 use tracing::{level_filters::LevelFilter, subscriber::SetGlobalDefaultError};
 use tracing_subscriber::{filter::Directive, layer::SubscriberExt, EnvFilter, Layer, Registry};
@@ -383,16 +383,15 @@ impl TracingBuilder<builder_state::Config> {
     /// in the opentelemetry crates. See [`Tracing`].
     pub fn with_otlp_log_exporter(
         self,
-        env_var: &'static str,
-        default_level_filter: LevelFilter,
+        settings: OtlpLogSettings,
     ) -> TracingBuilder<builder_state::Config> {
         TracingBuilder {
             service_name: self.service_name,
             console_log_config: self.console_log_config,
             otlp_log_config: SubscriberConfig {
-                enabled: true,
-                env_var,
-                default_level_filter,
+                enabled: settings.common_settings.enabled,
+                env_var: settings.common_settings.environment_variable,
+                default_level_filter: settings.common_settings.default_level,
             },
             otlp_trace_config: self.otlp_trace_config,
             _marker: self._marker,
@@ -502,7 +501,13 @@ mod test {
                     .enabled(true)
                     .build(),
             )
-            .with_otlp_log_exporter("ABC_OTLP_LOG", LevelFilter::DEBUG)
+            .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")

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

@@ -3,6 +3,9 @@ use tracing::level_filters::LevelFilter;
 pub mod console_log;
 pub use console_log::*;
 
+pub mod otlp_log;
+pub use otlp_log::*;
+
 pub mod otlp_trace;
 pub use otlp_trace::*;
 
@@ -63,6 +66,10 @@ impl SettingsBuilder {
         self.into()
     }
 
+    pub fn otlp_log_settings_builder(self) -> OtlpLogSettingsBuilder {
+        self.into()
+    }
+
     pub fn otlp_trace_settings_builder(self) -> OtlpTraceSettingsBuilder {
         self.into()
     }

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

@@ -0,0 +1,66 @@
+use super::{Build, Settings, SettingsBuilder};
+
+#[derive(Debug, Default, PartialEq)]
+pub struct OtlpLogSettings {
+    pub common_settings: Settings,
+}
+
+pub struct OtlpLogSettingsBuilder {
+    pub(crate) common_settings: Settings,
+}
+
+impl OtlpLogSettingsBuilder {
+    pub fn build(self) -> OtlpLogSettings {
+        self.into()
+    }
+}
+
+impl From<SettingsBuilder> for OtlpLogSettingsBuilder {
+    fn from(value: SettingsBuilder) -> Self {
+        Self {
+            common_settings: value.into(),
+        }
+    }
+}
+
+impl From<OtlpLogSettingsBuilder> for OtlpLogSettings {
+    fn from(value: OtlpLogSettingsBuilder) -> Self {
+        Self {
+            common_settings: value.common_settings,
+        }
+    }
+}
+
+impl Build<OtlpLogSettings> for SettingsBuilder {
+    fn build(self) -> OtlpLogSettings {
+        OtlpLogSettings {
+            common_settings: self.into(),
+            ..Default::default()
+        }
+    }
+}
+#[cfg(test)]
+mod test {
+    use tracing::level_filters::LevelFilter;
+
+    use super::*;
+
+    #[test]
+    fn builds_settings() {
+        let expected = OtlpLogSettings {
+            common_settings: Settings {
+                environment_variable: "hello",
+                enabled: true,
+                default_level: LevelFilter::DEBUG,
+            },
+        };
+        let result = Settings::builder()
+            .enabled(true)
+            .env_var("hello")
+            .default_level(LevelFilter::DEBUG)
+            .otlp_log_settings_builder()
+            .build();
+
+        assert_eq!(expected, result);
+    }
+}