Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions crates/collector/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ opentelemetry_sdk = { workspace = true, features = [
"trace",
"logs",
"rt-tokio",
"experimental_metrics_periodicreader_with_async_runtime",
] }
opentelemetry-otlp = { workspace = true, features = [
"metrics",
Expand Down
42 changes: 34 additions & 8 deletions crates/collector/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ use std::io::BufReader;
use std::path::PathBuf;
use std::pin::Pin;
use std::time::Instant;
use tracing::info;
use tracing::{error, info};

shadow!(build);

Expand Down Expand Up @@ -175,7 +175,10 @@ impl CollectorMetrics {

fn init_open_telemetry(
config: &TelemetryConfig,
) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
) -> Result<
opentelemetry_sdk::metrics::SdkMeterProvider,
Box<dyn std::error::Error + Send + Sync + 'static>,
> {
use opentelemetry::global;
use opentelemetry_otlp::{Protocol, WithExportConfig};
use opentelemetry_sdk::Resource;
Expand All @@ -187,8 +190,13 @@ fn init_open_telemetry(
.with_timeout(config.exporter_timeout)
.build()?;

let reader = opentelemetry_sdk::metrics::PeriodicReader::builder(exporter)
let reader =
opentelemetry_sdk::metrics::periodic_reader_with_async_runtime::PeriodicReader::builder(
exporter,
opentelemetry_sdk::runtime::Tokio,
)
.with_interval(config.reader_interval)
.with_timeout(config.reader_timeout)
.build();

let resource = Resource::builder()
Expand All @@ -201,8 +209,8 @@ fn init_open_telemetry(
.with_resource(resource)
.build();

global::set_meter_provider(provider);
Ok(())
global::set_meter_provider(provider.clone());
Ok(provider)
}

/// Builds the multi-line version/build info string
Expand Down Expand Up @@ -273,8 +281,19 @@ fn main() -> anyhow::Result<()> {
runtime_builder.enable_all();
let runtime = runtime_builder.build()?;

runtime.block_on(async move {
init_open_telemetry(&config.telemetry).map_err(|err| anyhow!(err))?;
// Dedicated runtime for the OTEL metrics PeriodicReader so its export task
// doesn't compete with the collection/publishing pipeline for worker threads.
let telemetry_runtime = tokio::runtime::Builder::new_multi_thread()
.worker_threads(1)
.enable_all()
.build()?;
let meter_provider = {
// `.enter()` makes the tokio::spawn done inside build() bind to telemetry_runtime.
let _guard = telemetry_runtime.enter();
init_open_telemetry(&config.telemetry).map_err(|err| anyhow!(err))?
};

let result = runtime.block_on(async move {
let meter = global::meter_provider().meter("netcalyx");
// Keep the metrics alive for the entire process lifetime.
let _collector_metrics = CollectorMetrics::new(&meter, process_start);
Expand Down Expand Up @@ -332,5 +351,12 @@ fn main() -> anyhow::Result<()> {
}
}
}
})
});

// Flush and shut down before the telemetry runtime is dropped
if let Err(err) = meter_provider.shutdown() {
error!("Failed to shut down OpenTelemetry meter provider: {err}");
}

result
}
Loading