RDK-59221: Enable Accumulate Support For Grep Markers in Telemetry Profiles

schemas/t2_reportProfileSchema.schema.json

@@ -1,5 +1,5 @@
 {
   "$schema": "http://json-schema.org/draft-06/schema#",
   "$id": "https://github.comcast.com/cfry002/telemetry2/schemas/t2_reportProfileSchema.schema.json",
   "title":"Telemetry 2.0 Report Profile Description",
   "version": "2.0.10",
@@ -40,6 +40,7 @@
                     "logFile": { "type": "string", "description": "The name of the log file to be searched."},
                     "use":     { "$ref":    "#/definitions/parmUse", "description": "This property indicates how the data for this parameter should be gathered and reported.<br/>&bull;&nbsp;&nbsp;\"count\": Indicates that the value to report for this parameter is the number of times it has occurred during the reporting interval..<br/>&bull;&nbsp;&nbsp;\"absolute\": Indicates that the value to report for this parameter is the last actual value received, in the case of events, or found in the log file, in the case of greps.<br/>&bull;&nbsp;&nbsp;\"csv\": Indicates that the value to report for this parameter is a comma separated list of all the actual values received, in the case of events, or found in the log file, in the case of greps. <b>NOTE:</b> \"csv\" is not currently supported in Telemetry 2.0."},
                     "reportEmpty": { "type": "boolean", "default":"false", "description": "Should this marker name be included in the generated report even if the search string was not found in the log file?"},
+                    "reportTimestamp": { "$ref": "#/definitions/parmReportTimestamp", "description": "This property indicates whether or not a timestamp should be encoded to indicate the time at which this parameter data was received."}
                     "firstSeekFromEOF": { "type": "integer", "description": "An offset, in bytes, backward from logFile EOF to where the grep for search must begin for the first report this profile generates.  See documentation."}
                 },
                 "additionalProperties": false,

source/bulkdata/profile.c

@@ -339,7 +339,6 @@ static void* CollectAndReport(void* data)
         int count = profile->grepSeekProfile->execCounter;
 
         Vector *profileParamVals = NULL;
-        Vector *grepResultList = NULL;
         cJSON *valArray = NULL;
         char* jsonReport = NULL;
         cJSON *triggercondition = NULL;
@@ -452,26 +451,13 @@ static void* CollectAndReport(void* data)
                 }
                 if(profile->topMarkerList != NULL && Vector_Size(profile->topMarkerList) > 0)
                 {
-                    Vector *topMarkerResultList = NULL;
-                    Vector_Create(&topMarkerResultList);
-                    processTopPattern(profile->name, profile->topMarkerList, topMarkerResultList, 0);
-                    long int reportSize = Vector_Size(topMarkerResultList);
-                    if(reportSize != 0)
-                    {
-                        T2Info("Top markers report is compleated report size %ld\n", (unsigned long)reportSize);
-                        encodeGrepResultInJSON(valArray, topMarkerResultList);
-                    }
-                    else
-                    {
-                        T2Debug("Top markers report generated but is empty possabliy the memory value is changed");
-                    }
-                    Vector_Destroy(topMarkerResultList, freeGResult);
+                    processTopPattern(profile->name, profile->topMarkerList, 0);
+                    encodeTopResultInJSON(valArray, profile->topMarkerList);
                 }
                 if(profile->gMarkerList != NULL && Vector_Size(profile->gMarkerList) > 0)
                 {
-                    getGrepResults(&(profile->grepSeekProfile), profile->gMarkerList, &grepResultList, profile->bClearSeekMap, false, customLogPath); // Passing 5th argument as false so that it doesn't check rotated logs for the first reporting after bootup for multiprofiles.
-                    encodeGrepResultInJSON(valArray, grepResultList);
-                    Vector_Destroy(grepResultList, freeGResult);
+                    getGrepResults(&(profile->grepSeekProfile), profile->gMarkerList, profile->bClearSeekMap, false, customLogPath); // Passing 4th argument as false so that it doesn't check rotated logs for the first reporting after bootup for multiprofiles.
+                    encodeGrepResultInJSON(valArray, profile->gMarkerList);
                 }
                 if(profile->eMarkerList != NULL && Vector_Size(profile->eMarkerList) > 0)
                 {

source/bulkdata/profilexconf.c

@@ -227,7 +227,6 @@ static void* CollectAndReportXconf(void* data)
         }
         profile = singleProfile;
         Vector *profileParamVals = NULL;
-        Vector *grepResultList = NULL;
         cJSON *valArray = NULL;
         char* jsonReport = NULL;
         char* customLogPath = NULL;
@@ -287,27 +286,15 @@ static void* CollectAndReportXconf(void* data)
             }
             if(profile->topMarkerList != NULL && Vector_Size(profile->topMarkerList) > 0)
             {
-                Vector *topMarkerResultList = NULL;
-                Vector_Create(&topMarkerResultList);
-                processTopPattern(profile->name, profile->topMarkerList, topMarkerResultList, count);
-                long int reportSize = Vector_Size(topMarkerResultList);
-                if(reportSize != 0)
-                {
-                    T2Info("Top markers report is compleated report size %ld\n", (unsigned long)reportSize);
-                    encodeGrepResultInJSON(valArray, topMarkerResultList);
-                }
-                else
-                {
-                    T2Debug("Top markers report generated but is empty possabliy the memory value is changed");
-                }
-                Vector_Destroy(topMarkerResultList, freeGResult);
+                processTopPattern(profile->name, profile->topMarkerList, count);
+                T2Info("Top markers report is completed\n");
+                encodeTopResultInJSON(valArray, profile->topMarkerList);
             }
             if(profile->gMarkerList != NULL && Vector_Size(profile->gMarkerList) > 0)
             {
-                getGrepResults(&(profile->grepSeekProfile), profile->gMarkerList, &grepResultList, profile->bClearSeekMap, checkRotated, customLogPath); // Passing 5th argument as true to check rotated logs only in case of single profile
+                getGrepResults(&(profile->grepSeekProfile), profile->gMarkerList, profile->bClearSeekMap, checkRotated, customLogPath); // Passing 4th argument as true to check rotated logs only in case of single profile
                 T2Info("Grep complete for %lu markers \n", (unsigned long)Vector_Size(profile->gMarkerList));
-                encodeGrepResultInJSON(valArray, grepResultList);
-                Vector_Destroy(grepResultList, freeGResult);
+                encodeGrepResultInJSON(valArray, profile->gMarkerList);
             }
 
             dcaFlagReportCompleation();