Skip to content

Commit fd76938

Browse files
committed
Build event name in Engine context
1 parent 4da423d commit fd76938

4 files changed

Lines changed: 20 additions & 2 deletions

File tree

incubator/catalog-filesystem/src/main/java/io/aklivity/zilla/runtime/catalog/filesystem/internal/FilesystemEventFormatter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public String format(
3939
int length)
4040
{
4141
final EventFW event = eventRO.wrap(buffer, index, index + length);
42-
final FilesystemEventExFW extension = schemaRegistryEventExRO
42+
final FilesystemEventExFW extension = filesystemEventExRO
4343
.wrap(event.extension().buffer(), event.extension().offset(), event.extension().limit());
4444
String result = null;
4545
switch (extension.kind())

runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/EngineContext.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,9 @@ String supplyQName(
134134
int supplyEventId(
135135
String name);
136136

137+
String supplyEventName(
138+
int eventId);
139+
137140
BindingHandler streamFactory();
138141

139142
GuardHandler supplyGuard(

runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/EngineWorker.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ public class EngineWorker implements EngineContext, Agent
224224
private final ScalarsLayout gaugesLayout;
225225
private final HistogramsLayout histogramsLayout;
226226
private final EventsLayout eventsLayout;
227+
private final Int2ObjectHashMap<String> eventNames;
227228
private final Supplier<MessageReader> supplyEventReader;
228229
private final EventFormatterFactory eventFormatterFactory;
229230

@@ -311,6 +312,7 @@ public EngineWorker(
311312
.path(config.directory().resolve(String.format("events%d", index)))
312313
.capacity(config.eventsBufferCapacity())
313314
.build();
315+
this.eventNames = new Int2ObjectHashMap<>();
314316

315317
this.agentName = String.format("engine/data#%d", index);
316318
this.streamsLayout = streamsLayout;
@@ -485,6 +487,13 @@ public int supplyEventId(
485487
return labels.supplyLabelId(name);
486488
}
487489

490+
@Override
491+
public String supplyEventName(
492+
int eventId)
493+
{
494+
return eventNames.computeIfAbsent(eventId, this::computeEventName);
495+
}
496+
488497
@Override
489498
public int supplyTypeId(
490499
String name)
@@ -1733,6 +1742,12 @@ public EventFormatter supplyEventFormatter()
17331742
return eventFormatterFactory.create(config, this);
17341743
}
17351744

1745+
private String computeEventName(
1746+
int eventId)
1747+
{
1748+
return supplyLocalName(eventId).replace('.', '_').toUpperCase();
1749+
}
1750+
17361751
private MessageConsumer supplyWriter(
17371752
int index)
17381753
{

runtime/exporter-stdout/src/main/java/io/aklivity/zilla/runtime/exporter/stdout/internal/stream/StdoutEventsStream.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private void handleEvent(
6262
{
6363
final EventFW event = eventRO.wrap(buffer, index, index + length);
6464
String qname = context.supplyQName(event.namespacedId());
65-
String eventName = context.supplyLocalName(event.id()).replace('.', '_').toUpperCase();
65+
String eventName = context.supplyEventName(event.id());
6666
String extension = formatter.format(msgTypeId, buffer, index, length);
6767
out.format(FORMAT, qname, asDateTime(event.timestamp()), eventName, extension);
6868
}

0 commit comments

Comments
 (0)