feat(headless-client): allow exporting metrics via OTLP (#10240)

In order to explore our metrics more easily, we add an exporter via OTLP
to the headless-client. The Gateway already supports this.
This commit is contained in:
Thomas Eizinger
2025-08-22 13:12:22 +00:00
committed by GitHub
parent d9f1b42595
commit ae2066379e
3 changed files with 57 additions and 13 deletions

1
rust/Cargo.lock generated
View File

@@ -2515,6 +2515,7 @@ dependencies = [
"libc",
"nix 0.30.1",
"opentelemetry",
"opentelemetry-otlp",
"opentelemetry-stdout",
"opentelemetry_sdk",
"phoenix-channel",

View File

@@ -21,6 +21,7 @@ futures = { workspace = true }
humantime = { workspace = true }
ip-packet = { workspace = true }
opentelemetry = { workspace = true, features = ["metrics"] }
opentelemetry-otlp = { workspace = true, features = ["metrics", "grpc-tonic"] }
opentelemetry-stdout = { workspace = true, features = ["metrics"] }
opentelemetry_sdk = { workspace = true, features = ["rt-tokio"] }
phoenix-channel = { workspace = true }

View File

@@ -11,8 +11,11 @@ use firezone_bin_shared::{
platform::{UdpSocketFactory, tcp_socket_factory},
signals,
};
use firezone_telemetry::{Telemetry, analytics, otel};
use opentelemetry_sdk::metrics::{PeriodicReader, SdkMeterProvider};
use firezone_telemetry::{
MaybePushMetricsExporter, NoopPushMetricsExporter, Telemetry, analytics, feature_flags, otel,
};
use opentelemetry_otlp::WithExportConfig as _;
use opentelemetry_sdk::metrics::SdkMeterProvider;
use phoenix_channel::PhoenixChannel;
use phoenix_channel::get_user_agent;
use phoenix_channel::{DeviceInfo, LoginUrl};
@@ -109,6 +112,15 @@ struct Cli {
#[arg(long, hide = true, env = "FIREZONE_METRICS")]
metrics: Option<MetricsExporter>,
/// Send metrics to a custom OTLP collector.
///
/// By default, Firezone's hosted OTLP collector is used.
///
/// This configuration option is private API and has no stability guarantees.
/// It may be removed / changed anytime.
#[arg(long, env, hide = true)]
otlp_grpc_endpoint: Option<String>,
/// A filesystem path where the token can be found
// Apparently passing secrets through stdin is the most secure method, but
// until anyone asks for it, env vars are okay and files on disk are slightly better.
@@ -121,6 +133,7 @@ struct Cli {
#[derive(Debug, Clone, Copy, clap::ValueEnum)]
enum MetricsExporter {
Stdout,
OtelCollector,
}
impl Cli {
@@ -237,17 +250,34 @@ fn main() -> Result<()> {
let mut last_connlib_start_instant = Some(Instant::now());
rt.block_on(async {
if let Some(MetricsExporter::Stdout) = cli.metrics {
let exporter = opentelemetry_stdout::MetricExporter::default();
let reader = PeriodicReader::builder(exporter).build();
let provider = SdkMeterProvider::builder()
.with_reader(reader)
.with_resource(otel::default_resource_with([
otel::attr::service_name!(),
otel::attr::service_version!(),
otel::attr::service_instance_id(firezone_id.clone()),
]))
.build();
if let Some(backend) = cli.metrics {
let resource = otel::default_resource_with([
otel::attr::service_name!(),
otel::attr::service_version!(),
otel::attr::service_instance_id(firezone_id.clone()),
]);
let provider = match (backend, cli.otlp_grpc_endpoint) {
(MetricsExporter::Stdout, _) => SdkMeterProvider::builder()
.with_periodic_exporter(opentelemetry_stdout::MetricExporter::default())
.with_resource(resource)
.build(),
(MetricsExporter::OtelCollector, Some(endpoint)) => SdkMeterProvider::builder()
.with_periodic_exporter(tonic_otlp_exporter(endpoint)?)
.with_resource(resource)
.build(),
(MetricsExporter::OtelCollector, None) => SdkMeterProvider::builder()
.with_periodic_exporter(MaybePushMetricsExporter {
inner: {
// TODO: Once Firezone has a hosted OTLP exporter, it will go here.
NoopPushMetricsExporter
},
should_export: feature_flags::export_metrics,
})
.with_resource(resource)
.build(),
};
opentelemetry::global::set_meter_provider(provider);
}
@@ -399,6 +429,18 @@ fn read_token_file(path: &Path) -> Result<Option<SecretString>> {
Ok(Some(token))
}
fn tonic_otlp_exporter(
endpoint: String,
) -> Result<opentelemetry_otlp::MetricExporter, anyhow::Error> {
let metric_exporter = opentelemetry_otlp::MetricExporter::builder()
.with_tonic()
.with_endpoint(format!("http://{endpoint}"))
.build()
.context("Failed to build OTLP metric exporter")?;
Ok(metric_exporter)
}
#[cfg(test)]
mod tests {
use super::Cli;