RDKCOM-5620: RDKBDEV-3472 Add collection and send timestamps to reports

configure.ac

@@ -170,6 +170,25 @@ AC_ARG_ENABLE([support-typing-fields],
 
 AM_CONDITIONAL([ENABLE_SUPPORT_TYPING_FIELDS], [test x$ENABLE_SUPPORT_TYPING_FIELDS = xtrue])
 
+ENABLE_T2_ENABLE_STS_TS_TIMESTAMP=false
+
+AC_ARG_ENABLE([t2-enable-sts-ts-timestamp],
+    [AS_HELP_STRING(
+        [--enable-t2-enable-sts-ts-timestamp],
+        [enable T2_ENABLE_STS_TS_TIMESTAMP (default is no)]
+    )],
+    [
+        case "${enableval}" in
+            yes) ENABLE_T2_ENABLE_STS_TS_TIMESTAMP=true ;;
+            no)  ENABLE_T2_ENABLE_STS_TS_TIMESTAMP=false ;;
+            *) AC_MSG_ERROR([bad value ${enableval} for --enable-t2-enable-sts-ts-timestamp]) ;;
+        esac
+    ]
+)
+
+AM_CONDITIONAL([ENABLE_T2_ENABLE_STS_TS_TIMESTAMP],
+    [test "x${ENABLE_T2_ENABLE_STS_TS_TIMESTAMP}" = "xtrue"])
+
 #privacy control flag
 IS_PRIVACYCONTROL_ENABLED=false
 AC_ARG_ENABLE([privacycontrol],

source/bulkdata/Makefile.am

@@ -61,3 +61,7 @@ endif
 if IS_LIBRDKCERTSEL_ENABLED
 libbulkdata_la_CFLAGS = $(LIBRDKCERTSEL_FLAG)
 endif
+
+if ENABLE_T2_ENABLE_STS_TS_TIMESTAMP
+libbulkdata_la_CPPFLAGS += -DT2_ENABLE_STS_TS_TIMESTAMP
+endif

source/bulkdata/profile.c

@@ -569,6 +569,35 @@ static void* CollectAndReport(void* data)
                 {
                     cJSON_AddItemToArray(valArray, triggercondition);
                 }
+#ifdef T2_ENABLE_STS_TS_TIMESTAMP
+                /* Add the collection timestamp as a separate object in Report[]. */
+                if(valArray != NULL && cJSON_IsArray(valArray))
+                {
+                    struct timespec collectionTime;
+                    if(clock_gettime(CLOCK_REALTIME, &collectionTime) == 0)
+                    {
+                        long long collectionTimeMs =
+                            (long long)collectionTime.tv_sec * 1000LL +
+                            collectionTime.tv_nsec / 1000000LL;
+                        cJSON *timestamp = cJSON_CreateObject();
+                        if(timestamp != NULL)
+                        {
+                            if(cJSON_AddNumberToObject(timestamp, "ts",
+                                                      (double)collectionTimeMs) != NULL)
+                            {
+                                if(!cJSON_AddItemToArray(valArray, timestamp))
+                                {
+                                    cJSON_Delete(timestamp);
+                                }
+                            }
+                            else
+                            {
+                                cJSON_Delete(timestamp);
+                            }
+                        }
+                    }
+                }
+#endif
                 ret = prepareJSONReport(profile->jsonReportObj, &jsonReport);
                 destroyJSONReport(profile->jsonReportObj);
                 profile->jsonReportObj = NULL;

source/protocol/http/Makefile.am

@@ -34,3 +34,7 @@ libhttp_la_CPPFLAGS = -fPIC -I${PKG_CONFIG_SYSROOT_DIR}$(includedir)/dbus-1.0 \
                                 -I${top_srcdir}/source/bulkdata \
                                 -I${top_srcdir}/source/utils
 
+if ENABLE_T2_ENABLE_STS_TS_TIMESTAMP
+libhttp_la_CPPFLAGS += -DT2_ENABLE_STS_TS_TIMESTAMP
+libhttp_la_LDFLAGS += -lcjson
+endif

source/protocol/http/curlinterface.c

@@ -31,6 +31,10 @@
 #include <sys/wait.h>
 #include <curl/curl.h>
 #include <signal.h>
+#ifdef T2_ENABLE_STS_TS_TIMESTAMP
+#include <time.h>
+#include <cjson/cJSON.h>
+#endif
 
 #include "curlinterface.h"
 #include "reportprofiles.h"
@@ -73,14 +77,60 @@ typedef enum _ADDRESS_TYPE
 T2ERROR sendReportOverHTTP(char *httpUrl, char *payload)
 {
     T2ERROR ret = T2ERROR_FAILURE;
+#ifdef T2_ENABLE_STS_TS_TIMESTAMP
+    char *payloadWithSts = NULL;
+#endif
 
     T2Debug("%s ++in\n", __FUNCTION__);
     if(httpUrl == NULL || payload == NULL)
     {
         return ret;
     }
     // Use new dedicated POST API
+#ifdef T2_ENABLE_STS_TS_TIMESTAMP
+    cJSON *root = cJSON_Parse(payload);
+    if(root != NULL)
+    {
+        cJSON *report = cJSON_GetObjectItemCaseSensitive(root, "Report");
+        if(report != NULL && cJSON_IsArray(report))
+        {
+            struct timespec sendTime;
+            if(clock_gettime(CLOCK_REALTIME, &sendTime) == 0)
+            {
+                long long sendTimeMs =
+                    (long long)sendTime.tv_sec * 1000LL +
+                    sendTime.tv_nsec / 1000000LL;
+                cJSON *timestamp = cJSON_CreateObject();
+                if(timestamp != NULL)
+                {
+                    if(cJSON_AddNumberToObject(timestamp, "sts",
+                                              (double)sendTimeMs) != NULL)
+                    {
+                        if(cJSON_AddItemToArray(report, timestamp))
+                        {
+                            payloadWithSts = cJSON_PrintUnformatted(root);
+                        }
+                        else
+                        {
+                            cJSON_Delete(timestamp);
+                        }
+                    }
+                    else
+                    {
+                        cJSON_Delete(timestamp);
+                    }
+                }
+            }
+        }
+        cJSON_Delete(root);
+    }
+
+    ret = http_pool_post(httpUrl,
+                         payloadWithSts != NULL ? payloadWithSts : payload);
+    free(payloadWithSts);
+#else
     ret = http_pool_post(httpUrl, payload);
+#endif
 
     if(ret == T2ERROR_SUCCESS)
     {