Merge pull request #298 from jpmcb/human-readable-logs

Removes `bunyan` JSON style logging
bottlerocket-os · Oct 13, 2022 · b2785f3 · b2785f3
2 parents f3d73e6 + 8b974db
commit b2785f3
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 45 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/agent/Cargo.toml b/agent/Cargo.toml
@@ -14,7 +14,6 @@ futures = "0.3"
 opentelemetry = { version = "0.16", features = ["rt-tokio-current-thread"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["registry", "env-filter"] }
-tracing-bunyan-formatter = "0.3"
 tracing-opentelemetry = "0.16"
 
 # k8s-openapi must match the version required by kube and enable a k8s version feature

diff --git a/agent/src/main.rs b/agent/src/main.rs
@@ -15,8 +15,7 @@ use models::node::{brs_name_from_node_name, BottlerocketShadow};
 use opentelemetry::sdk::propagation::TraceContextPropagator;
 use snafu::{OptionExt, ResultExt};
 use tracing::{event, Level};
-use tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer};
-use tracing_subscriber::{layer::SubscriberExt, EnvFilter, Registry};
+use tracing_subscriber::{fmt, layer::SubscriberExt, EnvFilter, Registry};
 
 use std::env;
 use std::fs;
@@ -117,10 +116,9 @@ pub fn init_telemetry() -> Result<()> {
     opentelemetry::global::set_text_map_propagator(TraceContextPropagator::new());
 
     let env_filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"));
-    let stdio_formatting_layer = BunyanFormattingLayer::new(AGENT.into(), std::io::stdout);
+    let stdio_formatting_layer = fmt::layer().pretty();
     let subscriber = Registry::default()
         .with(env_filter)
-        .with(JsonStorageLayer)
         .with(stdio_formatting_layer);
     tracing::subscriber::set_global_default(subscriber)
         .context(agent_error::TracingConfigurationSnafu)?;

diff --git a/apiserver/Cargo.toml b/apiserver/Cargo.toml
@@ -22,7 +22,6 @@ opentelemetry = { version = "0.16", features = ["rt-tokio-current-thread"]}
 opentelemetry-prometheus = "0.9"
 tracing = "0.1"
 tracing-actix-web = "0.4.0-beta.14"
-tracing-bunyan-formatter = "0.3"
 tracing-subscriber = { version = "0.3", features = ["registry", "env-filter"] }
 tracing-opentelemetry = "0.16"
 

diff --git a/apiserver/src/telemetry.rs b/apiserver/src/telemetry.rs
@@ -8,8 +8,7 @@ use opentelemetry::sdk::propagation::TraceContextPropagator;
 use snafu::ResultExt;
 use tracing::Span;
 use tracing_actix_web::{DefaultRootSpanBuilder, RootSpanBuilder};
-use tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer};
-use tracing_subscriber::{layer::SubscriberExt, EnvFilter, Registry};
+use tracing_subscriber::{fmt, layer::SubscriberExt, EnvFilter, Registry};
 
 use std::collections::HashSet;
 
@@ -58,10 +57,9 @@ pub fn init_telemetry() -> Result<(), telemetry_error::Error> {
     opentelemetry::global::set_text_map_propagator(TraceContextPropagator::new());
 
     let env_filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"));
-    let stdio_formatting_layer = BunyanFormattingLayer::new(APISERVER.into(), std::io::stdout);
+    let stdio_formatting_layer = fmt::layer().pretty();
     let subscriber = Registry::default()
         .with(env_filter)
-        .with(JsonStorageLayer)
         .with(stdio_formatting_layer);
     tracing::subscriber::set_global_default(subscriber)
         .context(telemetry_error::TracingConfigurationSnafu)?;

diff --git a/controller/Cargo.toml b/controller/Cargo.toml
@@ -24,6 +24,5 @@ serde_plain = "1.0.0"
 snafu = "0.7"
 tokio = { version = "1", features = ["macros", "rt-multi-thread", "time"] }
 tracing = "0.1"
-tracing-bunyan-formatter = "0.3"
 tracing-opentelemetry = "0.16"
 tracing-subscriber = { version = "0.3", features = ["registry", "env-filter"] }
diff --git a/controller/src/main.rs b/controller/src/main.rs
@@ -16,8 +16,7 @@ use kube::{
 use opentelemetry::sdk::propagation::TraceContextPropagator;
 use snafu::ResultExt;
 use tracing::{event, Level};
-use tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer};
-use tracing_subscriber::{layer::SubscriberExt, EnvFilter, Registry};
+use tracing_subscriber::{fmt, layer::SubscriberExt, EnvFilter, Registry};
 
 const DEFAULT_TRACE_LEVEL: &str = "info";
 
@@ -105,10 +104,9 @@ fn init_telemetry() -> Result<()> {
 
     let env_filter =
         EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new(DEFAULT_TRACE_LEVEL));
-    let stdio_formatting_layer = BunyanFormattingLayer::new(CONTROLLER.into(), std::io::stdout);
+    let stdio_formatting_layer = fmt::layer().pretty();
     let subscriber = Registry::default()
         .with(env_filter)
-        .with(JsonStorageLayer)
         .with(stdio_formatting_layer);
     tracing::subscriber::set_global_default(subscriber)
         .context(controller_error::TracingConfigurationSnafu)?;