Revert "fix ephemeral"

This reverts commit 596b66e.

incubator/command-dump/src/main/java/io/aklivity/zilla/runtime/command/dump/internal/airline/ZillaDumpCommand.java

@@ -80,7 +80,6 @@
 import io.aklivity.zilla.runtime.command.dump.internal.types.stream.WindowFW;
 import io.aklivity.zilla.runtime.engine.binding.function.MessagePredicate;
 import io.aklivity.zilla.runtime.engine.config.KindConfig;
-import io.aklivity.zilla.runtime.engine.namespace.NamespacedId;
 import io.aklivity.zilla.runtime.engine.reader.BindingsLayoutReader;
 
 @Command(name = "dump", description = "Dump stream content")
@@ -187,11 +186,6 @@ public final class ZillaDumpCommand extends ZillaCommand
         hidden = true)
     public String propertiesPath;
 
-    @Option(name = {"--replace-namespace"},
-        description = "Replace namespace (old-namespace-name=new-namespace-name)",
-        hidden = true)
-    public String replaceNamespace;
-
     @Option(name = "-e",
         description = "Show exception traces",
         hidden = true)
@@ -326,8 +320,7 @@ public void run()
                 final DumpHandler[] dumpHandlers = new DumpHandler[streamBufferCount];
                 for (int i = 0; i < streamBufferCount; i++)
                 {
-                    dumpHandlers[i] = new DumpHandler(i, filter, labels::lookupLabel, labels::lookupLabelId,
-                        bindings.bindings()::get, writer);
+                    dumpHandlers[i] = new DumpHandler(i, filter, labels::lookupLabel, bindings.bindings()::get, writer);
                 }
 
                 final MutableDirectBuffer buffer = writeBuffer;
@@ -457,48 +450,32 @@ private final class DumpHandler
         private final LongPredicate allowedBinding;
         private final WritableByteChannel writer;
         private final IntFunction<String> lookupLabel;
-        private final Function<String, Integer> lookupLabelId;
         private final Function<Long, long[]> lookupBindingInfo;
         private final CRC32C crc;
         private final ExtensionFW extensionRO;
         private final MutableDirectBuffer labelsBuffer;
         private final Long2LongHashMap sequence;
         private final Int2IntHashMap crcCache;
-        private final int oldNamespace;
-        private final int newNamespace;
 
         private long nextTimestamp = Long.MAX_VALUE;
 
         private DumpHandler(
             int worker,
             LongPredicate allowedBinding,
             IntFunction<String> lookupLabel,
-            Function<String, Integer> lookupLabelId,
             Function<Long, long[]> lookupBindingInfo,
             WritableByteChannel writer)
         {
             this.worker = worker;
             this.allowedBinding = allowedBinding;
             this.lookupLabel = lookupLabel;
-            this.lookupLabelId = lookupLabelId;
             this.lookupBindingInfo = lookupBindingInfo;
             this.writer = writer;
             this.crc = new CRC32C();
             this.extensionRO = new ExtensionFW();
             this.labelsBuffer = new UnsafeBuffer(ByteBuffer.allocate(LABELS_BUFFER_SLOT_CAPACITY));
             this.sequence = new Long2LongHashMap(0L);
             this.crcCache = new Int2IntHashMap(0);
-            if (replaceNamespace != null)
-            {
-                String[] namespaces = replaceNamespace.split("=");
-                oldNamespace = lookupLabelId.apply(namespaces[0]);
-                newNamespace = lookupLabelId.apply(namespaces[1]);
-            }
-            else
-            {
-                oldNamespace = 0;
-                newNamespace = 0;
-            }
         }
 
         private boolean nextTimestamp(
@@ -783,8 +760,8 @@ private int resolveProtocolTypeId(
             long routedId)
         {
             int protocolTypeLabelId = 0;
-            long[] origin = lookupBindingInfo.apply(replaceNamespace(originId));
-            long[] routed = lookupBindingInfo.apply(replaceNamespace(routedId));
+            long[] origin = lookupBindingInfo.apply(originId);
+            long[] routed = lookupBindingInfo.apply(routedId);
 
             if (origin != null && routed != null)
             {
@@ -802,20 +779,6 @@ private int resolveProtocolTypeId(
             return supplyLabelCrc(protocolTypeLabelId);
         }
 
-        private long replaceNamespace(
-            long bindingId)
-        {
-            long result = bindingId;
-            if (oldNamespace != 0 && newNamespace != 0)
-            {
-                if (NamespacedId.namespaceId(bindingId) == oldNamespace)
-                {
-                    result = NamespacedId.id(newNamespace, NamespacedId.localId(bindingId));
-                }
-            }
-            return result;
-        }
-
         private void encodePcapHeader(
             MutableDirectBuffer buffer,
             long length,

incubator/command-dump/src/test/java/io/aklivity/zilla/runtime/command/dump/internal/airline/DumpCommandRunner.java

@@ -29,7 +29,6 @@ public DumpCommandRunner()
         command.verbose = true;
         command.continuous = false;
         command.properties = List.of(String.format("zilla.engine.directory=%s", ENGINE_PATH));
-        command.replaceNamespace = "ephemeral=test";
     }
 
     public void createPcap(

incubator/command-dump/src/test/java/io/aklivity/zilla/runtime/command/dump/internal/airline/TsharkRunner.java

@@ -80,8 +80,7 @@ public Container.ExecResult createTxt(
     {
         String containerPath = String.format("/opt/%s", file.getFileName());
         tshark.copyFileToContainer(Transferable.of(Files.readAllBytes(file)), containerPath);
-        String protocols = "zilla,http,http2,tls,mqtt,kafka,amqp";
-        return tshark.execInContainer("tshark", "-O", protocols, "-r", containerPath);
+        return tshark.execInContainer("tshark", "-O", "zilla", "-r", containerPath);
     }
 
     private static Path resourceToPath(

incubator/command-dump/src/test/resources/io/aklivity/zilla/runtime/command/dump/internal/airline/expected_grpc_server_stream_rpc_establish.txt

@@ -87,8 +87,8 @@ Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 0, Ack: 1, Len:
 Zilla Frame
     Frame Type ID: 0x00000001
     Frame Type: BEGIN
-    Protocol Type ID: 0xf9c7583a
-    Protocol Type: grpc
+    Protocol Type ID: 0x00000000
+    Protocol Type: 
     Worker: 0
     Offset: 0x00000060
     Origin ID: 0x0000000a00000008
@@ -157,8 +157,8 @@ Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 1, Ack: 1, Len:
 Zilla Frame
     Frame Type ID: 0x40000002
     Frame Type: WINDOW
-    Protocol Type ID: 0xf9c7583a
-    Protocol Type: grpc
+    Protocol Type ID: 0x00000000
+    Protocol Type: 
     Worker: 1
     Offset: 0x000000b0
     Origin ID: 0x0000000a00000008
@@ -265,8 +265,8 @@ Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 302, Ack: 1, Le
 Zilla Frame
     Frame Type ID: 0x00000002
     Frame Type: DATA
-    Protocol Type ID: 0xf9c7583a
-    Protocol Type: grpc
+    Protocol Type ID: 0x00000000
+    Protocol Type: 
     Worker: 0
     Offset: 0x000001c0
     Origin ID: 0x0000000a00000008
@@ -333,8 +333,8 @@ Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 462, Ack: 1, Le
 Zilla Frame
     Frame Type ID: 0x00000003
     Frame Type: END
-    Protocol Type ID: 0xf9c7583a
-    Protocol Type: grpc
+    Protocol Type ID: 0x00000000
+    Protocol Type: 
     Worker: 0
     Offset: 0x00000230
     Origin ID: 0x0000000a00000008
@@ -361,8 +361,8 @@ Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 1, Ack: 143, Le
 Zilla Frame
     Frame Type ID: 0x00000001
     Frame Type: BEGIN
-    Protocol Type ID: 0xf9c7583a
-    Protocol Type: grpc
+    Protocol Type ID: 0x00000000
+    Protocol Type: 
     Worker: 1
     Offset: 0x000001d0
     Origin ID: 0x0000000a00000008
@@ -508,8 +508,8 @@ Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 214, Ack: 143,
 Zilla Frame
     Frame Type ID: 0x00000002
     Frame Type: DATA
-    Protocol Type ID: 0xf9c7583a
-    Protocol Type: grpc
+    Protocol Type ID: 0x00000000
+    Protocol Type: 
     Worker: 1
     Offset: 0x000002d8
     Origin ID: 0x0000000a00000008
@@ -548,8 +548,8 @@ Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 1, Ack: 587, Le
 Zilla Frame
     Frame Type ID: 0x40000002
     Frame Type: WINDOW
-    Protocol Type ID: 0xf9c7583a
-    Protocol Type: grpc
+    Protocol Type ID: 0x00000000
+    Protocol Type: 
     Worker: 0
     Offset: 0x00000338
     Origin ID: 0x0000000a00000008
@@ -582,8 +582,8 @@ Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 375, Ack: 143,
 Zilla Frame
     Frame Type ID: 0x00000002
     Frame Type: DATA
-    Protocol Type ID: 0xf9c7583a
-    Protocol Type: grpc
+    Protocol Type ID: 0x00000000
+    Protocol Type: 
     Worker: 1
     Offset: 0x00000348
     Origin ID: 0x0000000a00000008
@@ -662,8 +662,8 @@ Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 536, Ack: 143,
 Zilla Frame
     Frame Type ID: 0x00000003
     Frame Type: END
-    Protocol Type ID: 0xf9c7583a
-    Protocol Type: grpc
+    Protocol Type ID: 0x00000000
+    Protocol Type: 
     Worker: 1
     Offset: 0x000003b8
     Origin ID: 0x0000000a00000008
@@ -769,8 +769,8 @@ Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 143, Ack: 587,
 Zilla Frame
     Frame Type ID: 0x40000002
     Frame Type: WINDOW
-    Protocol Type ID: 0xf9c7583a
-    Protocol Type: grpc
+    Protocol Type ID: 0x00000000
+    Protocol Type: 
     Worker: 0
     Offset: 0x000004c8
     Origin ID: 0x0000000a00000008
@@ -803,8 +803,8 @@ Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 285, Ack: 587,
 Zilla Frame
     Frame Type ID: 0x40000002
     Frame Type: WINDOW
-    Protocol Type ID: 0xf9c7583a
-    Protocol Type: grpc
+    Protocol Type ID: 0x00000000
+    Protocol Type: 
     Worker: 0
     Offset: 0x00000528
     Origin ID: 0x0000000a00000008