Pratik Mankawde 87fad43d9a Merge branch 'pratik/otel-phase7-native-metrics' into pratik/otel-phase8-log-correlation ...

Conflict in docker/telemetry/docker-compose.yml, on the collector service's
command key. This branch layers a second --config for file_log offset
persistence; upstream added a comment above the ports block explaining the
loopback binding.

Kept both. The two changes are unrelated: one is the command list, the other is
a comment. The layered --config and all nine loopback-bound ports are present,
and the file still parses.

2026-09-22 15:13:54 +01:00

..

telemetry

Merge branch 'pratik/otel-phase7-native-metrics' into pratik/otel-phase8-log-correlation

2026-09-22 15:13:54 +01:00