observability: implement json-logging to stdout for aptos-logger (apt…

…os-labs#2182)
byteflyfunny · Jul 25, 2022 · fd60a8b · fd60a8b
1 parent 1d100ab
commit fd60a8b
Show file tree

Hide file tree

Showing 11 changed files with 186 additions and 69 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -9,6 +9,10 @@ repos:
       - id: end-of-file-fixer
         files: \.(rs|move)$
       - id: check-added-large-files
+  - repo: https://github.com/doublify/pre-commit-rust
+    rev: v1.0
+    hooks:
+    -   id: fmt
   - repo: https://github.com/Lucas-C/pre-commit-hooks
     rev: v1.3.0
     hooks:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/consensus/src/experimental/linkedlist.rs b/consensus/src/experimental/linkedlist.rs
@@ -4,11 +4,11 @@
 // modified from https://rust-unofficial.github.io/too-many-lists/fourth-final.html (MIT License)
 
 // maybe later we can move this to /common
+use aptos_infallible::{Mutex, MutexGuard};
 use std::{
     cell::{Ref, RefCell, RefMut},
     rc::Rc,
 };
-use aptos_infallible::{Mutex, MutexGuard};
 
 pub struct List<T> {
     pub head: Link<T>,

diff --git a/crates/aptos-crypto/src/unit_tests/compilation/cross_test.rs b/crates/aptos-crypto/src/unit_tests/compilation/cross_test.rs
@@ -7,7 +7,7 @@ use aptos_crypto::{
     test_utils::KeyPair,
     traits::*,
 };
-use aptos_crypto_derive::{CryptoHasher, BCSCryptoHash};
+use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher};
 use rand::{prelude::ThreadRng, thread_rng};
 use serde::{Deserialize, Serialize};
 

diff --git a/crates/aptos-logger/Cargo.toml b/crates/aptos-logger/Cargo.toml
@@ -20,8 +20,13 @@ once_cell = "1.10.0"
 prometheus = { version = "0.13.0", default-features = false }
 serde = { version = "1.0.137", features = ["derive"] }
 serde_json = "1.0.81"
+strum = "0.24.1"
+strum_macros = "0.24.2"
 tracing = "0.1.34"
 tracing-subscriber = "0.3.11"
 
 aptos-infallible = { path = "../aptos-infallible" }
 aptos-log-derive = { path = "../aptos-log-derive" }
+
+[dev-dependencies]
+pretty_assertions = "1.2.1"