Skip to content
This repository has been archived by the owner on Nov 1, 2023. It is now read-only.

Revert #2033 #2091

Merged
merged 1 commit into from
Jun 27, 2022
Merged
Show file tree
Hide file tree
Changes from all 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
11 changes: 3 additions & 8 deletions src/agent/Cargo.lock

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

6 changes: 5 additions & 1 deletion src/agent/onefuzz-telemetry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ z3 = ["z3-sys"]
intel_instructions = ["iced-x86"]

[dependencies]
appinsights = { version = "0.2.1", features = ["rustls", "blocking"], default-features = false }
# appinsights-rs haas included optional support for rustls since 2020-10, but
# not the feature has not been released yet. This is the pinned to the most
# recent git hash as of 2021-06-30. Once released, this should be reverted to
# use released versions
appinsights = { git = "https://github.com/dmolokanov/appinsights-rs", rev = "0af6ec83bad1c050160f5258ab08e9834596ce20", features=["rustls"], default-features = false }
log = "0.4"
uuid = { version = "0.8", features = ["serde", "v4"] }
serde = { version = "1.0", features = ["derive"] }
Expand Down
4 changes: 2 additions & 2 deletions src/agent/onefuzz-telemetry/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ impl fmt::Display for InstanceTelemetryKey {
}
}

pub type TelemetryClient = appinsights::blocking::TelemetryClient;
pub type TelemetryClient = appinsights::TelemetryClient<appinsights::InMemoryChannel>;
pub enum ClientType {
Instance,
Microsoft,
Expand Down Expand Up @@ -484,7 +484,7 @@ pub fn try_flush_and_close() {
let clients = global::take_clients();

for client in clients {
// close_channel performs an implicit flush
client.flush_channel();
client.close_channel();
}
}
Expand Down