refactor(cbor_plus_zstd): factored out the repeated initialization code for AbstractTraceWriterData into a AbstractTraceWriterData::new() constructor-like function

Author: nickysn

runtime_tracing/src/abstract_trace_writer.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashMap, error::Error, fs, path::{Path, PathBuf}};
+use std::{collections::HashMap, env, error::Error, fs, path::{Path, PathBuf}};
 
 use crate::{tracer::TOP_LEVEL_FUNCTION_ID, AssignCellRecord, AssignCompoundItemRecord, AssignmentRecord, CallRecord, CellValueRecord, CompoundValueRecord, FullValueRecord, FunctionId, FunctionRecord, Line, PathId, RValue, RecordEvent, ReturnRecord, StepRecord, TraceLowLevelEvent, TraceMetadata, TypeId, TypeKind, TypeRecord, TypeSpecificInfo, VariableCellRecord, VariableId, NONE_TYPE_ID};
 
@@ -20,6 +20,26 @@ pub struct AbstractTraceWriterData {
     pub trace_paths_path: Option<PathBuf>,
 }
 
+impl AbstractTraceWriterData {
+    pub fn new(program: &str, args: &[String]) -> Self {
+        AbstractTraceWriterData {
+            workdir: env::current_dir().expect("can access the current dir"),
+            program: program.to_string(),
+            args: args.to_vec(),
+
+            path_list: vec![],
+            function_list: vec![],
+            paths: HashMap::new(),
+            functions: HashMap::new(),
+            variables: HashMap::new(),
+            types: HashMap::new(),
+
+            trace_metadata_path: None,
+            trace_paths_path: None,
+        }
+    }
+}
+
 pub trait AbstractTraceWriter {
     fn get_data(&self) -> &AbstractTraceWriterData;
     fn get_mut_data(&mut self) -> &mut AbstractTraceWriterData;

runtime_tracing/src/cbor_zstd_writer.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashMap, env, fs::File, io::Write, path::PathBuf};
+use std::{fs::File, io::Write, path::PathBuf};
 use zeekstd::Encoder;
 
 use crate::{abstract_trace_writer::{AbstractTraceWriter, AbstractTraceWriterData}, trace_writer::TraceWriter, TraceLowLevelEvent};
@@ -21,21 +21,7 @@ impl<'a> StreamingTraceWriter<'a> {
     /// Create a new tracer instance for the given program and arguments.
     pub fn new(program: &str, args: &[String]) -> Self {
         StreamingTraceWriter {
-            base: AbstractTraceWriterData {
-                workdir: env::current_dir().expect("can access the current dir"),
-                program: program.to_string(),
-                args: args.to_vec(),
-
-                path_list: vec![],
-                function_list: vec![],
-                paths: HashMap::new(),
-                functions: HashMap::new(),
-                variables: HashMap::new(),
-                types: HashMap::new(),
-
-                trace_metadata_path: None,
-                trace_paths_path: None,
-            },
+            base: AbstractTraceWriterData::new(program, args),
 
             trace_events_path: None,
             trace_events_file_zstd_encoder: None,

runtime_tracing/src/non_streaming_trace_writer.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashMap, env, error::Error, fs, path::{Path, PathBuf}};
+use std::{error::Error, fs, path::{Path, PathBuf}};
 
 use crate::{abstract_trace_writer::{AbstractTraceWriter, AbstractTraceWriterData}, TraceEventsFileFormat, TraceLowLevelEvent, TraceWriter};
 
@@ -21,21 +21,7 @@ impl NonStreamingTraceWriter {
     /// Create a new tracer instance for the given program and arguments.
     pub fn new(program: &str, args: &[String]) -> Self {
         NonStreamingTraceWriter {
-                base: AbstractTraceWriterData {
-                workdir: env::current_dir().expect("can access the current dir"),
-                program: program.to_string(),
-                args: args.to_vec(),
-
-                path_list: vec![],
-                function_list: vec![],
-                paths: HashMap::new(),
-                functions: HashMap::new(),
-                variables: HashMap::new(),
-                types: HashMap::new(),
-
-                trace_metadata_path: None,
-                trace_paths_path: None,
-            },
+            base: AbstractTraceWriterData::new(program, args),
 
             events: vec![],