changing the order the of protocols being run

memory/mem_analytics.c

@@ -280,6 +280,11 @@ static int parse_command_line(int argc, char* argv[], MEM_ANALYTIC_INFO* mem_inf
 
 static void send_heap_info(CONNECTION_INFO* conn_info, REPORT_HANDLE report_handle)
 {
+    // MQTT Sending
+#ifdef USE_MQTT
+    initiate_lower_level_operation(conn_info, report_handle, PROTOCOL_MQTT, MESSAGES_TO_USE, USE_MSG_BYTE_ARRAY);
+    initiate_lower_level_operation(conn_info, report_handle, PROTOCOL_MQTT_WS, MESSAGES_TO_USE, USE_MSG_BYTE_ARRAY);
+#endif
     // AMQP Sending
 #ifdef USE_AMQP
     initiate_lower_level_operation(conn_info, report_handle, PROTOCOL_AMQP, MESSAGES_TO_USE, USE_MSG_BYTE_ARRAY);
@@ -288,13 +293,13 @@ static void send_heap_info(CONNECTION_INFO* conn_info, REPORT_HANDLE report_hand
     // HTTP Sending
 #ifdef USE_HTTP
     //initiate_lower_level_operation(conn_info, report_handle, PROTOCOL_HTTP, MESSAGES_TO_USE, USE_MSG_BYTE_ARRAY);
-    // MQTT Sending
-#endif
-#ifdef USE_MQTT
-    initiate_lower_level_operation(conn_info, report_handle, PROTOCOL_MQTT, MESSAGES_TO_USE, USE_MSG_BYTE_ARRAY);
-    initiate_lower_level_operation(conn_info, report_handle, PROTOCOL_MQTT_WS, MESSAGES_TO_USE, USE_MSG_BYTE_ARRAY);
 #endif
 
+    // MQTT Sending
+#ifdef USE_MQTT
+    initiate_upper_level_operation(conn_info, report_handle, PROTOCOL_MQTT, MESSAGES_TO_USE, USE_MSG_BYTE_ARRAY);
+    initiate_upper_level_operation(conn_info, report_handle, PROTOCOL_MQTT_WS, MESSAGES_TO_USE, USE_MSG_BYTE_ARRAY);
+#endif
     // AMQP Sending
 #ifdef USE_AMQP
     initiate_upper_level_operation(conn_info, report_handle, PROTOCOL_AMQP, MESSAGES_TO_USE, USE_MSG_BYTE_ARRAY);
@@ -303,11 +308,6 @@ static void send_heap_info(CONNECTION_INFO* conn_info, REPORT_HANDLE report_hand
     // HTTP Sending
 #ifdef USE_HTTP
     //initiate_upper_level_operation(conn_info, report_handle, PROTOCOL_HTTP, MESSAGES_TO_USE, USE_MSG_BYTE_ARRAY);
-#endif
-    // MQTT Sending
-#ifdef USE_MQTT
-    initiate_upper_level_operation(conn_info, report_handle, PROTOCOL_MQTT, MESSAGES_TO_USE, USE_MSG_BYTE_ARRAY);
-    initiate_upper_level_operation(conn_info, report_handle, PROTOCOL_MQTT_WS, MESSAGES_TO_USE, USE_MSG_BYTE_ARRAY);
 #endif
 }
 

network/network_analytics.c

@@ -273,15 +273,15 @@ static int parse_command_line(int argc, char* argv[], MEM_ANALYTIC_INFO* mem_inf
 
 static void send_network_info(CONNECTION_INFO* conn_info, REPORT_HANDLE report_handle)
 {
-    // AMQP Sending
-#ifdef USE_AMQP
-    initiate_lower_level_operation(conn_info, report_handle, PROTOCOL_AMQP, MESSAGES_TO_USE, USE_MSG_BYTE_ARRAY);
-    initiate_lower_level_operation(conn_info, report_handle, PROTOCOL_AMQP_WS, MESSAGES_TO_USE, USE_MSG_BYTE_ARRAY);
-#endif
     // MQTT Sending
 #ifdef USE_MQTT
     initiate_lower_level_operation(conn_info, report_handle, PROTOCOL_MQTT, MESSAGES_TO_USE, USE_MSG_BYTE_ARRAY);
     initiate_lower_level_operation(conn_info, report_handle, PROTOCOL_MQTT_WS, MESSAGES_TO_USE, USE_MSG_BYTE_ARRAY);
+#endif
+    // AMQP Sending
+#ifdef USE_AMQP
+    initiate_lower_level_operation(conn_info, report_handle, PROTOCOL_AMQP, MESSAGES_TO_USE, USE_MSG_BYTE_ARRAY);
+    initiate_lower_level_operation(conn_info, report_handle, PROTOCOL_AMQP_WS, MESSAGES_TO_USE, USE_MSG_BYTE_ARRAY);
 #endif
 }
 

script/execute_analysis.sh

@@ -17,8 +17,11 @@ conn_string="${IOTHUB_CONNECTION_STRING}"
 rm -r -f $cmake_folder
 mkdir -p $cmake_folder
 pushd $cmake_folder
-cmake $repo_root -DCMAKE_BUILD_TYPE=Release # -Duse_prov_client:BOOL=ON
 
+echo "Running cmake with -DCMAKE_BUILD_TYPE=Release"
+cmake $repo_root -DCMAKE_BUILD_TYPE=Release  >/dev/null # -Duse_prov_client:BOOL=ON
+
+echo "Building SDK"
 make -j >/dev/null
 
 # Run strip from the binaries

script/execute_multiple.sh

@@ -27,7 +27,7 @@ do
     pushd $cmake_folder
 
     echo "executing cmake/make with options <<$item>>"
-    cmake $repo_root -DCMAKE_BUILD_TYPE=Release -Dsdk_branch="$item" -Duse_http=OFF
+    cmake $repo_root -DCMAKE_BUILD_TYPE=Release -Dsdk_branch="$item" -Duse_http=OFF >/dev/null
 
     echo "building SDK"
     # Run make, but don't show the output