Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Complete telemetry for parachain & relaychain #301

Merged
cecton merged 7 commits into from
Jan 29, 2021
Merged

Complete telemetry for parachain & relaychain #301

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6d1434b
Complete telemetry for parachain & relaychain
cecton Jan 21, 2021
4acfc8d
Merge commit 0d086ae354fba5839ba7e6fec238094cb98cdd7a (no conflict)
cecton Jan 29, 2021
bcf4082
Revert something
cecton Jan 29, 2021
a876619
Merge commit cb00749f24a45408a6f77ce8600660749d17003c (no conflict)
cecton Jan 29, 2021
4126e0e
Update Substrate & Polkadot
cecton Jan 29, 2021
6f40898
Fix quotes & codec
cecton Jan 29, 2021
8cf0f9c
Fix logger rename
cecton Jan 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion rococo-parachains/src/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ pub fn run() -> Result<()> {
&polkadot_cli,
&polkadot_cli,
task_executor,
None,
config.telemetry_handle.clone(),
).map_err(|err| format!("Relay chain argument error: {}", err))?;
let collator = cli.run.base.validator || cli.collator;

Expand Down Expand Up @@ -431,4 +431,11 @@ impl CliConfiguration<Self> for RelayChainCli {
fn announce_block(&self) -> Result<bool> {
self.base.base.announce_block()
}

fn telemetry_endpoints(
&self,
chain_spec: &Box<dyn ChainSpec>,
) -> Result<Option<sc_telemetry::TelemetryEndpoints>> {
self.base.base.telemetry_endpoints(chain_spec)
}
}
3 changes: 2 additions & 1 deletion rococo-parachains/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ where

let params = new_partial(&parachain_config)?;
let telemetry_span = params.other;
let _telemetry_span_entered = telemetry_span.as_ref().map(|x| x.enter());
Copy link
Member

@bkchr bkchr Jan 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to do this here manually?

Copy link
Contributor Author

@cecton cecton Jan 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to investigate but I think there is something in a function somewhere below that reports something to the telemetry.

I know it's vague and it's probably not needed for the telemetry to work. I just wanted to make sure we don't miss a telemetry message at all.

Copy link
Member

@bkchr bkchr Jan 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please investigate this. The problem here is that this isn't any code that is reusable, so people would need to copy this.

Copy link
Contributor Author

@cecton cecton Jan 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right!! I missed that

Copy link
Contributor Author

@cecton cecton Jan 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed by paritytech/substrate#7951

params
.inherent_data_providers
.register_provider(sp_timestamp::InherentDataProvider)
Expand Down Expand Up @@ -171,7 +172,7 @@ where
network: network.clone(),
network_status_sinks,
system_rpc_tx,
telemetry_span,
telemetry_span: telemetry_span.clone(),
})?;

let announce_block = {
Expand Down