cbor encoder: added callback support for additional meta collection

This callback is called from the top hierarchy map, `data` of the metadata.

Author: vikramdattu

components/esp_insights/src/esp_insights_cbor_encoder.c

@@ -29,8 +29,24 @@
 static CborEncoder s_encoder, s_result_map, s_diag_map, s_diag_data_map;
 static CborEncoder s_meta_encoder, s_meta_result_map, s_diag_meta_map, s_diag_meta_data_map;
 
+#define CBOR_ENC_MAX_CBS    10
+static struct cbor_encoder_data {
+    insights_cbor_encoder_cb_t cb[CBOR_ENC_MAX_CBS];
+    int cb_cnt;
+} s_priv_data;
+
 static inline void _cbor_encode_meta_hdr(CborEncoder *hdr_map, const rtc_store_meta_header_t *hdr);
 
+esp_err_t esp_insights_cbor_encoder_register_meta_cb(insights_cbor_encoder_cb_t cb)
+{
+    if (s_priv_data.cb_cnt == CBOR_ENC_MAX_CBS) {
+        return ESP_ERR_NO_MEM;
+    }
+    ESP_LOGV(TAG, "Registering callback %p", cb);
+    s_priv_data.cb[s_priv_data.cb_cnt++] = cb;
+    return ESP_OK;
+}
+
 void esp_insights_cbor_encode_diag_begin(void *data, size_t data_size, const char *version)
 {
     cbor_encoder_init(&s_encoder, data, data_size, 0);
@@ -681,6 +697,25 @@ void esp_insights_cbor_encode_meta_data_end(void)
     cbor_encoder_close_container(&s_diag_meta_map, &s_diag_meta_data_map);
 }
 
+void esp_insights_cbor_encode_conf_meta_data_begin(void)
+{
+    cbor_encode_text_stringz(&s_diag_meta_map, "data");
+    cbor_encoder_create_map(&s_diag_meta_map, &s_diag_meta_data_map, CborIndefiniteLength);
+#ifdef NEW_META_STRUCT
+    for (int i = 0; i < s_priv_data.cb_cnt; i++) {
+        if (s_priv_data.cb[i]) {
+            s_priv_data.cb[i] (&s_diag_meta_data_map, INSIGHTS_MSG_TYPE_META);
+        }
+    }
+#endif
+}
+
+/** Vikram: remove? */
+void esp_insights_cbor_encode_conf_meta_data_end(void)
+{
+    cbor_encoder_close_container(&s_diag_meta_map, &s_diag_meta_data_map);
+}
+
 #if CONFIG_DIAG_ENABLE_METRICS
 static void encode_metrics_meta_element(CborEncoder *map, const esp_diag_metrics_meta_t *metrics)
 {

components/esp_insights/src/esp_insights_cbor_encoder.h

@@ -20,6 +20,28 @@
 #define NEW_META_STRUCT 1
 #endif
 
+typedef enum {
+    INSIGHTS_MSG_TYPE_META,
+    INSIGHTS_MSG_TYPE_DATA
+} insights_msg_type_t;
+
+/**
+ * @brief cbor encoder callback
+ *
+ * @param map   parent map to which new data will be encoded
+ * @param type  information type to be collected
+ */
+typedef void (*insights_cbor_encoder_cb_t) (CborEncoder *map, insights_msg_type_t type);
+
+/**
+ * @brief register a meta collection callback
+ *
+ * @param cb callback of type \ref insights_cbor_encoder_cb_t
+ *
+ * @return ESP_OK on success, appropriate error otherwise
+ */
+esp_err_t esp_insights_cbor_encoder_register_meta_cb(insights_cbor_encoder_cb_t cb);
+
 void esp_insights_cbor_encode_diag_begin(void *data, size_t data_size, const char *version);
 void esp_insights_cbor_encode_diag_data_begin(void);
 void esp_insights_cbor_encode_diag_boot_info(esp_diag_device_info_t *device_info);

components/esp_insights/src/esp_insights_cmd_resp.c

@@ -537,6 +537,7 @@ esp_err_t esp_insights_cmd_resp_enable(void)
         goto enable_err;
     }
 
+    esp_insights_cbor_encoder_register_meta_cb(&esp_insights_cbor_reboot_msg_cb);
     ESP_LOGI(TAG, "Enabling Command-Response Module.");
 
     /* Register our config parsing command to cmd_resp module */