mirror of
https://github.com/XRPLF/rippled.git
synced 2026-08-21 14:20:56 +00:00
Six findings from the review of #6494 survived independent verification. Each was checked against the branch tip, and where behaviour was in question, against a live collector and Loki rather than from the reviewer's claim or from documentation alone. Plan-doc section numbering. 06-implementation-phases.md used "## 6.9" twice: for the new Phase 8 section and for the pre-existing Risk Assessment. Three references already pointed at 6.8.1 and none at 6.9, and the later phases are numbered 6.8.2 through 6.8.4, so Phase 8 becomes 6.8.1 and the sequence is monotonic. Renumbering to 6.10, as suggested on the PR, would have collided with Success Metrics. filelog read position. The receiver relied on the upstream default start_at=end, which skips everything a node wrote before the first poll and reads nothing at all from a log that has stopped being written to. Read from the beginning instead, paired with a file_storage extension so a restart resumes at the last offset rather than re-ingesting the file. The collector image runs as 10001:10001 and ships no writable directory, and a fresh named volume is root-owned, so a one-shot init service prepares the volume first. It reuses an image the stack already pulls, adding no new dependency. Loki log stream label. The job resource attribute did not become a Loki index label, so the documented {job="xrpld"} queries matched nothing. Verified against grafana/loki:3.4.2 with its default config: only service_name and deployment_environment are indexed, and job arrives as structured metadata, which a stream selector cannot match. Dropped the attribute and moved the twelve queries this branch introduced to {service_name="xrpld"}. Three further occurrences in 07-observability-backends.md originate on the phase-1a branch and are left for a commit there. Trace ids on unsampled spans. Logs::format emitted trace_id and span_id whenever the span context was valid. A span dropped by the ParentBasedSampler still carries its parent's ids, so log lines advertised traces that were never exported and the log-to-trace link resolved to nothing. Require the sampled flag as well, and correct the task list and the documentation that promised the fields unconditionally. The remaining two findings were refuted. The reported risk of signing material reaching Loki does not hold: Logs::format already scrubs seven sensitive fields, and there is a single write path to the log file, so every JLOG site is covered. The suggestion to add internalLink to the Loki derived field is not applicable, because that key is not part of Grafana's schema.
240 lines
9.2 KiB
Markdown
240 lines
9.2 KiB
Markdown
# Phase 8: Log-Trace Correlation and Centralized Log Ingestion — Task List
|
|
|
|
> **Goal**: Inject trace context (trace_id, span_id) into xrpld's Journal log output for log-trace correlation, and add OTel Collector filelog receiver to ingest logs into Grafana Loki for unified observability.
|
|
>
|
|
> **Scope**: Two independent sub-phases — 8a (code change: trace_id in logs) and 8b (infra only: filelog receiver to Loki). No changes to the `beast::Journal` public API.
|
|
>
|
|
> **Branch**: `pratik/otel-phase8-log-correlation` (from `pratik/otel-phase7-native-metrics`)
|
|
|
|
### Related Plan Documents
|
|
|
|
| Document | Relevance |
|
|
| ---------------------------------------------------------------- | -------------------------------------------------------------- |
|
|
| [06-implementation-phases.md](./06-implementation-phases.md) | Phase 8 plan: motivation, architecture, exit criteria (§6.8.1) |
|
|
| [07-observability-backends.md](./07-observability-backends.md) | Loki backend recommendation, Grafana data source provisioning |
|
|
| [Phase7_taskList.md](./Phase7_taskList.md) | Prerequisite — native OTel metrics pipeline must be working |
|
|
| [05-configuration-reference.md](./05-configuration-reference.md) | `[telemetry]` config (trace_id injection toggle) |
|
|
|
|
---
|
|
|
|
## Task 8.1: Inject trace_id into Logs::format()
|
|
|
|
**Objective**: Add OTel trace context to every log line that is emitted within an active, sampled span. The sampled flag matters because a span dropped by the `ParentBasedSampler` still carries its parent's ids, so emitting them would advertise a trace that was never exported.
|
|
|
|
**What to do**:
|
|
|
|
- Edit `src/libxrpl/basics/Log.cpp`:
|
|
- In `Logs::format()` (around line 346), after severity is appended, check for active OTel span. The implementation checks the context value directly to avoid the heap allocation that `GetSpan()` performs on the no-span path:
|
|
```cpp
|
|
#ifdef XRPL_ENABLE_TELEMETRY
|
|
{
|
|
auto context = opentelemetry::context::RuntimeContext::GetCurrent();
|
|
auto spanValue = context.GetValue(opentelemetry::trace::kSpanKey);
|
|
if (opentelemetry::nostd::holds_alternative<
|
|
opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span>>(spanValue))
|
|
{
|
|
auto span = opentelemetry::nostd::get<
|
|
opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span>>(spanValue);
|
|
auto spanCtx = span->GetContext();
|
|
if (spanCtx.IsValid() && spanCtx.IsSampled())
|
|
{
|
|
char traceId[32], spanId[16];
|
|
spanCtx.trace_id().ToLowerBase16(
|
|
opentelemetry::nostd::span<char, 32>{traceId});
|
|
spanCtx.span_id().ToLowerBase16(
|
|
opentelemetry::nostd::span<char, 16>{spanId});
|
|
output += "trace_id=";
|
|
output.append(traceId, 32);
|
|
output += " span_id=";
|
|
output.append(spanId, 16);
|
|
output += ' ';
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
```
|
|
- Add `#include` for OTel context headers, guarded by `#ifdef XRPL_ENABLE_TELEMETRY`
|
|
|
|
- Edit `include/xrpl/basics/Log.h`:
|
|
- No changes needed — format() signature unchanged
|
|
|
|
**Key modified files**:
|
|
|
|
- `src/libxrpl/basics/Log.cpp`
|
|
|
|
**Performance note**: The implementation checks the thread-local context value directly (avoiding the heap allocation that `GetSpan()` performs on the no-span path). On threads without an active span (~99% of log lines), the cost is a thread-local read + variant type check (~15-20ns). On the active-span path, an additional shared_ptr copy + `GetContext()` + `IsValid()`/`IsSampled()` adds ~50ns total. Overhead is negligible at typical logging rates.
|
|
|
|
---
|
|
|
|
## Task 8.2: Add Loki to Docker Compose Stack
|
|
|
|
**Objective**: Add Grafana Loki as a log storage backend in the development observability stack.
|
|
|
|
**What to do**:
|
|
|
|
- Edit `docker/telemetry/docker-compose.yml`:
|
|
- Add Loki service:
|
|
```yaml
|
|
loki:
|
|
image: grafana/loki:3.4.2
|
|
ports:
|
|
- "3100:3100"
|
|
command: -config.file=/etc/loki/local-config.yaml
|
|
```
|
|
- Add Loki as a Grafana data source in provisioning
|
|
|
|
- Create `docker/telemetry/grafana/provisioning/datasources/loki.yaml`:
|
|
- Configure Loki data source with derived fields linking `trace_id` to Tempo
|
|
|
|
**Key new files**:
|
|
|
|
- `docker/telemetry/grafana/provisioning/datasources/loki.yaml`
|
|
|
|
**Key modified files**:
|
|
|
|
- `docker/telemetry/docker-compose.yml`
|
|
|
|
---
|
|
|
|
## Task 8.3: Add Filelog Receiver to OTel Collector
|
|
|
|
**Objective**: Configure the OTel Collector to tail xrpld's log file and export to Loki.
|
|
|
|
**What to do**:
|
|
|
|
- Edit `docker/telemetry/otel-collector-config.yaml`:
|
|
- Add `filelog` receiver:
|
|
```yaml
|
|
receivers:
|
|
filelog:
|
|
include: [/var/log/xrpld/*/debug.log]
|
|
operators:
|
|
- type: regex_parser
|
|
regex: '^(?P<timestamp>\S+)\s+(?P<partition>\S+):(?P<severity>\S+)\s+(?:trace_id=(?P<trace_id>[a-f0-9]+)\s+span_id=(?P<span_id>[a-f0-9]+)\s+)?(?P<message>.*)$'
|
|
timestamp:
|
|
parse_from: attributes.timestamp
|
|
layout: "%Y-%m-%dT%H:%M:%S.%fZ"
|
|
```
|
|
- Add logs pipeline:
|
|
```yaml
|
|
service:
|
|
pipelines:
|
|
logs:
|
|
receivers: [filelog]
|
|
processors: [batch]
|
|
exporters: [otlp/loki]
|
|
```
|
|
- Add Loki exporter:
|
|
```yaml
|
|
exporters:
|
|
otlphttp/loki:
|
|
endpoint: http://loki:3100/otlp
|
|
```
|
|
|
|
- Mount xrpld's log directory into the collector container via docker-compose volume
|
|
|
|
**Key modified files**:
|
|
|
|
- `docker/telemetry/otel-collector-config.yaml`
|
|
- `docker/telemetry/docker-compose.yml`
|
|
|
|
---
|
|
|
|
## Task 8.4: Configure Grafana Trace-to-Log Correlation
|
|
|
|
**Objective**: Enable one-click navigation from Tempo traces to Loki logs in Grafana.
|
|
|
|
**What to do**:
|
|
|
|
- Edit Grafana Tempo data source provisioning to add `tracesToLogs` configuration:
|
|
|
|
```yaml
|
|
tracesToLogs:
|
|
datasourceUid: loki
|
|
filterByTraceID: true
|
|
filterBySpanID: false
|
|
tags: ["partition", "severity"]
|
|
```
|
|
|
|
- Edit Grafana Loki data source provisioning to add `derivedFields` linking trace_id back to Tempo:
|
|
```yaml
|
|
derivedFields:
|
|
- datasourceUid: tempo
|
|
matcherRegex: "trace_id=(\\w+)"
|
|
name: TraceID
|
|
url: "$${__value.raw}"
|
|
```
|
|
|
|
**Key modified files**:
|
|
|
|
- `docker/telemetry/grafana/provisioning/datasources/loki.yaml`
|
|
- `docker/telemetry/grafana/provisioning/datasources/` (Tempo data source file)
|
|
|
|
---
|
|
|
|
## Task 8.5: Update Integration Tests
|
|
|
|
**Objective**: Verify trace_id appears in logs and Loki correlation works.
|
|
|
|
**What to do**:
|
|
|
|
- Edit `docker/telemetry/integration-test.sh`:
|
|
- After sending RPC requests (which create spans), grep xrpld's log output for `trace_id=`
|
|
- Verify trace_id matches a trace visible in Tempo
|
|
- Optionally: query Loki via API to confirm log ingestion
|
|
|
|
**Key modified files**:
|
|
|
|
- `docker/telemetry/integration-test.sh`
|
|
|
|
---
|
|
|
|
## Task 8.6: Update Documentation
|
|
|
|
**Objective**: Document the log correlation feature in runbook and reference docs.
|
|
|
|
**What to do**:
|
|
|
|
- Edit `docs/telemetry-runbook.md`:
|
|
- Add "Log-Trace Correlation" section explaining how to use Grafana Tempo -> Loki linking
|
|
- Add LogQL query examples for filtering by trace_id
|
|
|
|
- Edit `OpenTelemetryPlan/09-data-collection-reference.md`:
|
|
- Add new section "3. Log Correlation" between SpanMetrics and StatsD sections
|
|
- Document the log format with trace_id injection
|
|
- Document Loki as a new backend
|
|
|
|
- Edit `docker/telemetry/TESTING.md`:
|
|
- Add log correlation verification steps
|
|
|
|
**Key modified files**:
|
|
|
|
- `docs/telemetry-runbook.md`
|
|
- `OpenTelemetryPlan/09-data-collection-reference.md`
|
|
- `docker/telemetry/TESTING.md`
|
|
|
|
---
|
|
|
|
## Summary Table
|
|
|
|
| Task | Description | Sub-Phase | New Files | Modified Files | Depends On |
|
|
| ---- | ------------------------------------------ | --------- | --------- | -------------- | ---------- |
|
|
| 8.1 | Inject trace_id into Logs::format() | 8a | 0 | 1 | Phase 7 |
|
|
| 8.2 | Add Loki to Docker Compose stack | 8b | 1 | 1 | -- |
|
|
| 8.3 | Add filelog receiver to OTel Collector | 8b | 0 | 2 | 8.1, 8.2 |
|
|
| 8.4 | Configure Grafana trace-to-log correlation | 8b | 0 | 2 | 8.3 |
|
|
| 8.5 | Update integration tests | 8a + 8b | 0 | 1 | 8.4 |
|
|
| 8.6 | Update documentation | 8a + 8b | 0 | 3 | 8.5 |
|
|
|
|
**Parallel work**: Task 8.2 (Loki infra) can run in parallel with Task 8.1 (code change). Tasks 8.3-8.6 are sequential.
|
|
|
|
**Exit Criteria** (from [06-implementation-phases.md §6.8.1](./06-implementation-phases.md)):
|
|
|
|
- [ ] Log lines within active, sampled spans contain `trace_id=<hex> span_id=<hex>`
|
|
- [ ] Log lines outside spans have no trace context (no empty fields)
|
|
- [ ] Loki ingests xrpld logs via OTel Collector filelog receiver
|
|
- [ ] Grafana Tempo -> Loki one-click correlation works
|
|
- [ ] Grafana Loki -> Tempo reverse lookup works via derived field
|
|
- [ ] Integration test verifies trace_id presence in logs
|
|
- [ ] No performance regression from trace_id injection (< 0.1% overhead)
|