fix: integrating changes from @uggla in #195

src/exporters/mod.rs

@@ -735,7 +735,7 @@ impl MetricGenerator {
             attributes.insert("exe".to_string(), exe.clone());
 
             if let Some(cmdline_str) = cmdline {
-                attributes.insert("cmdline".to_string(), cmdline_str.replace('"', "\\\""));
+                attributes.insert("cmdline".to_string(), utils::filter_cmdline(&cmdline_str));
 
                 #[cfg(target_os = "linux")]
                 if self.qemu {

src/exporters/utils.rs

@@ -8,6 +8,16 @@ use {
     k8s_sync::{errors::KubernetesError, kubernetes::Kubernetes},
 };
 
+/// Returns a cmdline String filtered from potential characters that
+/// could break exporters output.
+///
+/// Here we replace:
+/// 1. Double quote by backslash double quote.
+/// 2. Remove carriage return.
+pub fn filter_cmdline(cmdline: &str) -> String {
+    cmdline.replace('\"', "\\\"").replace('\n', "")
+}
+
 /// Returns an Option containing the VM name of a qemu process.
 ///
 /// Then VM name is extracted from the command line.
@@ -112,6 +122,16 @@ pub fn get_kubernetes_client() -> Result<Kubernetes, KubernetesError> {
     }
 }
 
+#[test]
+// Fix bug https://github.com/hubblo-org/scaphandre/issues/175
+fn test_filter_cmdline_with_carriage_return() {
+    let cmdline = "bash-csleep infinity;\n> echo plop";
+    assert_eq!(
+        filter_cmdline(cmdline),
+        String::from("bash-csleep infinity;> echo plop")
+    );
+}
+
 //  Copyright 2020 The scaphandre authors.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
@@ -124,4 +144,4 @@ pub fn get_kubernetes_client() -> Result<Kubernetes, KubernetesError> {
 //  distributed under the License is distributed on an "AS IS" BASIS,
 //  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //  See the License for the specific language governing permissions and
-//  limitations under the License.
+//  limitations under the License.