logger: fixed tests

shuttle-hq · iulianbarbu · Aug 24, 2023 · Aug 22, 2023 · Aug 22, 2023 · Aug 22, 2023
commit 12fea556717f4b8b99a79a266cb3eb346b5b4332
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/logger/Cargo.toml b/logger/Cargo.toml
@@ -25,8 +25,7 @@ tokio = { workspace = true, features = ["rt-multi-thread"] }
 tokio-stream = { workspace = true }
 tonic = { workspace = true }
 tracing = { workspace = true }
-tracing-subscriber = { workspace = true, features = ["default"] }
-tracing-opentelemetry = { workspace = true }
+tracing-subscriber = { workspace = true, features = ["default", "json"] }
 
 [dependencies.shuttle-common]
 workspace = true
@@ -40,5 +39,3 @@ portpicker = { workspace = true }
 pretty_assertions = { workspace = true }
 serde_json = { workspace = true }
 shuttle-common-tests = { workspace = true }
-opentelemetry-otlp = { workspace = true }
-opentelemetry = { workspace = true }
diff --git a/logger/migrations/0000_init.sql b/logger/migrations/0000_init.sql
@@ -1,7 +1,6 @@
 CREATE TABLE IF NOT EXISTS logs (
     deployment_id TEXT,        -- The deployment that this log line pertains to.
     shuttle_service_name TEXT, -- The shuttle service which created this log.
-    timestamp INTEGER,         -- Unix epoch timestamp.
-    level INTEGER,             -- The log level
-    fields TEXT                -- Log fields object.
+    tx_timestamp INTEGER,      -- Unix epoch timestamp.
+    data BLOB                  -- Log fields object.
 );
diff --git a/logger/src/dal.rs b/logger/src/dal.rs
@@ -120,10 +120,10 @@ impl Dal for Sqlite {
 
 #[derive(Clone, Debug, FromRow)]
 pub struct Log {
-    pub(crate) deployment_id: String,
-    pub(crate) shuttle_service_name: String,
-    pub(crate) tx_timestamp: DateTime<Utc>,
-    pub(crate) data: Vec<u8>,
+    pub deployment_id: String,
+    pub shuttle_service_name: String,
+    pub tx_timestamp: DateTime<Utc>,
+    pub data: Vec<u8>,
 }
 
 impl From<Log> for LogItem {

diff --git a/logger/src/lib.rs b/logger/src/lib.rs
@@ -1,7 +1,7 @@
 use async_broadcast::Sender;
 use async_trait::async_trait;
 use chrono::{DateTime, NaiveDateTime, Utc};
-use dal::{Dal, DalError, Log};
+use dal::{Dal, DalError};
 use shuttle_common::{backends::auth::VerifyClaim, claims::Scope};
 use shuttle_proto::logger::{
     logger_server::Logger, LogItem, LogsRequest, LogsResponse, StoreLogsRequest, StoreLogsResponse,
@@ -14,6 +14,7 @@ use tonic::{Request, Response, Status};
 pub mod args;
 mod dal;
 
+pub use dal::Log;
 pub use dal::Sqlite;
 
 /// A wrapper to capture any error possible with this service
@@ -62,7 +63,6 @@ where
 
         let request = request.into_inner();
         let logs = request.logs;
-
         if !logs.is_empty() {
             _ = self
                 .logs_tx

diff --git a/logger/src/main.rs b/logger/src/main.rs
@@ -1,7 +1,6 @@
 use std::time::Duration;
 
 use clap::Parser;
-use opentelemetry_proto::tonic::collector::trace::v1::trace_service_server::TraceServiceServer;
 use shuttle_common::backends::{
     auth::{AuthPublicKey, JwtAuthenticationLayer},
     tracing::{setup_tracing, ExtractPropagationLayer},