fix(ocsf): preserve console record boundaries

Signed-off-by: John Myers <9696606+johntmyers@users.noreply.github.com>

Author: johntmyers

crates/openshell-ocsf/src/tracing_layers/shorthand_layer.rs

@@ -60,8 +60,7 @@ where
             if let Some(ocsf_event) = clone_current_event() {
                 let line = ocsf_event.format_shorthand();
                 if let Ok(mut w) = self.writer.lock() {
-                    let line = format!("{ts} OCSF {line}\n");
-                    let _ = w.write_all(line.as_bytes());
+                    let _ = write_record(&mut *w, format!("{ts} OCSF {line}"));
                 }
             }
         } else if self.include_non_ocsf {
@@ -72,13 +71,22 @@ where
             let mut message = String::new();
             event.record(&mut MessageVisitor(&mut message));
             if let Ok(mut w) = self.writer.lock() {
-                let line = format!("{ts} {level} {target}: {message}\n");
-                let _ = w.write_all(line.as_bytes());
+                let _ = write_record(&mut *w, format!("{ts} {level} {target}: {message}"));
             }
         }
     }
 }
 
+/// Preserve one physical line for the entire rendered record, including its
+/// target and any event fields. JSON serialization handles its own escaping.
+fn write_record(writer: &mut impl Write, mut line: String) -> std::io::Result<()> {
+    if line.contains(['\r', '\n']) {
+        line = line.replace('\r', "\\r").replace('\n', "\\n");
+    }
+    line.push('\n');
+    writer.write_all(line.as_bytes())
+}
+
 /// Simple visitor that extracts the message field from tracing events.
 struct MessageVisitor<'a>(&'a mut String);
 

crates/openshell-ocsf/tests/console_output.rs

@@ -129,3 +129,35 @@ fn concurrent_console_formats_submit_complete_records() {
     }
     assert_eq!(json_count, 8 * 50);
 }
+
+#[test]
+fn non_json_console_records_preserve_physical_line_boundaries() {
+    let records = Records::default();
+    let subscriber = tracing_subscriber::registry()
+        .with(OcsfShorthandLayer::new(records.clone()))
+        .with(OcsfJsonlLayer::new(records.clone()).with_console_format());
+    let message = "first\r\nsecond\nthird\rfourth";
+    let event = openshell_ocsf::ConfigStateChangeBuilder::new(&context())
+        .message(message)
+        .build();
+    tracing::subscriber::with_default(subscriber, || {
+        tracing::info!(target: "console\r\ncontinued", message = message);
+        ocsf_emit!(event);
+    });
+    let records = records.0.lock().unwrap();
+    assert_eq!(records.len(), 3);
+    for record in records.iter() {
+        assert_eq!(
+            record.iter().position(|byte| *byte == b'\n'),
+            Some(record.len() - 1)
+        );
+        assert!(!record.contains(&b'\r'));
+        assert_eq!(record.last(), Some(&b'\n'));
+        let line = std::str::from_utf8(record).unwrap();
+        if line.contains(" OCSF-JSON ") {
+            assert_eq!(payload(record)["message"], message);
+        } else {
+            assert!(line.contains("first\\r\\nsecond\\nthird\\rfourth"));
+        }
+    }
+}