common: cloudprotocol: align request log message with protocol

This patch aligns the request log message with the cloud protocol:
- Upload options are moved out from the log filter
to the request log message;
- Log type is changed to log upload type in the upload options struct.

Signed-off-by: Mykhailo Lohvynenko <mykhailo_lohvynenko@epam.com>

Author: mlohvynenko

include/aos/common/cloudprotocol/log.hpp

@@ -55,11 +55,35 @@ class LogTypeType {
 using LogTypeEnum = LogTypeType::Enum;
 using LogType     = EnumStringer<LogTypeType>;
 
+/**
+ * Log upload type type.
+ */
+class LogUploadTypeType {
+public:
+    enum class Enum {
+        eAMQPS,
+        eHTTPS,
+    };
+
+    static const Array<const char* const> GetStrings()
+    {
+        static const char* const sStrings[] = {
+            "amqps",
+            "https",
+        };
+
+        return Array<const char* const>(sStrings, ArraySize(sStrings));
+    };
+};
+
+using LogUploadTypeEnum = LogUploadTypeType::Enum;
+using LogUploadType     = EnumStringer<LogUploadTypeType>;
+
 /**
  * Log upload options.
  */
 struct LogUploadOptions {
-    LogType                       mType;
+    LogUploadType                 mType;
     StaticString<cURLLen>         mURL;
     StaticString<cBearerTokenLen> mBearerToken;
     Optional<Time>                mBearerTokenTTL;
@@ -92,7 +116,6 @@ struct LogFilter {
     Optional<Time>                                      mFrom;
     Optional<Time>                                      mTill;
     StaticArray<StaticString<cNodeIDLen>, cMaxNumNodes> mNodeIDs;
-    Optional<LogUploadOptions>                          mUploadOptions;
     InstanceFilter                                      mInstanceFilter;
 
     /**
@@ -104,7 +127,7 @@ struct LogFilter {
     bool operator==(const LogFilter& filter) const
     {
         return mFrom == filter.mFrom && mTill == filter.mTill && mNodeIDs == filter.mNodeIDs
-            && mUploadOptions == filter.mUploadOptions && mInstanceFilter == filter.mInstanceFilter;
+            && mInstanceFilter == filter.mInstanceFilter;
     }
 
     /**
@@ -120,9 +143,10 @@ struct LogFilter {
  * Log status.
  */
 struct RequestLog {
-    StaticString<cLogIDLen> mLogID;
-    LogType                 mLogType;
-    LogFilter               mFilter;
+    StaticString<cLogIDLen>    mLogID;
+    LogType                    mLogType;
+    LogFilter                  mFilter;
+    Optional<LogUploadOptions> mUploadOptions;
 
     /**
      * Compares log request.
@@ -132,7 +156,8 @@ struct RequestLog {
      */
     bool operator==(const RequestLog& request) const
     {
-        return mLogID == request.mLogID && mLogType == request.mLogType && mFilter == request.mFilter;
+        return mLogID == request.mLogID && mLogType == request.mLogType && mFilter == request.mFilter
+            && mUploadOptions == request.mUploadOptions;
     }
 
     /**