Skip to content

Commit 32d6877

Browse files
committed
Merge branch 'dev' of github.com:myadav27/hyperlight into dev
2 parents 390dbe3 + fb199a0 commit 32d6877

File tree

11 files changed

+228
-30
lines changed

11 files changed

+228
-30
lines changed

CHANGELOG.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
44

55
## [Prerelease] - Unreleased
66

7-
### Added
8-
-
97

10-
### Changed
11-
-
8+
## [v0.4.0] - Unreleased
129

13-
### Removed
14-
-
10+
### Changed
11+
- Metrics are now emitted using the [metrics](https://crates.io/crates/metrics) crate by @ludfjig in [#361](https://github.com/hyperlight-dev/hyperlight/pull/361)
1512

1613
### Fixed
17-
-
14+
- Fixed race condition causing thread to incorrectly believe it finished executing by @ludfjig in [#385](https://github.com/hyperlight-dev/hyperlight/pull/385)
15+
- Fixed incorrect logging levels in guest by @simongdavies in [#410](https://github.com/hyperlight-dev/hyperlight/pull/410)
16+
- Fixed missing compiler flags for building c guests by @prydt in [#421](https://github.com/hyperlight-dev/hyperlight/pull/421)
1817

1918
## [v0.3.0] - 2025-03-27
2019

@@ -65,7 +64,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
6564
The Initial Hyperlight Release 🎉
6665

6766

68-
[Prerelease]: <https://github.com/hyperlight-dev/hyperlight/compare/v0.3.0..HEAD>
67+
[Prerelease]: <https://github.com/hyperlight-dev/hyperlight/compare/v0.4.0..HEAD>
68+
[v0.4.0]: <https://github.com/hyperlight-dev/hyperlight/compare/v0.3.0...v0.4.0>
6969
[v0.3.0]: <https://github.com/hyperlight-dev/hyperlight/compare/v0.2.0...v0.3.0>
7070
[v0.2.0]: <https://github.com/hyperlight-dev/hyperlight/compare/v0.1.0...v0.2.0>
71-
[v0.1.0]: <https://github.com/hyperlight-dev/hyperlight/releases/tag/v0.1.0>
71+
[v0.1.0]: <https://github.com/hyperlight-dev/hyperlight/releases/tag/v0.1.0>

Cargo.lock

Lines changed: 142 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/hyperlight-metrics-logs-and-traces.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,18 @@ $env:RUST_LOG='none,hyperlight_host=info,tracing=info'; cargo run --example trac
6262

6363
### Using OTLP exporter and Jaeger
6464

65-
In the [examples/otlp_tracing](../src/hyperlight_host/examples/otlp_tracing) directory, there is an example that shows how to capture and send trace and log information to an otlp_collector using the opentelemetry_otlp crate. With this example the following commands can be used to set the verbosity of the trace output to `INFO` and run the example to generate trace data:
65+
In the [examples/tracing-otlp](../src/hyperlight_host/examples/tracing-otlp) directory, there is an example that shows how to capture and send trace and log information to an otlp_collector using the opentelemetry_otlp crate. With this example the following commands can be used to set the verbosity of the trace output to `INFO` and run the example to generate trace data:
6666

6767
#### Linux
6868

6969
```bash
70-
RUST_LOG='none,hyperlight_host=info,tracing=info' cargo run --example otlp_tracing
70+
RUST_LOG='none,hyperlight_host=info,tracing=info' cargo run --example tracing-otlp
7171
```
7272

7373
#### Windows
7474

7575
```powershell
76-
$env:RUST_LOG='none,hyperlight_host=info,tracing=info';cargo run --example otlp_tracing
76+
$env:RUST_LOG='none,hyperlight_host=info,tracing=info';cargo run --example tracing-otlp
7777
```
7878

7979
The sample will run and generate trace data until any key is pressed.

src/hyperlight_host/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ criterion = "0.5.1"
103103
tracing-chrome = "0.7.2"
104104
metrics-util = "0.19.1"
105105
metrics-exporter-prometheus = "0.17.0"
106+
tracing-tracy = "0.11.4"
106107

107108
[target.'cfg(windows)'.dev-dependencies]
108109
windows = { version = "0.61", features = [
File renamed without changes.

src/hyperlight_host/examples/chrome-tracing/main.rs renamed to src/hyperlight_host/examples/tracing-chrome/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use hyperlight_testing::simple_guest_as_string;
2323
use tracing_chrome::ChromeLayerBuilder;
2424
use tracing_subscriber::prelude::*;
2525

26-
// This example can be run with `cargo run --package hyperlight_host --example chrome-tracing --release`
26+
// This example can be run with `cargo run --package hyperlight_host --example tracing-chrome --release`
2727
fn main() -> Result<()> {
2828
// set up tracer
2929
let (chrome_layer, _guard) = ChromeLayerBuilder::new().build();
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
This is an example of using the tracing-tracy tracing-subscriber. When ran, it will generate traces that can be viewed in the tracy profiler.
2+
3+
You can run it with:
4+
5+
```console
6+
TRACY_NO_EXIT=1 RUST_LOG=trace cargo run --package hyperlight-host --example tracing-tracy --profile release-with-debug
7+
```
8+
9+
and then the client should show up in the profiler GUI:
10+
11+
![pic of tracy profiler](image.png)
50.5 KB
Loading

0 commit comments

Comments
 (0)