add pyroscope

.gitlab-ci.yml

@@ -195,7 +195,7 @@ test-build-linux-stable:
   script:
     - ./scripts/gitlab/test_linux_stable.sh
     # we're using the bin built here, instead of having a parallel `build-linux-release`
-    - time cargo build --profile testnet --verbose --bin polkadot
+    - time cargo build --profile testnet --features pyroscope --verbose --bin polkadot
     - sccache -s
     # pack artifacts
     - mkdir -p ./artifacts

Cargo.toml

@@ -143,6 +143,7 @@ runtime-benchmarks= [ "polkadot-cli/runtime-benchmarks" ]
 try-runtime = [ "polkadot-cli/try-runtime" ]
 fast-runtime = [ "polkadot-cli/fast-runtime" ]
 runtime-metrics = [ "polkadot-cli/runtime-metrics" ]
+pyroscope = ["polkadot-cli/pyroscope"]
 
 # Configuration for building a .deb package - for use with `cargo-deb`
 [package.metadata.deb]

cli/Cargo.toml

@@ -18,6 +18,7 @@ clap = { version = "3.0", features = ["derive"], optional = true }
 log = "0.4.13"
 thiserror = "1.0.30"
 futures = "0.3.21"
+pyro = { package = "pyroscope", version = "0.3.1", optional = true }
 
 service = { package = "polkadot-service", path = "../node/service", default-features = false, optional = true }
 polkadot-node-core-pvf = { path = "../node/core/pvf", optional = true }
@@ -57,6 +58,7 @@ trie-memory-tracker = ["sp-trie/memory-tracker"]
 full-node = ["service/full-node"]
 try-runtime = ["service/try-runtime"]
 fast-runtime = ["service/fast-runtime"]
+pyroscope = ["pyro"]
 
 # Configure the native runtimes to use. Polkadot is enabled by default.
 #

cli/src/cli.rs

@@ -115,7 +115,14 @@ pub struct RunCmd {
 	/// Must be valid socket address, of format `IP:Port`
 	/// commonly `127.0.0.1:6831`.
 	#[clap(long)]
-	pub jaeger_agent: Option<std::net::SocketAddr>,
+	pub jaeger_agent: Option<String>,
+
+	/// Add the destination address to the `pyroscope` agent.
+	///
+	/// Must be valid socket address, of format `IP:Port`
+	/// commonly `127.0.0.1:4040`.
+	#[clap(long)]
+	pub pyroscope_server: Option<String>,
 }
 
 #[allow(missing_docs)]

cli/src/command.rs

@@ -20,6 +20,7 @@ use log::info;
 use sc_cli::{Role, RuntimeVersion, SubstrateCli};
 use service::{self, IdentifyVariant};
 use sp_core::crypto::Ss58AddressFormatRegistry;
+use std::net::ToSocketAddrs;
 
 pub use crate::error::Error;
 pub use polkadot_performance_test::PerfCheckError;
@@ -266,7 +267,17 @@ where
 		info!("----------------------------");
 	}
 
-	let jaeger_agent = cli.run.jaeger_agent;
+	let jaeger_agent = if let Some(ref jaeger_agent) = cli.run.jaeger_agent {
+		Some(
+			jaeger_agent
+				.to_socket_addrs()
+				.map_err(Error::AddressResolutionFailure)?
+				.next()
+				.ok_or_else(|| Error::AddressResolutionMissing)?,
+		)
+	} else {
+		None
+	};
 
 	runner.run_node_until_exit(move |config| async move {
 		let role = config.role.clone();
@@ -293,6 +304,31 @@ where
 pub fn run() -> Result<()> {
 	let cli: Cli = Cli::from_args();
 
+	#[cfg(feature = "pyroscope")]
+	let mut pyroscope_agent_maybe = if let Some(ref agent_addr) = cli.run.pyroscope_server {
+		let address = agent_addr
+			.to_socket_addrs()
+			.map_err(Error::AddressResolutionFailure)?
+			.next()
+			.ok_or_else(|| Error::AddressResolutionMissing)?;
+		// The pyroscope agent requires a `http://` prefix, so we just do that.
+		let mut agent = pyro::PyroscopeAgent::builder(
+			"http://".to_owned() + address.to_string().as_str(),
+			"polkadot".to_owned(),
+		)
+		.sample_rate(113)
+		.build()?;
+		agent.start();
+		Some(agent)
+	} else {
+		None
+	};
+
+	#[cfg(not(feature = "pyroscope"))]
+	if cli.run.pyroscope_server.is_some() {
+		return Err(Error::PyroscopeNotCompiledIn)
+	}
+
 	match &cli.subcommand {
 		None => run_node_inner(cli, service::RealOverseerGen, polkadot_node_metrics::logger_hook()),
 		Some(Subcommand::BuildSpec(cmd)) => {
@@ -509,5 +545,10 @@ pub fn run() -> Result<()> {
 		)
 		.into()),
 	}?;
+
+	#[cfg(feature = "pyroscope")]
+	if let Some(mut pyroscope_agent) = pyroscope_agent_maybe.take() {
+		pyroscope_agent.stop();
+	}
 	Ok(())
 }

cli/src/error.rs

@@ -31,6 +31,20 @@ pub enum Error {
 	#[error(transparent)]
 	PerfCheck(#[from] polkadot_performance_test::PerfCheckError),
 
+	#[cfg(not(feature = "pyroscope"))]
+	#[error("Binary was not compiled with `--feature=pyroscope`")]
+	PyroscopeNotCompiledIn,
+
+	#[cfg(feature = "pyroscope")]
+	#[error("Failed to connect to pyroscope agent")]
+	PyroscopeError(#[from] pyro::error::PyroscopeError),
+
+	#[error("Failed to resolve provided URL")]
+	AddressResolutionFailure(#[from] std::io::Error),
+
+	#[error("URL did not resolve to anything")]
+	AddressResolutionMissing,
+
 	#[error("Other: {0}")]
 	Other(String),
 }