Skip to content

Commit 60af377

Browse files
committed
Refactoring KVP PR to move kvp.rs into main libazureinit crate, combine handle_event with on_event, combine handle_span with on_close, adjust kvp writer logic to rely on a tokio task to send the encoded KVP over a channel and other minor adjustmnets in reference to PR comments.
1 parent 2b1ded8 commit 60af377

File tree

9 files changed

+325
-335
lines changed

9 files changed

+325
-335
lines changed

Cargo.toml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ tracing = "0.1.40"
1717
tracing-opentelemetry = "0.18.0"
1818
# We work fine with any version of 4, but 4.5 bumped MSRV to 1.74
1919
clap = { version = "<=4.4", features = ["derive", "cargo", "env"] }
20-
sys-info = "0.9"
20+
sysinfo = "0.27"
2121

2222
[dev-dependencies]
2323
# Purely for the MSRV requirement.
@@ -32,10 +32,6 @@ opentelemetry = "0.21"
3232
path = "libazureinit"
3333
version = "0.1.0"
3434

35-
[dependencies.azurekvp]
36-
path = "azurekvp"
37-
version = "0.1.0"
38-
3935
[profile.dev]
4036
incremental = true
4137

@@ -50,7 +46,6 @@ path = "tests/functional_tests.rs"
5046
[workspace]
5147
members = [
5248
"libazureinit",
53-
"azurekvp",
5449
]
5550

5651
[features]

azurekvp/Cargo.toml

Lines changed: 0 additions & 28 deletions
This file was deleted.

azurekvp/src/lib.rs

Lines changed: 0 additions & 6 deletions
This file was deleted.

azurekvp/src/tracing.rs

Lines changed: 0 additions & 154 deletions
This file was deleted.

libazureinit/Cargo.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,15 @@ block-utils = "0.11.1"
2020
tracing = "0.1.40"
2121
strum = { version = "0.26.3", features = ["derive"] }
2222
fstab = "0.4.0"
23+
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
24+
opentelemetry = "0.18.0"
25+
uuid = { version = "1.2", features = ["v4"] }
26+
anyhow = "1.0.81"
27+
sysinfo = "0.27"
28+
chrono = "0.4"
2329

2430
[dev-dependencies]
31+
tracing-test = { version = "0.2", features = ["no-env-filter"] }
2532
tempfile = "3"
2633
tokio = { version = "1", features = ["full"] }
2734
tokio-util = "0.7.11"

0 commit comments

Comments
 (0)