Telemetry - change NetworkState from string to json (#2338)

* change NetworkState from string to json in telemetry

substrate/core/cli/src/informant.rs

@@ -82,7 +82,7 @@ pub fn start<C>(service: &Service<C>, exit: ::exit_future::Exit, handle: TaskExe
 				(proc.cpu_usage(), proc.memory())
 			} else { (0.0, 0) };
 
-			let network_state = serde_json::to_string(&network.network_state()).unwrap_or_default();
+			let network_state = network.network_state();
 
 			telemetry!(
 				SUBSTRATE_INFO;

substrate/core/network-libp2p/Cargo.toml

@@ -29,6 +29,10 @@ tokio-timer = "0.2"
 unsigned-varint = { version = "0.2.1", features = ["codec"] }
 void = "1.0"
 
+slog = { version = "^2", features = ["nested-values"] }
+slog_derive = "0.1.1"
+erased-serde = "0.3.9"
+
 [dev-dependencies]
 tempdir = "0.3"
 

substrate/core/network-libp2p/src/lib.rs

@@ -31,7 +31,8 @@ pub use libp2p::{Multiaddr, multiaddr, build_multiaddr};
 pub use libp2p::{identity, PeerId, core::PublicKey};
 
 use libp2p::core::nodes::ConnectedPoint;
-use serde_derive::Serialize;
+use serde_derive::{Deserialize, Serialize};
+use slog_derive::SerdeValue;
 use std::{collections::{HashMap, HashSet}, error, fmt, time::Duration};
 
 /// Protocol / handler id
@@ -92,7 +93,7 @@ impl From<multiaddr::Error> for ParseErr {
 /// Meant for general diagnostic purposes.
 ///
 /// **Warning**: This API is not stable.
-#[derive(Debug, PartialEq, Serialize)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, SerdeValue)]
 #[serde(rename_all = "camelCase")]
 pub struct NetworkState {
 	/// PeerId of the local node.
@@ -113,7 +114,7 @@ pub struct NetworkState {
 	pub peerset: serde_json::Value,
 }
 
-#[derive(Debug, PartialEq, Serialize)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct NetworkStatePeer {
 	/// How we are connected to the node.
@@ -132,14 +133,14 @@ pub struct NetworkStatePeer {
 	pub known_addresses: HashSet<Multiaddr>,
 }
 
-#[derive(Debug, PartialEq, Serialize)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct NetworkStateNotConnectedPeer {
 	/// List of addresses known for this node.
 	pub known_addresses: HashSet<Multiaddr>,
 }
 
-#[derive(Debug, PartialEq, Serialize)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub enum NetworkStatePeerEndpoint {
 	/// We are dialing the given address.

substrate/core/service/Cargo.toml

@@ -10,7 +10,7 @@ parking_lot = "0.7.1"
 error-chain = "0.12"
 lazy_static = "1.0"
 log = "0.4"
-slog = "^2"
+slog = {version = "^2", features = ["nested-values"]}
 tokio = "0.1.7"
 exit-future = "0.1"
 serde = "1.0"

substrate/core/telemetry/Cargo.toml

@@ -12,8 +12,8 @@ log = "0.4"
 rand = "0.6"
 serde = "1.0.81"
 serde_derive = "1.0"
-slog = "^2"
-slog-json = "^2"
-slog-async = "^2"
+slog = { version = "^2", features = ["nested-values"] }
+slog-json = { version = "^2", features = ["nested-values"] }
+slog-async = { version = "^2", features = ["nested-values"] }
 slog-scope = "^4"
 ws = { version = "^0.7", features = ["ssl"] }