Skip to content

RUST-1268 Correctly report rustc version used for compilation in handshake #622

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 1 commit into from
Apr 13, 2022
Merged

RUST-1268 Correctly report rustc version used for compilation in handshake #622

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 Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ openssl-probe = { version = "0.1.5", optional = true }
os_info = { version = "3.0.1", default-features = false }
percent-encoding = "2.0.0"
rand = { version = "0.8.3", features = ["small_rng"] }
rustc_version_runtime = "0.1.4"
rustls-pemfile = "0.3.0"
serde_with = "1.3.1"
sha-1 = "0.10.0"
Expand All @@ -84,7 +85,6 @@ tokio-openssl = { version = "0.6.3", optional = true }
trust-dns-proto = "0.21.1"
trust-dns-resolver = "0.21.1"
typed-builder = "0.10.0"
version_check = "0.9.1"
webpki-roots = "0.22.2"
zstd = { version = "0.11.0", optional = true }

Expand Down
22 changes: 6 additions & 16 deletions src/cmap/establish/handshake/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ struct ClientMetadata {
application: Option<AppMetadata>,
driver: DriverMetadata,
os: OsMetadata,
platform: Option<String>,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this only seemed to be an option to allow it to be initially set to None in BASE_CLIENT_METADATA below, and then conditionally set if version_check::triple returned a value.
since we can unconditionally set that value now in one line, and the fact that we allowed this value to be None is kind of how this bug existed in the first place, it seems preferable to make it non-optional.

platform: String,
}

#[derive(Clone, Debug)]
Expand Down Expand Up @@ -74,10 +74,7 @@ impl From<ClientMetadata> for Bson {
);

metadata_doc.insert("os", metadata.os);

if let Some(platform) = metadata.platform {
metadata_doc.insert("platform", platform);
}
metadata_doc.insert("platform", metadata.platform);

Bson::Document(metadata_doc)
}
Expand Down Expand Up @@ -118,7 +115,7 @@ lazy_static! {
name: None,
version: None,
},
platform: None,
platform: format!("{} with {}", rustc_version_runtime::version_meta().short_version_string, RUNTIME_NAME),
};

let info = os_info::get();
Expand All @@ -131,11 +128,6 @@ lazy_static! {
}
}

if let Some((version, channel, date)) = version_check::triple() {
metadata.platform =
Some(format!("rustc {} {} ({}) with {}", version, channel, date, RUNTIME_NAME));
}

metadata
};
}
Expand Down Expand Up @@ -182,11 +174,9 @@ impl Handshaker {
metadata.driver.version.push_str(version);
}

if let Some(ref mut platform) = metadata.platform {
if let Some(ref driver_info_platform) = driver_info.platform {
platform.push('|');
platform.push_str(driver_info_platform);
}
if let Some(ref driver_info_platform) = driver_info.platform {
metadata.platform.push('|');
metadata.platform.push_str(driver_info_platform);
}
}

Expand Down