The telemetry should not be initialized if no telemetry has been provided (#6666)

* Initial commit

Forked at: e10598af1f
Parent branch: origin/master

* Fix: do not initialize telemetry if telemetry is not set

* Update client/telemetry/src/lib.rs

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>

* Update client/telemetry/src/lib.rs

* Update client/telemetry/src/lib.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
This commit is contained in:
Cecile Tonglet
2020-07-16 11:46:40 +02:00
committed by GitHub
parent 2827637103
commit 4ac2078992
2 changed files with 14 additions and 2 deletions
+7 -2
View File
@@ -1012,7 +1012,12 @@ ServiceBuilder<
let telemetry_connection_sinks: Arc<Mutex<Vec<TracingUnboundedSender<()>>>> = Default::default();
// Telemetry
let telemetry = config.telemetry_endpoints.clone().map(|endpoints| {
let telemetry = config.telemetry_endpoints.clone().and_then(|endpoints| {
if endpoints.is_empty() {
// we don't want the telemetry to be initialized if telemetry_endpoints == Some([])
return None;
}
let genesis_hash = match client.block_hash(Zero::zero()) {
Ok(Some(hash)) => hash,
_ => Default::default(),
@@ -1031,7 +1036,7 @@ ServiceBuilder<
future,
);
telemetry
Some(telemetry)
});
// Instrumentation