Skip to content

chore(dns): Fix test compilation failure in 4daa1f4f0 #2873

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
olix0r merged 1 commit into from
Apr 9, 2024
Merged

chore(dns): Fix test compilation failure in 4daa1f4f0 #2873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion linkerd/dns/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ impl ResolveError {
#[cfg(test)]
mod tests {
use super::{Name, Resolver, Suffix};
use hickory_resolver::proto::rr::{domain, rdata};
use std::{net, str::FromStr};
use trust_dns_resolver::proto::rr::{domain, rdata};

#[test]
fn test_dns_name_parsing() {
Expand Down
2 changes: 1 addition & 1 deletion linkerd/tracing/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const ENV_LOG_LEVEL: &str = "LINKERD2_PROXY_LOG";
const ENV_LOG_FORMAT: &str = "LINKERD2_PROXY_LOG_FORMAT";
const ENV_ACCESS_LOG: &str = "LINKERD2_PROXY_ACCESS_LOG";

const DEFAULT_LOG_LEVEL: &str = "warn,linkerd=info,trust_dns=error";
const DEFAULT_LOG_LEVEL: &str = "warn,linkerd=info,hickory_dns=error";
const DEFAULT_LOG_FORMAT: &str = "PLAIN";

#[derive(Debug, Default)]
Expand Down