Merge branch 'main' into rustls

shotover/Cargo.toml

@@ -43,6 +43,7 @@ typetag.workspace = true
 thiserror = "1.0"
 anyhow.workspace = true
 backtrace = "0.3.66"
+backtrace-ext = "0.2"
 
 # Parsers
 cql3-parser = "0.3.2"

shotover/src/runner.rs

@@ -234,9 +234,7 @@ impl TracingState {
  .with_env_filter(env_filter)
  .with_filter_reloading();
  let handle = ReloadHandle::Json(builder.reload_handle());
- // To avoid unit tests that run in the same excutable from blowing up when they try to reinitialize tracing we ignore the result returned by try_init.
- // Currently the implementation of try_init will only fail when it is called multiple times.
- builder.try_init().ok();
+ builder.init();
  handle
  }
  LogFormat::Human => {
@@ -245,13 +243,10 @@ impl TracingState {
  .with_env_filter(env_filter)
  .with_filter_reloading();
  let handle = ReloadHandle::Human(builder.reload_handle());
- builder.try_init().ok();
+ builder.init();
  handle
  }
  };
- if let LogFormat::Json = format {
- crate::tracing_panic_handler::setup();
- }
 
  // When in json mode we need to process panics as events instead of printing directly to stdout.
  // This is so that:

shotover/src/tracing_panic_handler.rs

@@ -1,4 +1,4 @@
-use backtrace::{Backtrace, BacktraceFmt, BacktraceFrame, BytesOrWideString, PrintFmt};
+use backtrace::{Backtrace, BacktraceFmt, BytesOrWideString, PrintFmt};
 use std::fmt;
 
 pub fn setup() {
@@ -49,37 +49,9 @@ impl fmt::Display for BacktraceFormatter {
 
  let mut f = BacktraceFmt::new(f, PrintFmt::Short, &mut print_path);
  f.add_context()?;
- let mut include_frames = false;
- for frame in self.0.frames() {
- if frame_is_named(
- frame,
- "std::sys_common::backtrace::__rust_begin_short_backtrace",
- ) {
- break;
- }
-
- if include_frames {
- f.frame().backtrace_frame(frame)?;
- }
-
- if frame_is_named(
- frame,
- "std::sys_common::backtrace::__rust_end_short_backtrace",
- ) {
- include_frames = true;
- }
+ for (frame, _) in backtrace_ext::short_frames_strict(&self.0) {
+ f.frame().backtrace_frame(frame)?;
  }
  f.finish()
  }
 }
-
-fn frame_is_named(frame: &BacktraceFrame, name: &str) -> bool {
- for symbol in frame.symbols() {
- if let Some(full_name) = symbol.name() {
- if format!("{}", full_name).starts_with(name) {
- return true;
- }
- }
- }
- false
-}