Skip to content

Commit ad4591d

Browse files
Copilotjsturtevant
andcommitted
Make tracing-tracy optional to fix gdb test build failures
The tracing-tracy dependency was causing linker errors in CI due to glibc version incompatibility. Made it optional by: - Moving tracing-tracy from dev-dependencies to optional dependencies - Creating a new trace_tracy feature - Adding required-features to the tracing-tracy example This prevents tracy from being built during gdb tests, avoiding the linker error with __isoc23_fscanf and __isoc23_strtol symbols. Co-authored-by: jsturtevant <[email protected]>
1 parent 5350a8c commit ad4591d

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/hyperlight_host/Cargo.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ tracing = { version = "0.1.43", features = ["log"] }
4040
tracing-log = "0.2.0"
4141
tracing-core = "0.1.35"
4242
tracing-opentelemetry = { version = "0.32.0", optional = true }
43+
tracing-tracy = { version = "0.11.4", optional = true }
4344
hyperlight-common = { workspace = true, default-features = true, features = [ "std" ] }
4445
hyperlight-guest-tracing = { workspace = true, default-features = true, optional = true }
4546
vmm-sys-util = "0.15.0"
@@ -104,7 +105,6 @@ criterion = "0.8.1"
104105
tracing-chrome = "0.7.2"
105106
metrics-util = "0.20.1"
106107
metrics-exporter-prometheus = { version = "0.18.1", default-features = false }
107-
tracing-tracy = "0.11.4"
108108
serde_json = "1.0"
109109
hyperlight-component-macro = { workspace = true }
110110

@@ -130,6 +130,7 @@ print_debug = []
130130
# Dumps the VM state to a file on unexpected errors or crashes. The path of the file will be printed on stdout and logged.
131131
crashdump = ["dep:chrono"]
132132
trace_guest = ["dep:opentelemetry", "dep:tracing-opentelemetry", "dep:hyperlight-guest-tracing", "hyperlight-common/trace_guest"]
133+
trace_tracy = ["dep:tracing-tracy"]
133134
mem_profile = [ "trace_guest", "dep:framehop", "dep:fallible-iterator", "hyperlight-common/mem_profile" ]
134135
kvm = ["dep:kvm-bindings", "dep:kvm-ioctls"]
135136
mshv3 = ["dep:mshv-bindings", "dep:mshv-ioctls"]
@@ -139,6 +140,10 @@ fuzzing = ["hyperlight-common/fuzzing"]
139140
build-metadata = ["dep:built"]
140141
init-paging = []
141142

143+
[[example]]
144+
name = "tracing-tracy"
145+
required-features = ["trace_tracy"]
146+
142147
[[bench]]
143148
name = "benchmarks"
144149
harness = false

0 commit comments

Comments
 (0)