From ec06dd38d67cf1a9fee4ae511f00db0dd5f7771e Mon Sep 17 00:00:00 2001
From: mck <mck@apache.org>
Date: Sat, 25 Dec 2021 16:25:36 +0100
Subject: [PATCH] Collect tracing data, when permitted to do so

---
 ds-collector/ds-collector                  |  1 +
 ds-collector/rust-commands/collect-info.rs | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/ds-collector/ds-collector b/ds-collector/ds-collector
index 45f8a63..2dc964e 100755
--- a/ds-collector/ds-collector
+++ b/ds-collector/ds-collector
@@ -483,6 +483,7 @@ collect_via_rust() {
   export no_nodesyncrate
   export solr_data_dir
   export skip_dse_solr
+  if ! [ "$enableTracingCollection" = "true" ] ; then export skip_tracing_collection="true" ; fi
   if echo $- | grep -q x ; then export COLLECT_INFO_DEBUG=true ; fi
   ${baseDir}/collect-info "$server_pid" "$artifactDir" 
   statusState=$?
diff --git a/ds-collector/rust-commands/collect-info.rs b/ds-collector/rust-commands/collect-info.rs
index c6de6d9..bba60d5 100644
--- a/ds-collector/rust-commands/collect-info.rs
+++ b/ds-collector/rust-commands/collect-info.rs
@@ -1215,4 +1215,25 @@ const COMMANDS: &[Cmd<'static>] = &[
         use_sudo: false,
         use_timeout: true,
     },
+    // collect system traces, if permitted
+    Cmd {
+        command: "cqlsh",
+        args: "{cqlsh_host} {cqlsh_port} {cqlsh_opts} -e 'COPY system_traces.sessions TO {artifact_dir}/system_traces_sessions.csv;''",
+        file: "",
+        optional: true,
+        skip_flags: "skip_tracing_collection",
+        use_stdout: true,
+        use_sudo: false,
+        use_timeout: false,
+    },
+    Cmd {
+        command: "cqlsh",
+        args: "{cqlsh_host} {cqlsh_port} {cqlsh_opts} -e 'COPY system_traces.events TO {artifact_dir}/system_traces_events.csv;''",
+        file: "",
+        optional: true,
+        skip_flags: "skip_tracing_collection",
+        use_stdout: true,
+        use_sudo: false,
+        use_timeout: false,
+    },
 ];