vinzenz/hyperhive
vinzenz/hyperhive
Watch
0
0
Fork
You've already forked hyperhive
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(otel): the collector's upstream exporter honours otel.protocol

Browse source 
The module hardcoded otlphttp, so a hive with protocol = "grpc" would
have had its agents' protocol respected end to end before the collector
and silently rewritten to HTTP after it. Splitting the path in two makes
the upstream half the one that has to keep honouring the option; the
agent half is pinned to the receiver's protocol and derived, not
configured.
This commit is contained in:
atlas 2026-08-15 09:33:11 +02:00 • committed by mara
commit 1fc267b880
1 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
nix/host-modules/otel.nix
View file

@ -181,6 +181,23 @@
let
otel = config.services.hyperhive.otel;
listen = "${config.services.hyperhive.network.bridgeIp}:${toString otel.collector.port}";
# `otel.protocol` describes the UPSTREAM link and always did.
# Inserting a collector splits the path in two, and the
# upstream half is the one that has to keep honouring it — so
# the exporter is chosen by it, rather than the option quietly
# becoming "how agents talk to the collector". The agent half
# is pinned to OTLP/HTTP by the receiver below (derived in
# hive-c0re/environment.nix).
grpcUpstream = otel.protocol == "grpc";
upstreamName = if grpcUpstream then "otlp" else "otlphttp";
upstream = {
endpoint = otel.endpoint;
# The value is interpolated by the collector at runtime from
# its environment, never by nix. `EnvironmentFile` below is
# what puts it there.
headers.${otel.collector.upstreamHeaderName} = "\${env:${otel.collector.upstreamHeaderName}}";
}
// lib.optionalAttrs (otel.protocol == "http/json") { encoding = "json"; };
in
{
assertions = [
@ -215,16 +232,10 @@
validateConfigFile = true;
settings = {
receivers.otlp.protocols.http.endpoint = listen;
exporters.otlphttp = {
endpoint = otel.endpoint;
# The value is interpolated by the collector at runtime
# from its environment, never by nix. `EnvironmentFile`
# below is what puts it there.
headers.${otel.collector.upstreamHeaderName} = "\${env:${otel.collector.upstreamHeaderName}}";
};
exporters.${upstreamName} = upstream;
service.pipelines.metrics = {
receivers = [ "otlp" ];
exporters = [ "otlphttp" ];
exporters = [ upstreamName ];
};
};
};