From 5e3b438bd74a3ca55b15a03f60848e33d9c18964 Mon Sep 17 00:00:00 2001
From: James Short <jwshort@meta.com>
Date: Wed, 1 May 2024 17:25:20 -0700
Subject: [PATCH] Telemetry service directory override.

In addition to opt-in for telemetry (see #553) this uses the log
directory override from #556 to place the sentry/telemetry logs.
---
 src/terminal/TerminalServerMain.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/terminal/TerminalServerMain.cpp b/src/terminal/TerminalServerMain.cpp
index d19c5d25d..1932ddd20 100644
--- a/src/terminal/TerminalServerMain.cpp
+++ b/src/terminal/TerminalServerMain.cpp
@@ -79,7 +79,7 @@ int main(int argc, char **argv) {
 
     int port = 0;
     string bindIp = "";
-    bool telemetry = false;
+    bool enableTelemetry = false;
     string logDirectory = GetTempDirectory();
     if (result.count("cfgfile")) {
       // Load the config file
@@ -101,7 +101,7 @@ int main(int argc, char **argv) {
           }
         }
 
-        telemetry = ini.GetBoolValue("Debug", "telemetry", false);
+        enableTelemetry = ini.GetBoolValue("Debug", "telemetry", false);
         // read verbose level (prioritize command line option over cfgfile)
         const char *vlevel = ini.GetValue("Debug", "verbose", NULL);
         if (result.count("verbose")) {
@@ -155,7 +155,7 @@ int main(int argc, char **argv) {
     }
 
     if (result.count("telemetry")) {
-      telemetry = result["telemetry"].as<bool>();
+      enableTelemetry = result["telemetry"].as<bool>();
     }
 
     if (result.count("logdir")) {
@@ -181,7 +181,7 @@ int main(int argc, char **argv) {
     el::Helpers::installPreRollOutCallback(LogHandler::rolloutHandler);
 
     TelemetryService::create(
-        telemetry, GetTempDirectory() + "/.sentry-native-etserver", "Server");
+        enableTelemetry, logDirectory + "/.sentry-native-etserver", "Server");
 
     serverFifo.createDirectoriesIfRequired();