revert some stuff

OxfordAbstracts · Oct 22, 2024 · a88277f · a88277f
1 parent caf244d
commit a88277f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 25 deletions.
diff --git a/metrics/Cargo.lock b/metrics/Cargo.lock
diff --git a/metrics/Cargo.toml b/metrics/Cargo.toml
@@ -13,7 +13,6 @@ log = "0.4.16"
 
 reqwest = { version = "0.11", features = ["json"]}
 
-base64 = "0.22.1"
 tokio = { version = "1.37", features = ["full"]}
 actix-web = "4.0.1"
 actix-ws = "0.3.0"

diff --git a/metrics/src/logprocessor.rs b/metrics/src/logprocessor.rs
@@ -2,7 +2,6 @@ use log::warn;
 
 use serde::Deserialize;
 use serde_json::{from_str, from_value};
-use base64::prelude::{Engine as _, BASE64_STANDARD_NO_PAD};
 use crate::Telemetry;
 
 use opentelemetry::{
@@ -202,26 +201,25 @@ pub async fn log_processor(logline: &String, metric_obj: &Telemetry, tracer: &tr
                     handle_http_log(&log,metric_obj).await;
                 }
                 "websocket-log" => {
-                    println!("Got WS log: {}", logline);
                     handle_websocket_log(&log,metric_obj).await;
                 }
                 _ => {}
             };
 
             //Send log to opentel:
-            // tracer.in_span("hasura-log", |cx| {
-            //     let span = cx.span();
-            //     span.add_event(
-            //         logline.clone(),
-            //         vec![],
-            //     );
-            //     span.set_attribute(KeyValue::new("hasura-timestamp", log.timestamp));
-            //     span.set_attribute(KeyValue::new("hasura-logtype", log.logtype));
-            // });
+            tracer.in_span("hasura-log", |cx| {
+                let span = cx.span();
+                span.add_event(
+                    logline.clone(),
+                    vec![],
+                );
+                span.set_attribute(KeyValue::new("hasura-timestamp", log.timestamp));
+                span.set_attribute(KeyValue::new("hasura-logtype", log.logtype));
+            });
         }
         Err(e) => {
             warn!("Failed to parse log line: {}", e);
-            warn!("Line was b64: {}", BASE64_STANDARD_NO_PAD.encode(logline));
+            warn!("Line was: {}", logline);
         }
     };
 }
diff --git a/metrics/src/main.rs b/metrics/src/main.rs
@@ -193,7 +193,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     debug!("Configuration: {:?}", config);
 
-    // let terminate_rx = signal_handler();
+    let terminate_rx = signal_handler();
 
     let metric_obj: Telemetry = Telemetry::new(config.common_labels.clone().unwrap_or_default(),config.histogram_buckets.clone());
     let metric_obj = web::Data::new(metric_obj);
@@ -202,7 +202,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         webserver(&config),
         // logreader::read_file(&tracer, &log_file, &metric_obj, config.sleep_time, terminate_rx.clone()),
         logreceiver::ws_server(&config, tracer.clone(), metric_obj.clone()),
-        // collectors::run_metadata_collector(&config, &metric_obj, terminate_rx.clone())
+        collectors::run_metadata_collector(&config, &metric_obj, terminate_rx.clone())
     );
 
     match res {