move event names out of format

aklivity · May 30, 2024 · 331b84a · 331b84a
1 parent d6c1529
commit 331b84a
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 21 deletions.
diff --git a/...qtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/internal/MqttEventFormatter.java b/...qtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/internal/MqttEventFormatter.java
@@ -26,8 +26,6 @@
 
 public final class MqttEventFormatter implements EventFormatterSpi
 {
-    private static final String CLIENT_CONNECTED_FORMAT = "CLIENT_CONNECTED %s %s";
-
     private final EventFW eventRO = new EventFW();
     private final MqttEventExFW mqttEventExRO = new MqttEventExFW();
 
@@ -50,7 +48,7 @@ public String format(
         case CLIENT_CONNECTED:
         {
             MqttClientConnectedExFW ex = extension.clientConnected();
-            result = String.format(CLIENT_CONNECTED_FORMAT, identity(ex.identity()), asString(ex.clientId()));
+            result = String.format("%s %s", identity(ex.identity()), asString(ex.clientId()));
             break;
         }
         }

diff --git a/...main/java/io/aklivity/zilla/runtime/catalog/apicurio/internal/ApicurioEventFormatter.java b/...main/java/io/aklivity/zilla/runtime/catalog/apicurio/internal/ApicurioEventFormatter.java
@@ -29,13 +29,6 @@
 
 public final class ApicurioEventFormatter implements EventFormatterSpi
 {
-    private static final String UNRETRIEVABLE_ARTIFACT_SUBJECT_VERSION = "UNRETRIEVABLE_ARTIFACT %s %s";
-    private static final String UNRETRIEVABLE_ARTIFACT_SUBJECT_VERSION_STALE_ARTIFACT =
-        "UNRETRIEVABLE_ARTIFACT %s %s, USING_STALE_ARTIFACT %d";
-    private static final String UNRETRIEVABLE_ARTIFACT_ID = "UNRETRIEVABLE_ARTIFACT_ID %d";
-    private static final String RETRIEVED_ARTIFACT_SUBJECT_VERSION = "RETRIEVED_ARTIFACT_SUBJECT_VERSION %s %s";
-    private static final String RETRIEVED_ARTIFACT_ID = "RETRIEVED_ARTIFACT_ID %d";
-
     private final EventFW eventRO = new EventFW();
     private final ApicurioEventExFW schemaRegistryEventExRO = new ApicurioEventExFW();
 
@@ -58,27 +51,27 @@ public String format(
         case UNRETRIEVABLE_ARTIFACT_SUBJECT_VERSION:
         {
             ApicurioUnretrievableArtifactSubjectVersionExFW ex = extension.unretrievableArtifactSubjectVersion();
-            result = String.format(UNRETRIEVABLE_ARTIFACT_SUBJECT_VERSION, asString(ex.subject()), asString(ex.version()));
+            result = String.format("%s %s", asString(ex.subject()), asString(ex.version()));
             break;
         }
         case UNRETRIEVABLE_ARTIFACT_SUBJECT_VERSION_STALE_ARTIFACT:
         {
             ApicurioUnretrievableArtifactSubjectVersionStaleArtifactExFW ex = extension
                 .unretrievableArtifactSubjectVersionStaleArtifact();
-            result = String.format(UNRETRIEVABLE_ARTIFACT_SUBJECT_VERSION_STALE_ARTIFACT, asString(ex.subject()),
+            result = String.format("%s (%s) |  stale artifactId (%d)", asString(ex.subject()),
                 asString(ex.version()), ex.artifactId());
             break;
         }
         case UNRETRIEVABLE_ARTIFACT_ID:
         {
             ApicurioUnretrievableArtifactIdExFW ex = extension.unretrievableArtifactId();
-            result = String.format(UNRETRIEVABLE_ARTIFACT_ID, ex.artifactId());
+            result = String.format("%d", ex.artifactId());
             break;
         }
         case RETRIEVED_ARTIFACT_SUBJECT_VERSION:
         {
             ApicurioRetrievableArtifactSubjectVersionExFW ex = extension.retrievableArtifactSubjectVersion();
-            result = String.format(RETRIEVED_ARTIFACT_SUBJECT_VERSION, asString(ex.subject()), asString(ex.version()));
+            result = String.format("%s %s", asString(ex.subject()), asString(ex.version()));
             break;
         }
         case RETRIEVED_ARTIFACT_ID:

diff --git a/...t.spec/src/main/scripts/io/aklivity/zilla/specs/binding/mqtt/config/server.log.event.yaml b/...t.spec/src/main/scripts/io/aklivity/zilla/specs/binding/mqtt/config/server.log.event.yaml
@@ -24,7 +24,8 @@ telemetry:
                 events:
                     - qname: test.net0
                       id: binding.mqtt.client.connected
-                      message: CLIENT_CONNECTED - client
+                      name: BINDING_MQTT_CLIENT_CONNECTED
+                      message: "- client"
 bindings:
     net0:
         type: mqtt

diff --git a/.../aklivity/zilla/specs/catalog/apicurio/config/resolve/artifact/global/id/retry/zilla.yaml b/.../aklivity/zilla/specs/catalog/apicurio/config/resolve/artifact/global/id/retry/zilla.yaml
@@ -23,10 +23,12 @@ telemetry:
         events:
           - qname: test.catalog0
             id: catalog.apicurio.unretrievable.artifact.id
-            message: UNRETRIEVABLE_ARTIFACT_ID 1
+            name: CATALOG_APICURIO_UNRETRIEVABLE_ARTIFACT_ID
+            message: 1
           - qname: test.catalog0
             id: catalog.apicurio.retrievable.artifact.id
-            message: RETRIEVED_ARTIFACT_ID 1
+            name: CATALOG_APICURIO_RETRIEVED_ARTIFACT_ID
+            message: 1
 catalogs:
   catalog0:
     type: apicurio

diff --git a/...zilla/specs/catalog/apicurio/config/resolve/artifact/id/subject/version/failed/zilla.yaml b/...zilla/specs/catalog/apicurio/config/resolve/artifact/id/subject/version/failed/zilla.yaml
@@ -25,8 +25,10 @@ telemetry:
             id: catalog.apicurio.remote.access.rejected
             name: CATALOG_APICURIO_REMOTE_ACCESS_REJECTED
             message: GET http://localhost:8081/apis/registry/v2/ids/globalIds/1 0
+          - qname: test.catalog0
             id: catalog.apicurio.unretrievable.artifact.subject.version
-            message: UNRETRIEVABLE_ARTIFACT artifactId latest
+            name: CATALOG_APICURIO_UNRETRIEVABLE_ARTIFACT_SUBJECT_VERSION
+            message: artifactId latest
 catalogs:
   catalog0:
     type: apicurio

diff --git a/.../zilla/specs/catalog/apicurio/config/resolve/artifact/id/subject/version/retry/zilla.yaml b/.../zilla/specs/catalog/apicurio/config/resolve/artifact/id/subject/version/retry/zilla.yaml
@@ -23,13 +23,16 @@ telemetry:
         events:
           - qname: test.catalog0
             id: catalog.apicurio.unretrievable.artifact.subject.version
-            message: UNRETRIEVABLE_ARTIFACT artifactId latest
+            name: CATALOG_APICURIO_UNRETRIEVABLE_ARTIFACT_SUBJECT_VERSION
+            message: artifactId latest
           - qname: test.catalog0
             id: catalog.apicurio.unretrievable.artifact.subject.version.stale.artifact
-            message: UNRETRIEVABLE_ARTIFACT artifactId latest, USING_STALE_ARTIFACT 1
+            name: UNRETRIEVABLE_ARTIFACT_SUBJECT_VERSION_STALE_ARTIFACT
+            message: artifactId (latest) | stale artifactId (1)
           - qname: test.catalog0
             id: catalog.apicurio.retrievable.artifact.subject.version
-            message: RETRIEVED_ARTIFACT_SUBJECT_VERSION artifactId latest
+            name: CATALOG_APICURIO_RETRIEVED_ARTIFACT_SUBJECT_VERSION
+            message: artifactId latest
 catalogs:
   catalog0:
     type: apicurio