1 files changed, 18 insertions, 0 deletions

diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp
index ec8f7d95e..ddc8b262e 100644
--- a/src/core/telemetry_session.cpp
+++ b/src/core/telemetry_session.cpp
@@ -2,6 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <cstring>
+
 #include "common/scm_rev.h"
 #include "core/telemetry_session.h"
 
@@ -10,9 +12,25 @@ namespace Core {
 TelemetrySession::TelemetrySession() {
     // TODO(bunnei): Replace with a backend that logs to our web service
     backend = std::make_unique<Telemetry::NullVisitor>();
+
+    // Log one-time session start information
+    const auto duration{std::chrono::steady_clock::now().time_since_epoch()};
+    const auto start_time{std::chrono::duration_cast<std::chrono::microseconds>(duration).count()};
+    AddField(Telemetry::FieldType::Session, "StartTime", start_time);
+
+    // Log one-time application information
+    const bool is_git_dirty{std::strstr(Common::g_scm_desc, "dirty") != nullptr};
+    AddField(Telemetry::FieldType::App, "GitIsDirty", is_git_dirty);
+    AddField(Telemetry::FieldType::App, "GitBranch", Common::g_scm_branch);
+    AddField(Telemetry::FieldType::App, "GitRevision", Common::g_scm_rev);
 }
 
 TelemetrySession::~TelemetrySession() {
+    // Log one-time session end information
+    const auto duration{std::chrono::steady_clock::now().time_since_epoch()};
+    const auto end_time{std::chrono::duration_cast<std::chrono::microseconds>(duration).count()};
+    AddField(Telemetry::FieldType::Session, "EndTime", end_time);
+
     // Complete the session, submitting to web service if necessary
     // This is just a placeholder to wrap up the session once the core completes and this is
     // destroyed. This will be moved elsewhere once we are actually doing real I/O with the service.