Support configuring metric, shared data, and shared queue handlers on the plugin.

Signed-off-by: Hiram Chirino <hiram@hiramchirino.com>

Author: chirino

proxy-wasm-java-host/src/main/java/io/roastedroot/proxywasm/ABI.java

@@ -1598,18 +1598,18 @@ int proxyGetSharedData(
             }
 
             try {
-                if (value.data.length != 0) {
-                    int addr = malloc(value.data.length);
-                    putMemory(addr, value.data);
+                if (value.data().length != 0) {
+                    int addr = malloc(value.data().length);
+                    putMemory(addr, value.data());
                     putUint32(returnValueData, addr);
                 } else {
                     putUint32(returnValueData, 0);
                 }
-                putUint32(returnValueSize, value.data.length);
+                putUint32(returnValueSize, value.data().length);
             } catch (WasmException e) {
                 throw new WasmException(WasmResult.INVALID_MEMORY_ACCESS);
             }
-            putUint32(returnCas, value.cas);
+            putUint32(returnCas, value.cas());
             return WasmResult.OK.getValue();
 
         } catch (WasmException e) {

proxy-wasm-java-host/src/main/java/io/roastedroot/proxywasm/LogHandler.java

@@ -2,6 +2,8 @@
 
 public interface LogHandler {
 
+    LogHandler DEFAULT = new LogHandler() {};
+
     default void log(LogLevel level, String message) throws WasmException {}
 
     default LogLevel getLogLevel() throws WasmException {

proxy-wasm-java-host/src/main/java/io/roastedroot/proxywasm/MetricsHandler.java

@@ -2,6 +2,8 @@
 
 public interface MetricsHandler {
 
+    MetricsHandler DEFAULT = new MetricsHandler() {};
+
     default int defineMetric(MetricType metricType, String name) throws WasmException {
         throw new WasmException(WasmResult.UNIMPLEMENTED);
     }

proxy-wasm-java-host/src/main/java/io/roastedroot/proxywasm/SharedData.java

@@ -1,11 +1,19 @@
 package io.roastedroot.proxywasm;
 
 public class SharedData {
-    public byte[] data;
-    public int cas;
+    private final byte[] data;
+    private final int cas;
 
     public SharedData(byte[] data, int cas) {
         this.data = data;
         this.cas = cas;
     }
+
+    public byte[] data() {
+        return data;
+    }
+
+    public int cas() {
+        return cas;
+    }
 }

proxy-wasm-java-host/src/main/java/io/roastedroot/proxywasm/SharedDataHandler.java

@@ -2,6 +2,8 @@
 
 public interface SharedDataHandler {
 
+    SharedDataHandler DEFAULT = new SharedDataHandler() {};
+
     default SharedData getSharedData(String key) throws WasmException {
         throw new WasmException(WasmResult.UNIMPLEMENTED);
     }

proxy-wasm-java-host/src/main/java/io/roastedroot/proxywasm/SharedQueueHandler.java

@@ -2,6 +2,8 @@
 
 public interface SharedQueueHandler {
 
+    SharedQueueHandler DEFAULT = new SharedQueueHandler() {};
+
     default int registerSharedQueue(QueueName name) throws WasmException {
         throw new WasmException(WasmResult.UNIMPLEMENTED);
     }

proxy-wasm-java-host/src/main/java/io/roastedroot/proxywasm/plugin/Logger.java

@@ -15,12 +15,16 @@
 import io.roastedroot.proxywasm.ChainedHandler;
 import io.roastedroot.proxywasm.ForeignFunction;
 import io.roastedroot.proxywasm.Handler;
+import io.roastedroot.proxywasm.LogHandler;
 import io.roastedroot.proxywasm.LogLevel;
 import io.roastedroot.proxywasm.MetricType;
+import io.roastedroot.proxywasm.MetricsHandler;
 import io.roastedroot.proxywasm.ProxyMap;
 import io.roastedroot.proxywasm.ProxyWasm;
 import io.roastedroot.proxywasm.QueueName;
 import io.roastedroot.proxywasm.SharedData;
+import io.roastedroot.proxywasm.SharedDataHandler;
+import io.roastedroot.proxywasm.SharedQueueHandler;
 import io.roastedroot.proxywasm.StartException;
 import io.roastedroot.proxywasm.WasmException;
 import io.roastedroot.proxywasm.WasmResult;
@@ -41,6 +45,10 @@ public final class Plugin {
     private final boolean shared;
     private final String name;
 
+    private final MetricsHandler metricsHandler;
+    private final SharedQueueHandler sharedQueueHandler;
+    private final SharedDataHandler sharedDataHandler;
+
     private Plugin(Builder builder, ProxyWasm proxyWasm) throws StartException {
         Objects.requireNonNull(proxyWasm);
         this.name = Objects.requireNonNullElse(builder.name, "default");
@@ -49,9 +57,16 @@ private Plugin(Builder builder, ProxyWasm proxyWasm) throws StartException {
         this.upstreams = builder.upstreams;
         this.strictUpstreams = builder.strictUpstreams;
         this.minTickPeriodMilliseconds = builder.minTickPeriodMilliseconds;
-        this.logger = builder.logger;
         this.vmConfig = builder.vmConfig;
         this.pluginConfig = builder.pluginConfig;
+        this.logger = Objects.requireNonNullElse(builder.logger, LogHandler.DEFAULT);
+        ;
+        this.metricsHandler =
+                Objects.requireNonNullElse(builder.metricsHandler, MetricsHandler.DEFAULT);
+        this.sharedQueueHandler =
+                Objects.requireNonNullElse(builder.sharedQueueHandler, SharedQueueHandler.DEFAULT);
+        this.sharedDataHandler =
+                Objects.requireNonNullElse(builder.sharedDataHandler, SharedDataHandler.DEFAULT);
 
         this.wasm = proxyWasm;
         this.wasm.setPluginHandler(new HandlerImpl());
@@ -86,7 +101,7 @@ public void setServerAdaptor(ServerAdaptor serverAdaptor) {
         this.serverAdaptor = serverAdaptor;
     }
 
-    public Logger logger() {
+    public LogHandler logger() {
         return logger;
     }
 
@@ -121,9 +136,12 @@ public static class Builder implements Cloneable {
         private HashMap<String, String> upstreams;
         private boolean strictUpstreams;
         private int minTickPeriodMilliseconds;
-        private Logger logger;
+        private LogHandler logger;
         private byte[] vmConfig;
         private byte[] pluginConfig;
+        private MetricsHandler metricsHandler;
+        private SharedQueueHandler sharedQueueHandler;
+        private SharedDataHandler sharedDataHandler;
 
         public Plugin.Builder withName(String name) {
             this.name = name;
@@ -150,11 +168,26 @@ public Builder withMinTickPeriodMilliseconds(int minTickPeriodMilliseconds) {
             return this;
         }
 
-        public Builder withLogger(Logger logger) {
+        public Builder withLogger(LogHandler logger) {
             this.logger = logger;
             return this;
         }
 
+        public Builder withMetricsHandler(MetricsHandler metricsHandler) {
+            this.metricsHandler = metricsHandler;
+            return this;
+        }
+
+        public Builder withSharedQueueHandler(SharedQueueHandler sharedQueueHandler) {
+            this.sharedQueueHandler = sharedQueueHandler;
+            return this;
+        }
+
+        public Builder withSharedDataHandler(SharedDataHandler sharedDataHandler) {
+            this.sharedDataHandler = sharedDataHandler;
+            return this;
+        }
+
         public Plugin.Builder withShared(boolean shared) {
             this.shared = shared;
             return this;
@@ -202,7 +235,7 @@ public Plugin build(ProxyWasm proxyWasm) throws StartException {
         }
     }
 
-    public Logger logger;
+    public LogHandler logger;
     static final boolean DEBUG = "true".equals(System.getenv("DEBUG"));
     byte[] vmConfig;
     byte[] pluginConfig;
@@ -214,26 +247,9 @@ public Plugin build(ProxyWasm proxyWasm) throws StartException {
     private int tickPeriodMilliseconds;
     private Runnable cancelTick;
     HashMap<String, ForeignFunction> foreignFunctions;
-    private final AtomicInteger lastMetricId = new AtomicInteger(0);
-    private HashMap<Integer, io.roastedroot.proxywasm.plugin.Metric> metrics = new HashMap<>();
-    private HashMap<String, io.roastedroot.proxywasm.plugin.Metric> metricsByName = new HashMap<>();
     private byte[] funcCallData = new byte[0];
     private final HashMap<List<String>, byte[]> properties = new HashMap<>();
 
-    public static class Metric {
-
-        public final int id;
-        public final MetricType type;
-        public final String name;
-        public long value;
-
-        public Metric(int id, MetricType type, String name) {
-            this.id = id;
-            this.type = type;
-            this.name = name;
-        }
-    }
-
     class HandlerImpl extends ChainedHandler {
 
         @Override
@@ -282,21 +298,12 @@ public WasmResult setProperty(List<String> path, byte[] value) {
 
         @Override
         public void log(LogLevel level, String message) throws WasmException {
-            Logger l = logger;
-            if (l == null) {
-                super.log(level, message);
-                return;
-            }
-            l.log(level, message);
+            logger.log(level, message);
         }
 
         @Override
         public LogLevel getLogLevel() throws WasmException {
-            Logger l = logger;
-            if (l == null) {
-                return super.getLogLevel();
-            }
-            return l.getLogLevel();
+            return logger.getLogLevel();
         }
 
         // //////////////////////////////////////////////////////////////////////
@@ -474,51 +481,27 @@ public int dispatchHttpCall(
 
         @Override
         public int defineMetric(MetricType type, String name) throws WasmException {
-            var id = lastMetricId.incrementAndGet();
-            io.roastedroot.proxywasm.plugin.Metric value =
-                    new io.roastedroot.proxywasm.plugin.Metric(id, type, name);
-            metrics.put(id, value);
-            metricsByName.put(name, value);
-            return id;
+            return metricsHandler.defineMetric(type, name);
         }
 
         @Override
         public long getMetric(int metricId) throws WasmException {
-            var metric = metrics.get(metricId);
-            if (metric == null) {
-                throw new WasmException(WasmResult.NOT_FOUND);
-            }
-            return metric.value;
+            return metricsHandler.getMetric(metricId);
         }
 
         @Override
         public WasmResult incrementMetric(int metricId, long value) {
-            var metric = metrics.get(metricId);
-            if (metric == null) {
-                return WasmResult.NOT_FOUND;
-            }
-            metric.value += value;
-            return WasmResult.OK;
+            return metricsHandler.incrementMetric(metricId, value);
         }
 
         @Override
         public WasmResult recordMetric(int metricId, long value) {
-            var metric = metrics.get(metricId);
-            if (metric == null) {
-                return WasmResult.NOT_FOUND;
-            }
-            metric.value = value;
-            return WasmResult.OK;
+            return metricsHandler.recordMetric(metricId, value);
         }
 
         @Override
         public WasmResult removeMetric(int metricId) {
-            io.roastedroot.proxywasm.plugin.Metric metric = metrics.remove(metricId);
-            if (metric == null) {
-                return WasmResult.NOT_FOUND;
-            }
-            metricsByName.remove(metric.name);
-            return WasmResult.OK;
+            return metricsHandler.removeMetric(metricId);
         }
 
         // //////////////////////////////////////////////////////////////////////
@@ -539,12 +522,12 @@ public ForeignFunction getForeignFunction(String name) {
 
         @Override
         public SharedData getSharedData(String key) throws WasmException {
-            return next().getSharedData(key);
+            return sharedDataHandler.getSharedData(key);
         }
 
         @Override
         public WasmResult setSharedData(String key, byte[] value, int cas) {
-            return next().setSharedData(key, value, cas);
+            return sharedDataHandler.setSharedData(key, value, cas);
         }
 
         // //////////////////////////////////////////////////////////////////////
@@ -553,22 +536,22 @@ public WasmResult setSharedData(String key, byte[] value, int cas) {
 
         @Override
         public int registerSharedQueue(QueueName queueName) throws WasmException {
-            return next().registerSharedQueue(queueName);
+            return sharedQueueHandler.registerSharedQueue(queueName);
         }
 
         @Override
         public int resolveSharedQueue(QueueName queueName) throws WasmException {
-            return next().resolveSharedQueue(queueName);
+            return sharedQueueHandler.resolveSharedQueue(queueName);
         }
 
         @Override
         public byte[] dequeueSharedQueue(int queueId) throws WasmException {
-            return next().dequeueSharedQueue(queueId);
+            return sharedQueueHandler.dequeueSharedQueue(queueId);
         }
 
         @Override
         public WasmResult enqueueSharedQueue(int queueId, byte[] value) {
-            return next().enqueueSharedQueue(queueId, value);
+            return sharedQueueHandler.enqueueSharedQueue(queueId, value);
         }
     }
 }