From 4b3bf57993430e8a5f28eee8083fc5aa5b84559d Mon Sep 17 00:00:00 2001 From: John Fallows Date: Mon, 16 Jun 2025 11:28:09 -0700 Subject: [PATCH] Enhance stdout exporter to include trace id --- .../stdout/internal/stream/StdoutEventsStream.java | 7 ++++--- .../runtime/exporter/stdout/internal/events/EventIT.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/runtime/exporter-stdout/src/main/java/io/aklivity/zilla/runtime/exporter/stdout/internal/stream/StdoutEventsStream.java b/runtime/exporter-stdout/src/main/java/io/aklivity/zilla/runtime/exporter/stdout/internal/stream/StdoutEventsStream.java index 9099c5a611..b9be3fd13f 100644 --- a/runtime/exporter-stdout/src/main/java/io/aklivity/zilla/runtime/exporter/stdout/internal/stream/StdoutEventsStream.java +++ b/runtime/exporter-stdout/src/main/java/io/aklivity/zilla/runtime/exporter/stdout/internal/stream/StdoutEventsStream.java @@ -29,8 +29,8 @@ public class StdoutEventsStream { - // {zilla namespace}:{component name} [dd/MMM/yyyy:HH:mm:ss Z] {event name} {event body}\n - private static final String FORMAT = "%s [%s] %s %s%n"; + // {zilla namespace}:{component name} [dd/MMM/yyyy:HH:mm:ss Z] [trace id] {event name} {event body}\n + private static final String FORMAT = "%s [%s] [%016xd] %s %s%n"; private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("dd/MMM/yyyy:HH:mm:ss Z"); private final StdoutExporterContext context; @@ -62,9 +62,10 @@ private void handleEvent( { final EventFW event = eventRO.wrap(buffer, index, index + length); String qname = context.supplyQName(event.namespacedId()); + long traceId = event.traceId(); String eventName = context.supplyEventName(event.id()); String extension = formatter.format(msgTypeId, buffer, index, length); - out.format(FORMAT, qname, asDateTime(event.timestamp()), eventName, extension); + out.format(FORMAT, qname, asDateTime(event.timestamp()), traceId, eventName, extension); } private static String asDateTime( diff --git a/runtime/exporter-stdout/src/test/java/io/aklivity/zilla/runtime/exporter/stdout/internal/events/EventIT.java b/runtime/exporter-stdout/src/test/java/io/aklivity/zilla/runtime/exporter/stdout/internal/events/EventIT.java index 5a021aa78a..fd0d0e6ac8 100644 --- a/runtime/exporter-stdout/src/test/java/io/aklivity/zilla/runtime/exporter/stdout/internal/events/EventIT.java +++ b/runtime/exporter-stdout/src/test/java/io/aklivity/zilla/runtime/exporter/stdout/internal/events/EventIT.java @@ -63,6 +63,6 @@ public class EventIT public void shouldLogEvents() throws Exception { k3po.finish(); - output.expect(Pattern.compile("test.net0 \\[[^\\]]+\\] BINDING_TEST_CONNECTED test event message\n")); + output.expect(Pattern.compile("test.net0 \\[[^\\]]+\\] \\[[^\\]]+\\] BINDING_TEST_CONNECTED test event message\n")); } }