fix: finish initial adapting to simpler rr support record: reuse importTrace

Author: alehander92

src/ct/db_backend_record.nim

@@ -73,10 +73,8 @@ proc recordWithRR(
     echo fmt"error: ct-rr-support returned exit code ", code
     quit(code)
 
-  var trace = Json.decode(readFile(traceDbMetadataPath), Trace)
-  trace.id = traceId
-
-  result = importDbTrace(traceMetadataPath, traceId, recordPid, lang, DB_SELF_CONTAINED_DEFAULT)
+  # record pid and lang in trace_db_metadata.json
+  result = importTrace(traceFolder, traceId, NO_PID, LangUnknown, DB_SELF_CONTAINED_DEFAULT, traceKind="rr")
 
 
 # rr patches for ruby/other vm-s: not supported now, instead
@@ -182,7 +180,7 @@ proc recordDb(
     echo fmt"error: recorder exited with {exitCode} for {lang}"
     quit(1)
 
-  result = importDbTrace(traceMetadataPath, traceId, recordPid, lang, DB_SELF_CONTAINED_DEFAULT)
+  result = importTrace(traceFolder, traceId, recordPid, lang, DB_SELF_CONTAINED_DEFAULT, traceKind="db")
 
 
 # record a program run
@@ -313,9 +311,14 @@ proc record(
         traceId,
         pythonActivationPath = activationPathResolved)
     elif traceKind == "rr":
-      echo "TODO rr"
+      echo "rr"
       echo rrSupportPath
-      quit(1)
+      return recordWithRR(
+        rrSupportPath,
+        executable,
+        args,
+        outputFolder,
+        traceId)
     else:
       echo fmt"ERROR: unsupported lang {lang}"
       quit(1)

src/ct/online_sharing/download.nim

@@ -38,7 +38,7 @@ proc downloadTrace*(url: string): int =
   let lang = detectLang(pathValue.extractFilename, LangUnknown, isWasm)
   let recordPid = NO_PID # for now not processing the pid , but it can be 
   # accessed from trace metadata file if we need it in the future
-  discard importDbTrace(traceMetadataPath, traceId, recordPid, lang, DB_SELF_CONTAINED_DEFAULT, url)
+  discard importTrace(unzippedLocation, traceId, recordPid, lang, DB_SELF_CONTAINED_DEFAULT, url)
   return traceId
 
 proc downloadTraceCommand*(traceDownloadUrl: string) =

src/ct/trace/replay.nim

@@ -139,7 +139,7 @@ proc replay*(
     trace = findTraceForArgs(patternArg, traceIdArg, traceFolderArg)
 
     if trace.isNil and traceFolderArg.isSome:
-      trace = importDbTrace(traceFolderArg.get() / "trace_metadata.json", NO_TRACE_ID, NO_PID, LangUnknown)
+      trace = importTrace(traceFolderArg.get(), NO_TRACE_ID, NO_PID, LangUnknown)
     if trace.isNil:
       echo "ERROR: can't find or import trace"
       quit(1)

src/ct/trace/storage_and_import.nim

@@ -83,8 +83,8 @@ proc processSourceFoldersList*(folderSet: HashSet[string], programDir: string =
   result = sortedFolders
 
 
-proc importDbTrace*(
-  traceMetadataPath: string,
+proc importTrace*(
+  traceFolder: string,
   traceIdArg: int,
   recordPid: int,
   langArg: Lang = LangNoir,
@@ -93,7 +93,15 @@ proc importDbTrace*(
   traceKind: string = "db",
 ): Trace =
 
-  # for rr: trace_db_metadata.json: has those fields but also many others
+  # for now support different files with the same subset of fields:
+  #   db: trace_metadata.json
+  #   rr: trace_db_metadata.json: 
+  # both should have `program`, `args`, `workdir`(but maybe also others)
+  let traceMetadataPath = if traceKind == "db":
+      traceFolder / "trace_metadata.json"
+    else:
+      traceFolder / "trace_db_metadata.json"
+
   echo traceMetadataPath
   let rawTraceMetadata = readFile(traceMetadataPath)
   let untypedJson = parseJson(rawTraceMetadata)
@@ -120,7 +128,11 @@ proc importDbTrace*(
       traceFolder
   if traceIdArg == NO_TRACE_ID:
     createDir(outputFolder)
-    copyFile(traceMetadataPath, outputFolder / "trace_metadata.json")
+    if traceMetadataPath.endsWith("trace_metadata.json"):
+      copyFile(traceMetadataPath, outputFolder / "trace_metadata.json")
+    elif traceMetadataPath.endsWith("trace_db_metadata.json"):
+      copyFile(traceMetadataPath, outputFolder / "trace_db_metadata.json")
+
     try:
       copyFile(tracePathsPath, outputFolder / "trace_paths.json")
     except CatchableError as e:
@@ -152,9 +164,9 @@ proc importDbTrace*(
         # for now assume this is used only for db traces
         # and that C/C++/Rust there can come only from wasm targets currently
         if traceLang == LangRust:
-          lang = LangRustWasm
+          lang = if traceKind == "db": LangRustWasm else: LangRust
         elif traceLang in {LangC, LangCpp}:
-          lang = LangCppWasm
+          lang = if traceKind == "db": LangCppWasm else: traceLang
         else:
           lang = traceLang
         break # for now assume the first detected lang is ok
@@ -176,27 +188,41 @@ proc importDbTrace*(
   let sourceFolders = processSourceFoldersList(sourceFoldersInitialSet, workdir)
   let sourceFoldersText = sourceFolders.join(" ")
 
-  trace_index.recordTrace(
-    traceID,
-    program = program,
-    args = args,
-    compileCommand = "",
-    env = "",
-    workdir = workdir,
-    lang = lang,
-    sourceFolders = sourceFoldersText,
-    lowLevelFolder = "",
-    outputFolder = outputFolder,
-    test = false,
-    imported = selfContained,
-    shellID = -1,
-    rrPid = recordPid,
-    exitCode = -1,
-    calltrace = true,
-    # for now always use FullRecord for db-backend
-    # and ignore possible env var override
-    calltraceMode = CalltraceMode.FullRecord,
-    fileId = downloadUrl)
+  echo "traceKind ", traceKind
+  if traceKind == "db":
+    trace_index.recordTrace(
+      traceID,
+      program = program,
+      args = args,
+      compileCommand = "",
+      env = "",
+      workdir = workdir,
+      lang = lang,
+      sourceFolders = sourceFoldersText,
+      lowLevelFolder = "",
+      outputFolder = outputFolder,
+      test = false,
+      imported = selfContained,
+      shellID = -1,
+      rrPid = recordPid,
+      exitCode = -1,
+      calltrace = true,
+      # for now always use FullRecord for db-backend
+      # and ignore possible env var override
+      calltraceMode = CalltraceMode.FullRecord,
+      fileId = downloadUrl)
+  else:
+    try:
+      var trace = Json.decode(readFile(traceMetadataPath), Trace)
+      trace.id = traceID
+      # trace.sourceFolders = sourceFolders
+      trace.outputFolder = outputFolder
+      trace.imported = selfContained
+      echo trace.repr
+      trace_index.recordTrace(trace, test=false)
+    except CatchableError as e:
+      echo "[codetracer importTrace error]: ", e.repr
+      quit(1)
 
 proc getFolderSize(folderPath: string): int64 =
   var totalSize: int64 = 0

src/db-backend/src/dap_server.rs

@@ -119,7 +119,7 @@ fn launch(
         Ok(handler)
     } else {
         warn!("problem with reading metadata or path trace files: try rr?");
-        let path = trace_folder.join("rr").join("latest-trace");
+        let path = trace_folder.join("rr");
         if path.exists() {
             let db = Db::new(&PathBuf::from(""));
             let ct_rr_args = CtRRArgs {