Skip to content

Commit 8a3207e

Browse files
committed
[#117]: renaming fields of net_metrics
1 parent d0167c9 commit 8a3207e

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

core/src/components/metrics/src/main.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@ pub async fn display_metrics_map(
113113
let sk_err = net_metrics.sk_err;
114114
let sk_err_soft = net_metrics.sk_err_soft;
115115
let sk_backlog_len = net_metrics.sk_backlog_len;
116-
let sk_wmem_queued = net_metrics.sk_wmem_queued;
116+
let sk_write_memory_queued = net_metrics.sk_write_memory_queued;
117117
let sk_ack_backlog = net_metrics.sk_ack_backlog;
118-
let sk_rcvbuf = net_metrics.sk_rcvbuf;
118+
let sk_receive_buffer_size = net_metrics.sk_receive_buffer_size;
119119
info!(
120-
"sk_drops: {}, sk_err: {}, sk_err_soft: {}, sk_backlog_len: {}, sk_wmem_queued: {}, sk_ack_backlog: {}, sk_rcvbuf: {}",
121-
sk_drop_count, sk_err, sk_err_soft, sk_backlog_len, sk_wmem_queued, sk_ack_backlog, sk_rcvbuf
120+
"sk_drops: {}, sk_err: {}, sk_err_soft: {}, sk_backlog_len: {}, sk_write_memory_queued: {}, sk_ack_backlog: {}, sk_receive_buffer_size: {}",
121+
sk_drop_count, sk_err, sk_err_soft, sk_backlog_len, sk_write_memory_queued, sk_ack_backlog, sk_receive_buffer_size
122122
);
123123
}
124124
}

core/src/components/metrics/src/structs.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ pub struct NetworkMetrics {
66
pub sk_err: i32, // Offset 284
77
pub sk_err_soft: i32, // Offset 600
88
pub sk_backlog_len: i32, // Offset 196
9-
pub sk_wmem_queued: i32, // Offset 376
10-
pub sk_rcvbuf: i32, // Offset 244
9+
pub sk_write_memory_queued: i32, // Offset 376
10+
pub sk_receive_buffer_size: i32, // Offset 244
1111
pub sk_ack_backlog: u32, // Offset 604
1212
pub sk_drops: i32, // Offset 136
1313
}

core/src/components/metrics_tracer/src/data_structures.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ use aya_ebpf::{macros::map, maps::{LruPerCpuHashMap, PerfEventArray}};
22

33

44
pub struct NetworkMetrics {
5-
pub sk_err: i32, // Offset 284
6-
pub sk_err_soft: i32, // Offset 600
7-
pub sk_backlog_len: i32, // Offset 196
8-
pub sk_wmem_queued: i32, // Offset 376
9-
pub sk_rcvbuf: i32, // Offset 244
10-
pub sk_ack_backlog: u32, // Offset 604
11-
pub sk_drops: i32, // Offset 136
5+
pub sk_err: i32, // Offset 284
6+
pub sk_err_soft: i32, // Offset 600
7+
pub sk_backlog_len: i32, // Offset 196
8+
pub sk_write_memory_queued: i32,// Offset 376
9+
pub sk_receive_buffer_size: i32,// Offset 244
10+
pub sk_ack_backlog: u32, // Offset 604
11+
pub sk_drops: i32, // Offset 136
1212
}
1313

1414
#[map(name = "net_metrics")]

core/src/components/metrics_tracer/src/main.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,25 @@ fn try_metrics_tracer(ctx: ProbeContext) -> Result<u32, i64> {
3333
let sk_err_offset = 284;
3434
let sk_err_soft_offset = 600;
3535
let sk_backlog_len_offset = 196;
36-
let sk_wmem_queued_offset = 376;
37-
let sk_rcvbuf_offset = 244;
36+
let sk_write_memory_queued_offset = 376;
37+
let sk_receive_buffer_size_offset = 244;
3838
let sk_ack_backlog_offset = 604;
3939
let sk_drops_offset = 136;
4040

4141
let sk_err = unsafe { bpf_probe_read_kernel::<i32>(sk_pointer.add(sk_err_offset) as *const i32).map_err(|_| 1)? };
4242
let sk_err_soft = unsafe { bpf_probe_read_kernel::<i32>(sk_pointer.add(sk_err_soft_offset) as *const i32).map_err(|_| 1)? };
4343
let sk_backlog_len = unsafe { bpf_probe_read_kernel::<i32>(sk_pointer.add(sk_backlog_len_offset) as *const i32).map_err(|_| 1)? };
44-
let sk_wmem_queued = unsafe { bpf_probe_read_kernel::<i32>(sk_pointer.add(sk_wmem_queued_offset) as *const i32).map_err(|_| 1)? };
45-
let sk_rcvbuf = unsafe { bpf_probe_read_kernel::<i32>(sk_pointer.add(sk_rcvbuf_offset) as *const i32).map_err(|_| 1)? };
44+
let sk_write_memory_queued = unsafe { bpf_probe_read_kernel::<i32>(sk_pointer.add(sk_wmem_queued_offset) as *const i32).map_err(|_| 1)? };
45+
let sk_receive_buffer_size = unsafe { bpf_probe_read_kernel::<i32>(sk_pointer.add(sk_rcvbuf_offset) as *const i32).map_err(|_| 1)? };
4646
let sk_ack_backlog = unsafe { bpf_probe_read_kernel::<u32>(sk_pointer.add(sk_ack_backlog_offset) as *const u32).map_err(|_| 1)? };
4747
let sk_drops = unsafe { bpf_probe_read_kernel::<i32>(sk_pointer.add(sk_drops_offset) as *const i32).map_err(|_| 1)? };
4848

4949
let net_metrics = NetworkMetrics {
5050
sk_err,
5151
sk_err_soft,
5252
sk_backlog_len,
53-
sk_wmem_queued,
54-
sk_rcvbuf,
53+
sk_write_memory_queued,
54+
sk_receive_buffer_size,
5555
sk_ack_backlog,
5656
sk_drops,
5757
};

0 commit comments

Comments
 (0)