Skip to content
This repository was archived by the owner on Nov 1, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions docs/telemetry.md
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,6 @@ The following information is recorded for Salvo related tasks:
during symbolic execution but may have been input tainted. Examples include
`Cmovs` and `Movq`. For the full list, see
[iced_x86::mnemonic](https://docs.rs/iced-x86/1.10.3/iced_x86/enum.Mnemonic.html).
* Z3ErrorCode - An error code that corresponds to an error code from Z3 when
solving a constraint fails. Examples include `NoParser` and
`InvalidPattern`. For the full list, see
[z3_sys::ErrorCode](https://docs.rs/z3-sys/0.6.3/z3_sys/enum.ErrorCode.html)
* SymexTimeout - A u64 representing the maximum time in seconds to spend during
symbolic execution, reported each time symbolic execution was stopped due to
the limit.
7 changes: 0 additions & 7 deletions src/agent/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions src/agent/onefuzz-telemetry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ license = "MIT"

[features]
default = []
z3 = ["z3-sys"]
intel_instructions = ["iced-x86"]

[dependencies]
Expand All @@ -16,7 +15,6 @@ appinsights = { version = "0.2.3" }
log = "0.4"
uuid = { version = "0.8", features = ["serde", "v4"] }
serde = { version = "1.0", features = ["derive"] }
z3-sys = { version = "0.6", optional = true}
iced-x86 = { version = "1.17", optional = true}
tokio = { version = "1.24", features = ["full"] }
lazy_static = "1.4"
Expand Down
33 changes: 0 additions & 33 deletions src/agent/onefuzz-telemetry/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ use serde::{Deserialize, Serialize};
use std::fmt;
use std::sync::{LockResult, RwLockReadGuard, RwLockWriteGuard};
use uuid::Uuid;
#[cfg(feature = "z3")]
use z3_sys::ErrorCode as Z3ErrorCode;

pub use chrono::Utc;

Expand Down Expand Up @@ -42,25 +40,6 @@ impl InstanceTelemetryKey {
}
}

#[cfg(feature = "z3")]
pub fn z3_error_as_str(code: &Z3ErrorCode) -> &'static str {
match code {
Z3ErrorCode::OK => "OK",
Z3ErrorCode::SortError => "SortError",
Z3ErrorCode::IOB => "IOB",
Z3ErrorCode::InvalidArg => "InvalidArg",
Z3ErrorCode::ParserError => "ParserError",
Z3ErrorCode::NoParser => "NoParser",
Z3ErrorCode::InvalidPattern => "InvalidPattern",
Z3ErrorCode::MemoutFail => "MemoutFail",
Z3ErrorCode::FileAccessError => "FileAccessError",
Z3ErrorCode::InternalFatal => "InternalFatal",
Z3ErrorCode::InvalidUsage => "InvalidUsage",
Z3ErrorCode::DecRefError => "DecRefError",
Z3ErrorCode::Exception => "Exception",
}
}

impl fmt::Display for InstanceTelemetryKey {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{}", self.0)
Expand Down Expand Up @@ -182,10 +161,6 @@ pub enum EventData {
MissedInstructionCode(IntelInstructionCode),
#[cfg(feature = "intel_instructions")]
MissedInstructionMnemonic(IntelInstructionMnemonic),
#[cfg(feature = "z3")]
Z3ErrorCode(Z3ErrorCode),
#[cfg(feature = "z3")]
Z3ErrorString(String),
SymexTimeout(u64),
}

Expand Down Expand Up @@ -260,10 +235,6 @@ impl EventData {
("divergence_path_expected_index", x.to_string())
}
Self::DivergencePathActualIndex(x) => ("divergence_path_actual_index", x.to_string()),
#[cfg(feature = "z3")]
Self::Z3ErrorCode(x) => ("z3_error_code", z3_error_as_str(x).to_owned()),
#[cfg(feature = "z3")]
Self::Z3ErrorString(x) => ("z3_error_string", x.to_owned()),
Self::SymexTimeout(x) => ("symex_timeout", x.to_string()),
}
}
Expand Down Expand Up @@ -328,10 +299,6 @@ impl EventData {
Self::MissedInstructionCode(_) => true,
#[cfg(feature = "intel_instructions")]
Self::MissedInstructionMnemonic(_) => true,
#[cfg(feature = "z3")]
Self::Z3ErrorCode(_) => true,
#[cfg(feature = "z3")]
Self::Z3ErrorString(_) => false,
Self::SymexTimeout(_) => true,
}
}
Expand Down