Merge branch 'main' into chore-lambda-evaluator

databendlabs · Nov 29, 2023 · 42497a0 · 42497a0
2 parents a48cb3c + 56be80a
commit 42497a0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/.cargo/audit.toml b/.cargo/audit.toml
@@ -18,5 +18,17 @@ ignore = [
     "RUSTSEC-2021-0139",
     # buf_redux
     # buf_redux is Unmaintained
-    "RUSTSEC-2023-0028"
+    "RUSTSEC-2023-0028",
+    # rsa
+    # Marvin Attack: potential key recovery through timing sidechannels
+    "RUSTSEC-2023-0071",
+    # mach
+    # mach is Unmaintained
+    "RUSTSEC-2020-0168",
+    # atty
+    # Potential unaligned read
+    "RUSTSEC-2021-0145",
+    # borsh
+    # Parsing borsh messages with ZST which are not-copy/clone is unsound
+    "RUSTSEC-2023-0033"
 ]
diff --git a/src/common/tracing/Cargo.toml b/src/common/tracing/Cargo.toml
@@ -26,7 +26,7 @@ log = { workspace = true }
 minitrace = { workspace = true }
 minitrace-opentelemetry = "0.6"
 opentelemetry = { version = "0.20", features = ["trace", "logs"] }
-opentelemetry-otlp = { version = "0.13", features = ["trace", "logs"] }
+opentelemetry-otlp = { version = "0.13", features = ["trace", "logs", "grpc-tonic"] }
 opentelemetry_sdk = { version = "0.20", features = ["trace", "logs", "rt-tokio"] }
 serde = { workspace = true }
 serde_json = "1"

diff --git a/src/common/tracing/src/init.rs b/src/common/tracing/src/init.rs
@@ -162,7 +162,7 @@ pub fn init_logging(
         let mut labels = labels.clone();
         labels.insert("category".to_string(), "system".to_string());
         labels.extend(cfg.otlp.labels.clone());
-        let logger = new_otlp_log_writer(&cfg.tracing.otlp_endpoint, labels);
+        let logger = new_otlp_log_writer(&cfg.otlp.endpoint, labels);
         let dispatch = fern::Dispatch::new()
             .level(cfg.otlp.level.parse().unwrap_or(LevelFilter::Info))
             .format(formatter("json"))
@@ -196,7 +196,7 @@ pub fn init_logging(
             let mut labels = labels.clone();
             labels.insert("category".to_string(), "query".to_string());
             labels.extend(cfg.query.labels.clone());
-            let logger = new_otlp_log_writer(&cfg.tracing.otlp_endpoint, labels);
+            let logger = new_otlp_log_writer(&cfg.query.otlp_endpoint, labels);
             query_logger = query_logger.chain(Box::new(logger) as Box<dyn Log>);
         }
     }