Skip to content

Commit

Permalink
chore: Standardize on cfg(windows) (#15000)
Browse files Browse the repository at this point in the history
We have used both `cfg(windows)` and `cfg(target_os = "windows")` in a number of
places. This picks the simpler form, which is equivalent to
`cfg(target_family = "windows")` and related to `cfg(unix)` which we also use.
  • Loading branch information
bruceg authored Oct 31, 2022
1 parent ac69a47 commit a5d7cea
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
8 changes: 4 additions & 4 deletions src/api/schema/metrics/host.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ impl SwapMetrics {

/// Swapped in bytes total (not available on Windows)
async fn swapped_in_bytes_total(&self) -> Option<f64> {
if cfg!(not(target_os = "windows")) {
if cfg!(not(windows)) {
Some(filter_host_metric(&self.0, "memory_swapped_in_bytes_total"))
} else {
None
Expand All @@ -119,7 +119,7 @@ impl SwapMetrics {

/// Swapped out bytes total (not available on Windows)
async fn swapped_out_bytes_total(&self) -> Option<f64> {
if cfg!(not(target_os = "windows")) {
if cfg!(not(windows)) {
Some(filter_host_metric(
&self.0,
"memory_swapped_out_bytes_total",
Expand Down Expand Up @@ -191,7 +191,7 @@ impl NetworkMetrics {

/// Total transmission packets dropped (Linux/Windows only)
async fn transmit_packets_drop_total(&self) -> Option<f64> {
if cfg!(any(target_os = "linux", target_os = "windows")) {
if cfg!(any(target_os = "linux", windows)) {
Some(filter_host_metric(
&self.0,
"network_transmit_packets_drop_total",
Expand All @@ -203,7 +203,7 @@ impl NetworkMetrics {

/// Total transmission packets (Linux/Windows only)
async fn transmit_packets_total(&self) -> Option<f64> {
if cfg!(any(target_os = "linux", target_os = "windows")) {
if cfg!(any(target_os = "linux", windows)) {
Some(filter_host_metric(
&self.0,
"network_transmit_packets_total",
Expand Down
2 changes: 1 addition & 1 deletion src/sources/host_metrics/disk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ mod tests {
let metrics = buffer.metrics;

// The Windows test runner doesn't generate any disk metrics on the VM.
#[cfg(not(target_os = "windows"))]
#[cfg(not(windows))]
assert!(!metrics.is_empty());
assert!(metrics.len() % 4 == 0);
assert!(all_counters(&metrics));
Expand Down
8 changes: 4 additions & 4 deletions src/sources/host_metrics/filesystem.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use futures::StreamExt;
use heim::units::information::byte;
#[cfg(not(target_os = "windows"))]
#[cfg(not(windows))]
use heim::units::ratio::ratio;
use vector_config::configurable_component;
use vector_core::metric_tags;
Expand Down Expand Up @@ -106,7 +106,7 @@ impl HostMetrics {
usage.used().get::<byte>() as f64,
tags.clone(),
);
#[cfg(not(target_os = "windows"))]
#[cfg(not(windows))]
output.gauge(
"filesystem_used_ratio",
usage.ratio().get::<ratio>() as f64,
Expand Down Expand Up @@ -134,7 +134,7 @@ mod tests {
FilesystemConfig,
};

#[cfg(not(target_os = "windows"))]
#[cfg(not(windows))]
#[tokio::test]
async fn generates_filesystem_metrics() {
let mut buffer = MetricsBuffer::new(None);
Expand Down Expand Up @@ -166,7 +166,7 @@ mod tests {
assert_eq!(count_tag(&metrics, "mountpoint"), metrics.len());
}

#[cfg(target_os = "windows")]
#[cfg(windows)]
#[tokio::test]
async fn generates_filesystem_metrics() {
let mut buffer = MetricsBuffer::new(None);
Expand Down
6 changes: 3 additions & 3 deletions src/sources/host_metrics/memory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
use heim::memory::os::linux::MemoryExt;
#[cfg(target_os = "macos")]
use heim::memory::os::macos::MemoryExt;
#[cfg(not(target_os = "windows"))]
#[cfg(not(windows))]
use heim::memory::os::SwapExt;
use heim::units::information::byte;
use vector_core::event::MetricTags;
Expand Down Expand Up @@ -102,13 +102,13 @@ impl HostMetrics {
swap.used().get::<byte>() as f64,
MetricTags::default(),
);
#[cfg(not(target_os = "windows"))]
#[cfg(not(windows))]
output.counter(
"memory_swapped_in_bytes_total",
swap.sin().map(|swap| swap.get::<byte>()).unwrap_or(0) as f64,
MetricTags::default(),
);
#[cfg(not(target_os = "windows"))]
#[cfg(not(windows))]
output.counter(
"memory_swapped_out_bytes_total",
swap.sout().map(|swap| swap.get::<byte>()).unwrap_or(0) as f64,
Expand Down
4 changes: 2 additions & 2 deletions src/sources/host_metrics/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::path::Path;
use chrono::{DateTime, Utc};
use futures::StreamExt;
use glob::{Pattern, PatternError};
#[cfg(not(target_os = "windows"))]
#[cfg(not(windows))]
use heim::units::ratio::ratio;
use heim::units::time::second;
use tokio::time;
Expand Down Expand Up @@ -623,7 +623,7 @@ pub(self) mod tests {
}

// Windows does not produce load average metrics.
#[cfg(not(target_os = "windows"))]
#[cfg(not(windows))]
#[tokio::test]
async fn generates_loadavg_metrics() {
let mut buffer = MetricsBuffer::new(None);
Expand Down
8 changes: 4 additions & 4 deletions src/sources/host_metrics/network.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use futures::StreamExt;
#[cfg(target_os = "linux")]
use heim::net::os::linux::IoCountersExt;
#[cfg(target_os = "windows")]
#[cfg(windows)]
use heim::net::os::windows::IoCountersExt;
use heim::units::information::byte;
use vector_config::configurable_component;
Expand Down Expand Up @@ -69,13 +69,13 @@ impl HostMetrics {
counter.errors_sent() as f64,
MetricTags::from([(String::from("device"), interface.to_string())]),
);
#[cfg(any(target_os = "linux", target_os = "windows"))]
#[cfg(any(target_os = "linux", windows))]
output.counter(
"network_transmit_packets_drop_total",
counter.drop_sent() as f64,
MetricTags::from([(String::from("device"), interface.to_string())]),
);
#[cfg(any(target_os = "linux", target_os = "windows"))]
#[cfg(any(target_os = "linux", windows))]
output.counter(
"network_transmit_packets_total",
counter.packets_sent() as f64,
Expand All @@ -95,7 +95,7 @@ impl HostMetrics {

// The Windows CI environment produces zero network metrics, causing
// these tests to always fail.
#[cfg(all(test, not(target_os = "windows")))]
#[cfg(all(test, not(windows)))]
mod tests {
use super::{
super::{
Expand Down

0 comments on commit a5d7cea

Please sign in to comment.