webos-fluentbit-plugins=37-r10 webos-initscripts=87

:Release Notes:
Collect device usage data

:Detailed Notes:
webos-fluentbit-plugins: submissions/36..submissions/37
189cd09 WebOSSystemdFilter: Collect error log
32de273 WebOSSystemdFilter: Collect app usage data
c8e1f7a WebOSSystemdFilter: Collect app execution data
8b302b0 Add /usr/sbin/gatord to jira exceptions list
27f9b93 Collect device power on with MAC addr
82b78eb Rename Handler to WebOSSystemdFilter

webos-initscripts: submissions/86..submissions/87
20c97eb Fix if statement in fluent-bit.sh

:Testing Performed:
See the CCC jira ticket

:QA Notes:
N/A

:Issues Addressed:
[WRO-12419] CCC: webos-fluentbit-plugins=37-r10 webos-initscripts=87
[WRO-11634] Collect device power on with MAC addr
[WRO-12173] Collect app execution time
[WRO-12248] Collect error and app usage logs
[WRO-12575] Popup is not displaying on screen

Change-Id: I1d0302ae0a737360df4b8163c0def55cc05d6a00

meta-webos/recipes-core/initscripts/webos-initscripts.bb

@@ -19,7 +19,7 @@ RDEPENDS:${PN} = "${VIRTUAL-RUNTIME_init_manager} ${VIRTUAL-RUNTIME_bash} python
 PROVIDES = "initscripts"
 RPROVIDES:${PN} = "initscripts initd-functions"
 
-WEBOS_VERSION = "3.0.0-86_47aa729e1026c96365d48692e937150e6b7d5eaa"
+WEBOS_VERSION = "3.0.0-87_dbba6ee303189adf276ea9be4342e67b9b35582b"
 PR = "r17"
 
 inherit webos_component

meta-webos/recipes-webos/webos-fluentbit-plugins/webos-fluentbit-plugins.bb

@@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = " \
 DEPENDS = "glib-2.0 luna-service2 libpbnjson fluentbit msgpack-c"
 RDEPENDS:${PN} = "nyx-utils python3-core python3-requests python3-atlassian-python-api"
 
-WEBOS_VERSION = "1.0.0-36_943fa331cf43556faa302ebdf8ef0bbbbca0b977"
-PR = "r9"
+WEBOS_VERSION = "1.0.0-37_63ec3ce1216cd9bb3b0f09a4083aed28440e6e64"
+PR = "r10"
 
 inherit webos_component
 inherit webos_enhanced_submissions
@@ -28,3 +28,7 @@ inherit webos_distro_variant_dep
 SRC_URI="${WEBOSOSE_GIT_REPO_COMPLETE}"
 
 S = "${WORKDIR}/git"
+
+SRC_URI:append = " \
+    file://0001-Fix-build-error.patch \
+"

meta-webos/recipes-webos/webos-fluentbit-plugins/webos-fluentbit-plugins/0001-Fix-build-error.patch

@@ -0,0 +1,85 @@
+From 9a58800ecb83b477503a421f95caa6e6416dcd75 Mon Sep 17 00:00:00 2001
+From: Myungchul Kim <[email protected]>
+Date: Mon, 19 Sep 2022 09:33:05 +0900
+Subject: [PATCH] Fix build error
+
+Build Failed
+http://gecko.lge.com/jenkins/job/webos-master-verify-raspberrypi4/12201/ : FAILURE
+http://gecko.lge.com/jenkins/job/webos-master-verify-raspberrypi4-64/12149/ : SUCCESS
+
+Change-Id: I070796f961817ec8623f8e3d964fd0dbe530a2ec
+---
+ files/conf/fluent-bit_webos_official.conf           | 2 +-
+ plugins/common/util/MSGPackUtil.cpp                 | 6 +++---
+ plugins/common/util/MSGPackUtil.h                   | 2 +-
+ plugins/filter_webos_systemd/WebOSSystemdFilter.cpp | 2 +-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/files/conf/fluent-bit_webos_official.conf b/files/conf/fluent-bit_webos_official.conf
+index 27f4f7b..8c156b8 100644
+--- a/files/conf/fluent-bit_webos_official.conf
++++ b/files/conf/fluent-bit_webos_official.conf
+@@ -32,7 +32,7 @@
+     Match systemd
+     Host webosdev.lge.com
+     Port 9200
+-    Index rdx_systemd_raw_v2
++    Index rdx_systemd_raw_v3
+     Time_Key timestamp
+     HTTP_User rdx
+     HTTP_Passwd webos123
+diff --git a/plugins/common/util/MSGPackUtil.cpp b/plugins/common/util/MSGPackUtil.cpp
+index 61fcaeb..fc0e017 100644
+--- a/plugins/common/util/MSGPackUtil.cpp
++++ b/plugins/common/util/MSGPackUtil.cpp
+@@ -68,7 +68,7 @@ void MSGPackUtil::putValue(msgpack_packer* packer, const string& key, const JVal
+             break;
+         case JV_NUM:
+             // pbnjson does not distinguish integer from floating point (even if the serialized form is X.000000). This is by design.
+-            putValue(packer, kv.first.asString(), kv.second.asNumber<int>());
++            putValue(packer, kv.first.asString(), kv.second.asNumber<int64_t>());
+             break;
+         case JV_STR:
+             putValue(packer, kv.first.asString(), kv.second.asString());
+@@ -106,10 +106,10 @@ void MSGPackUtil::putValue(msgpack_packer* packer, const string& key, const char
+     putValue(packer, key, string(value));
+ }
+
+-void MSGPackUtil::putValue(msgpack_packer* packer, const string& key, int value)
++void MSGPackUtil::putValue(msgpack_packer* packer, const string& key, int64_t value)
+ {
+     packStr(packer, key);
+-    msgpack_pack_int(packer, value);
++    msgpack_pack_int64(packer, value);
+ }
+
+ void MSGPackUtil::putValue(msgpack_packer* packer, const string& key, double value)
+diff --git a/plugins/common/util/MSGPackUtil.h b/plugins/common/util/MSGPackUtil.h
+index f624fb5..5c3e670 100644
+--- a/plugins/common/util/MSGPackUtil.h
++++ b/plugins/common/util/MSGPackUtil.h
+@@ -35,7 +35,7 @@ public:
+     static void putValue(msgpack_packer* packer, const string& key, const JValue& value);
+     static void putValue(msgpack_packer* packer, const string& key, const string& value);
+     static void putValue(msgpack_packer* packer, const string& key, const char* value);
+-    static void putValue(msgpack_packer* packer, const string& key, int value);
++    static void putValue(msgpack_packer* packer, const string& key, int64_t value);
+     static void putValue(msgpack_packer* packer, const string& key, double value);
+     static void putValue(msgpack_packer* packer, const string& key, bool value);
+
+diff --git a/plugins/filter_webos_systemd/WebOSSystemdFilter.cpp b/plugins/filter_webos_systemd/WebOSSystemdFilter.cpp
+index ec9e944..b46faa1 100644
+--- a/plugins/filter_webos_systemd/WebOSSystemdFilter.cpp
++++ b/plugins/filter_webos_systemd/WebOSSystemdFilter.cpp
+@@ -282,7 +282,7 @@ void WebOSSystemdFilter::handleAppExecution(msgpack_unpacked* result, msgpack_pa
+     MSGPackUtil::putValue(packer, "event", "appExecution");
+     MSGPackUtil::putValue(packer, "main", appId);
+     JValue extra = Object();
+-    extra.put("durationSec", duration.tm.tv_sec);
++    extra.put("durationSec", (int64_t)duration.tm.tv_sec);
+     MSGPackUtil::putValue(packer, "extra", extra);
+     PLUGIN_INFO("Event (appExecution), Main (%s), Extra %s", appId.c_str(), extra.stringify().c_str());
+ }
+-- 
+2.25.1
+