From 253022f8599a9c62239d0af044ead035b09dc28a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6ran=20Sander?= <mountaindude@ptarmiganlabs.com>
Date: Tue, 28 Nov 2023 07:10:34 +0000
Subject: [PATCH] More updates towards #678

---
 src/lib/post-to-influxdb.js  |  4 ----
 src/lib/post-to-mqtt.js      | 16 ++++++++++------
 src/lib/post-to-new-relic.js | 22 ++++++++++------------
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/lib/post-to-influxdb.js b/src/lib/post-to-influxdb.js
index f20515f8..2743fc76 100755
--- a/src/lib/post-to-influxdb.js
+++ b/src/lib/post-to-influxdb.js
@@ -438,10 +438,6 @@ function postUserEventToInfluxdb(msg) {
         if (msg?.ua?.os?.name) tags.uaOsName = msg?.ua?.os?.name;
         if (msg?.ua?.os?.version) tags.uaOsVersion = msg?.ua?.os?.version;
 
-
-
-
-
         // Add custom tags from config file to payload
         if (
             globals.config.has('Butler-SOS.userEvents.tags') &&
diff --git a/src/lib/post-to-mqtt.js b/src/lib/post-to-mqtt.js
index 0f91b499..7560bc5f 100755
--- a/src/lib/post-to-mqtt.js
+++ b/src/lib/post-to-mqtt.js
@@ -111,17 +111,21 @@ function postUserEventToMQTT(msg) {
             userDir: msg.user_directory,
             userId: msg.user_id,
             origin: msg.origin,
-            appId: msg.appId,
-            appName: msg.appName,
-            uaBrowserName: msg.ua.browser.name,
-            uaBrowserMajorVersion: msg.ua.browser.major,
-            uaOsName: msg.ua.os.name,
-            uaOsVersion: msg.ua.os.version,
             context: msg.context,
             message: msg.message,
             tags: {},
         };
 
+        // Add app id and name if they exist
+        if (msg?.appId) payload.appId = msg.appId;
+        if (msg?.appName) payload.appName = msg.appName;
+
+        // Add user agent info if it exists
+        if (msg?.ua?.browser?.name) payload.uaBrowserName = msg.ua.browser.name;
+        if (msg?.ua?.browser?.major) payload.uaBrowserMajorVersion = msg.ua.browser.major;
+        if (msg?.ua?.os?.name) payload.uaOsName = msg.ua.os.name;
+        if (msg?.ua?.os?.version) payload.uaOsVersion = msg.ua.os.version;
+
         // Add custom tags from config file to payload
         if (
             globals.config.has('Butler-SOS.userEvents.tags') &&
diff --git a/src/lib/post-to-new-relic.js b/src/lib/post-to-new-relic.js
index 3cd6caf7..11eea040 100755
--- a/src/lib/post-to-new-relic.js
+++ b/src/lib/post-to-new-relic.js
@@ -708,12 +708,6 @@ async function postUserEventToNewRelic(msg) {
                     .update(msg.user_id)
                     .digest('hex'),
                 qs_origin: msg.origin,
-                qs_appId: msg.appId,
-                qs_appName: msg.appName,
-                qs_uaBrowserName: msg.ua.browser.name,
-                qs_uaBrowserMajorVersion: msg.ua.browser.major,
-                qs_uaOsName: msg.ua.os.name,
-                qs_uaOsVersion: msg.ua.os.version,
             };
         } else {
             attributes = {
@@ -724,15 +718,19 @@ async function postUserEventToNewRelic(msg) {
                 qs_userDirectory: msg.user_directory,
                 qs_userId: msg.user_id,
                 qs_origin: msg.origin,
-                qs_appId: msg.appId,
-                qs_appName: msg.appName,
-                qs_uaBrowserName: msg.ua.browser.name,
-                qs_uaBrowserMajorVersion: msg.ua.browser.major,
-                qs_uaOsName: msg.ua.os.name,
-                qs_uaOsVersion: msg.ua.os.version,
             };
         }
 
+        // Add app id and name to attributes if they exist
+        if (msg?.appId) attributes.qs_appId = msg.appId;
+        if (msg?.appName) attributes.qs_appName = msg.appName;
+
+        // Add user agent fields to attributes if they exist
+        if (msg?.ua?.browser?.name) attributes.qs_uaBrowserName = msg.ua.browser.name;
+        if (msg?.ua?.browser?.major) attributes.qs_uaBrowserMajorVersion = msg.ua.browser.major;
+        if (msg?.ua?.os?.name) attributes.qs_uaOsName = msg.ua.os.name;
+        if (msg?.ua?.os?.version) attributes.qs_uaOsVersion = msg.ua.os.version;
+
         // Add custom tags from config file to payload
         if (
             globals.config.has('Butler-SOS.userEvents.tags') &&