Complete telemetry for parachain & relaychain (#301)

* Complete telemetry for parachain & relaychain

* Update Substrate & Polkadot

test/service/src/lib.rs

@@ -73,13 +73,13 @@ pub fn new_partial(
 		(),
 		sp_consensus::import_queue::BasicQueue<Block, PrefixedMemoryDB<BlakeTwo256>>,
 		sc_transaction_pool::FullPool<Block, TFullClient<Block, RuntimeApi, RuntimeExecutor>>,
-		Option<sc_telemetry::TelemetrySpan>,
+		(),
 	>,
 	sc_service::Error,
 > {
 	let inherent_data_providers = sp_inherents::InherentDataProviders::new();
 
-	let (client, backend, keystore_container, task_manager, telemetry_span) =
+	let (client, backend, keystore_container, task_manager) =
 		sc_service::new_full_parts::<Block, RuntimeApi, RuntimeExecutor>(&config)?;
 	let client = Arc::new(client);
 
@@ -109,7 +109,7 @@ pub fn new_partial(
 		transaction_pool,
 		inherent_data_providers,
 		select_chain: (),
-		other: telemetry_span,
+		other: (),
 	};
 
 	Ok(params)
@@ -146,7 +146,6 @@ where
 	let mut parachain_config = prepare_node_config(parachain_config);
 
 	let params = new_partial(&mut parachain_config)?;
-	let telemetry_span = params.other;
 	params
 		.inherent_data_providers
 		.register_provider(sp_timestamp::InherentDataProvider)
@@ -207,7 +206,6 @@ where
 		network: network.clone(),
 		network_status_sinks,
 		system_rpc_tx,
-		telemetry_span,
 	})?;
 
 	let announce_block = {
@@ -419,6 +417,7 @@ pub fn node_config(
 		telemetry_handle: None,
 		telemetry_endpoints: None,
 		telemetry_external_transport: None,
+		telemetry_span: None,
 		default_heap_pages: None,
 		offchain_worker: OffchainWorkerConfig {
 			enabled: true,