[Rust] Enter more session scoped tracing spans for debug info and binary view callbacks

18 files changed, 5 insertions, 16 deletions

diff --git a/plugins/warp/Cargo.toml b/plugins/warp/Cargo.toml
index 79f7632f..3a623e0a 100644
--- a/plugins/warp/Cargo.toml
+++ b/plugins/warp/Cargo.toml
@@ -11,6 +11,7 @@ crate-type = ["lib", "cdylib"]
 demo = []
 
 [dependencies]
+tracing = "0.1"
 binaryninja = { workspace = true, features = ["rayon"] }
 binaryninjacore-sys.workspace = true
 warp = { git = "https://github.com/Vector35/warp/", tag = "1.0.1" }
diff --git a/plugins/warp/demo/Cargo.toml b/plugins/warp/demo/Cargo.toml
index 50664483..662b4131 100644
--- a/plugins/warp/demo/Cargo.toml
+++ b/plugins/warp/demo/Cargo.toml
@@ -12,6 +12,7 @@ path = "../src/lib.rs"
 demo = []
 
 [dependencies]
+tracing = "0.1"
 binaryninja = { workspace = true, features = ["rayon", "demo"] }
 binaryninjacore-sys.workspace = true
 warp = { git = "https://github.com/Vector35/warp/", tag = "1.0.0" }
diff --git a/plugins/warp/src/cache.rs b/plugins/warp/src/cache.rs
index 30c7487c..41aab423 100644
--- a/plugins/warp/src/cache.rs
+++ b/plugins/warp/src/cache.rs
@@ -11,7 +11,7 @@ use binaryninja::binary_view::{BinaryView, BinaryViewExt};
 use binaryninja::function::Function as BNFunction;
 use binaryninja::rc::Guard;
 use binaryninja::rc::Ref as BNRef;
-use binaryninja::{tracing, ObjectDestructor};
+use binaryninja::ObjectDestructor;
 use std::hash::{DefaultHasher, Hash, Hasher};
 
 pub fn register_cache_destructor() {
diff --git a/plugins/warp/src/container/disk.rs b/plugins/warp/src/container/disk.rs
index 5e4a5613..6e296ea1 100644
--- a/plugins/warp/src/container/disk.rs
+++ b/plugins/warp/src/container/disk.rs
@@ -1,7 +1,6 @@
 use crate::container::{
     Container, ContainerError, ContainerResult, SourceId, SourcePath, SourceTag,
 };
-use binaryninja::tracing;
 use std::collections::{HashMap, HashSet};
 use std::fmt::{Debug, Display, Formatter};
 use std::hash::{Hash, Hasher};
diff --git a/plugins/warp/src/container/network.rs b/plugins/warp/src/container/network.rs
index 0908b103..0ba515f9 100644
--- a/plugins/warp/src/container/network.rs
+++ b/plugins/warp/src/container/network.rs
@@ -3,7 +3,6 @@ use crate::container::{
     Container, ContainerError, ContainerResult, ContainerSearchQuery, ContainerSearchResponse,
     SourceId, SourcePath, SourceTag,
 };
-use binaryninja::tracing;
 use directories::ProjectDirs;
 use std::collections::{HashMap, HashSet};
 use std::fmt::{Debug, Display, Formatter};
diff --git a/plugins/warp/src/container/network/client.rs b/plugins/warp/src/container/network/client.rs
index d3c94d1a..0b772dcc 100644
--- a/plugins/warp/src/container/network/client.rs
+++ b/plugins/warp/src/container/network/client.rs
@@ -5,7 +5,6 @@ use crate::container::{
 };
 use base64::Engine;
 use binaryninja::download::DownloadProvider;
-use binaryninja::tracing;
 use serde::Deserialize;
 use serde_json::json;
 use std::collections::HashMap;
diff --git a/plugins/warp/src/convert/types.rs b/plugins/warp/src/convert/types.rs
index 227df2ea..8421eb5e 100644
--- a/plugins/warp/src/convert/types.rs
+++ b/plugins/warp/src/convert/types.rs
@@ -6,7 +6,6 @@ use binaryninja::calling_convention::CoreCallingConvention as BNCallingConventio
 use binaryninja::confidence::Conf as BNConf;
 use binaryninja::confidence::MAX_CONFIDENCE;
 use binaryninja::rc::Ref as BNRef;
-use binaryninja::tracing;
 use binaryninja::types::BaseStructure as BNBaseStructure;
 use binaryninja::types::EnumerationBuilder as BNEnumerationBuilder;
 use binaryninja::types::FunctionParameter as BNFunctionParameter;
diff --git a/plugins/warp/src/plugin.rs b/plugins/warp/src/plugin.rs
index dec62c2f..cb527fff 100644
--- a/plugins/warp/src/plugin.rs
+++ b/plugins/warp/src/plugin.rs
@@ -12,8 +12,8 @@ use binaryninja::background_task::BackgroundTask;
 use binaryninja::command::{
     register_command, register_command_for_function, register_command_for_project,
 };
+use binaryninja::is_ui_enabled;
 use binaryninja::settings::{QueryOptions, Settings};
-use binaryninja::{is_ui_enabled, tracing};
 
 mod commit;
 mod create;
diff --git a/plugins/warp/src/plugin/commit.rs b/plugins/warp/src/plugin/commit.rs
index 56a78f9a..d98a356a 100644
--- a/plugins/warp/src/plugin/commit.rs
+++ b/plugins/warp/src/plugin/commit.rs
@@ -6,7 +6,6 @@ use crate::plugin::create::OpenFileField;
 use binaryninja::binary_view::BinaryView;
 use binaryninja::command::Command;
 use binaryninja::interaction::{Form, FormInputField};
-use binaryninja::tracing;
 use warp::chunk::ChunkKind;
 use warp::WarpFile;
 
diff --git a/plugins/warp/src/plugin/create.rs b/plugins/warp/src/plugin/create.rs
index 04a3e9b6..0c6a2fd5 100644
--- a/plugins/warp/src/plugin/create.rs
+++ b/plugins/warp/src/plugin/create.rs
@@ -10,7 +10,6 @@ use binaryninja::command::Command;
 use binaryninja::interaction::form::{Form, FormInputField};
 use binaryninja::interaction::{MessageBoxButtonResult, MessageBoxButtonSet, MessageBoxIcon};
 use binaryninja::rc::Ref;
-use binaryninja::tracing;
 use std::path::PathBuf;
 use std::thread;
 use warp::chunk::Chunk;
diff --git a/plugins/warp/src/plugin/debug.rs b/plugins/warp/src/plugin/debug.rs
index 6db491e2..d220d329 100644
--- a/plugins/warp/src/plugin/debug.rs
+++ b/plugins/warp/src/plugin/debug.rs
@@ -3,7 +3,7 @@ use crate::{build_function, cache};
 use binaryninja::binary_view::BinaryView;
 use binaryninja::command::{Command, FunctionCommand};
 use binaryninja::function::Function;
-use binaryninja::{tracing, ObjectDestructor};
+use binaryninja::ObjectDestructor;
 
 pub struct DebugFunction;
 
diff --git a/plugins/warp/src/plugin/ffi/container.rs b/plugins/warp/src/plugin/ffi/container.rs
index 6c2551c1..2376ef10 100644
--- a/plugins/warp/src/plugin/ffi/container.rs
+++ b/plugins/warp/src/plugin/ffi/container.rs
@@ -10,7 +10,6 @@ use binaryninja::architecture::CoreArchitecture;
 use binaryninja::binary_view::BinaryView;
 use binaryninja::rc::Ref;
 use binaryninja::string::BnString;
-use binaryninja::tracing;
 use binaryninja::types::Type;
 use binaryninjacore_sys::{BNArchitecture, BNBinaryView, BNType};
 use std::ffi::{c_char, CStr};
diff --git a/plugins/warp/src/plugin/file.rs b/plugins/warp/src/plugin/file.rs
index 899e3f46..cd5fb626 100644
--- a/plugins/warp/src/plugin/file.rs
+++ b/plugins/warp/src/plugin/file.rs
@@ -1,7 +1,6 @@
 use crate::report::ReportGenerator;
 use binaryninja::binary_view::{BinaryView, BinaryViewExt};
 use binaryninja::command::Command;
-use binaryninja::tracing;
 
 pub struct ShowFileReport;
 
diff --git a/plugins/warp/src/plugin/function.rs b/plugins/warp/src/plugin/function.rs
index 3c0dc06c..36db7d55 100644
--- a/plugins/warp/src/plugin/function.rs
+++ b/plugins/warp/src/plugin/function.rs
@@ -10,7 +10,6 @@ use binaryninja::binary_view::{BinaryView, BinaryViewExt};
 use binaryninja::command::{Command, FunctionCommand};
 use binaryninja::function::{Function, FunctionUpdateType};
 use binaryninja::rc::Guard;
-use binaryninja::tracing;
 use rayon::iter::ParallelIterator;
 use std::thread;
 use warp::signature::function::FunctionGUID;
diff --git a/plugins/warp/src/plugin/load.rs b/plugins/warp/src/plugin/load.rs
index bd0e4838..2be473d8 100644
--- a/plugins/warp/src/plugin/load.rs
+++ b/plugins/warp/src/plugin/load.rs
@@ -10,7 +10,6 @@ use binaryninja::interaction::{
     MessageBoxIcon,
 };
 use binaryninja::rc::Ref;
-use binaryninja::tracing;
 use std::collections::HashMap;
 use std::path::PathBuf;
 use std::sync::atomic::AtomicBool;
diff --git a/plugins/warp/src/plugin/project.rs b/plugins/warp/src/plugin/project.rs
index 8862c00a..b6081c1f 100644
--- a/plugins/warp/src/plugin/project.rs
+++ b/plugins/warp/src/plugin/project.rs
@@ -9,7 +9,6 @@ use binaryninja::interaction::{Form, FormInputField};
 use binaryninja::project::folder::ProjectFolder;
 use binaryninja::project::Project;
 use binaryninja::rc::Ref;
-use binaryninja::tracing;
 use binaryninja::worker_thread::{set_worker_thread_count, worker_thread_count};
 use rayon::ThreadPoolBuilder;
 use regex::Regex;
diff --git a/plugins/warp/src/plugin/workflow.rs b/plugins/warp/src/plugin/workflow.rs
index a51c7399..1f4ef101 100644
--- a/plugins/warp/src/plugin/workflow.rs
+++ b/plugins/warp/src/plugin/workflow.rs
@@ -15,7 +15,6 @@ use binaryninja::command::Command;
 use binaryninja::function::Function as BNFunction;
 use binaryninja::rc::Ref as BNRef;
 use binaryninja::settings::{QueryOptions, Settings};
-use binaryninja::tracing;
 use binaryninja::workflow::{activity, Activity, AnalysisContext, Workflow, WorkflowBuilder};
 use dashmap::DashSet;
 use itertools::Itertools;
diff --git a/plugins/warp/src/processor.rs b/plugins/warp/src/processor.rs
index 3076ddca..e21a2efd 100644
--- a/plugins/warp/src/processor.rs
+++ b/plugins/warp/src/processor.rs
@@ -29,7 +29,6 @@ use binaryninja::rc::{Guard, Ref};
 use crate::cache::cached_type_references;
 use crate::convert::platform_to_target;
 use crate::{build_function, INCLUDE_TAG_ICON, INCLUDE_TAG_NAME};
-use binaryninja::tracing;
 use warp::chunk::{Chunk, ChunkKind, CompressionType};
 use warp::r#type::chunk::TypeChunk;
 use warp::signature::chunk::SignatureChunk;