Skip to content

EHT-1025 - Replace otel deps with prometheus client #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Sep 9, 2025
Merged

EHT-1025 - Replace otel deps with prometheus client #108

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5b5cf0e
EHT-1025 - Replace otel deps with prometheus client
spoutn1k Jul 7, 2025
7d1494c
- revert changes to historical snapshots as these shouldn't have any
johnsonw Aug 27, 2025
14a3df3
- move `dump_stats` to lib
johnsonw Aug 27, 2025
507d7f1
- Remove otel references in code
johnsonw Aug 27, 2025
abad1d2
- Remove the explicit naming of the snapshot as it's not needed.
johnsonw Aug 27, 2025
47fcd72
- change `openmetrics` to `metrics`.
johnsonw Aug 27, 2025
eca0b7b
- Remove `target_info`
johnsonw Aug 27, 2025
d432f97
- Remove the `otel_scope_name` label
johnsonw Aug 28, 2025
f215d8b
- Add test to ensure all snapshots are equivalent to their matching otel
johnsonw Aug 28, 2025
667cff4
- rename each snapshot in the `otel_snapshots` directory to use the
johnsonw Aug 28, 2025
c40515d
- Update scrape benchmark to use lustre metrics from system.
johnsonw Aug 29, 2025
40ddc41
- add a test to check how long it takes to scrape
johnsonw Aug 30, 2025
2a65c05
- benchmark updates
johnsonw Aug 30, 2025
3e267a5
- bump up measurement time
johnsonw Aug 30, 2025
9701243
- Update scrape benchmark to do a total of 200 requests.
johnsonw Aug 30, 2025
c57f2a1
- Use String instead of Vec<u8>
johnsonw Sep 2, 2025
ddd771f
- Use a total of 60 requests instead of 200.
johnsonw Sep 2, 2025
417551a
- Use the app() function from routes.rs in the scrape benchmark and make
johnsonw Sep 2, 2025
5c35210
- Bump MemoryHigh to 2750 and MemoryMax to 3G
johnsonw Sep 8, 2025
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
10 changes: 10 additions & 0 deletions .github/workflows/lustre-metrics-bench.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1

- uses: actions/cache@v4
with:
path: |
~/.cargo/bin/
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}

- name: Install Valgrind
run: sudo apt-get update && sudo apt-get install -y valgrind

Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/scrape-memory-metrics-bench.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1

- uses: actions/cache@v4
with:
path: |
~/.cargo/bin/
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}

- name: Run Scrape Memory Metrics Benchmark
run: |
# Run the benchmark first (suppress Criterion output)
Expand Down
212 changes: 26 additions & 186 deletions Cargo.lock
View file
Open in desktop

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

10 changes: 1 addition & 9 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,8 @@ criterion = "0.7"
iai-callgrind = "0.16"
include_dir = { version = "0.7", features = ["glob"] }
insta = "1"
opentelemetry = "0.29.1"
opentelemetry-otlp = "0.29"
opentelemetry-prometheus = "0.29.1"
opentelemetry_sdk = "0.29"
opentelemetry-semantic-conventions = { version = "0.29", features = [
"semconv_experimental",
] }
pretty_assertions = "1.4.1"
prometheus = "0.14"
prometheus-client = { git = "https://github.com/whamcloud/client_rust", branch = "whamcloud-08-12-2025" }
Copy link
Member

@jgrund jgrund Aug 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there an upstream PR for these changes?

Copy link
Contributor Author

@johnsonw johnsonw Aug 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are a couple patches that are in review:

prometheus/client_rust#278
prometheus/client_rust#279

This patch does not have a PR upstream: whamcloud/client_rust@d81f9a1

prometheus-parse = "0.2.5"
serde = "1"
serde_json = "1"
Expand All @@ -43,7 +36,6 @@ serial_test = "3.2"
sysinfo = "0.29"
thiserror = "2"
tokio = "1"
tokio-stream = "0.1"
tower = "0.5"
tower-http = "0.6"
tracing = "0.1"
Expand Down
9 changes: 8 additions & 1 deletion lustre-collector/src/lnetctl_parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,14 @@ pub fn parse(xs: &[u8]) -> Result<Vec<Record>, LustreCollectorError> {
let y: LnetNetStats = serde_yaml::from_slice(xs)?;

Ok(y.net
.map(|x| x.iter().flat_map(build_lnet_stats).collect())
.map(|xs| {
let capacity = xs.iter().map(|x| x.local_nis.len() * 3).sum();
let mut records = Vec::with_capacity(capacity);

records.extend(xs.iter().flat_map(build_lnet_stats));

records
})
.unwrap_or_default())
}

Expand Down
Loading
Loading