update tests

incubator/catalog-filesystem.spec/src/main/scripts/io/aklivity/zilla/specs/catalog/filesystem/config/event.yaml

@@ -23,7 +23,8 @@ telemetry:
         events:
           - qname: test.catalog0
             id: catalog.filesystem.file.not.found
-            message: FILE_NOT_FOUND asyncapi/kafka.yaml
+            name: CATALOG_FILESYSTEM_FILE_NOT_FOUND
+            message: asyncapi/kafka.yaml
 catalogs:
   catalog0:
     type: filesystem

runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/HttpEventFormatter.java

@@ -26,8 +26,6 @@
 
 public final class HttpEventFormatter implements EventFormatterSpi
 {
-    private static final String REQUEST_ACCEPTED_FORMAT = "REQUEST_ACCEPTED %s %s %s %s %s";
-
     private final EventFW eventRO = new EventFW();
     private final HttpEventExFW httpEventExRO = new HttpEventExFW();
 
@@ -50,7 +48,7 @@ public String format(
         case REQUEST_ACCEPTED:
         {
             HttpRequestAcceptedExFW ex = extension.requestAccepted();
-            result = String.format(REQUEST_ACCEPTED_FORMAT, identity(ex.identity()), asString(ex.scheme()), asString(ex.method()),
+            result = String.format("%s %s %s %s %s", identity(ex.identity()), asString(ex.scheme()), asString(ex.method()),
                 asString(ex.authority()), asString(ex.path()));
             break;
         }

runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/internal/KafkaEventFormatter.java

@@ -27,9 +27,6 @@
 
 public final class KafkaEventFormatter implements EventFormatterSpi
 {
-    private static final String AUTHORIZATION_FAILED_FORMAT = "AUTHORIZATION_FAILED %s";
-    private static final String API_VERSION_REJECTED_FORMAT = "API_VERSION_REJECTED %d %d";
-
     private final EventFW eventRO = new EventFW();
     private final KafkaEventExFW kafkaEventExRO = new KafkaEventExFW();
 
@@ -52,13 +49,13 @@ public String format(
         case AUTHORIZATION_FAILED:
         {
             KafkaAuthorizationFailedExFW ex = extension.authorizationFailed();
-            result = String.format(AUTHORIZATION_FAILED_FORMAT, identity(ex.identity()));
+            result = String.format("%s", identity(ex.identity()));
             break;
         }
         case API_VERSION_REJECTED:
         {
             final KafkaApiVersionRejectedExFW ex = extension.apiVersionRejected();
-            result = String.format(API_VERSION_REJECTED_FORMAT, ex.apiKey(), ex.apiVersion());
+            result = String.format("%d %d", ex.apiKey(), ex.apiVersion());
         }
         }
         return result;

runtime/binding-tcp/src/main/java/io/aklivity/zilla/runtime/binding/tcp/internal/TcpEventFormatter.java

@@ -26,8 +26,6 @@
 
 public final class TcpEventFormatter implements EventFormatterSpi
 {
-    private static final String DNS_FAILED_FORMAT = "DNS_FAILED %s";
-
     private final EventFW eventRO = new EventFW();
     private final TcpEventExFW tcpEventExRO = new TcpEventExFW();
 
@@ -50,7 +48,7 @@ public String format(
         case DNS_FAILED:
         {
             final TcpDnsFailedExFW ex = extension.dnsFailed();
-            result = String.format(DNS_FAILED_FORMAT, asString(ex.address()));
+            result = String.format("%s", asString(ex.address()));
             break;
         }
         }

runtime/binding-tls/src/main/java/io/aklivity/zilla/runtime/binding/tls/internal/TlsEventFormatter.java

@@ -24,12 +24,6 @@
 
 public final class TlsEventFormatter implements EventFormatterSpi
 {
-    private static final String TLS_FAILED_FORMAT = "TLS_FAILED";
-    private static final String PROTOCOL_REJECTED_FORMAT = "PROTOCOL_REJECTED";
-    private static final String KEY_REJECTED_FORMAT = "KEY_REJECTED";
-    private static final String PEER_NOT_VERIFIED_FORMAT = "PEER_NOT_VERIFIED";
-    private static final String HANDSHAKE_FAILED_FORMAT = "HANDSHAKE_FAILED";
-
     private final EventFW eventRO = new EventFW();
     private final TlsEventExFW tlsEventExRO = new TlsEventExFW();
 
@@ -51,27 +45,27 @@ public String format(
         {
         case TLS_FAILED:
         {
-            result = TLS_FAILED_FORMAT;
+            result = "";
             break;
         }
         case TLS_PROTOCOL_REJECTED:
         {
-            result = PROTOCOL_REJECTED_FORMAT;
+            result = "";
             break;
         }
         case TLS_KEY_REJECTED:
         {
-            result = KEY_REJECTED_FORMAT;
+            result = "";
             break;
         }
         case TLS_PEER_NOT_VERIFIED:
         {
-            result = PEER_NOT_VERIFIED_FORMAT;
+            result = "";
             break;
         }
         case TLS_HANDSHAKE_FAILED:
         {
-            result = HANDSHAKE_FAILED_FORMAT;
+            result = "";
             break;
         }
         }

runtime/catalog-karapace/src/main/java/io/aklivity/zilla/runtime/catalog/karapace/internal/KarapaceEventFormatter.java

@@ -29,13 +29,6 @@
 
 public final class KarapaceEventFormatter implements EventFormatterSpi
 {
-    private static final String UNRETRIEVABLE_SCHEMA_SUBJECT_VERSION = "UNRETRIEVABLE_SCHEMA %s %s";
-    private static final String UNRETRIEVABLE_SCHEMA_SUBJECT_VERSION_STALE_SCHEMA =
-        "UNRETRIEVABLE_SCHEMA %s %s, USING_STALE_SCHEMA %d";
-    private static final String UNRETRIEVABLE_SCHEMA_ID = "UNRETRIEVABLE_SCHEMA_ID %d";
-    private static final String RETRIEVED_SCHEMA_SUBJECT_VERSION = "RETRIEVED_SCHEMA_SUBJECT_VERSION %s %s";
-    private static final String RETRIEVED_SCHEMA_ID = "RETRIEVED_SCHEMA_ID %d";
-
     private final EventFW eventRO = new EventFW();
     private final KarapaceEventExFW karapaceEventExRO = new KarapaceEventExFW();
 
@@ -58,33 +51,33 @@ public String format(
         case UNRETRIEVABLE_SCHEMA_SUBJECT_VERSION:
         {
             KarapaceUnretrievableSchemaSubjectVersionExFW ex = extension.unretrievableSchemaSubjectVersion();
-            result = String.format(UNRETRIEVABLE_SCHEMA_SUBJECT_VERSION, asString(ex.subject()), asString(ex.version()));
+            result = String.format("%s %s", asString(ex.subject()), asString(ex.version()));
             break;
         }
         case UNRETRIEVABLE_SCHEMA_SUBJECT_VERSION_STALE_SCHEMA:
         {
             KarapaceUnretrievableSchemaSubjectVersionStaleSchemaExFW ex = extension
                 .unretrievableSchemaSubjectVersionStaleSchema();
-            result = String.format(UNRETRIEVABLE_SCHEMA_SUBJECT_VERSION_STALE_SCHEMA, asString(ex.subject()),
+            result = String.format("%s %s, using stale schema: %d", asString(ex.subject()),
                 asString(ex.version()), ex.schemaId());
             break;
         }
         case UNRETRIEVABLE_SCHEMA_ID:
         {
             KarapaceUnretrievableSchemaIdExFW ex = extension.unretrievableSchemaId();
-            result = String.format(UNRETRIEVABLE_SCHEMA_ID, ex.schemaId());
+            result = String.format("%d", ex.schemaId());
             break;
         }
         case RETRIEVED_SCHEMA_SUBJECT_VERSION:
         {
             KarapaceRetrievableSchemaSubjectVersionExFW ex = extension.retrievableSchemaSubjectVersion();
-            result = String.format(RETRIEVED_SCHEMA_SUBJECT_VERSION, asString(ex.subject()), asString(ex.version()));
+            result = String.format("%s %s", asString(ex.subject()), asString(ex.version()));
             break;
         }
         case RETRIEVED_SCHEMA_ID:
         {
             KarapaceRetrievableSchemaIdExFW ex = extension.retrievableSchemaId();
-            result = String.format(RETRIEVED_SCHEMA_ID, ex.schemaId());
+            result = String.format("%d", ex.schemaId());
             break;
         }
         }

runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/exporter/TestExporterHandler.java

@@ -70,14 +70,15 @@ private void handleEvent(
         final EventFW event = eventRO.wrap(buffer, index, index + length);
         String qname = context.supplyQName(event.namespacedId());
         String id = context.supplyLocalName(event.id());
+        String name = context.supplyEventName(event.id());
         String message = formatter.format(msgTypeId, buffer, index, length);
         if (options.events != null && eventIndex < options.events.size())
         {
             TestExporterOptionsConfig.Event e = options.events.get(eventIndex);
-            if (!qname.equals(e.qName) || !id.equals(e.id) || !message.equals(e.message))
+            if (!qname.equals(e.qName) || !id.equals(e.id) || !name.equals(e.name) || !message.equals(e.message))
             {
-                throw new IllegalStateException(String.format("event mismatch, expected: %s %s %s, got: %s %s %s",
-                    e.qName, e.id, e.message, qname, id, message));
+                throw new IllegalStateException(String.format("event mismatch, expected: %s %s %s %s, got: %s %s %s %s",
+                    e.qName, e.id, e.name, e.message, qname, id, name, message));
             }
             eventIndex++;
         }

runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/exporter/config/TestExporterOptionsConfig.java

@@ -48,15 +48,18 @@ public static final class Event
     {
         public final String qName;
         public final String id;
+        public final String name;
         public final String message;
 
         public Event(
-            String qName,
-            String id,
-            String message)
+                String qName,
+                String id,
+                String name,
+                String message)
         {
             this.qName = qName;
             this.id = id;
+            this.name = name;
             this.message = message;
         }
     }

runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/exporter/config/TestExporterOptionsConfigAdapter.java

@@ -33,6 +33,7 @@ public final class TestExporterOptionsConfigAdapter implements OptionsConfigAdap
     private static final String EVENTS_NAME = "events";
     private static final String QNAME_NAME = "qname";
     private static final String ID_NAME = "id";
+    private static final String NAME_NAME = "name";
     private static final String MESSAGE_NAME = "message";
 
     @Override
@@ -68,6 +69,7 @@ public JsonObject adaptToJson(
                 JsonObjectBuilder event = Json.createObjectBuilder();
                 event.add(QNAME_NAME, e.qName);
                 event.add(ID_NAME, e.id);
+                event.add(NAME_NAME, e.name);
                 event.add(MESSAGE_NAME, e.message);
                 events.add(event);
             }
@@ -98,7 +100,12 @@ public OptionsConfig adaptFromJson(
                     JsonObject e0 = e.asJsonObject();
                     if (e0.containsKey(QNAME_NAME) && e0.containsKey(MESSAGE_NAME))
                     {
-                        testOptions.event(e0.getString(QNAME_NAME), e0.getString(ID_NAME), e0.getString(MESSAGE_NAME));
+                        testOptions.event(
+                                e0.getString(QNAME_NAME),
+                                e0.getString(ID_NAME),
+                                e0.getString(NAME_NAME),
+                                e0.getString(MESSAGE_NAME)
+                        );
                     }
                 }
             }

runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/exporter/config/TestExporterOptionsConfigBuilder.java

@@ -52,13 +52,14 @@ public TestExporterOptionsConfigBuilder<T> mode(
     public TestExporterOptionsConfigBuilder<T> event(
         String qName,
         String id,
+        String name,
         String message)
     {
         if (this.events == null)
         {
             this.events = new LinkedList<>();
         }
-        this.events.add(new TestExporterOptionsConfig.Event(qName, id, message));
+        this.events.add(new TestExporterOptionsConfig.Event(qName, id, name, message));
         return this;
     }
 

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 \\[[^\\]]+\\] test event message\n"));
+        output.expect(Pattern.compile("test.net0 \\[[^\\]]+\\] BINDING_TEST_CONNECTED - test event message\n"));
     }
 }

runtime/guard-jwt/src/main/java/io/aklivity/zilla/runtime/guard/jwt/internal/JwtEventFormatter.java

@@ -25,8 +25,6 @@
 
 public final class JwtEventFormatter implements EventFormatterSpi
 {
-    private static final String AUTHORIZATION_FAILED_FORMAT = "AUTHORIZATION_FAILED %s";
-
     private final EventFW eventRO = new EventFW();
     private final JwtEventExFW jwtEventExRO = new JwtEventExFW();
 
@@ -49,7 +47,7 @@ public String format(
         case AUTHORIZATION_FAILED:
         {
             JwtAuthorizationFailedExFW ex = extension.authorizationFailed();
-            result = String.format(AUTHORIZATION_FAILED_FORMAT, identity(ex.identity()));
+            result = String.format("%s", identity(ex.identity()));
             break;
         }
         }

runtime/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroModelEventFormatter.java

@@ -25,8 +25,6 @@
 
 public final class AvroModelEventFormatter implements EventFormatterSpi
 {
-    private static final String VALIDATION_FAILED = "VALIDATION_FAILED %s";
-
     private final EventFW eventRO = new EventFW();
     private final AvroModelEventExFW jsonModelEventExFW = new AvroModelEventExFW();
 
@@ -49,7 +47,7 @@ public String format(
         case VALIDATION_FAILED:
         {
             AvroModelValidationFailedExFW ex = extension.validationFailed();
-            result = String.format(VALIDATION_FAILED, asString(ex.error()));
+            result = String.format("%s", asString(ex.error()));
             break;
         }
         }

runtime/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/CoreModelEventFormatter.java

@@ -25,8 +25,6 @@
 
 public final class CoreModelEventFormatter implements EventFormatterSpi
 {
-    private static final String VALIDATION_FAILED = "VALIDATION_FAILED %s";
-
     private final EventFW eventRO = new EventFW();
     private final CoreModelEventExFW coreModelEventExFW = new CoreModelEventExFW();
 
@@ -49,7 +47,7 @@ public String format(
         case VALIDATION_FAILED:
         {
             CoreModelValidationFailedExFW ex = extension.validationFailed();
-            result = String.format(VALIDATION_FAILED, asString(ex.error()));
+            result = String.format("%s", asString(ex.error()));
             break;
         }
         }

runtime/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonModelEventFormatter.java

@@ -25,8 +25,6 @@
 
 public final class JsonModelEventFormatter implements EventFormatterSpi
 {
-    private static final String VALIDATION_FAILED = "VALIDATION_FAILED %s";
-
     private final EventFW eventRO = new EventFW();
     private final JsonModelEventExFW jsonModelEventExFW = new JsonModelEventExFW();
 
@@ -49,7 +47,7 @@ public String format(
         case VALIDATION_FAILED:
         {
             JsonModelValidationFailedExFW ex = extension.validationFailed();
-            result = String.format(VALIDATION_FAILED, asString(ex.error()));
+            result = String.format("%s", asString(ex.error()));
             break;
         }
         }

runtime/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufModelEventFormatter.java

@@ -25,8 +25,6 @@
 
 public final class ProtobufModelEventFormatter implements EventFormatterSpi
 {
-    private static final String VALIDATION_FAILED = "VALIDATION_FAILED %s";
-
     private final EventFW eventRO = new EventFW();
     private final ProtobufModelEventExFW protobufModelEventExFW = new ProtobufModelEventExFW();
 
@@ -49,7 +47,7 @@ public String format(
         case VALIDATION_FAILED:
         {
             ProtobufModelValidationFailedExFW ex = extension.validationFailed();
-            result = String.format(VALIDATION_FAILED, asString(ex.error()));
+            result = String.format("%s", asString(ex.error()));
             break;
         }
         }

specs/binding-http.spec/src/main/scripts/io/aklivity/zilla/specs/binding/http/config/v1.1/server.event.yaml

@@ -24,7 +24,8 @@ telemetry:
         events:
           - qname: test.net0
             id: binding.http.request.accepted
-            message: REQUEST_ACCEPTED - http GET localhost:8080 /
+            name: BINDING_HTTP_REQUEST_ACCEPTED
+            message: http GET localhost:8080 /
 bindings:
   net0:
     type: http

specs/binding-http.spec/src/main/scripts/io/aklivity/zilla/specs/binding/http/config/v2/server.event.yaml

@@ -24,7 +24,8 @@ telemetry:
         events:
           - qname: test.net0
             id: binding.http.request.accepted
-            message: REQUEST_ACCEPTED - http GET localhost:8080 /
+            name: BINDING_HTTP_REQUEST_ACCEPTED
+            message: http GET localhost:8080 /
 bindings:
   net0:
     type: http

specs/binding-kafka.spec/src/main/scripts/io/aklivity/zilla/specs/binding/kafka/config/client.event.yaml

@@ -24,7 +24,8 @@ telemetry:
         events:
           - qname: test.app0
             id: binding.kafka.api.version.rejected
-            message: API_VERSION_REJECTED 32 0
+            name: BINDING_KAFKA_API_VERSION_REJECTED
+            message: 32 0
 bindings:
   app0:
     type: kafka

specs/binding-tcp.spec/src/main/scripts/io/aklivity/zilla/specs/binding/tcp/config/client.event.yaml

@@ -24,7 +24,8 @@ telemetry:
         events:
           - qname: test.app0
             id: binding.tcp.dns.failed
-            message: DNS_FAILED localhost
+            name: BINDING_TCP_DNS_FAILED
+            message: localhost
 bindings:
   app0:
     type: tcp