Skip to content

Commit ea26ede

Browse files
authored
chore(deps): upgrade rust to v1.93.1 (#1034)
## What? Upgrade rust to latest stable 1.93.1 ## Why? `time` vulnerability fix is only available on rust >= 1.88.0
1 parent d2c3cd8 commit ea26ede

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

env.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,7 +1012,7 @@ mod tests {
10121012
otlp_config_traces_probabilistic_sampler_sampling_percentage: Some(50),
10131013
otlp_config_logs_enabled: true,
10141014
statsd_metric_namespace: None,
1015-
dogstatsd_so_rcvbuf: Some(1048576),
1015+
dogstatsd_so_rcvbuf: Some(1_048_576),
10161016
dogstatsd_buffer_size: Some(65507),
10171017
dogstatsd_queue_size: Some(2048),
10181018
api_key_secret_arn: "arn:aws:secretsmanager:region:account:secret:datadog-api-key"
@@ -1216,7 +1216,7 @@ mod tests {
12161216
.load(&mut config)
12171217
.expect("Failed to load config");
12181218

1219-
assert_eq!(config.dogstatsd_so_rcvbuf, Some(1048576));
1219+
assert_eq!(config.dogstatsd_so_rcvbuf, Some(1_048_576));
12201220
assert_eq!(config.dogstatsd_buffer_size, Some(65507));
12211221
assert_eq!(config.dogstatsd_queue_size, Some(2048));
12221222
Ok(())

mod.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,10 @@ impl ConfigBuilder {
188188

189189
// If `proxy_https` is not set, set it from `HTTPS_PROXY` environment variable
190190
// if it exists
191-
if let Ok(https_proxy) = std::env::var("HTTPS_PROXY") {
192-
if self.config.proxy_https.is_none() {
193-
self.config.proxy_https = Some(https_proxy);
194-
}
191+
if let Ok(https_proxy) = std::env::var("HTTPS_PROXY")
192+
&& self.config.proxy_https.is_none()
193+
{
194+
self.config.proxy_https = Some(https_proxy);
195195
}
196196

197197
// If `proxy_https` is set, check if the site is in `NO_PROXY` environment variable
@@ -1008,7 +1008,7 @@ pub mod tests {
10081008
TracePropagationStyle::TraceContext
10091009
],
10101010
logs_config_logs_dd_url: "https://http-intake.logs.datadoghq.com".to_string(),
1011-
apm_dd_url: trace_intake_url("datadoghq.com").to_string(),
1011+
apm_dd_url: trace_intake_url("datadoghq.com").clone(),
10121012
dd_url: String::new(), // We add the prefix in main.rs
10131013
..Config::default()
10141014
}

yaml.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,7 +1029,7 @@ api_security_sample_delay: 60 # Seconds
10291029
apm_filter_tags_regex_require: None,
10301030
apm_filter_tags_regex_reject: None,
10311031
statsd_metric_namespace: None,
1032-
dogstatsd_so_rcvbuf: Some(1048576),
1032+
dogstatsd_so_rcvbuf: Some(1_048_576),
10331033
dogstatsd_buffer_size: Some(65507),
10341034
dogstatsd_queue_size: Some(2048),
10351035
};
@@ -1047,11 +1047,11 @@ api_security_sample_delay: 60 # Seconds
10471047
jail.clear_env();
10481048
jail.create_file(
10491049
"datadog.yaml",
1050-
r#"
1050+
r"
10511051
dogstatsd_so_rcvbuf: 524288
10521052
dogstatsd_buffer_size: 16384
10531053
dogstatsd_queue_size: 512
1054-
"#,
1054+
",
10551055
)?;
10561056
let mut config = Config::default();
10571057
let yaml_config_source = YamlConfigSource {
@@ -1061,7 +1061,7 @@ dogstatsd_queue_size: 512
10611061
.load(&mut config)
10621062
.expect("Failed to load config");
10631063

1064-
assert_eq!(config.dogstatsd_so_rcvbuf, Some(524288));
1064+
assert_eq!(config.dogstatsd_so_rcvbuf, Some(524_288));
10651065
assert_eq!(config.dogstatsd_buffer_size, Some(16384));
10661066
assert_eq!(config.dogstatsd_queue_size, Some(512));
10671067
Ok(())

0 commit comments

Comments
 (0)