graph, graphql: Replace custom LogLevel enum with slog::Level

Author: fordN

graph/src/components/log_store/elasticsearch.rs

@@ -45,7 +45,7 @@ impl ElasticsearchLogStore {
         if let Some(level) = &query.level {
             must_clauses.push(json!({
                 "term": {
-                    "level": level.as_str()
+                    "level": level.as_str().to_ascii_lowercase()
                 }
             }));
         }

graph/src/components/log_store/file.rs

@@ -286,8 +286,8 @@ struct FileLogMeta {
 
 #[cfg(test)]
 mod tests {
-    use super::super::LogLevel;
     use super::*;
+    use slog::Level;
     use std::io::Write;
     use tempfile::TempDir;
 
@@ -377,7 +377,7 @@ mod tests {
         assert_eq!(entries.len(), 1);
         assert_eq!(entries[0].id, "log-1");
         assert_eq!(entries[0].text, "Test error message");
-        assert_eq!(entries[0].level, LogLevel::Error);
+        assert_eq!(entries[0].level, Level::Error);
     }
 
     #[tokio::test]
@@ -410,7 +410,7 @@ mod tests {
         // Query for errors only
         let query = LogQuery {
             subgraph_id,
-            level: Some(LogLevel::Error),
+            level: Some(Level::Error),
             from: None,
             to: None,
             search: None,
@@ -424,7 +424,7 @@ mod tests {
 
         let entries = result.unwrap();
         assert_eq!(entries.len(), 2);
-        assert!(entries.iter().all(|e| e.level == LogLevel::Error));
+        assert!(entries.iter().all(|e| e.level == Level::Error));
     }
 
     #[tokio::test]

graph/src/components/log_store/loki.rs

@@ -33,7 +33,7 @@ impl LokiLogStore {
 
         // Add log level selector if specified
         if let Some(level) = &query.level {
-            selectors.push(format!("level=\"{}\"", level.as_str()));
+            selectors.push(format!("level=\"{}\"", level.as_str().to_ascii_lowercase()));
         }
 
         // Base selector
@@ -234,8 +234,8 @@ struct LokiLogMeta {
 
 #[cfg(test)]
 mod tests {
-    use super::super::LogLevel;
     use super::*;
+    use slog::Level;
 
     #[test]
     fn test_build_logql_query_basic() {
@@ -260,7 +260,7 @@ mod tests {
         let store = LokiLogStore::new("http://localhost:3100".to_string(), None).unwrap();
         let query = LogQuery {
             subgraph_id: DeploymentHash::new("QmTest").unwrap(),
-            level: Some(LogLevel::Error),
+            level: Some(Level::Error),
             from: None,
             to: None,
             search: None,

graph/src/components/log_store/mod.rs

@@ -4,6 +4,7 @@ pub mod file;
 pub mod loki;
 
 use async_trait::async_trait;
+use slog::Level;
 use std::fmt;
 use std::path::PathBuf;
 use std::str::FromStr;
@@ -55,42 +56,6 @@ pub enum LogStoreConfig {
     },
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum LogLevel {
-    Critical,
-    Error,
-    Warning,
-    Info,
-    Debug,
-}
-
-impl LogLevel {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            LogLevel::Critical => "critical",
-            LogLevel::Error => "error",
-            LogLevel::Warning => "warning",
-            LogLevel::Info => "info",
-            LogLevel::Debug => "debug",
-        }
-    }
-}
-
-impl FromStr for LogLevel {
-    type Err = String;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s.trim().to_lowercase().as_str() {
-            "critical" => Ok(LogLevel::Critical),
-            "error" => Ok(LogLevel::Error),
-            "warning" => Ok(LogLevel::Warning),
-            "info" => Ok(LogLevel::Info),
-            "debug" => Ok(LogLevel::Debug),
-            _ => Err(format!("Invalid log level: {}", s)),
-        }
-    }
-}
-
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum OrderDirection {
     Asc,
@@ -136,7 +101,7 @@ pub struct LogEntry {
     pub id: String,
     pub subgraph_id: DeploymentHash,
     pub timestamp: String,
-    pub level: LogLevel,
+    pub level: Level,
     pub text: String,
     pub arguments: Vec<(String, String)>,
     pub meta: LogMeta,
@@ -145,7 +110,7 @@ pub struct LogEntry {
 #[derive(Debug, Clone)]
 pub struct LogQuery {
     pub subgraph_id: DeploymentHash,
-    pub level: Option<LogLevel>,
+    pub level: Option<Level>,
     pub from: Option<String>,
     pub to: Option<String>,
     pub search: Option<String>,

graphql/src/store/logs.rs

@@ -70,11 +70,11 @@ pub fn build_log_query(
         match name.as_str() {
             "level" => {
                 if let r::Value::Enum(level_str) = value {
-                    level = Some(level_str.parse().map_err(|e: String| {
+                    level = Some(level_str.parse().map_err(|_| {
                         QueryExecutionError::InvalidArgumentError(
                             field.position,
                             "level".to_string(),
-                            q::Value::String(e),
+                            q::Value::String(format!("Invalid log level: {}", level_str)),
                         )
                     })?);
                 }