From a9b0dc9dd0801f75c61b67743fda7bd05d4e1e8b Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 26 Oct 2020 01:17:24 -0500
Subject: [PATCH 001/164] argsfile support

---
 .../io/nosqlbench/engine/cli/ArgsFile.java    | 222 ++++++++++++++++--
 .../nosqlbench/engine/cli/NBCLIOptions.java   |  14 +-
 .../nosqlbench/engine/cli/ArgsFileTest.java   |  39 +++
 .../test/resources/argsfiles/alphagamma.cli   |   2 +
 4 files changed, 244 insertions(+), 33 deletions(-)
 create mode 100644 engine-cli/src/test/java/io/nosqlbench/engine/cli/ArgsFileTest.java
 create mode 100644 engine-cli/src/test/resources/argsfiles/alphagamma.cli

diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/ArgsFile.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/ArgsFile.java
index 2abdea92d..d63480cd6 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/ArgsFile.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/ArgsFile.java
@@ -1,29 +1,217 @@
 package io.nosqlbench.engine.cli;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
+/**
+ * <H1>Synopsis</H1>
+ *
+ * ArgsFile is a command-line modifier which can take linked list of
+ * command args and modify it, and/or modify argsfile refrenced in this way.
+ *
+ * <H1>ArgsFile Selection</H1>
+ *
+ * During processing, any occurence of '-argsfile' selects the active argsfile and loads
+ * it into the command line in place of the '-argsfile' argument. By default the args file
+ * will be loaded if it exists, and a warning will be given if it does not.
+ *
+ * The '-argsfile-required &lt;somepath&gt;' version will throw an error if the args file
+ * is not present, but it will not report any warnings or details otherwise.
+ *
+ * The `-argsfile-optional &lt;somepath&gt; version will not throw an error if the args
+ * file is not present, and it will not report any warnings or details otherwise.
+ *
+ * A prefix command line can be given to ArgsFile to pre-load any settings. In this way
+ * it is possible to easily provide a default args file which will be loaded. For example,
+ * A prefix command of '-argsfile-optional &lt;somepath&gt;' will load options if they are
+ * available in the specified file, but will otherwise provide no feedback to the user.
+ *
+ * <H1>ArgsFile Injection</H1>
+ *
+ * When an argsfile is loaded, it reads a command from each line into the current position
+ * of the command line. No parsing is done. Blank lines are ignored. Newlines are used as the
+ * argument delimiter, and lines that end with a backslash before the newline are automatically
+ * joined together.
+ *
+ * <H1>ArgsFile Diagnostics</H1>
+ *
+ * All modifications to the command line should be reported to the logging facility at
+ * INFO level. This assumes that the calling layer wants to inform users of command line injections,
+ * and that the user can select to be notified of warnings only if desired.
+ *
+ * <H1>Environment Variables</H1>
+ *
+ * Simple environment variable substitution is attempted for any pattern which appears as '$' followed
+ * by all uppercase letters and underscores. Any references of this type which are not resolvable
+ * will cause an error to be thrown.
+ */
 public class ArgsFile {
-    private final Path argsPath;
+    private final static Logger logger = LoggerFactory.getLogger(ArgsFile.class);
 
-    public ArgsFile(String path) {
-        this.argsPath = Path.of(path);
+    private Path argsPath;
+    private LinkedList<String> preload;
+
+    public ArgsFile() {
     }
 
-    public LinkedList<String> doArgsFile(String argsfileSpec, LinkedList<String> arglist) {
-        return null;
+    public ArgsFile preload(String... preload) {
+        this.preload = new LinkedList<String>(Arrays.asList(preload));
+        return this;
     }
 
-    private LinkedList<String> spliceArgs(String argsfileSpec, LinkedList<String> arglist) {
-        Pattern envpattern = Pattern.compile("(?<envvar>\\$[A-Za-z_]+)");
-        Matcher matcher = envpattern.matcher(argsfileSpec);
+    private enum Selection {
+        // Ignore if not present, show injections at info
+        IgnoreIfMissing,
+        // Warn if not present, but show injections at info
+        WarnIfMissing,
+        // throw error if not present, show injections at info
+        ErrorIfMissing
+    }
+
+    public LinkedList<String> process(String... args) {
+        return process(new LinkedList<String>(Arrays.asList(args)));
+    }
+
+    public LinkedList<String> process(LinkedList<String> commandline) {
+        if (preload != null) {
+            LinkedList<String> modified = new LinkedList<String>();
+            modified.addAll(preload);
+            modified.addAll(commandline);
+            preload = null;
+            commandline = modified;
+        }
+        LinkedList<String> composed = new LinkedList<>();
+        while (commandline.peekFirst() != null) {
+            String arg = commandline.peekFirst();
+            switch (arg) {
+                case "-argsfile":
+                    commandline.removeFirst();
+                    String argspath = readWordOrThrow(commandline, "path to an args file");
+                    setArgsFile(argspath, Selection.WarnIfMissing);
+                    commandline = loadArgs(this.argsPath, Selection.WarnIfMissing, commandline);
+                    break;
+                case "-argsfile-required":
+                    commandline.removeFirst();
+                    String argspathRequired = readWordOrThrow(commandline, "path to an args file");
+                    setArgsFile(argspathRequired, Selection.ErrorIfMissing);
+                    commandline = loadArgs(this.argsPath, Selection.ErrorIfMissing, commandline);
+                    break;
+                case "-argsfile-optional":
+                    commandline.removeFirst();
+                    String argspathOptional = readWordOrThrow(commandline, "path to an args file");
+                    setArgsFile(argspathOptional, Selection.IgnoreIfMissing);
+                    commandline = loadArgs(this.argsPath, Selection.IgnoreIfMissing, commandline);
+                    break;
+                case "-pin":
+                    commandline.removeFirst();
+                    commandline = pinArg(commandline);
+                    break;
+                case "-unpin":
+                    commandline.removeFirst();
+                    commandline = unpinArg(commandline);
+                    break;
+                default:
+                    composed.addLast(commandline.removeFirst());
+            }
+
+        }
+        return composed;
+    }
+
+    private LinkedList<String> loadArgs(Path argspath, Selection mode, LinkedList<String> commandline) {
+        if (!assertArgsFileExists(argspath, mode)) {
+            return commandline;
+        }
+        List<String> lines = null;
+        try {
+            lines = Files.readAllLines(argspath);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        List<String> content = lines.stream()
+                .filter(s -> !s.startsWith("#"))
+                .filter(s -> !s.startsWith("/"))
+                .filter(s -> !s.isBlank())
+                .filter(s -> !s.isEmpty())
+                .collect(Collectors.toList());
+        StringBuilder splitword = new StringBuilder();
+        LinkedList<String> loaded = new LinkedList<>();
+        for (String s : content) {
+            splitword.append(s);
+            if (!s.endsWith("\\")) {
+                loaded.addLast(splitword.toString());
+                splitword.setLength(0);
+            } else {
+                splitword.setLength(splitword.length() - 1);
+            }
+        }
+        if (splitword.length() > 0) {
+            throw new RuntimeException("unqualified line continuation for '" + splitword.toString() + "'");
+        }
+
+        Iterator<String> injections = loaded.descendingIterator();
+        while (injections.hasNext()) {
+            String injection = injections.next();
+            injection = injectEnv(injection);
+            commandline.addFirst(injection);
+        }
+
+        return commandline;
+    }
+
+    private boolean assertArgsFileExists(Path argspath, Selection mode) {
+        if (!Files.exists(argsPath)) {
+            switch (mode) {
+                case ErrorIfMissing:
+                    throw new RuntimeException("A required argsfile was specified, but it does not exist: '" + argspath + "'");
+                case WarnIfMissing:
+                    logger.warn("An argsfile was specified, but it does not exist: '" + argspath + "'");
+                case IgnoreIfMissing:
+            }
+            return false;
+        }
+        return true;
+    }
+
+    private void setArgsFile(String argspath, Selection mode) {
+        this.argsPath = Path.of(argspath);
+//        assertIfMissing(this.argsPath,mode);
+    }
+
+    private String readWordOrThrow(LinkedList<String> commandline, String description) {
+        String found = commandline.peekFirst();
+        if (found == null) {
+            throw new RuntimeException("Unable to read argument top option for " + description);
+        }
+        return commandline.removeFirst();
+    }
+
+    private LinkedList<String> pinArg(LinkedList<String> commandline) {
+        if (this.argsPath == null) {
+            throw new RuntimeException("No argsfile has been selected before using the pin option.");
+        }
+        return commandline;
+    }
+
+    private LinkedList<String> unpinArg(LinkedList<String> commandline) {
+        if (this.argsPath == null) {
+            throw new RuntimeException("No argsfile has been selected before using the unpin option.");
+        }
+        return commandline;
+    }
+
+    private String injectEnv(String word) {
+        Pattern envpattern = Pattern.compile("(?<envvar>\\$[A-Z_]+)");
+        Matcher matcher = envpattern.matcher(word);
         StringBuilder sb = new StringBuilder();
-
         while (matcher.find()) {
             String envvar = matcher.group("envvar");
             String value = System.getenv(envvar);
@@ -33,19 +221,9 @@ public class ArgsFile {
             matcher.appendReplacement(sb, value);
         }
         matcher.appendTail(sb);
-        Path argfilePath = Path.of(sb.toString());
-        List<String> lines = null;
-        try {
-            lines = Files.readAllLines(argfilePath);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        // TODO: finish update logic here
-        return arglist;
-
+        return sb.toString();
     }
 
-
     public LinkedList<String> pin(LinkedList<String> arglist) {
         return arglist;
     }
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
index 8c4457431..f0bd65e82 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
@@ -163,7 +163,8 @@ public class NBCLIOptions {
     }
 
     private LinkedList<String> parseGlobalOptions(String[] args) {
-        ArgsFile argsfile = new ArgsFile(ARGS_FILE_DEFAULT);
+        ArgsFile argsfile = new ArgsFile();
+        argsfile.preload("-argsfile-optional", ARGS_FILE_DEFAULT);
 
         LinkedList<String> arglist = new LinkedList<>() {{
             addAll(Arrays.asList(args));
@@ -188,18 +189,9 @@ public class NBCLIOptions {
 
             switch (word) {
                 case ARGS_FILE:
-                    arglist.removeFirst();
-                    String argsfileSpec = readWordOrThrow(arglist, "argsfile");
-                    argsfile = new ArgsFile(argsfileSpec);
-                    arglist = argsfile.doArgsFile(argsfileSpec, arglist);
-                    break;
                 case ARGS_PIN:
-                    arglist.removeFirst();
-                    arglist = argsfile.pin(arglist);
-                    break;
                 case ARGS_UNPIN:
-                    arglist.removeFirst();
-                    arglist = argsfile.unpin(arglist);
+                    arglist = argsfile.process(arglist);
                     break;
                 case ANNOTATE_EVENTS:
                     arglist.removeFirst();
diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/ArgsFileTest.java b/engine-cli/src/test/java/io/nosqlbench/engine/cli/ArgsFileTest.java
new file mode 100644
index 000000000..be6b11c59
--- /dev/null
+++ b/engine-cli/src/test/java/io/nosqlbench/engine/cli/ArgsFileTest.java
@@ -0,0 +1,39 @@
+package io.nosqlbench.engine.cli;
+
+import org.junit.Test;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ArgsFileTest {
+
+    @Test
+    public void testLoadingArgs() {
+        LinkedList<String> result;
+        ArgsFile argsFile = new ArgsFile();
+        result = argsFile.process("-argsfile", "src/test/resources/argsfiles/nonextant.cli");
+        assertThat(result).containsExactly();
+        result = argsFile.process("-argsfile", "src/test/resources/argsfiles/alphagamma.cli");
+        assertThat(result).containsExactly("alpha", "gamma");
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void testLoadingMissingRequiredFails() {
+        LinkedList<String> result;
+        ArgsFile argsFile = new ArgsFile();
+        result = argsFile.process("-argsfile-required", "src/test/resources/argsfiles/nonextant.cli");
+    }
+
+    @Test
+    public void testLoadingInPlace() {
+        LinkedList<String> result;
+        LinkedList<String> commands = new LinkedList<>(List.of("--abc", "--def", "-argsfile", "src/test/resources/argsfiles/alphagamma.cli"));
+        ArgsFile argsFile = new ArgsFile().preload("-argsfile-optional", "src/test/resources/argsfiles/alphagamma.cli");
+        result = argsFile.process(commands);
+        assertThat(result).containsExactly("alpha", "gamma", "--abc", "--def", "alpha", "gamma");
+
+    }
+
+}
\ No newline at end of file
diff --git a/engine-cli/src/test/resources/argsfiles/alphagamma.cli b/engine-cli/src/test/resources/argsfiles/alphagamma.cli
new file mode 100644
index 000000000..febb53a79
--- /dev/null
+++ b/engine-cli/src/test/resources/argsfiles/alphagamma.cli
@@ -0,0 +1,2 @@
+alpha
+gamma
\ No newline at end of file

From b9607d07e601f9b4b9ff470a80a31a982bc0f44d Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 26 Oct 2020 12:08:05 -0500
Subject: [PATCH 002/164] make argsfiles use double dash

---
 devdocs/sketches/argfiles.md                  | 31 ++++++++++---------
 .../io/nosqlbench/engine/cli/ArgsFile.java    | 20 ++++++------
 .../nosqlbench/engine/cli/NBCLIOptions.java   |  8 ++---
 .../nosqlbench/engine/cli/ArgsFileTest.java   | 13 ++++----
 4 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/devdocs/sketches/argfiles.md b/devdocs/sketches/argfiles.md
index 159df6cef..b29b34db5 100644
--- a/devdocs/sketches/argfiles.md
+++ b/devdocs/sketches/argfiles.md
@@ -5,7 +5,7 @@ An argsfile (Command Line Arguments File) is a simple text file which
   file to contain a set of global defaults that you want to use by
    default and automatically.
 
-A command, `-argsfile <path>` is used to specify an args file. You can
+A command, `--argsfile <path>` is used to specify an args file. You can
  use it like an instant import statement in the middle of a command
   line. Notice that this option uses only a single dash. This
    distinguishes  the argsfile options from the others in general. These are meta
@@ -17,8 +17,8 @@ A command, `-argsfile <path>` is used to specify an args file. You can
 The default args file location is `$HOME/.nosqlbench/argsfile`. If this
 file is present, it is loaded by nosqlbench when it starts even if you
  don't ask it to. That is, nosqlbench behaves as if your first set of
-  command line arguments is `-argsfile "$HOME/.nosqlbench/argsfile
-  `. However, unlike when you specify `-argsfile ...` explicitly on
+  command line arguments is `--argsfile "$HOME/.nosqlbench/argsfile
+  `. However, unlike when you specify `--argsfile ...` explicitly on
    your command line, this form will not throw an error if the file is
     missing. This means that when you explicitly ask for an args file
      to be loaded, and it does not exist, an error is thrown. If you
@@ -36,51 +36,52 @@ An args file simply contains an argument on each line, like this:
 ## Pinning options
 
 It is possible to pin an option to the default args file by use of the
- `-pin` meta-option. This option will take the following command line
+ `--pin` meta-option. This option will take the following command line
   argument and add it to the currently active args file. That means, if
-   you use `-pin --docker-metrics`, then `--docker-metrics` is added to
+   you use `--pin --docker-metrics`, then `--docker-metrics` is added to
     the args file. If there is an exact duplicate of the same option
      and value, then it is skipped, but if the option name is the same
       with a different value, then it is added at the end. This allows
        for options which may be called multiple times normally.
 
-If the `-pin` option occurs after an explicit use of `-argsfile
+If the `--pin` option occurs after an explicit use of `--argsfile
  <filename>`, then the filename used in this argument is the one that
   is modified.
 
-After the `-pin` option, the following argument is taken as any global
+After the `--pin` option, the following argument is taken as any global
  option (--with-double-dashes) and any non-option values after it which
   are not commands (reserved words)
 
-When the `-pin` option is used, it does not cause the pinned option
+When the `--pin` option is used, it does not cause the pinned option
  to be excluded from the current command line call. The effects of the
   pinned option will take place in the current nosqlbench invocation
-   just as they would without the `-pin`. However, when pinning global
+   just as they would without the `--pin`. However, when pinning global
     options when there are no commands on the command line, nosqlbench
      will not run a scenario, so this form is suitable for setting
       arguments.
 
-As a special case, if the `-pin` is the last option of
+As a special case, if the `--pin` is the last option of
 
 ## Unpinning options.
 
 To reverse the effect of pinning an option, you simply use
- `-unpin ...`.
+ `--unpin ...`.
 
-The behavior of -unpin is slightly different than -pin. Specifically,
+The behavior of --unpin is slightly different than --pin. Specifically,
 an option which is unpinned will be removed from the arg list, and will
  not be used in the current invocation of nosqlbench after removal.
 
-Further, you can specify `-unpin --grafana-baseurl` to unpin an option which
+Further, you can specify `--unpin --grafana-baseurl` to unpin an option
+ which
  normally has an argument, and all instances of that argument will be
   removed. If you want to unpin a specific instance of a multi-valued
    option, or one that can be specified more than once with different
     parameter values, then you must provide the value as well, as in
-     `-unpin --log-histograms 'histodata.log:.*:1m'`
+     `--unpin --log-histograms 'histodata.log:.*:1m'`
 
 # Setting defaults, the simple way
 
 To simply set global defaults, you can run nosqlbench with a command
  line like this:
 
-   ./nb -pin --docker-metrics-at metricsnode -pin --annotate all
+   ./nb --pin --docker-metrics-at metricsnode --pin --annotate all
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/ArgsFile.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/ArgsFile.java
index d63480cd6..94dcd4258 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/ArgsFile.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/ArgsFile.java
@@ -19,19 +19,19 @@ import java.util.stream.Collectors;
  *
  * <H1>ArgsFile Selection</H1>
  *
- * During processing, any occurence of '-argsfile' selects the active argsfile and loads
- * it into the command line in place of the '-argsfile' argument. By default the args file
+ * During processing, any occurence of '--argsfile' selects the active argsfile and loads
+ * it into the command line in place of the '--argsfile' argument. By default the args file
  * will be loaded if it exists, and a warning will be given if it does not.
  *
- * The '-argsfile-required &lt;somepath&gt;' version will throw an error if the args file
+ * The '--argsfile-required &lt;somepath&gt;' version will throw an error if the args file
  * is not present, but it will not report any warnings or details otherwise.
  *
- * The `-argsfile-optional &lt;somepath&gt; version will not throw an error if the args
+ * The `--argsfile-optional &lt;somepath&gt; version will not throw an error if the args
  * file is not present, and it will not report any warnings or details otherwise.
  *
  * A prefix command line can be given to ArgsFile to pre-load any settings. In this way
  * it is possible to easily provide a default args file which will be loaded. For example,
- * A prefix command of '-argsfile-optional &lt;somepath&gt;' will load options if they are
+ * A prefix command of '--argsfile-optional &lt;somepath&gt;' will load options if they are
  * available in the specified file, but will otherwise provide no feedback to the user.
  *
  * <H1>ArgsFile Injection</H1>
@@ -92,29 +92,29 @@ public class ArgsFile {
         while (commandline.peekFirst() != null) {
             String arg = commandline.peekFirst();
             switch (arg) {
-                case "-argsfile":
+                case "--argsfile":
                     commandline.removeFirst();
                     String argspath = readWordOrThrow(commandline, "path to an args file");
                     setArgsFile(argspath, Selection.WarnIfMissing);
                     commandline = loadArgs(this.argsPath, Selection.WarnIfMissing, commandline);
                     break;
-                case "-argsfile-required":
+                case "--argsfile-required":
                     commandline.removeFirst();
                     String argspathRequired = readWordOrThrow(commandline, "path to an args file");
                     setArgsFile(argspathRequired, Selection.ErrorIfMissing);
                     commandline = loadArgs(this.argsPath, Selection.ErrorIfMissing, commandline);
                     break;
-                case "-argsfile-optional":
+                case "--argsfile-optional":
                     commandline.removeFirst();
                     String argspathOptional = readWordOrThrow(commandline, "path to an args file");
                     setArgsFile(argspathOptional, Selection.IgnoreIfMissing);
                     commandline = loadArgs(this.argsPath, Selection.IgnoreIfMissing, commandline);
                     break;
-                case "-pin":
+                case "--pin":
                     commandline.removeFirst();
                     commandline = pinArg(commandline);
                     break;
-                case "-unpin":
+                case "--unpin":
                     commandline.removeFirst();
                     commandline = unpinArg(commandline);
                     break;
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
index f0bd65e82..c92aa52f3 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
@@ -26,10 +26,10 @@ public class NBCLIOptions {
 
     // Options which may contextualize other CLI options or commands.
     // These must be parsed first
-    private static final String ARGS_FILE = "-argsfile";
+    private static final String ARGS_FILE = "--argsfile";
     private static final String ARGS_FILE_DEFAULT = "$HOME/.nosqlbench/argsfile";
-    private static final String ARGS_PIN = "-pin";
-    private static final String ARGS_UNPIN = "-unpin";
+    private static final String ARGS_PIN = "--pin";
+    private static final String ARGS_UNPIN = "--unpin";
 
     private static final String INCLUDE = "--include";
     private static final String METRICS_PREFIX = "--metrics-prefix";
@@ -164,7 +164,7 @@ public class NBCLIOptions {
 
     private LinkedList<String> parseGlobalOptions(String[] args) {
         ArgsFile argsfile = new ArgsFile();
-        argsfile.preload("-argsfile-optional", ARGS_FILE_DEFAULT);
+        argsfile.preload("--argsfile-optional", ARGS_FILE_DEFAULT);
 
         LinkedList<String> arglist = new LinkedList<>() {{
             addAll(Arrays.asList(args));
diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/ArgsFileTest.java b/engine-cli/src/test/java/io/nosqlbench/engine/cli/ArgsFileTest.java
index be6b11c59..91bb05ecc 100644
--- a/engine-cli/src/test/java/io/nosqlbench/engine/cli/ArgsFileTest.java
+++ b/engine-cli/src/test/java/io/nosqlbench/engine/cli/ArgsFileTest.java
@@ -13,9 +13,9 @@ public class ArgsFileTest {
     public void testLoadingArgs() {
         LinkedList<String> result;
         ArgsFile argsFile = new ArgsFile();
-        result = argsFile.process("-argsfile", "src/test/resources/argsfiles/nonextant.cli");
+        result = argsFile.process("--argsfile", "src/test/resources/argsfiles/nonextant.cli");
         assertThat(result).containsExactly();
-        result = argsFile.process("-argsfile", "src/test/resources/argsfiles/alphagamma.cli");
+        result = argsFile.process("--argsfile", "src/test/resources/argsfiles/alphagamma.cli");
         assertThat(result).containsExactly("alpha", "gamma");
     }
 
@@ -23,17 +23,18 @@ public class ArgsFileTest {
     public void testLoadingMissingRequiredFails() {
         LinkedList<String> result;
         ArgsFile argsFile = new ArgsFile();
-        result = argsFile.process("-argsfile-required", "src/test/resources/argsfiles/nonextant.cli");
+        result = argsFile.process("--argsfile-required", "src/test/resources/argsfiles/nonextant.cli");
     }
 
     @Test
     public void testLoadingInPlace() {
         LinkedList<String> result;
-        LinkedList<String> commands = new LinkedList<>(List.of("--abc", "--def", "-argsfile", "src/test/resources/argsfiles/alphagamma.cli"));
-        ArgsFile argsFile = new ArgsFile().preload("-argsfile-optional", "src/test/resources/argsfiles/alphagamma.cli");
+        LinkedList<String> commands = new LinkedList<>(List.of("--abc", "--def", "--argsfile", "src/test/resources" +
+                "/argsfiles/alphagamma.cli"));
+        ArgsFile argsFile = new ArgsFile().preload("--argsfile-optional", "src/test/resources/argsfiles/alphagamma" +
+                ".cli");
         result = argsFile.process(commands);
         assertThat(result).containsExactly("alpha", "gamma", "--abc", "--def", "alpha", "gamma");
-
     }
 
 }
\ No newline at end of file

From 2830d070a6f0174ed50d6be1fe7bcbc2de6368f8 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Thu, 29 Oct 2020 10:55:19 -0500
Subject: [PATCH 003/164] simple workload improvements

---
 nb/src/main/resources/examples/sequences.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nb/src/main/resources/examples/sequences.yaml b/nb/src/main/resources/examples/sequences.yaml
index 9f086b582..e82a099a8 100644
--- a/nb/src/main/resources/examples/sequences.yaml
+++ b/nb/src/main/resources/examples/sequences.yaml
@@ -5,6 +5,9 @@
 # eb run driver=stdout workload=examples/sequences cycles=20 seq=bucket
 # yields A B C D B C D C D D A B C D B C D C D D
 
+description: |
+  Demonstration of the different op sequencing strategies
+
 scenarios:
   concat: run driver===stdout seq===concat cycles=20
   bucket: run driver===stdout seq===bucket cycles=20

From 6a8dfef1096821153fb7881a03fb83972096fdbc Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Thu, 29 Oct 2020 10:55:24 -0500
Subject: [PATCH 004/164] qualify grafana docker with tag

---
 .../engine/docker/DockerHelper.java           | 21 ++++++++++++-------
 .../engine/docker/DockerMetricsManager.java   |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java
index fcaf1aa07..812b737b4 100644
--- a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java
+++ b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java
@@ -28,9 +28,9 @@ public class DockerHelper {
     private static final String DOCKER_HOST_ADDR = "unix:///var/run/docker.sock";
 //    private Client rsClient = ClientBuilder.newClient();
 
-    private DockerClientConfig config;
-    private DockerClient dockerClient;
-    private Logger logger = LoggerFactory.getLogger(DockerHelper.class);
+    private final DockerClientConfig config;
+    private final DockerClient dockerClient;
+    private final Logger logger = LoggerFactory.getLogger(DockerHelper.class);
 
     public DockerHelper() {
         System.getProperties().setProperty(DOCKER_HOST, DOCKER_HOST_ADDR);
@@ -56,7 +56,7 @@ public class DockerHelper {
         };
          */
 
-        Container containerId = searchContainer(name, reload);
+        Container containerId = searchContainer(name, reload, tag);
         if (containerId != null) {
             logger.debug("container is already up with the id: " + containerId.getId());
             return null;
@@ -65,15 +65,20 @@ public class DockerHelper {
         Info info = dockerClient.infoCmd().exec();
         dockerClient.buildImageCmd();
 
-        String term = IMG.split("/")[1];
+//        String term = IMG+":"+tag;
+
+//        String term = IMG.split("/")[1];
         //List<SearchItem> dockerSearch = dockerClient.searchImagesCmd(term).exec();
-        List<Image> dockerList = dockerClient.listImagesCmd().withImageNameFilter(IMG).exec();
+        List<Image> dockerList = dockerClient
+                .listImagesCmd()
+                .withImageNameFilter(IMG + ":" + tag)
+                .exec();
         if (dockerList.size() == 0) {
             dockerClient.pullImageCmd(IMG)
                     .withTag(tag)
                     .exec(new PullImageResultCallback()).awaitSuccess();
 
-            dockerList = dockerClient.listImagesCmd().withImageNameFilter(IMG).exec();
+            dockerList = dockerClient.listImagesCmd().withImageNameFilter(IMG + ":" + tag).exec();
             if (dockerList.size() == 0) {
                 logger.error(String.format("Image %s not found, unable to automatically pull image." +
                                 " Check `docker images`",
@@ -178,7 +183,7 @@ public class DockerHelper {
         return false;
     }
 
-    public Container searchContainer(String name, String reload) {
+    public Container searchContainer(String name, String reload, String tag) {
 
         ListContainersCmd listContainersCmd = dockerClient.listContainersCmd().withStatusFilter(List.of("running"));
         listContainersCmd.getFilters().put("name", Arrays.asList(name));
diff --git a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java
index c31957153..eac7a6edd 100644
--- a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java
+++ b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java
@@ -157,7 +157,7 @@ public class DockerMetricsManager {
 
         logger.info("searching for graphite exporter container ip");
 
-        ContainerNetworkSettings settings = dh.searchContainer(name, null).getNetworkSettings();
+        ContainerNetworkSettings settings = dh.searchContainer(name, null, tag).getNetworkSettings();
         Map<String, ContainerNetwork> networks = settings.getNetworks();
         String ip = null;
         for (String key : networks.keySet()) {

From fd74ccba69dd4c3feedd7d6425905b6face4aa4f Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Thu, 29 Oct 2020 10:55:29 -0500
Subject: [PATCH 005/164] move common topics to resources base

---
 devdocs/sketches/argfiles.md                  |  87 ---------------
 engine-cli/src/main/resources/argsfile.md     | 101 ++++++++++++++++++
 .../src/main/resources/docker-metrics.md      |  93 ++++++++++++++++
 .../src/main/resources}/threads.md            |   0
 engine-cli/src/main/resources/topics.md       |   3 +
 .../docs-for-ebhistoric/nb-cli-docs/docker.md |  60 -----------
 6 files changed, 197 insertions(+), 147 deletions(-)
 delete mode 100644 devdocs/sketches/argfiles.md
 create mode 100644 engine-cli/src/main/resources/argsfile.md
 create mode 100644 engine-cli/src/main/resources/docker-metrics.md
 rename {engine-docs/src/main/resources/docs-for-ebhistoric/nb-cli-docs => engine-cli/src/main/resources}/threads.md (100%)
 delete mode 100644 engine-docs/src/main/resources/docs-for-ebhistoric/nb-cli-docs/docker.md

diff --git a/devdocs/sketches/argfiles.md b/devdocs/sketches/argfiles.md
deleted file mode 100644
index b29b34db5..000000000
--- a/devdocs/sketches/argfiles.md
+++ /dev/null
@@ -1,87 +0,0 @@
-# Args Files
-
-An argsfile (Command Line Arguments File) is a simple text file which
- contains defaults for command-line arguments. You can use an args
-  file to contain a set of global defaults that you want to use by
-   default and automatically.
-
-A command, `--argsfile <path>` is used to specify an args file. You can
- use it like an instant import statement in the middle of a command
-  line. Notice that this option uses only a single dash. This
-   distinguishes  the argsfile options from the others in general. These are meta
-   options which can modify how options are loaded, so it is important
-    that the look distinctive from everything else.
-
-## Default argsfile
-
-The default args file location is `$HOME/.nosqlbench/argsfile`. If this
-file is present, it is loaded by nosqlbench when it starts even if you
- don't ask it to. That is, nosqlbench behaves as if your first set of
-  command line arguments is `--argsfile "$HOME/.nosqlbench/argsfile
-  `. However, unlike when you specify `--argsfile ...` explicitly on
-   your command line, this form will not throw an error if the file is
-    missing. This means that when you explicitly ask for an args file
-     to be loaded, and it does not exist, an error is thrown. If you
-      don't ask for it, but the default one does exist, it is loaded
-       automatically before other options are processed.
-
-## Args file format
-
-An args file simply contains an argument on each line, like this:
-
-    --docker-metrics
-    --annotate all
-    --grafana-baseurl http://localhost:3000/
-
-## Pinning options
-
-It is possible to pin an option to the default args file by use of the
- `--pin` meta-option. This option will take the following command line
-  argument and add it to the currently active args file. That means, if
-   you use `--pin --docker-metrics`, then `--docker-metrics` is added to
-    the args file. If there is an exact duplicate of the same option
-     and value, then it is skipped, but if the option name is the same
-      with a different value, then it is added at the end. This allows
-       for options which may be called multiple times normally.
-
-If the `--pin` option occurs after an explicit use of `--argsfile
- <filename>`, then the filename used in this argument is the one that
-  is modified.
-
-After the `--pin` option, the following argument is taken as any global
- option (--with-double-dashes) and any non-option values after it which
-  are not commands (reserved words)
-
-When the `--pin` option is used, it does not cause the pinned option
- to be excluded from the current command line call. The effects of the
-  pinned option will take place in the current nosqlbench invocation
-   just as they would without the `--pin`. However, when pinning global
-    options when there are no commands on the command line, nosqlbench
-     will not run a scenario, so this form is suitable for setting
-      arguments.
-
-As a special case, if the `--pin` is the last option of
-
-## Unpinning options.
-
-To reverse the effect of pinning an option, you simply use
- `--unpin ...`.
-
-The behavior of --unpin is slightly different than --pin. Specifically,
-an option which is unpinned will be removed from the arg list, and will
- not be used in the current invocation of nosqlbench after removal.
-
-Further, you can specify `--unpin --grafana-baseurl` to unpin an option
- which
- normally has an argument, and all instances of that argument will be
-  removed. If you want to unpin a specific instance of a multi-valued
-   option, or one that can be specified more than once with different
-    parameter values, then you must provide the value as well, as in
-     `--unpin --log-histograms 'histodata.log:.*:1m'`
-
-# Setting defaults, the simple way
-
-To simply set global defaults, you can run nosqlbench with a command
- line like this:
-
-   ./nb --pin --docker-metrics-at metricsnode --pin --annotate all
diff --git a/engine-cli/src/main/resources/argsfile.md b/engine-cli/src/main/resources/argsfile.md
new file mode 100644
index 000000000..6dba1011c
--- /dev/null
+++ b/engine-cli/src/main/resources/argsfile.md
@@ -0,0 +1,101 @@
+# Args Files
+
+An argsfile (Command Line Arguments File) is a simple text file which
+contains defaults for command-line arguments. You can use an args
+file to contain a set of global defaults that you want to use by
+default and automatically.
+
+A command, `--argsfile <path>` is used to specify an args file. You can
+use it like an instant import statement in the middle of a command
+line. There are three variants of this option. The `--argsfile <path>`
+variant will warn you if the file doesn't exist. If you want to load
+an argsfile if it exist, but avoid warnings if it doesn't, then use
+the `--argsfile-optional <path>` form. If you want to throw an error if
+the argsfile doesn't exist, then use the `--argsfile-required <path>`
+form.
+
+## Default argsfile
+
+The default args file location is `$NBSTATEDIR/argsfile`.
+
+After the NBSTATEDIR environment variable or default is resolved,
+the default argsfile will be searched for in that directory.
+
+`$NBSTATEDIR` is a mechanism for setting and finding the local state
+directory for NoSQLBench. It is a search path, delimited by
+colons, and allowing Java system properties and shell environment
+variables. When the NBSTATEDIR location is first needed,
+the paths are checked in order, and the first one found is used.
+If one is not found on the filesystem, the first expanded value
+is used to create the state directory.
+ 
+ 
+If the default argsfile is is present, it is loaded by nosqlbench when
+it starts even if you don't ask it to. That is, nosqlbench behaves as
+ if your first set of command line arguments is
+ 
+    --argsfile-optional "$NBSTATEDIR/argsfile    
+
+Just as with the NBSTATEDIR location, the argsfile can also be used
+like a search path. That is, if the value provided is a colon-delimited
+set of possible paths, the first one found (after variable expansion)
+will be used. If needed, the first expanded path will be used to create
+an argsfile when pinning options are used.
+
+## Args file format
+
+An args file simply contains an argument on each line, like this:
+
+    --docker-metrics
+    --annotate all
+    --grafana-baseurl http://localhost:3000/
+
+## Pinning options
+
+It is possible to pin an option to the default args file by use of the
+`--pin` meta-option. This option will take the following command line
+argument and add it to the currently active args file. That means, if
+you use `--pin --docker-metrics`, then `--docker-metrics` is added to
+the args file. If there is an exact duplicate of the same option
+and value, then it is skipped, but if the option name is the same
+with a different value, then it is added at the end. This allows
+for options which may be called multiple times normally.
+
+If the `--pin` option occurs after an explicit use of `--argsfile
+<filename>`, then the filename used in this argument is the one that
+is modified.
+
+After the `--pin` option, the following argument is taken as any global
+option (--with-double-dashes) and any non-option values after it which
+are not commands (reserved words)
+
+When the `--pin` option is used, it does not cause the pinned option
+to be excluded from the current command line call. The effects of the
+pinned option will take place in the current nosqlbench invocation
+just as they would without the `--pin`. However, when pinning global
+options when there are no commands on the command line, nosqlbench
+will not run a scenario, so this form is suitable for setting
+arguments.
+
+## Unpinning options.
+
+To reverse the effect of pinning an option, you simply use
+ `--unpin ...`.
+
+The behavior of --unpin is slightly different than --pin. Specifically,
+an option which is unpinned will be removed from the arg list, and will
+not be used in the current invocation of nosqlbench after removal.
+
+Further, you can specify `--unpin --grafana-baseurl` to unpin an option
+which normally has an argument, and all instances of that argument will be
+removed. If you want to unpin a specific instance of a multi-valued
+option, or one that can be specified more than once with different
+parameter values, then you must provide the value as well, as in
+`--unpin --log-histograms 'histodata.log:.*:1m'`
+
+# Setting defaults, the simple way
+
+To simply set global defaults, you can run nosqlbench with a command
+line like this:
+
+    ./nb --pin --docker-metrics-at metricsnode --pin --annotate all
diff --git a/engine-cli/src/main/resources/docker-metrics.md b/engine-cli/src/main/resources/docker-metrics.md
new file mode 100644
index 000000000..b4039b678
--- /dev/null
+++ b/engine-cli/src/main/resources/docker-metrics.md
@@ -0,0 +1,93 @@
+# docker-metrics
+
+Enlist nosqlbench to stand up your metrics infrastructure using a local 
+docker runtime:
+
+    --docker-metrics
+
+When this option is set, nosqlbench will start graphite, prometheus, 
+and grafana dockers (if-needed) automatically on your local system
+, configure them to work together, and point nosqlbench to send metrics
+and annotations to the system automatically.
+
+The inclued NoSQLBench dashboard uses the default grafana credentials of
+ admin:admin. You can find this dashboard by browsing to the "manage
+  dashboards" section of grafana.
+ 
+# remote docker-metrics
+
+It is possible to use `--docker-metrics` to set up a metrics collector
+stack on one system and use it from multiple other systems. In order
+to point client system at the collector, use an option like this:
+
+    --docker-metrics-at 192.168.192.168
+
+This will configure graphite and grafana annotations to point to
+the docker stack at the configured address.
+
+Further, if you want to do one-time configuration on the collector node
+and other nodes, you can use this pattern:
+
+    # on the collector node
+    ... --pin --docker-metrics
+    
+    # on other nodes
+    ... --pin --docker-metrics-at <collector node ip>
+
+This causes these options to be configured by default in an argsfile
+at `$HOME/.nosqlbench/argsfile`. The options above are pinned to
+be included by default in every command run from that point forward.
+
+## Docker Details
+
+If you want to know exactly what nosqlbench is doing, it's the equivalent
+of running the following by hand:
+
+    # pull and run the graphite-exporter container
+    docker run -d -p 9108:9108 -p 9109:9109 -p 9109:9109/udp prom/graphite-exporter
+
+Configuration files which are used by the docker containers are stored in: 
+
+    $HOME/.nosqlbench
+
+## Resetting docker state
+
+If you need to clear the state for a local docker metrics stack, you
+ can remove these directories.
+
+    # DASHBOARDS AND METRICS WILL BE LOST IF YOU DO THIS  
+    rm ~/.nosqlbench/{grafana,prometheus,prometheus-conf,graphite-exporter}
+
+## Manually installing dockers
+
+    # pull and run the prometheus container
+    docker run -d -p 9090:9090 -v '<USER HOME>/.prometheus:/etc/prometheus' prom/prometheus --config.file=/etc/prometheus/prometheus.yml" --storage.tsdb.path=/prometheus" --storage.tsdb.retention=183d --web.enable-lifecycle
+        
+    # pull and run the grafana container
+    docker run -d -p 3000:3000 -v grafana/grafana
+
+## Experimental environment variables
+
+These may allow you to send snapshot data to a specially configured
+remote grafana instance.
+ 
+    GF_SECURITY_ADMIN_PASSWORD=admin
+    GF_AUTH_ANONYMOUS_ENABLED="true"
+    GF_SNAPSHOTS_EXTERNAL_SNAPSHOT_URL=http://54.165.144.56:3001
+    GF_SNAPSHOTS_EXTERNAL_SNAPSHOT_NAME="Send to Wei"
+
+## Configuration Endpoints (Experimental)
+
+You can use the grafana api to set up the datasource and dashboard
+if you have other tools which integrate with grafana:
+
+    # These are not commands, they are only provides API parameters
+    
+    POST http://localhost:3000/api/dashboards/db
+    analysis.json
+    # (found in resources/docker/dashboards/analysis.json)
+    
+    POST http://localhost:3000/api/datasources
+    prometheus-datasource.yaml
+    # (found in resources/docker/datasources/prometheus-datasource.yaml)
+
diff --git a/engine-docs/src/main/resources/docs-for-ebhistoric/nb-cli-docs/threads.md b/engine-cli/src/main/resources/threads.md
similarity index 100%
rename from engine-docs/src/main/resources/docs-for-ebhistoric/nb-cli-docs/threads.md
rename to engine-cli/src/main/resources/threads.md
diff --git a/engine-cli/src/main/resources/topics.md b/engine-cli/src/main/resources/topics.md
index 14cf57c7b..6541bdd77 100644
--- a/engine-cli/src/main/resources/topics.md
+++ b/engine-cli/src/main/resources/topics.md
@@ -1,3 +1,6 @@
 # global help topics
 - commandline
 - cli-scripting
+- argsfile
+- threads
+- docker-metrics
diff --git a/engine-docs/src/main/resources/docs-for-ebhistoric/nb-cli-docs/docker.md b/engine-docs/src/main/resources/docs-for-ebhistoric/nb-cli-docs/docker.md
deleted file mode 100644
index 8f9900bf0..000000000
--- a/engine-docs/src/main/resources/docs-for-ebhistoric/nb-cli-docs/docker.md
+++ /dev/null
@@ -1,60 +0,0 @@
-## docker metrics
-
-### summary
-
-Enlist nosqlbench to stand up your metrics infrastructure using a local docker runtime:
-
-    --docker-metrics
-
-When this option is set, nosqlbench will start graphite, prometheus, and grafana automatically
-on your local docker, configure them to work together, and point nosqlbench to send metrics
-the system automatically. It also imports a base dashboard for nosqlbench and configures grafana
-snapshot export to share with a central DataStax grafana instance (grafana can be found on localhost:3000
-with the default credentials admin/admin).
-
-### details
-
-If you want to know exactly what nosqlbench is doing, it's the equivalent of running the following by hand:
-
-#### pull and run the graphite-exporter container
-
-    docker run -d -p 9108:9108 -p 9109:9109 -p 9109:9109/udp prom/graphite-exporter
-
-####  prometheus config
-
-place prometheus config in .prometheus:
-
-prometheus.yml (found in resources/docker/prometheus/prometheus.yml)
-
-
-#### pull and run the prometheus container
-
-    docker run -d -p 9090:9090 -v '<USER HOME>/.prometheus:/etc/prometheus' prom/prometheus --config.file=/etc/prometheus/prometheus.yml" --storage.tsdb.path=/prometheus" --storage.tsdb.retention=183d --web.enable-lifecycle
-
-#### pull and run the grafana container
-
-    docker run -d -p 3000:3000 -v grafana/grafana
-
-with the following environment variables:
-
-    GF_SECURITY_ADMIN_PASSWORD=admin
-    GF_AUTH_ANONYMOUS_ENABLED="true"
-    GF_SNAPSHOTS_EXTERNAL_SNAPSHOT_URL=http://54.165.144.56:3001
-    GF_SNAPSHOTS_EXTERNAL_SNAPSHOT_NAME="Send to Wei"
-
-#### configure grafana
-
-use the grafana api to set up the datasource and dashboard
-
-POST
-http://localhost:3000/api/dashboards/db
-
-Payload:
-analysis.json (found in resources/docker/dashboards/analysis.json)
-
-POST
-http://localhost:3000/api/datasources
-
-Payload:
-prometheus-datasource.yaml (found in resources/docker/datasources/prometheus-datasource.yaml)
-

From b5901679123c08de7a6f1726d52b3178f1fad9a1 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Thu, 29 Oct 2020 10:55:33 -0500
Subject: [PATCH 006/164] environment and sys prop support

---
 .../io/nosqlbench/engine/cli/Environment.java | 197 ++++++++++++++++++
 .../engine/cli/EnvironmentTest.java           |  18 ++
 .../src/test/resources/argsfiles/home_env.cli |   1 +
 3 files changed, 216 insertions(+)
 create mode 100644 engine-cli/src/main/java/io/nosqlbench/engine/cli/Environment.java
 create mode 100644 engine-cli/src/test/java/io/nosqlbench/engine/cli/EnvironmentTest.java
 create mode 100644 engine-cli/src/test/resources/argsfiles/home_env.cli

diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/Environment.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/Environment.java
new file mode 100644
index 000000000..adf3da550
--- /dev/null
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/Environment.java
@@ -0,0 +1,197 @@
+package io.nosqlbench.engine.cli;
+
+import io.nosqlbench.nb.api.errors.BasicError;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Safer, Easier lookup of property and environment variables, so
+ * that commonly used env vars as seen on *n*x systems map to stable
+ * system properties where known, but attempt to fall through to
+ * the env variables if not.
+ *
+ * As long as all accesses and mutations for System properties and/or
+ * environment variables are marshaled through a singleton instance
+ * of this class, then users will not easily make a modify-after-reference
+ * bug without a warning or error.
+ *
+ * Referencing a variable here means that a value was asked for under a
+ * name, and a value was returned, even if this was the default value.
+ *
+ * Properties which contains a dot are presumed to be System properties,
+ * and so in that case System properties take precedence for those.
+ *
+ * Environment variables which are known to map to a stable system property
+ * are redirected to the system property.
+ *
+ * Otherwise, the environment variable is checked.
+ *
+ * Finally, System properties are checked for names not containing a dot.
+ *
+ * The first location to return a non-null value is used. Null values are considered
+ * invalid in this API, except when provided as a default value.
+ */
+public class Environment {
+    private final static Logger logger = LoggerFactory.getLogger(Environment.class);
+
+    // package private for testing
+    Environment() {
+    }
+
+    public final static Environment INSTANCE = new Environment();
+
+    private final LinkedHashMap<String, String> references = new LinkedHashMap<>();
+
+    private final static Map<String, String> envToProp = Map.of(
+            "PWD", "user.dir",
+            "HOME", "user.home",
+            "USERNAME", "user.name", // Win*
+            "USER", "user.name", // *n*x
+            "LOGNAME", "user.name" // *n*x
+    );
+
+    public Environment resetRefs() {
+        this.references.clear();
+        return this;
+    }
+
+    public void put(String propname, String value) {
+        if (envToProp.containsKey(propname)) {
+            throw new RuntimeException("The property you are changing should be considered immutable in this " +
+                    "process: '" + propname + "'");
+        }
+        if (references.containsKey(propname)) {
+            if (references.get(propname).equals(value)) {
+                logger.warn("changing already referenced property '" + propname + "' to same value");
+            } else {
+                throw new BasicError("Changing already referenced property '" + propname + "' from \n" +
+                        "'" + references.get(propname) + "' to '" + value + "' is not supported.\n" +
+                        " (maybe you can change the order of your options to set higher-level parameters first.)");
+            }
+
+        }
+        System.setProperty(propname, value);
+    }
+
+    private String reference(String name, String value) {
+        this.references.put(name, value);
+        return value;
+    }
+
+    /**
+     * Return the value in the first place it is found to be non-null,
+     * or the default value otherwise.
+     *
+     * @param name         The system property or environment variable name
+     * @param defaultValue The value to return if the name is not found
+     * @return the system property or environment variable's value, or the default value
+     */
+    public String getOr(String name, String defaultValue) {
+        String value = peek(name);
+        if (value == null) {
+            value = defaultValue;
+        }
+        return reference(name, value);
+    }
+
+    private String peek(String name) {
+        String value = null;
+        if (name.contains(".")) {
+            value = System.getProperty(name.toLowerCase());
+            if (value != null) {
+                return value;
+            }
+        }
+        if (envToProp.containsKey(name.toUpperCase())) {
+            String propName = envToProp.get(name.toUpperCase());
+            logger.debug("redirecting env var '" + name + "' to property '" + propName + "'");
+            value = System.getProperty(propName);
+            if (value != null) {
+                return value;
+            }
+        }
+        value = System.getProperty(name);
+        if (value != null) {
+            return value;
+        }
+
+        value = System.getenv(name);
+        if (value != null) {
+            return value;
+        }
+
+        return null;
+    }
+
+    /**
+     * Attempt to read the variable in System properties or the shell environment. If it
+     * is not found, throw an exception.
+     *
+     * @param name The System property or environment variable
+     * @return the variable
+     * @throws BasicError if no value was found which was non-null
+     */
+    public String get(String name) {
+        String value = getOr(name, null);
+        if (value == null) {
+            throw new BasicError("No variable was found for '" + name + "' in system properties nor in the shell " +
+                    "environment.");
+        }
+        return value;
+    }
+
+    public boolean containsKey(String name) {
+        String value = peek(name);
+        return (value != null);
+    }
+
+    /**
+     * For the given word, if it contains a pattern with '$' followed by alpha, followed
+     * by alphanumeric and underscores, replace this pattern with the system property or
+     * environment variable of the same name. Do this for all occurrences of this pattern.
+     *
+     * For patterns which start with '${' and end with '}', replace the contents with the same
+     * rules as above, but allow any character in between.
+     *
+     * Nesting is not supported.
+     *
+     * @param word The word to interpolate the environment values into
+     * @return The interpolated value, after substitutions, or null if any lookup failed
+     */
+    public Optional<String> interpolate(String word) {
+        Pattern envpattern = Pattern.compile("(\\$(?<env1>[a-zA-Z_][A-Za-z0-9_.]+)|\\$\\{(?<env2>[^}]+)\\})");
+        Matcher matcher = envpattern.matcher(word);
+        StringBuilder sb = new StringBuilder();
+        while (matcher.find()) {
+            String envvar = matcher.group("env1");
+            if (envvar == null) {
+                envvar = matcher.group("env2");
+            }
+            String value = peek(envvar);
+            if (value == null) {
+                logger.debug("no value found for '" + envvar + "', returning Optional.empty() for '" + word + "'");
+                return Optional.empty();
+            } else {
+                value = reference(envvar, value);
+            }
+            matcher.appendReplacement(sb, value);
+        }
+        matcher.appendTail(sb);
+        return Optional.of(sb.toString());
+    }
+
+    public List<String> interpolate(CharSequence delim, String combined) {
+        String[] split = combined.split(delim.toString());
+        List<String> mapped = new ArrayList<>();
+        for (String pattern : split) {
+            Optional<String> interpolated = interpolate(pattern);
+            interpolated.ifPresent(mapped::add);
+        }
+        return mapped;
+    }
+
+}
diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/EnvironmentTest.java b/engine-cli/src/test/java/io/nosqlbench/engine/cli/EnvironmentTest.java
new file mode 100644
index 000000000..c65b069f1
--- /dev/null
+++ b/engine-cli/src/test/java/io/nosqlbench/engine/cli/EnvironmentTest.java
@@ -0,0 +1,18 @@
+package io.nosqlbench.engine.cli;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class EnvironmentTest {
+
+    @Test
+    public void testInterpolation() {
+        Environment env = new Environment();
+        String home1 = env.interpolate("home is '$HOME'").orElse(null);
+        assertThat(home1).matches(".+");
+        String home2 = env.interpolate("home is '${home}'").orElse(null);
+        assertThat(home1).matches(".+");
+    }
+
+}
\ No newline at end of file
diff --git a/engine-cli/src/test/resources/argsfiles/home_env.cli b/engine-cli/src/test/resources/argsfiles/home_env.cli
new file mode 100644
index 000000000..ad8641311
--- /dev/null
+++ b/engine-cli/src/test/resources/argsfiles/home_env.cli
@@ -0,0 +1 @@
+--homedir $HOME
\ No newline at end of file

From 1382d33d12a4c396d87b7bd7d9eb993b3060a472 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Thu, 29 Oct 2020 10:55:38 -0500
Subject: [PATCH 007/164] argsfiles and statedirs

---
 .../io/nosqlbench/engine/cli/ArgsFile.java    | 234 --------
 .../java/io/nosqlbench/engine/cli/NBCLI.java  |  64 +--
 .../nosqlbench/engine/cli/NBCLIArgsFile.java  | 500 ++++++++++++++++++
 .../nosqlbench/engine/cli/NBCLIOptions.java   | 152 ++++--
 .../nosqlbench/engine/cli/ArgsFileTest.java   |  40 --
 .../engine/cli/NBCLIArgsFileTest.java         | 117 ++++
 6 files changed, 768 insertions(+), 339 deletions(-)
 delete mode 100644 engine-cli/src/main/java/io/nosqlbench/engine/cli/ArgsFile.java
 create mode 100644 engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIArgsFile.java
 delete mode 100644 engine-cli/src/test/java/io/nosqlbench/engine/cli/ArgsFileTest.java
 create mode 100644 engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIArgsFileTest.java

diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/ArgsFile.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/ArgsFile.java
deleted file mode 100644
index 94dcd4258..000000000
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/ArgsFile.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package io.nosqlbench.engine.cli;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-/**
- * <H1>Synopsis</H1>
- *
- * ArgsFile is a command-line modifier which can take linked list of
- * command args and modify it, and/or modify argsfile refrenced in this way.
- *
- * <H1>ArgsFile Selection</H1>
- *
- * During processing, any occurence of '--argsfile' selects the active argsfile and loads
- * it into the command line in place of the '--argsfile' argument. By default the args file
- * will be loaded if it exists, and a warning will be given if it does not.
- *
- * The '--argsfile-required &lt;somepath&gt;' version will throw an error if the args file
- * is not present, but it will not report any warnings or details otherwise.
- *
- * The `--argsfile-optional &lt;somepath&gt; version will not throw an error if the args
- * file is not present, and it will not report any warnings or details otherwise.
- *
- * A prefix command line can be given to ArgsFile to pre-load any settings. In this way
- * it is possible to easily provide a default args file which will be loaded. For example,
- * A prefix command of '--argsfile-optional &lt;somepath&gt;' will load options if they are
- * available in the specified file, but will otherwise provide no feedback to the user.
- *
- * <H1>ArgsFile Injection</H1>
- *
- * When an argsfile is loaded, it reads a command from each line into the current position
- * of the command line. No parsing is done. Blank lines are ignored. Newlines are used as the
- * argument delimiter, and lines that end with a backslash before the newline are automatically
- * joined together.
- *
- * <H1>ArgsFile Diagnostics</H1>
- *
- * All modifications to the command line should be reported to the logging facility at
- * INFO level. This assumes that the calling layer wants to inform users of command line injections,
- * and that the user can select to be notified of warnings only if desired.
- *
- * <H1>Environment Variables</H1>
- *
- * Simple environment variable substitution is attempted for any pattern which appears as '$' followed
- * by all uppercase letters and underscores. Any references of this type which are not resolvable
- * will cause an error to be thrown.
- */
-public class ArgsFile {
-    private final static Logger logger = LoggerFactory.getLogger(ArgsFile.class);
-
-    private Path argsPath;
-    private LinkedList<String> preload;
-
-    public ArgsFile() {
-    }
-
-    public ArgsFile preload(String... preload) {
-        this.preload = new LinkedList<String>(Arrays.asList(preload));
-        return this;
-    }
-
-    private enum Selection {
-        // Ignore if not present, show injections at info
-        IgnoreIfMissing,
-        // Warn if not present, but show injections at info
-        WarnIfMissing,
-        // throw error if not present, show injections at info
-        ErrorIfMissing
-    }
-
-    public LinkedList<String> process(String... args) {
-        return process(new LinkedList<String>(Arrays.asList(args)));
-    }
-
-    public LinkedList<String> process(LinkedList<String> commandline) {
-        if (preload != null) {
-            LinkedList<String> modified = new LinkedList<String>();
-            modified.addAll(preload);
-            modified.addAll(commandline);
-            preload = null;
-            commandline = modified;
-        }
-        LinkedList<String> composed = new LinkedList<>();
-        while (commandline.peekFirst() != null) {
-            String arg = commandline.peekFirst();
-            switch (arg) {
-                case "--argsfile":
-                    commandline.removeFirst();
-                    String argspath = readWordOrThrow(commandline, "path to an args file");
-                    setArgsFile(argspath, Selection.WarnIfMissing);
-                    commandline = loadArgs(this.argsPath, Selection.WarnIfMissing, commandline);
-                    break;
-                case "--argsfile-required":
-                    commandline.removeFirst();
-                    String argspathRequired = readWordOrThrow(commandline, "path to an args file");
-                    setArgsFile(argspathRequired, Selection.ErrorIfMissing);
-                    commandline = loadArgs(this.argsPath, Selection.ErrorIfMissing, commandline);
-                    break;
-                case "--argsfile-optional":
-                    commandline.removeFirst();
-                    String argspathOptional = readWordOrThrow(commandline, "path to an args file");
-                    setArgsFile(argspathOptional, Selection.IgnoreIfMissing);
-                    commandline = loadArgs(this.argsPath, Selection.IgnoreIfMissing, commandline);
-                    break;
-                case "--pin":
-                    commandline.removeFirst();
-                    commandline = pinArg(commandline);
-                    break;
-                case "--unpin":
-                    commandline.removeFirst();
-                    commandline = unpinArg(commandline);
-                    break;
-                default:
-                    composed.addLast(commandline.removeFirst());
-            }
-
-        }
-        return composed;
-    }
-
-    private LinkedList<String> loadArgs(Path argspath, Selection mode, LinkedList<String> commandline) {
-        if (!assertArgsFileExists(argspath, mode)) {
-            return commandline;
-        }
-        List<String> lines = null;
-        try {
-            lines = Files.readAllLines(argspath);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        List<String> content = lines.stream()
-                .filter(s -> !s.startsWith("#"))
-                .filter(s -> !s.startsWith("/"))
-                .filter(s -> !s.isBlank())
-                .filter(s -> !s.isEmpty())
-                .collect(Collectors.toList());
-        StringBuilder splitword = new StringBuilder();
-        LinkedList<String> loaded = new LinkedList<>();
-        for (String s : content) {
-            splitword.append(s);
-            if (!s.endsWith("\\")) {
-                loaded.addLast(splitword.toString());
-                splitword.setLength(0);
-            } else {
-                splitword.setLength(splitword.length() - 1);
-            }
-        }
-        if (splitword.length() > 0) {
-            throw new RuntimeException("unqualified line continuation for '" + splitword.toString() + "'");
-        }
-
-        Iterator<String> injections = loaded.descendingIterator();
-        while (injections.hasNext()) {
-            String injection = injections.next();
-            injection = injectEnv(injection);
-            commandline.addFirst(injection);
-        }
-
-        return commandline;
-    }
-
-    private boolean assertArgsFileExists(Path argspath, Selection mode) {
-        if (!Files.exists(argsPath)) {
-            switch (mode) {
-                case ErrorIfMissing:
-                    throw new RuntimeException("A required argsfile was specified, but it does not exist: '" + argspath + "'");
-                case WarnIfMissing:
-                    logger.warn("An argsfile was specified, but it does not exist: '" + argspath + "'");
-                case IgnoreIfMissing:
-            }
-            return false;
-        }
-        return true;
-    }
-
-    private void setArgsFile(String argspath, Selection mode) {
-        this.argsPath = Path.of(argspath);
-//        assertIfMissing(this.argsPath,mode);
-    }
-
-    private String readWordOrThrow(LinkedList<String> commandline, String description) {
-        String found = commandline.peekFirst();
-        if (found == null) {
-            throw new RuntimeException("Unable to read argument top option for " + description);
-        }
-        return commandline.removeFirst();
-    }
-
-    private LinkedList<String> pinArg(LinkedList<String> commandline) {
-        if (this.argsPath == null) {
-            throw new RuntimeException("No argsfile has been selected before using the pin option.");
-        }
-        return commandline;
-    }
-
-    private LinkedList<String> unpinArg(LinkedList<String> commandline) {
-        if (this.argsPath == null) {
-            throw new RuntimeException("No argsfile has been selected before using the unpin option.");
-        }
-        return commandline;
-    }
-
-    private String injectEnv(String word) {
-        Pattern envpattern = Pattern.compile("(?<envvar>\\$[A-Z_]+)");
-        Matcher matcher = envpattern.matcher(word);
-        StringBuilder sb = new StringBuilder();
-        while (matcher.find()) {
-            String envvar = matcher.group("envvar");
-            String value = System.getenv(envvar);
-            if (value == null) {
-                throw new RuntimeException("Env var '" + envvar + "' was not found in the environment.");
-            }
-            matcher.appendReplacement(sb, value);
-        }
-        matcher.appendTail(sb);
-        return sb.toString();
-    }
-
-    public LinkedList<String> pin(LinkedList<String> arglist) {
-        return arglist;
-    }
-
-    public LinkedList<String> unpin(LinkedList<String> arglist) {
-        return arglist;
-    }
-}
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
index 57caa129d..db6f08530 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
@@ -39,10 +39,10 @@ import java.util.stream.Collectors;
 
 public class NBCLI {
 
-    private static final Logger logger = LoggerFactory.getLogger(NBCLI.class);
+    private static final Logger logger = LoggerFactory.getLogger("NBCLI");
     private static final Logger EVENTS = LoggerFactory.getLogger("EVENTS");
-    private static final String CHART_HDR_LOG_NAME = "hdrdata-for-chart.log";
 
+    private static final String CHART_HDR_LOG_NAME = "hdrdata-for-chart.log";
 
     private final String commandName;
 
@@ -70,36 +70,43 @@ public class NBCLI {
         NBCLIOptions globalOptions = new NBCLIOptions(args, NBCLIOptions.Mode.ParseGlobalsOnly);
 
         // Global only processing
+        if (args.length == 0) {
+            System.out.println(loadHelpFile("commandline.md"));
+            System.exit(0);
+        }
 
+        boolean dockerMetrics = globalOptions.wantsDockerMetrics();
+        String dockerMetricsAt = globalOptions.wantsDockerMetricsAt();
         String reportGraphiteTo = globalOptions.wantsReportGraphiteTo();
+        int mOpts = (dockerMetrics ? 1 : 0) + (dockerMetricsAt != null ? 1 : 0) + (reportGraphiteTo != null ? 1 : 0);
+        if (mOpts > 1) {
+            throw new BasicError("You have multiple conflicting options which attempt to set\n" +
+                    " the destination for metrics and annotations. Please select only one of\n" +
+                    " --docker-metrics, --docker-metrics-at <addr>, or --report-graphite-to <addr>\n" +
+                    " For more details, see run 'nb help docker-metrics'");
+        }
 
-        if (globalOptions.wantsDockerMetrics()) {
+        String metricsAddr = null;
+
+        if (dockerMetrics) {
+            // Setup docker stack for local docker metrics
             logger.info("Docker metrics is enabled. Docker must be installed for this to work");
             DockerMetricsManager dmh = new DockerMetricsManager();
             Map<String, String> dashboardOptions = Map.of(
-                DockerMetricsManager.GRAFANA_TAG, globalOptions.getDockerGrafanaTag()
+                    DockerMetricsManager.GRAFANA_TAG, globalOptions.getDockerGrafanaTag()
             );
             dmh.startMetrics(dashboardOptions);
-
             String warn = "Docker Containers are started, for grafana and prometheus, hit" +
-                " these urls in your browser: http://<host>:3000 and http://<host>:9090";
+                    " these urls in your browser: http://<host>:3000 and http://<host>:9090";
             logger.warn(warn);
-            if (reportGraphiteTo != null) {
-                logger.warn(String.format("Docker metrics are enabled (--docker-metrics)" +
-                                " but graphite reporting (--report-graphite-to) is set to %s \n" +
-                                "usually only one of the two is configured.",
-                        reportGraphiteTo));
-            } else {
-                logger.info("Setting graphite reporting to localhost");
-                reportGraphiteTo = "localhost:9109";
-            }
+            metricsAddr = "localhost";
+        } else if (dockerMetricsAt != null) {
+            metricsAddr = dockerMetricsAt;
+        }
 
-            if (globalOptions.getAnnotatorsConfig() != null) {
-                logger.warn("Docker metrics and separate annotations" +
-                        "are configured (both --docker-metrics and --annotations).");
-            } else {
-                Annotators.init("grafana{http://localhost:3000/}");
-            }
+        if (metricsAddr != null) {
+            reportGraphiteTo = metricsAddr + ":9109";
+            Annotators.init("{type:'grafana',url:'http://" + metricsAddr + ":3000/'}");
         }
 
         if (args.length > 0 && args[0].toLowerCase().equals("virtdata")) {
@@ -275,13 +282,6 @@ public class NBCLI {
         // intentionally not shown for warn-only
         logger.info("console logging level is " + options.wantsConsoleLogLevel());
 
-        if (options.getCommands().
-
-                size() == 0) {
-            System.out.println(loadHelpFile("commandline.md"));
-            System.exit(0);
-        }
-
         ScenariosExecutor executor = new ScenariosExecutor("executor-" + sessionName, 1);
 
         Scenario scenario = new Scenario(
@@ -311,8 +311,6 @@ public class NBCLI {
         }
 
 
-        // Execute Scenario!
-
         Level consoleLogLevel = options.wantsConsoleLogLevel();
         Level scenarioLogLevel = Level.toLevel(options.getLogsLevel());
         if (scenarioLogLevel.toInt() > consoleLogLevel.toInt()) {
@@ -321,6 +319,12 @@ public class NBCLI {
 
         Level maxLevel = Level.toLevel(Math.min(consoleLogLevel.toInt(), scenarioLogLevel.toInt()));
 
+        // Execute Scenario!
+        if (options.getCommands().size() == 0) {
+            logger.info("No commands provided. Exiting before scenario.");
+            System.exit(0);
+        }
+
         scenario.addScriptText(scriptData);
         ScriptParams scriptParams = new ScriptParams();
         scriptParams.putAll(buffer.getCombinedParams());
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIArgsFile.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIArgsFile.java
new file mode 100644
index 000000000..ec047e94f
--- /dev/null
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIArgsFile.java
@@ -0,0 +1,500 @@
+package io.nosqlbench.engine.cli;
+
+import io.nosqlbench.nb.api.errors.BasicError;
+import joptsimple.internal.Strings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.PosixFilePermissions;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <H1>Synopsis</H1>
+ *
+ * ArgsFile is a command-line modifier which can take linked list of
+ * command args and modify it, and/or modify argsfile refrenced in this way.
+ *
+ * <H1>ArgsFile Selection</H1>
+ *
+ * During processing, any occurence of '--argsfile' selects the active argsfile and loads
+ * it into the command line in place of the '--argsfile' argument. By default the args file
+ * will be loaded if it exists, and a warning will be given if it does not.
+ *
+ * The '--argsfile-required &lt;somepath&gt;' version will throw an error if the args file
+ * is not present, but it will not report any warnings or details otherwise.
+ *
+ * The `--argsfile-optional &lt;somepath&gt; version will not throw an error if the args
+ * file is not present, and it will not report any warnings or details otherwise.
+ *
+ * A prefix command line can be given to ArgsFile to pre-load any settings. In this way
+ * it is possible to easily provide a default args file which will be loaded. For example,
+ * A prefix command of '--argsfile-optional &lt;somepath&gt;' will load options if they are
+ * available in the specified file, but will otherwise provide no feedback to the user.
+ *
+ * <H1>ArgsFile Injection</H1>
+ *
+ * When an argsfile is loaded, it reads a command from each line into the current position
+ * of the command line. No parsing is done. Blank lines are ignored. Newlines are used as the
+ * argument delimiter, and lines that end with a backslash before the newline are automatically
+ * joined together.
+ *
+ * <H1>ArgsFile Diagnostics</H1>
+ *
+ * All modifications to the command line should be reported to the logging facility at
+ * INFO level. This assumes that the calling layer wants to inform users of command line injections,
+ * and that the user can select to be notified of warnings only if desired.
+ *
+ * <H1>Environment Variables</H1>
+ *
+ * Simple environment variable substitution is attempted for any pattern which appears as '$' followed
+ * by all uppercase letters and underscores. Any references of this type which are not resolvable
+ * will cause an error to be thrown.
+ */
+public class NBCLIArgsFile {
+    private final static Logger logger = LoggerFactory.getLogger("ARGSFILE");
+
+    // Options which may contextualize other CLI options or commands.
+    // These must be parsed first
+    public static final String ARGS_FILE = "--argsfile";
+    public static final String ARGS_FILE_OPTIONAL = "--argsfile-optional";
+    public static final String ARGS_FILE_REQUIRED = "--argsfile-required";
+    public static final String ARGS_PIN = "--pin";
+    public static final String ARGS_UNPIN = "--unpin";
+
+    private Path argsPath;
+    private LinkedList<String> preload;
+    private final Set<String> stopWords = new HashSet<>();
+    private final LinkedHashSet<String> args = new LinkedHashSet<>();
+    LinkedHashSet<String> argsToPin = new LinkedHashSet<>();
+    LinkedHashSet<String> argsToUnpin = new LinkedHashSet<>();
+    private final Set<String> readPaths = new HashSet<>();
+
+    public NBCLIArgsFile() {
+    }
+
+    public NBCLIArgsFile preload(String... preload) {
+        this.preload = new LinkedList<String>(Arrays.asList(preload));
+        return this;
+    }
+
+    /**
+     * Indicate which words are invalid for the purposes of matching
+     * trailing parts of arguments. The provided words will not
+     * be considered as valid values to arguments in any case.
+     *
+     * @param reservedWords Words to ignore in option values
+     * @return this ArgsFile, for method chaining
+     */
+    public NBCLIArgsFile reserved(Collection<String> reservedWords) {
+        this.stopWords.addAll(reservedWords);
+        return this;
+    }
+
+    /**
+     * Indicate which words are invalid for the purposes of matching
+     * trailing parts of arguments. The provided words will not
+     * be considered as valid values to arguments in any case.
+     *
+     * @param reservedWords Words to ignore in option values
+     * @return this ArgsFile, for method chaining
+     */
+    public NBCLIArgsFile reserved(String... reservedWords) {
+        this.stopWords.addAll(Arrays.asList(reservedWords));
+        return this;
+    }
+
+    private enum Selection {
+        // Ignore if not present, show injections at info
+        IgnoreIfMissing,
+        // Warn if not present, but show injections at info
+        WarnIfMissing,
+        // throw error if not present, show injections at info
+        ErrorIfMissing
+    }
+
+    public LinkedList<String> process(String... args) {
+        return process(new LinkedList<String>(Arrays.asList(args)));
+    }
+
+    public LinkedList<String> process(LinkedList<String> commandline) {
+        if (preload != null) {
+            LinkedList<String> modified = new LinkedList<String>();
+            modified.addAll(preload);
+            modified.addAll(commandline);
+            preload = null;
+            commandline = modified;
+        }
+        LinkedList<String> composed = new LinkedList<>();
+
+        while (commandline.peekFirst() != null) {
+            String arg = commandline.peekFirst();
+            switch (arg) {
+                case ARGS_FILE:
+                    pinAndUnpin();
+                    commandline.removeFirst();
+                    String argspath = readWordOrThrow(commandline, "path to an args file");
+                    setArgsFile(argspath, Selection.WarnIfMissing);
+                    commandline = mergeArgs(this.argsPath, Selection.WarnIfMissing, commandline);
+                    break;
+                case ARGS_FILE_REQUIRED:
+                    commandline.removeFirst();
+                    String argspathRequired = readWordOrThrow(commandline, "path to an args file");
+                    setArgsFile(argspathRequired, Selection.ErrorIfMissing);
+                    commandline = mergeArgs(this.argsPath, Selection.ErrorIfMissing, commandline);
+                    break;
+                case ARGS_FILE_OPTIONAL:
+                    commandline.removeFirst();
+                    String argspathOptional = readWordOrThrow(commandline, "path to an args file");
+                    setArgsFile(argspathOptional, Selection.IgnoreIfMissing);
+                    commandline = mergeArgs(this.argsPath, Selection.IgnoreIfMissing, commandline);
+                    break;
+                case ARGS_PIN:
+                    commandline.removeFirst();
+                    argsToPin.addAll(argsToLines(readOptionAndArg(commandline, false)));
+                    break;
+                case ARGS_UNPIN:
+                    commandline.removeFirst();
+                    argsToUnpin.addAll(argsToLines(readOptionAndArg(commandline, true)));
+                    break;
+                default:
+                    composed.addLast(commandline.removeFirst());
+            }
+        }
+        pinAndUnpin();
+        return composed;
+    }
+
+    private void pinAndUnpin() {
+        if (this.argsToUnpin.size() == 0 && this.argsToPin.size() == 0) {
+            return;
+        }
+        LinkedHashSet<String> extant = readArgsFile(this.argsPath, Selection.IgnoreIfMissing);
+        LinkedHashSet<String> mergedPins = mergePins(this.argsToPin, this.argsToUnpin, extant);
+        if (extant.equals(mergedPins)) {
+            logger.info("Pinning resulted in no changes to argsfile '" + this.argsPath.toString() + "'");
+        } else {
+            logger.info("Writing updated argsfile '" + this.argsPath.toString() + "' with " +
+                    (this.argsToPin.size() + this.argsToUnpin.size()) + " changes");
+            writeArgsFile(mergedPins);
+        }
+
+        this.argsToPin.clear();
+        this.argsToUnpin.clear();
+
+    }
+
+
+    private LinkedHashSet<String> mergePins(
+            LinkedHashSet<String> toPin,
+            LinkedHashSet<String> toUnpin,
+            LinkedHashSet<String> extant) {
+
+        LinkedHashSet<String> merged = new LinkedHashSet<>();
+        merged.addAll(extant);
+
+        for (String arg : toPin) {
+            if (argsToUnpin.contains(arg)) {
+                throw new RuntimeException("You have both --pin and --unpin for '" + arg + ", I don't know which " +
+                        "one you want.");
+            }
+        }
+        for (String arg : toUnpin) {
+            if (argsToPin.contains(arg)) {
+                throw new RuntimeException("You have both --pin and --unpin for '" + arg + ", I don't know which " +
+                        "one you want.");
+            }
+        }
+
+        for (String toAdd : toPin) {
+            if (merged.contains(toAdd)) {
+                logger.warn("Requested to pin argument again: '" + toAdd + "', ignoring");
+            } else {
+                logger.info("Pinning option '" + toAdd + "' to '" + this.argsPath.toString() + "'");
+                merged.add(toAdd);
+            }
+        }
+
+        for (String toDel : toUnpin) {
+            if (merged.contains(toDel)) {
+                logger.info("Unpinning '" + toDel + "' from '" + this.argsPath.toString() + "'");
+                merged.remove(toDel);
+            } else {
+                logger.warn("Requested to unpin argument '" + toDel + "' which was not found in " + argsPath.toString());
+            }
+        }
+
+        return merged;
+    }
+
+    LinkedList<String> mergeArgs(Path argspath, Selection mode, LinkedList<String> commandline) {
+        this.args.clear();
+        if (this.readPaths.contains(argsPath.toString())) {
+            throw new BasicError("Recursive reading of argsfile is detected for '" + argspath.toString() + "'.\n" +
+                    "Please ensure that you do not have cyclic references in your arguments for argsfiles.");
+        }
+        LinkedHashSet<String> loaded = readArgsFile(argspath, mode);
+        this.readPaths.add(argsPath.toString());
+
+        List<String> interpolated = loaded.stream()
+                .map(p -> {
+                    String q = Environment.INSTANCE.interpolate(p).orElse(p);
+                    if (!q.equals(p)) {
+                        logger.info("argsfile: '" + argsPath.toString() + "': loaded option '" + p + "' as '" + q + "'");
+                    }
+                    return q;
+                })
+                .collect(Collectors.toList());
+
+        LinkedList<String> inArgvForm = linesToArgs(interpolated);
+        this.args.addAll(inArgvForm);
+        return concat(inArgvForm, commandline);
+    }
+
+    private LinkedList<String> concat(Collection<String>... entries) {
+        LinkedList<String> composed = new LinkedList<>();
+        for (Collection<String> list : entries) {
+            composed.addAll(list);
+        }
+        return composed;
+    }
+
+    /**
+     * <p>Load the args file into an args array. The returned format follows
+     * the standard pattern of args as you would see for a main method, although
+     * the internal format is structured to support easy editing and clarity.</p>
+     *
+     * <p>
+     * The args file is stored in a simple option-per-line format which
+     * follows these rules:
+     * <UL>
+     * <LI>Lines ending with a backslash (\) only are concatenated to the next
+     * line with the backslash removed.
+     * <LI>Line content consists of one option and one optional argument.</LI>
+     * <LI>Options must start with at least one dash (-).</LI>
+     * <LI>If an argument is provided for an option, it follows the option and a space.</LI>
+     * <LI>Empty lines and lines which start with '//' or '#' are ignored.</LI>
+     * <LI>Lines which are identical after applying the above rules are elided
+     * down to the last occurence.</LI>
+     * </UL>
+     * </p>
+     *
+     * <p>
+     * This allows for multi-valued options, or options which can be specified multiple
+     * times with different arguments to be supported, so long as each occurrence has a
+     * unique option value.
+     * </p>
+     *
+     * @param argspath The path of the argsfile to load
+     * @param mode     The level of feedback to provide in the case of a missing file
+     * @return The argsfile content, structured like an args array
+     */
+    private LinkedHashSet<String> readArgsFile(Path argspath, Selection mode) {
+        LinkedHashSet<String> args = new LinkedHashSet<>();
+
+        if (!assertArgsFileExists(argspath, mode)) {
+            return args;
+        }
+
+        List<String> lines = null;
+        try {
+            lines = Files.readAllLines(argspath);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        List<String> content = lines.stream()
+                .filter(s -> !s.startsWith("#"))
+                .filter(s -> !s.startsWith("/"))
+                .filter(s -> !s.isBlank())
+                .filter(s -> !s.isEmpty())
+                .collect(Collectors.toList());
+        StringBuilder splitword = new StringBuilder();
+        LinkedHashSet<String> loaded = new LinkedHashSet<>();
+        for (String s : content) {
+            splitword.append(s);
+            if (!s.endsWith("\\")) {
+                loaded.add(splitword.toString());
+                splitword.setLength(0);
+            } else {
+                splitword.setLength(splitword.length() - 1);
+            }
+        }
+        if (splitword.length() > 0) {
+            throw new RuntimeException("unqualified line continuation for '" + splitword.toString() + "'");
+        }
+
+        return loaded;
+    }
+
+    /**
+     * Write the argsfile in the format specified by {@link #readArgsFile(Path, Selection)}
+     *
+     * This method requires that an argsFile has been set by a previous
+     * --argsfile or --argsfile-required or --argsfile-optional option.
+     *
+     * @param args The args to write in one-arg-per-line form
+     */
+    private void writeArgsFile(LinkedHashSet<String> args) {
+        if (this.argsPath == null) {
+            throw new RuntimeException("No argsfile has been selected before using the pin option.");
+        }
+
+        try {
+            Files.createDirectories(
+                    this.argsPath.getParent(),
+                    PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwxrwx---"))
+            );
+            Files.write(this.argsPath, args);
+        } catch (IOException e) {
+            throw new BasicError("unable to write '" + this.argsPath + "': " + e.getMessage());
+        }
+    }
+
+    private boolean assertArgsFileExists(Path argspath, Selection mode) {
+        if (!Files.exists(argsPath)) {
+            switch (mode) {
+                case ErrorIfMissing:
+                    throw new RuntimeException("A required argsfile was specified, but it does not exist: '" + argspath + "'");
+                case WarnIfMissing:
+                    logger.warn("An argsfile was specified, but it does not exist: '" + argspath + "'");
+                case IgnoreIfMissing:
+            }
+            return false;
+        }
+        return true;
+    }
+
+    private void setArgsFile(String argspath, Selection mode) {
+        Path selected = null;
+        String[] possibles = argspath.split(":");
+        for (String possible : possibles) {
+            Optional<String> expanded = Environment.INSTANCE.interpolate(possible);
+            if (expanded.isPresent()) {
+                Path possiblePath = Path.of(expanded.get());
+                if (Files.exists(possiblePath)) {
+                    selected = possiblePath;
+                    break;
+                }
+            }
+        }
+
+        if (selected == null) {
+            String defaultFirst = possibles[0];
+            defaultFirst = Environment.INSTANCE.interpolate(defaultFirst)
+                    .orElseThrow(() -> new RuntimeException("Invalid default argsfile: '" + possibles[0] + "'"));
+            selected = Path.of(defaultFirst);
+        }
+
+        this.argsPath = selected;
+        logger.debug("argsfile path is now '" + this.argsPath.toString() + "'");
+    }
+
+    /**
+     * Convert argv arguments to consolidated form which is used in the args file.
+     * This means that options and their (optional) arguments are on the
+     * same line, concatenated with a space after the option.
+     *
+     * @return The arg-per-line form
+     */
+    LinkedHashSet<String> argsToLines(List<String> args) {
+        LinkedHashSet<String> lines = new LinkedHashSet<>();
+        Iterator<String> iter = args.iterator();
+        List<String> element = new ArrayList<>();
+        while (iter.hasNext()) {
+            String word = iter.next();
+            if (word.startsWith("-")) {
+                if (element.size() > 0) {
+                    lines.add(Strings.join(element, " "));
+                    element.clear();
+                }
+            }
+            element.add(word);
+        }
+        lines.add(Strings.join(element, " "));
+        return lines;
+    }
+
+    /**
+     * Convert arg lines as used in an args file to the argv which
+     * is used on the command line.
+     *
+     * @return The argv list as you would see with {@code main(String[] argv)}
+     */
+    LinkedList<String> linesToArgs(Collection<String> lines) {
+        LinkedList<String> args = new LinkedList<>();
+        for (String line : lines) {
+            if (line.startsWith("-")) {
+                String[] words = line.split(" ", 2);
+                args.addAll(Arrays.asList(words));
+            } else {
+                args.add(line);
+            }
+        }
+        return args;
+    }
+
+    private LinkedList<String> unpin(LinkedList<String> arglist) {
+        if (this.argsPath == null) {
+            throw new RuntimeException("No argsfile has been selected before using the pin option.");
+        }
+        return arglist;
+    }
+
+    /**
+     * Read the current command line option from the argument list,
+     * so long as it is a dash or double-dash option, and is not a
+     * reserved word, and any argument that goes with it, if any.
+     *
+     * @param arglist The command line containing the option
+     * @return A list containing the current command line option
+     */
+    private LinkedList<String> readOptionAndArg(LinkedList<String> arglist, boolean consume) {
+        LinkedList<String> option = new LinkedList<>();
+        ListIterator<String> iter = arglist.listIterator();
+
+        if (!iter.hasNext()) {
+            throw new RuntimeException("Arguments must follow the --pin option");
+        }
+        String opt = iter.next();
+
+        if (!opt.startsWith("-") || stopWords.contains(opt)) {
+            throw new RuntimeException("Arguments following the --pin option must not" +
+                    " be commands like '" + opt + "'");
+        }
+        option.add(opt);
+        if (consume) {
+            iter.remove();
+        }
+
+        if (iter.hasNext()) {
+            opt = iter.next();
+            if (!stopWords.contains(opt) && !opt.startsWith("-")) {
+                option.add(opt);
+                if (consume) {
+                    iter.remove();
+                }
+            }
+        }
+        return option;
+    }
+
+
+    /**
+     * Consume the next word from the beginning of the linked list. If there is
+     * no word to consume, then throw an error with the description.
+     *
+     * @param commandline A list of words
+     * @param description A description of what the next word value is meant to represent
+     * @return The next word from the list
+     */
+    private String readWordOrThrow(LinkedList<String> commandline, String description) {
+        String found = commandline.peekFirst();
+        if (found == null) {
+            throw new RuntimeException("Unable to read argument top option for " + description);
+        }
+        return commandline.removeFirst();
+    }
+}
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
index c92aa52f3..fe0398152 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
@@ -4,11 +4,15 @@ import ch.qos.logback.classic.Level;
 import io.nosqlbench.engine.api.metrics.IndicatorMode;
 import io.nosqlbench.engine.api.util.Unit;
 import io.nosqlbench.engine.core.script.Scenario;
+import io.nosqlbench.nb.api.errors.BasicError;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.attribute.PosixFilePermissions;
 import java.security.InvalidParameterException;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -19,19 +23,16 @@ import java.util.stream.Collectors;
  */
 public class NBCLIOptions {
 
-    private final static String userHome = System.getProperty("user.home");
-    private final static Path defaultOptFile = Path.of(userHome, ".nosqlbench/options");
-
-    private final static Logger logger = LoggerFactory.getLogger(NBCLIOptions.class);
-
-    // Options which may contextualize other CLI options or commands.
-    // These must be parsed first
-    private static final String ARGS_FILE = "--argsfile";
-    private static final String ARGS_FILE_DEFAULT = "$HOME/.nosqlbench/argsfile";
-    private static final String ARGS_PIN = "--pin";
-    private static final String ARGS_UNPIN = "--unpin";
+    private final static Logger logger = LoggerFactory.getLogger("OPTIONS");
 
+    private final static String NB_STATE_DIR = "--statedir";
+    private final static String NB_STATEDIR_PATHS = "$NBSTATEDIR:$PWD/.nosqlbench:$HOME/.nosqlbench";
+    public static final String ARGS_FILE_DEFAULT = "$NBSTATEDIR/argsfile";
     private static final String INCLUDE = "--include";
+
+    private final static String userHome = System.getProperty("user.home");
+
+
     private static final String METRICS_PREFIX = "--metrics-prefix";
 
     //    private static final String ANNOTATE_TO_GRAFANA = "--grafana-baseurl";
@@ -39,7 +40,6 @@ public class NBCLIOptions {
     private static final String ANNOTATORS_CONFIG = "--annotators";
     private static final String DEFAULT_ANNOTATORS = "all";
 
-
     // Discovery
     private static final String HELP = "--help";
     private static final String LIST_METRICS = "--list-metrics";
@@ -91,6 +91,7 @@ public class NBCLIOptions {
     private static final String DOCKER_GRAFANA_TAG = "--docker-grafana-tag";
 
     private static final String DEFAULT_CONSOLE_LOGGING_PATTERN = "%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n";
+    public static final String NBSTATEDIR = "NBSTATEDIR";
 
     private final LinkedList<Cmd> cmdList = new LinkedList<>();
     private int logsMax = 0;
@@ -130,13 +131,16 @@ public class NBCLIOptions {
     private Scenario.Engine engine = Scenario.Engine.Graalvm;
     private boolean graaljs_compat = false;
     private int hdr_digits = 4;
-    private String docker_grafana_tag = "7.0.1";
+    private String docker_grafana_tag = "7.2.2";
     private boolean showStackTraces = false;
     private boolean compileScript = false;
     private String scriptFile = null;
     private String[] annotateEvents = new String[]{"ALL"};
     private String dockerMetricsHost;
     private String annotatorsConfig = "";
+    private String statedirs = NB_STATEDIR_PATHS;
+    private Path statepath;
+    private List<String> statePathAccesses = new ArrayList<>();
 
     public String getAnnotatorsConfig() {
         return annotatorsConfig;
@@ -163,8 +167,6 @@ public class NBCLIOptions {
     }
 
     private LinkedList<String> parseGlobalOptions(String[] args) {
-        ArgsFile argsfile = new ArgsFile();
-        argsfile.preload("--argsfile-optional", ARGS_FILE_DEFAULT);
 
         LinkedList<String> arglist = new LinkedList<>() {{
             addAll(Arrays.asList(args));
@@ -175,7 +177,8 @@ public class NBCLIOptions {
             return arglist;
         }
 
-        // Preprocess --include regardless of position
+        // Process --include and --statedir, separately first
+        // regardless of position
         LinkedList<String> nonincludes = new LinkedList<>();
         while (arglist.peekFirst() != null) {
             String word = arglist.peekFirst();
@@ -188,9 +191,53 @@ public class NBCLIOptions {
             }
 
             switch (word) {
-                case ARGS_FILE:
-                case ARGS_PIN:
-                case ARGS_UNPIN:
+                case NB_STATE_DIR:
+                    arglist.removeFirst();
+                    this.statedirs = readWordOrThrow(arglist, "nosqlbench global state directory");
+                    break;
+                case INCLUDE:
+                    arglist.removeFirst();
+                    String include = readWordOrThrow(arglist, "path to include");
+                    wantsToIncludePaths.add(include);
+                    break;
+                default:
+                    nonincludes.addLast(arglist.removeFirst());
+            }
+        }
+        this.statedirs = (this.statedirs != null ? this.statedirs : NB_STATEDIR_PATHS);
+        this.setStatePath();
+
+        arglist = nonincludes;
+        nonincludes = new LinkedList<>();
+
+        // Now that statdirs is settled, auto load argsfile if it is present
+        NBCLIArgsFile argsfile = new NBCLIArgsFile();
+        argsfile.reserved(NBCLICommandParser.RESERVED_WORDS);
+        argsfile.preload("--argsfile-optional", ARGS_FILE_DEFAULT);
+        arglist = argsfile.process(arglist);
+
+        // Parse all --argsfile... and other high level options
+
+        while (arglist.peekFirst() != null) {
+            String word = arglist.peekFirst();
+            if (word.startsWith("--") && word.contains("=")) {
+                String wordToSplit = arglist.removeFirst();
+                String[] split = wordToSplit.split("=", 2);
+                arglist.offerFirst(split[1]);
+                arglist.offerFirst(split[0]);
+                continue;
+            }
+
+            switch (word) {
+                // These options modify other options. They should be processed early.
+                case NBCLIArgsFile.ARGS_FILE:
+                case NBCLIArgsFile.ARGS_FILE_OPTIONAL:
+                case NBCLIArgsFile.ARGS_FILE_REQUIRED:
+                case NBCLIArgsFile.ARGS_PIN:
+                case NBCLIArgsFile.ARGS_UNPIN:
+                    if (this.statepath == null) {
+                        setStatePath();
+                    }
                     arglist = argsfile.process(arglist);
                     break;
                 case ANNOTATE_EVENTS:
@@ -198,19 +245,10 @@ public class NBCLIOptions {
                     String toAnnotate = readWordOrThrow(arglist, "annotated events");
                     annotateEvents = toAnnotate.split("\\\\s*,\\\\s*");
                     break;
-//                case ANNOTATE_TO_GRAFANA:
-//                    arglist.removeFirst();
-//                    grafanaEndpoint = readWordOrThrow(arglist,"grafana API endpoint");
-//                    break;
                 case ANNOTATORS_CONFIG:
                     arglist.removeFirst();
                     this.annotatorsConfig = readWordOrThrow(arglist, "annotators config");
                     break;
-                case INCLUDE:
-                    arglist.removeFirst();
-                    String include = readWordOrThrow(arglist, "path to include");
-                    wantsToIncludePaths.add(include);
-                    break;
                 case REPORT_GRAPHITE_TO:
                     arglist.removeFirst();
                     reportGraphiteTo = arglist.removeFirst();
@@ -245,13 +283,57 @@ public class NBCLIOptions {
                     break;
                 default:
                     nonincludes.addLast(arglist.removeFirst());
-
             }
-
         }
+
         return nonincludes;
     }
 
+    private Path setStatePath() {
+        if (statePathAccesses.size() > 0) {
+            throw new BasicError("The statedir must be set before it is used by other\n" +
+                    " options. If you want to change the statedir, be sure you do it before\n" +
+                    " dependent options. These parameters were called before this --statedir:\n" +
+                    statePathAccesses.stream().map(s -> "> " + s).collect(Collectors.joining("\n")));
+        }
+        if (this.statepath != null) {
+            return this.statepath;
+        }
+
+        List<String> paths = Environment.INSTANCE.interpolate(":", statedirs);
+        Path selected = null;
+
+        for (String pathName : paths) {
+            Path path = Path.of(pathName);
+            if (Files.exists(path)) {
+                if (Files.isDirectory(path)) {
+                    selected = path;
+                    break;
+                } else {
+                    logger.warn("possible state dir path is not a directory: '" + path.toString() + "'");
+                }
+            }
+        }
+        if (selected == null) {
+            selected = Path.of(paths.get(0));
+        }
+
+        if (!Files.exists(selected)) {
+            try {
+                Files.createDirectories(
+                        selected,
+                        PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwxrwx---"))
+                );
+            } catch (IOException e) {
+                throw new BasicError("Could not create state directory at '" + selected.toString() + "': " + e.getMessage());
+            }
+        }
+
+        Environment.INSTANCE.put(NBSTATEDIR, selected.toString());
+
+        return selected;
+    }
+
     private void parseAllOptions(String[] args) {
         LinkedList<String> arglist = parseGlobalOptions(args);
 
@@ -565,7 +647,7 @@ public class NBCLIOptions {
                 spec.indicatorMode = IndicatorMode.logonly;
             } else if (this.getCommands().stream().anyMatch(cmd -> cmd.getCmdType().equals(Cmd.CmdType.script))) {
                 logger.info("Command line includes script calls, so progress data on console is " +
-                    "suppressed.");
+                        "suppressed.");
                 spec.indicatorMode = IndicatorMode.logonly;
             }
         }
@@ -577,7 +659,7 @@ public class NBCLIOptions {
         configs.stream().map(LoggerConfig::getFilename).forEach(s -> {
             if (files.contains(s)) {
                 logger.warn(s + " is included in " + configName + " more than once. It will only be included " +
-                    "in the first matching config. Reorder your options if you need to control this.");
+                        "in the first matching config. Reorder your options if you need to control this.");
             }
             files.add(s);
         });
@@ -688,8 +770,8 @@ public class NBCLIOptions {
                     break;
                 default:
                     throw new RuntimeException(
-                        LOG_HISTOGRAMS +
-                            " options must be in either 'regex:filename:interval' or 'regex:filename' or 'filename' format"
+                            LOG_HISTOGRAMS +
+                                    " options must be in either 'regex:filename:interval' or 'regex:filename' or 'filename' format"
                     );
             }
         }
@@ -714,7 +796,7 @@ public class NBCLIOptions {
         switch (parts.length) {
             case 2:
                 Unit.msFor(parts[1]).orElseThrow(
-                    () -> new RuntimeException("Unable to parse progress indicator indicatorSpec '" + parts[1] + "'")
+                        () -> new RuntimeException("Unable to parse progress indicator indicatorSpec '" + parts[1] + "'")
                 );
                 progressSpec.intervalSpec = parts[1];
             case 1:
diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/ArgsFileTest.java b/engine-cli/src/test/java/io/nosqlbench/engine/cli/ArgsFileTest.java
deleted file mode 100644
index 91bb05ecc..000000000
--- a/engine-cli/src/test/java/io/nosqlbench/engine/cli/ArgsFileTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package io.nosqlbench.engine.cli;
-
-import org.junit.Test;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class ArgsFileTest {
-
-    @Test
-    public void testLoadingArgs() {
-        LinkedList<String> result;
-        ArgsFile argsFile = new ArgsFile();
-        result = argsFile.process("--argsfile", "src/test/resources/argsfiles/nonextant.cli");
-        assertThat(result).containsExactly();
-        result = argsFile.process("--argsfile", "src/test/resources/argsfiles/alphagamma.cli");
-        assertThat(result).containsExactly("alpha", "gamma");
-    }
-
-    @Test(expected = RuntimeException.class)
-    public void testLoadingMissingRequiredFails() {
-        LinkedList<String> result;
-        ArgsFile argsFile = new ArgsFile();
-        result = argsFile.process("--argsfile-required", "src/test/resources/argsfiles/nonextant.cli");
-    }
-
-    @Test
-    public void testLoadingInPlace() {
-        LinkedList<String> result;
-        LinkedList<String> commands = new LinkedList<>(List.of("--abc", "--def", "--argsfile", "src/test/resources" +
-                "/argsfiles/alphagamma.cli"));
-        ArgsFile argsFile = new ArgsFile().preload("--argsfile-optional", "src/test/resources/argsfiles/alphagamma" +
-                ".cli");
-        result = argsFile.process(commands);
-        assertThat(result).containsExactly("alpha", "gamma", "--abc", "--def", "alpha", "gamma");
-    }
-
-}
\ No newline at end of file
diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIArgsFileTest.java b/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIArgsFileTest.java
new file mode 100644
index 000000000..9b2b8f55b
--- /dev/null
+++ b/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIArgsFileTest.java
@@ -0,0 +1,117 @@
+package io.nosqlbench.engine.cli;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.PosixFilePermissions;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class NBCLIArgsFileTest {
+
+    @Test
+    public void testLoadingArgs() {
+        LinkedList<String> result;
+        NBCLIArgsFile argsFile = new NBCLIArgsFile();
+        result = argsFile.process("--argsfile", "src/test/resources/argsfiles/nonextant.cli");
+        assertThat(result).containsExactly();
+        result = argsFile.process("--argsfile", "src/test/resources/argsfiles/alphagamma.cli");
+        assertThat(result).containsExactly("alpha", "gamma");
+    }
+
+    @Test
+    public void loadParamsWithEnv() {
+        NBCLIArgsFile argsfile = new NBCLIArgsFile();
+        LinkedList<String> result = argsfile.process("--argsfile-required", "src/test/resources/argsfiles/home_env.cli");
+        System.out.println(result);
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void testLoadingMissingRequiredFails() {
+        LinkedList<String> result;
+        NBCLIArgsFile argsFile = new NBCLIArgsFile();
+        result = argsFile.process("--argsfile-required", "src/test/resources/argsfiles/nonextant.cli");
+    }
+
+    @Test
+    public void testLoadingInPlace() {
+        LinkedList<String> result;
+        LinkedList<String> commands = new LinkedList<>(List.of("--abc", "--def"));
+
+        NBCLIArgsFile argsFile = new NBCLIArgsFile().preload("--argsfile-optional", "src/test/resources/argsfiles/alphagamma" +
+                ".cli");
+        result = argsFile.process(commands);
+        assertThat(result).containsExactly("alpha", "gamma", "--abc", "--def");
+    }
+
+    @Test
+    public void testLinesToArgs() {
+        NBCLIArgsFile argsfile = new NBCLIArgsFile().reserved("reservedword");
+        LinkedList<String> args = argsfile.linesToArgs(
+                List.of("--optionname argument", "--optionname2", "--opt3 reservedword")
+        );
+        assertThat(args).containsExactly("--optionname", "argument", "--optionname2", "--opt3", "reservedword");
+    }
+
+    @Test
+    public void testOptionPinning() {
+        Path tempFile = null;
+        try {
+            tempFile = Files.createTempFile(
+                    "tmpfile",
+                    "cli",
+                    PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rw-rw-r--"))
+            );
+
+            // preloading is a way to have global defaults based on
+            // the presence of a default file
+            NBCLIArgsFile argsfile = new NBCLIArgsFile().preload(
+                    "--argsfile-optional", tempFile.toAbsolutePath().toString()
+            );
+
+            LinkedList<String> commandline;
+
+            commandline = argsfile.process(
+                    "--pin", "--option1",
+                    "--pin", "--option1",
+                    "--pin", "--option2", "arg2"
+            );
+
+            String filecontents;
+            filecontents = Files.readString(tempFile);
+
+            // logging should indicate no changes
+            commandline = argsfile.process(
+                    "--pin", "--option1",
+                    "--pin", "--option1",
+                    "--pin", "--option2", "arg2"
+            );
+
+            // unpinned options should be discarded
+            commandline = argsfile.process(
+                    "--unpin", "--option1",
+                    "--option4", "--option5"
+            );
+
+            assertThat(commandline).containsExactly(
+                    "--option4", "--option5"
+            );
+
+            assertThat(filecontents).isEqualTo("--option1\n--option2 arg2\n");
+
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } finally {
+            try {
+                Files.deleteIfExists(tempFile);
+            } catch (Exception ignored) {
+            }
+        }
+    }
+
+
+}
\ No newline at end of file

From 1e958a7e7911e65bbef555c65ae738bb75d7f1d6 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Thu, 29 Oct 2020 10:55:43 -0500
Subject: [PATCH 008/164] simplify logger naming for core systems

---
 .../engine/api/activityimpl/SimpleActivity.java           | 2 +-
 .../nosqlbench/engine/core/metrics/MetricReporters.java   | 8 ++++----
 .../java/io/nosqlbench/engine/core/script/Scenario.java   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java
index de0d82610..9eed87e0e 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java
@@ -35,7 +35,7 @@ import java.util.function.Supplier;
  * A default implementation of an Activity, suitable for building upon.
  */
 public class SimpleActivity implements Activity, ProgressCapable {
-    private final static Logger logger = LoggerFactory.getLogger(SimpleActivity.class);
+    private final static Logger logger = LoggerFactory.getLogger("ACTIVITY");
 
     protected ActivityDef activityDef;
     private final List<AutoCloseable> closeables = new ArrayList<>();
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricReporters.java b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricReporters.java
index 27346ef9b..8574f6edb 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricReporters.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricReporters.java
@@ -35,10 +35,10 @@ import java.util.concurrent.TimeUnit;
 
 public class MetricReporters implements Shutdownable {
     private final static Logger logger = LoggerFactory.getLogger(MetricReporters.class);
-    private static MetricReporters instance = new MetricReporters();
+    private static final MetricReporters instance = new MetricReporters();
 
-    private List<PrefixedRegistry> metricRegistries = new ArrayList<>();
-    private List<ScheduledReporter> scheduledReporters = new ArrayList<>();
+    private final List<PrefixedRegistry> metricRegistries = new ArrayList<>();
+    private final List<ScheduledReporter> scheduledReporters = new ArrayList<>();
 
     private MetricReporters() {
         ShutdownManager.register(this);
@@ -136,7 +136,7 @@ public class MetricReporters implements Shutdownable {
 
     public MetricReporters start(int consoleIntervalSeconds, int remoteIntervalSeconds) {
         for (ScheduledReporter scheduledReporter : scheduledReporters) {
-            logger.info("starting reporter: " + scheduledReporter);
+            logger.info("starting reporter: " + scheduledReporter.getClass().getSimpleName());
             if (scheduledReporter instanceof ConsoleReporter) {
                 scheduledReporter.start(consoleIntervalSeconds, TimeUnit.SECONDS);
             } else {
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
index 3b0360f16..3c8a49e1e 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
@@ -46,7 +46,7 @@ import java.util.stream.Collectors;
 
 public class Scenario implements Callable<ScenarioResult> {
 
-    private static final Logger logger = (Logger) LoggerFactory.getLogger(Scenario.class);
+    private static final Logger logger = (Logger) LoggerFactory.getLogger("SCENARIO");
 
     private State state = State.Scheduled;
 

From d5a98f140a262037ecaf13252741082c63e3146e Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Thu, 29 Oct 2020 11:34:38 -0500
Subject: [PATCH 009/164] update release notes

---
 RELEASENOTES.md | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 15867f798..38beaf0a4 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,19 +1,8 @@
-- f702736f (HEAD -> main) flatten maps in OpTemplates to allow map consumers
-- 4a9fa81b pull Named service up
-- 574a89e7 pull ConfigAware api up
-- 71195d0a http release fixes
-- 3fa89ebc partial work for --args
-- 262df571 improved error messages
-- 453b1b2c extract ratio from optemplate before construction
-- dcf458c4 annotation progress
-- 7017b6cd add SplitLongs function
-- 0758670f add nb clients module
-- 1dbf36c4 add grafana annotation client
-- 120d9761 remove warning for speculative defaults
-- c78f1e92 typos and minor fixes
-- f3f1b8f4 add annotations design sketch
-- 394580d6 more idea sketches
-- 9e5972f5 comment cleanup
-- 06edfcc9 fix NPE when binding has undefined value
-- 510746b7 improve mismatched scenario name feedback
-- 735b32e1 add illustrative test for EpochMillisToJavaLocalDate
+- 1e958a7e (HEAD -> main) simplify logger naming for core systems
+- 1382d33d argsfiles and statedirs
+- b5901679 environment and sys prop support
+- fd74ccba move common topics to resources base
+- 6a8dfef1 qualify grafana docker with tag
+- 2830d070 simple workload improvements
+- b9607d07 make argsfiles use double dash
+- a9b0dc9d argsfile support

From 4611f679536a06407b4af548a4187b89f7f74357 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Thu, 29 Oct 2020 11:34:56 -0500
Subject: [PATCH 010/164] cqld4 fixes

---
 driver-cqld4/pom.xml                                        | 6 ++++++
 .../activitytype/cqld4/statements/rowoperators/Save.java    | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/driver-cqld4/pom.xml b/driver-cqld4/pom.xml
index b869f96a4..d8216bd72 100644
--- a/driver-cqld4/pom.xml
+++ b/driver-cqld4/pom.xml
@@ -76,6 +76,12 @@
             <groupId>org.xerial.snappy</groupId>
             <artifactId>snappy-java</artifactId>
         </dependency>
+      <dependency>
+        <groupId>io.nosqlbench</groupId>
+        <artifactId>virtdata-lib-basics</artifactId>
+        <version>3.12.155-SNAPSHOT</version>
+        <scope>compile</scope>
+      </dependency>
 
     </dependencies>
 
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/rowoperators/Save.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/rowoperators/Save.java
index df35df3f0..fc01f6934 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/rowoperators/Save.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/rowoperators/Save.java
@@ -1,7 +1,6 @@
 package io.nosqlbench.activitytype.cqld4.statements.rowoperators;
 
 import com.datastax.oss.driver.api.core.cql.ColumnDefinition;
-import com.datastax.oss.driver.api.core.cql.ColumnDefinitions;
 import com.datastax.oss.driver.api.core.cql.Row;
 import io.nosqlbench.activitytype.cqld4.api.RowCycleOperator;
 import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState;

From 2d9d141cfffef3e69a9c943607c2b7d0f8ba5433 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Thu, 12 Nov 2020 15:24:27 -0600
Subject: [PATCH 011/164] include dsegraph

---
 RELEASENOTES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 15867f798..787cc5822 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -17,3 +17,5 @@
 - 06edfcc9 fix NPE when binding has undefined value
 - 510746b7 improve mismatched scenario name feedback
 - 735b32e1 add illustrative test for EpochMillisToJavaLocalDate
+- 2390f253 Initial Migration of DSE Graph
+- 2275573c Update Readme

From 7ead8fba2f59521049f54d841b3db6d9a1602c93 Mon Sep 17 00:00:00 2001
From: nb-droid <nosqlbenchdroid@gmail.com>
Date: Thu, 12 Nov 2020 21:35:46 +0000
Subject: [PATCH 012/164] [maven-release-plugin] prepare release
 nosqlbench-3.12.155

---
 docsys/pom.xml                 |  6 +++---
 driver-cql-shaded/pom.xml      |  6 +++---
 driver-cqlverify/pom.xml       |  6 +++---
 driver-diag/pom.xml            |  6 +++---
 driver-dsegraph-shaded/pom.xml |  6 +++---
 driver-http/pom.xml            |  6 +++---
 driver-jmx/pom.xml             |  6 +++---
 driver-kafka/pom.xml           |  6 +++---
 driver-mongodb/pom.xml         |  6 +++---
 driver-stdout/pom.xml          |  6 +++---
 driver-tcp/pom.xml             |  8 ++++----
 driver-web/pom.xml             |  6 +++---
 drivers-api/pom.xml            |  6 +++---
 engine-api/pom.xml             | 10 +++++-----
 engine-cli/pom.xml             |  6 +++---
 engine-clients/pom.xml         |  4 ++--
 engine-core/pom.xml            |  8 ++++----
 engine-docker/pom.xml          |  4 ++--
 engine-docs/pom.xml            |  4 ++--
 engine-extensions/pom.xml      |  4 ++--
 engine-rest/pom.xml            |  4 ++--
 mvn-defaults/pom.xml           |  4 ++--
 nb-annotations/pom.xml         |  2 +-
 nb-api/pom.xml                 |  4 ++--
 nb/pom.xml                     | 36 +++++++++++++++++-----------------
 pom.xml                        |  4 ++--
 virtdata-api/pom.xml           |  6 +++---
 virtdata-lang/pom.xml          |  2 +-
 virtdata-lib-basics/pom.xml    |  4 ++--
 virtdata-lib-curves4/pom.xml   |  6 +++---
 virtdata-lib-random/pom.xml    |  6 +++---
 virtdata-lib-realer/pom.xml    |  4 ++--
 virtdata-realdata/pom.xml      |  4 ++--
 virtdata-userlibs/pom.xml      | 16 +++++++--------
 34 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/docsys/pom.xml b/docsys/pom.xml
index 8ebb39825..1f89ad0f5 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index a7918c88a..2b9d1eea8 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index b80d13267..fca7ac100 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>3.12.155-SNAPSHOT</version>
+    <version>3.12.155</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cql-shaded</artifactId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
     </dependency>
 
   </dependencies>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index 876af26e0..834a4e8d9 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index 77bdc0b0e..8eec49a26 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId> 
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index abbfdd73a..0a7543952 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index 0fb2df6d2..e728686c3 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index 63fe03ed0..4549b8f5a 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -44,13 +44,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index 81f78dc92..b3816f48f 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index 7bb6e8b3f..4dfe527ea 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index 7c1e7e1c7..6f2e409ad 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,19 +24,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index 0792af8ce..fb93b7881 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index c8ecb8267..3f4e8817a 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index cc264b70b..23fe9bfbf 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,25 +23,25 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index a5e010a26..1a0fc0fa6 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index 9b23a67e2..32aad946d 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.155-SNAPSHOT</version>
+    <version>3.12.155</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>3.12.155-SNAPSHOT</version>
+      <version>3.12.155</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index 12a95183f..365e9d745 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
@@ -90,7 +90,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-clients</artifactId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index e2985ccff..969dc47ef 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index 51542e43f..e1eb3e31b 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.155-SNAPSHOT</version>
+    <version>3.12.155</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>docsys</artifactId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index 136d66e56..714ffca56 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index cccec2954..d8495afda 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 97cb7bfb4..0aa94449e 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>3.12.155-SNAPSHOT</version>
+    <version>3.12.155</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -95,7 +95,7 @@
     <scm>
         <url>scm:git:https://github.com/nosqlbench/nosqlbench.git</url>
         <!--        <tag>nosqlbench-2.0.102-SNAPSHOT</tag>-->
-        <tag>HEAD</tag>
+        <tag>nosqlbench-3.12.155</tag>
     </scm>
 
     <dependencyManagement>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index 9ea4bb229..ee56907aa 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 5a41f6031..82f628576 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
diff --git a/nb/pom.xml b/nb/pom.xml
index 6f6f045cb..f905b3ec1 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,31 +24,31 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-rest</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docs</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-extensions</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <!--        <dependency>-->
@@ -60,67 +60,67 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-web</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-kafka</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-diag</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-tcp</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-http</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-jmx</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-dsegraph-shaded</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-cql-shaded</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-cqlverify</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-mongodb</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <!--        <dependency>-->
@@ -259,7 +259,7 @@
                 <dependency>
                     <groupId>io.nosqlbench</groupId>
                     <artifactId>driver-mongodb</artifactId>
-                    <version>3.12.155-SNAPSHOT</version>
+                    <version>3.12.155</version>
                 </dependency>
             </dependencies>
         </profile>
diff --git a/pom.xml b/pom.xml
index abc203dcf..5db1a1559 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
@@ -145,7 +145,7 @@
             scm:git:https://github.com/nosqlbench/nosqlbench.git
         </developerConnection>
         <url>scm:git:git@github.com:nosqlbench/nosqlbench.git</url>
-        <tag>HEAD</tag>
+        <tag>nosqlbench-3.12.155</tag>
     </scm>
 
     <distributionManagement>
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index 99425bb5f..b1e41362f 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index c4b07dddd..10131c033 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index aeafd6554..c461c77d7 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index 0194ec6d7..a7082c086 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index 7c42852d5..5933d678f 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index 279090f3f..4e9444f6f 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index dda04f214..2ac839bd4 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index fd434bd34..1ee5422e4 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.155</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,36 +18,36 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.155</version>
         </dependency>
 
         <dependency>

From ad5bc4e4477bf1bbd09a3b5a977038dfc36dac91 Mon Sep 17 00:00:00 2001
From: nb-droid <nosqlbenchdroid@gmail.com>
Date: Thu, 12 Nov 2020 21:35:52 +0000
Subject: [PATCH 013/164] [maven-release-plugin] prepare for next development
 iteration

---
 docsys/pom.xml                 |  6 +++---
 driver-cql-shaded/pom.xml      |  6 +++---
 driver-cqlverify/pom.xml       |  6 +++---
 driver-diag/pom.xml            |  6 +++---
 driver-dsegraph-shaded/pom.xml |  6 +++---
 driver-http/pom.xml            |  6 +++---
 driver-jmx/pom.xml             |  6 +++---
 driver-kafka/pom.xml           |  6 +++---
 driver-mongodb/pom.xml         |  6 +++---
 driver-stdout/pom.xml          |  6 +++---
 driver-tcp/pom.xml             |  8 ++++----
 driver-web/pom.xml             |  6 +++---
 drivers-api/pom.xml            |  6 +++---
 engine-api/pom.xml             | 10 +++++-----
 engine-cli/pom.xml             |  6 +++---
 engine-clients/pom.xml         |  4 ++--
 engine-core/pom.xml            |  8 ++++----
 engine-docker/pom.xml          |  4 ++--
 engine-docs/pom.xml            |  4 ++--
 engine-extensions/pom.xml      |  4 ++--
 engine-rest/pom.xml            |  4 ++--
 mvn-defaults/pom.xml           |  4 ++--
 nb-annotations/pom.xml         |  2 +-
 nb-api/pom.xml                 |  4 ++--
 nb/pom.xml                     | 36 +++++++++++++++++-----------------
 pom.xml                        |  4 ++--
 virtdata-api/pom.xml           |  6 +++---
 virtdata-lang/pom.xml          |  2 +-
 virtdata-lib-basics/pom.xml    |  4 ++--
 virtdata-lib-curves4/pom.xml   |  6 +++---
 virtdata-lib-random/pom.xml    |  6 +++---
 virtdata-lib-realer/pom.xml    |  4 ++--
 virtdata-realdata/pom.xml      |  4 ++--
 virtdata-userlibs/pom.xml      | 16 +++++++--------
 34 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/docsys/pom.xml b/docsys/pom.xml
index 1f89ad0f5..38ef76178 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index 2b9d1eea8..02bc2c009 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index fca7ac100..bdce34dd8 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>3.12.155</version>
+    <version>3.12.156-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cql-shaded</artifactId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index 834a4e8d9..bdc2687c6 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index 8eec49a26..50a0078e2 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId> 
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index 0a7543952..ddf35a5d8 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index e728686c3..c38259925 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index 4549b8f5a..8dc0bef7a 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -44,13 +44,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index b3816f48f..37138df14 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index 4dfe527ea..5175e32be 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index 6f2e409ad..9462878a7 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,19 +24,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index fb93b7881..9ac89affa 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index 3f4e8817a..b51ee675b 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index 23fe9bfbf..dd67637cb 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,25 +23,25 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index 1a0fc0fa6..efc5314c5 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index 32aad946d..0c0dc49c3 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.155</version>
+    <version>3.12.156-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>3.12.155</version>
+      <version>3.12.156-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index 365e9d745..67bc4df8e 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -90,7 +90,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-clients</artifactId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index 969dc47ef..4e3368a67 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index e1eb3e31b..3571c7aff 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.155</version>
+    <version>3.12.156-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>docsys</artifactId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index 714ffca56..a4eef4090 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index d8495afda..446e932a7 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 0aa94449e..5f5fd76bf 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>3.12.155</version>
+    <version>3.12.156-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -95,7 +95,7 @@
     <scm>
         <url>scm:git:https://github.com/nosqlbench/nosqlbench.git</url>
         <!--        <tag>nosqlbench-2.0.102-SNAPSHOT</tag>-->
-        <tag>nosqlbench-3.12.155</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <dependencyManagement>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index ee56907aa..8a655563b 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 82f628576..6daf0666b 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/nb/pom.xml b/nb/pom.xml
index f905b3ec1..54837d431 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,31 +24,31 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-rest</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docs</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-extensions</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <!--        <dependency>-->
@@ -60,67 +60,67 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-web</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-kafka</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-diag</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-tcp</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-http</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-jmx</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-dsegraph-shaded</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-cql-shaded</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-cqlverify</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-mongodb</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <!--        <dependency>-->
@@ -259,7 +259,7 @@
                 <dependency>
                     <groupId>io.nosqlbench</groupId>
                     <artifactId>driver-mongodb</artifactId>
-                    <version>3.12.155</version>
+                    <version>3.12.156-SNAPSHOT</version>
                 </dependency>
             </dependencies>
         </profile>
diff --git a/pom.xml b/pom.xml
index 5db1a1559..42c461ecf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
@@ -145,7 +145,7 @@
             scm:git:https://github.com/nosqlbench/nosqlbench.git
         </developerConnection>
         <url>scm:git:git@github.com:nosqlbench/nosqlbench.git</url>
-        <tag>nosqlbench-3.12.155</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index b1e41362f..f7e15ce94 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index 10131c033..d883e3ac0 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index c461c77d7..5e5974d36 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index a7082c086..c88224403 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index 5933d678f..a259d6b73 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index 4e9444f6f..41121ee38 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index 2ac839bd4..14cc88ca8 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index 1ee5422e4..3ee4b0b8d 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.155</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,36 +18,36 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-            <version>3.12.155</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>

From 93e10e6a70275edfa2e6bc413a10cb763533207a Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 16:29:40 -0600
Subject: [PATCH 014/164] config model improvements

---
 .../nosqlbench/nb/api/config/ConfigAware.java |  3 +-
 .../nb/api/config/ConfigElement.java          | 59 +++++++++++++++++++
 .../nb/api/config/ConfigReader.java           | 40 +++++++++++++
 3 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigElement.java
 create mode 100644 nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigReader.java

diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigAware.java b/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigAware.java
index de040a6fe..2ec877dd4 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigAware.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigAware.java
@@ -3,6 +3,7 @@ package io.nosqlbench.nb.api.config;
 import java.util.Map;
 
 public interface ConfigAware {
-    void applyConfig(Map<String,?> element);
+    void applyConfig(Map<String, ?> providedConfig);
+
     ConfigModel getConfigModel();
 }
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigElement.java b/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigElement.java
new file mode 100644
index 000000000..b8f1bfaa4
--- /dev/null
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigElement.java
@@ -0,0 +1,59 @@
+package io.nosqlbench.nb.api.config;
+
+public class ConfigElement<T> {
+
+    public final String name;
+    public final Class<? extends T> type;
+    public final String description;
+    private final T defaultValue;
+    public boolean required;
+
+    public ConfigElement(
+            String name,
+            Class<? extends T> type,
+            String description,
+            boolean required,
+            T defaultValue
+    ) {
+        this.name = name;
+        this.type = type;
+        this.description = description;
+        this.required = required;
+        this.defaultValue = defaultValue;
+    }
+
+    @Override
+    public String toString() {
+        return "Element{" +
+                "name='" + name + '\'' +
+                ", type=" + type +
+                ", description='" + description + '\'' +
+                ", required=" + required +
+                ", defaultValue = " + defaultValue +
+                '}';
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Class<?> getType() {
+        return type;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public boolean isRequired() {
+        return required;
+    }
+
+    public void setRequired(boolean required) {
+        this.required = required;
+    }
+
+    public T getDefaultValue() {
+        return defaultValue;
+    }
+}
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigReader.java b/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigReader.java
new file mode 100644
index 000000000..5457fa8d4
--- /dev/null
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigReader.java
@@ -0,0 +1,40 @@
+package io.nosqlbench.nb.api.config;
+
+import io.nosqlbench.nb.api.Environment;
+
+import java.util.LinkedHashMap;
+import java.util.Optional;
+
+public class ConfigReader extends LinkedHashMap<String, Object> {
+    private final ConfigModel configModel;
+
+    public ConfigReader(ConfigModel model, LinkedHashMap<String, Object> validConfig) {
+        super(validConfig);
+        this.configModel = model;
+    }
+
+    public <T> T paramEnv(String name, Class<? extends T> vclass) {
+        T param = param(name, vclass);
+        if (param instanceof String) {
+            Optional<String> interpolated = Environment.INSTANCE.interpolate(param.toString());
+            if (interpolated.isEmpty()) {
+                throw new RuntimeException("Unable to interpolate env and sys props in '" + param + "'");
+            }
+            return (T) interpolated.get();
+        } else {
+            return param;
+        }
+
+    }
+
+    public <T> T param(String name, Class<? extends T> vclass) {
+        Object o = get(name);
+        ConfigElement<?> elem = configModel.getElements().get(name);
+        if (elem == null) {
+            throw new RuntimeException("Invalid config element named '" + name + "'");
+        }
+        Class<T> type = (Class<T>) elem.getType();
+        T typeCastedValue = type.cast(o);
+        return typeCastedValue;
+    }
+}

From 55edec5389c5102c00e5346b3bc9466d2d330247 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 16:32:21 -0600
Subject: [PATCH 015/164] add ToByteBuffer binding function

---
 .../conversions/from_long/ToByteBuffer.java   | 22 ++++++++++--
 .../from_long/ToByteBufferTest.java           | 35 +++++++++++++++++++
 2 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBufferTest.java

diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBuffer.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBuffer.java
index 307782c84..0fad52b1e 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBuffer.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBuffer.java
@@ -20,6 +20,7 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_long;
 
 import io.nosqlbench.virtdata.api.annotations.Categories;
 import io.nosqlbench.virtdata.api.annotations.Category;
+import io.nosqlbench.virtdata.api.annotations.Example;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.nio.ByteBuffer;
@@ -32,10 +33,27 @@ import java.util.function.LongFunction;
 @Categories({Category.conversion})
 public class ToByteBuffer implements LongFunction<ByteBuffer> {
 
+    private final int allocSize;
+    private final int bufSize;
+
+    public ToByteBuffer() {
+        this.allocSize = Long.BYTES;
+        this.bufSize = Long.BYTES;
+    }
+
+    @Example({"ToByteBuffer(13)", "Repeat the input long value to make a 13byte buffer"})
+    public ToByteBuffer(int size) {
+        this.bufSize = size;
+        this.allocSize = ((size + Long.BYTES - 1) / Long.BYTES) * Long.BYTES;
+    }
+
     @Override
     public ByteBuffer apply(long input) {
-        ByteBuffer buffer = ByteBuffer.allocate(Long.BYTES);
-        buffer.putLong(input);
+        ByteBuffer buffer = ByteBuffer.allocate(allocSize);
+        while (buffer.remaining() >= Long.BYTES) {
+            buffer.putLong(input);
+        }
+        buffer.position(this.bufSize);
         buffer.flip();
         return buffer;
     }
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBufferTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBufferTest.java
new file mode 100644
index 000000000..3f7ac17b1
--- /dev/null
+++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBufferTest.java
@@ -0,0 +1,35 @@
+package io.nosqlbench.virtdata.library.basics.shared.conversions.from_long;
+
+import org.junit.Test;
+
+import java.nio.ByteBuffer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ToByteBufferTest {
+
+    @Test
+    public void toByteBuffer7() {
+        ToByteBuffer f = new ToByteBuffer(7);
+        ByteBuffer byteBuffer = f.apply(33);
+        ByteBuffer expected = ByteBuffer.wrap(new byte[]{0, 0, 0, 0, 0, 0, 0});
+        assertThat(byteBuffer).isEqualByComparingTo(expected);
+    }
+
+    @Test
+    public void toByteBuffer8() {
+        ToByteBuffer f = new ToByteBuffer(8);
+        ByteBuffer byteBuffer = f.apply(33);
+        ByteBuffer expected = ByteBuffer.wrap(new byte[]{0, 0, 0, 0, 0, 0, 0, 33});
+        assertThat(byteBuffer).isEqualByComparingTo(expected);
+    }
+
+    @Test
+    public void toByteBuffer9() {
+        ToByteBuffer f = new ToByteBuffer(9);
+        ByteBuffer byteBuffer = f.apply(33);
+        ByteBuffer expected = ByteBuffer.wrap(new byte[]{0, 0, 0, 0, 0, 0, 0, 33, 0});
+        assertThat(byteBuffer).isEqualByComparingTo(expected);
+    }
+
+}
\ No newline at end of file

From 4d65dc625f5d292df197f9b8f0b74f8a9ceea823 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:22:01 -0600
Subject: [PATCH 016/164] update inactive coords

---
 driver-cqld4/pom.xml |   6 +-
 nb/pom.xml           | 168 +++++++++++++++++++++----------------------
 2 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/driver-cqld4/pom.xml b/driver-cqld4/pom.xml
index d8216bd72..f6b1252f5 100644
--- a/driver-cqld4/pom.xml
+++ b/driver-cqld4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>3.12.141-SNAPSHOT</version>
+        <version>3.12.155-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.141-SNAPSHOT</version>
+            <version>3.12.155-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.146-SNAPSHOT</version>
+            <version>3.12.155-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/nb/pom.xml b/nb/pom.xml
index 18a60f899..d71d03574 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -230,90 +230,90 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>with-cql-d4</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>io.nosqlbench</groupId>
-                    <artifactId>driver-cqld4</artifactId>
-                    <version>3.12.141-SNAPSHOT</version>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>with-mongodb</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>io.nosqlbench</groupId>
-                    <artifactId>driver-mongodb</artifactId>
-                    <version>3.12.155-SNAPSHOT</version>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>build-nb-appimage</id>
-            <activation>
-                <os>
-                    <family>unix</family>
-                    <name>linux</name>
-                    <arch>amd64</arch>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>build-nb-appimage</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <basedir>${project.basedir}</basedir>
-                                    <executable>${project.basedir}/build-bin.sh</executable>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>enforce</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>enforce</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-enforcer-plugin</artifactId>
-                        <configuration>
-                            <rules>
-                                <dependencyConvergence />
-                            </rules>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
+  <profiles>
+    <profile>
+      <id>with-cql-d4</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>io.nosqlbench</groupId>
+          <artifactId>driver-cqld4</artifactId>
+          <version>3.12.155-SNAPSHOT</version>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>with-mongodb</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>io.nosqlbench</groupId>
+          <artifactId>driver-mongodb</artifactId>
+          <version>3.12.155-SNAPSHOT</version>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>build-nb-appimage</id>
+      <activation>
+        <os>
+          <family>unix</family>
+          <name>linux</name>
+          <arch>amd64</arch>
+        </os>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>build-nb-appimage</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
+                <configuration>
+                  <basedir>${project.basedir}</basedir>
+                  <executable>${project.basedir}/build-bin.sh</executable>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>enforce</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>enforce</goal>
+                </goals>
+              </execution>
+            </executions>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <configuration>
+              <rules>
+                <dependencyConvergence/>
+              </rules>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
 
 
     </profiles>

From 52b029f8b8bdd5ba73458a2954b872493b86d22b Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:22:12 -0600
Subject: [PATCH 017/164] typos, culling, and alignment

---
 devdocs/docstructure/bundled_docs.md          |  3 +-
 .../nosqlbench/docsys/core/DocServerApp.java  | 15 ------
 .../nosqlbench/engine/cli/NBCLIOptions.java   |  2 +-
 .../engine/core/script/BufferAppender.java    | 49 -------------------
 .../docs/NosqlbenchMarkdownManifest.java      |  7 +--
 .../script/AsyncScriptIntegrationTests.java   |  1 +
 6 files changed, 8 insertions(+), 69 deletions(-)
 delete mode 100644 engine-core/src/main/java/io/nosqlbench/engine/core/script/BufferAppender.java

diff --git a/devdocs/docstructure/bundled_docs.md b/devdocs/docstructure/bundled_docs.md
index 8291e64fa..bc08c9434 100644
--- a/devdocs/docstructure/bundled_docs.md
+++ b/devdocs/docstructure/bundled_docs.md
@@ -9,7 +9,8 @@ can be used by the documentation system.
 
 ## MarkdownDocs Service
 
-The primary markdown service that is meant to be consumed by the documetnation system is known simply as
+The primary markdown service that is meant to be consumed by the
+ documentation system is known simply as
 
     MarkdownDocs
 
diff --git a/docsys/src/main/java/io/nosqlbench/docsys/core/DocServerApp.java b/docsys/src/main/java/io/nosqlbench/docsys/core/DocServerApp.java
index e99c836ff..e93da3b3e 100644
--- a/docsys/src/main/java/io/nosqlbench/docsys/core/DocServerApp.java
+++ b/docsys/src/main/java/io/nosqlbench/docsys/core/DocServerApp.java
@@ -14,21 +14,6 @@ import java.util.Arrays;
 public class DocServerApp {
     private static final Logger logger = LogManager.getLogger(DocServerApp.class);
 
-//    static {
-//        // defer to an extant logger context if it is there, otherwise
-//        // assume a local and docserver specific logging configuration
-//
-//        LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
-//        if (context.getLoggerList().size() == 1 && context.getLoggerList().get(0).getName().equals("ROOT")) {
-//            configureDocServerLogging(context);
-//            logger = LoggerFactory.getLogger(DocServerApp.class);
-//            logger.info("Configured logging system from logback-docsys.xml");
-//        } else {
-//            logger = LoggerFactory.getLogger(DocServerApp.class);
-//            logger.info("Configured logging within existing logging context.");
-//        }
-//    }
-
     public static void main(String[] args) {
         if (args.length > 0 && args[0].contains("help")) {
             showHelp();
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
index fe0398152..807377d0a 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
@@ -624,7 +624,7 @@ public class NBCLIOptions {
 
     private String readWordOrThrow(LinkedList<String> arglist, String required) {
         if (arglist.peekFirst() == null) {
-            throw new InvalidParameterException(required + " not found");
+            throw new InvalidParameterException(required + " is required after this option");
         }
         return arglist.removeFirst();
     }
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/BufferAppender.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/BufferAppender.java
deleted file mode 100644
index 2391df249..000000000
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/BufferAppender.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *
- *    Copyright 2016 jshook
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * /
- */
-
-package io.nosqlbench.engine.core.script;
-
-import ch.qos.logback.core.OutputStreamAppender;
-
-import java.io.CharArrayWriter;
-
-public class BufferAppender<E> extends OutputStreamAppender<E> {
-
-    private CharArrayWriter buffer = new CharArrayWriter(0);
-
-    @Override
-    public void start() {
-        buffer = new CharArrayWriter(0);
-        super.start();
-    }
-
-    @Override
-    public void stop() {
-        super.stop();
-        buffer.reset();
-    }
-
-    @Override
-    protected void append(E eventObject) {
-        super.append(eventObject);
-        buffer.append(eventObject.toString());
-    }
-
-    public String toString() {
-        return (buffer==null) ? "" : buffer.toString();
-    }
-}
diff --git a/engine-docs/src/main/java/io/nosqlbench/engine/docs/NosqlbenchMarkdownManifest.java b/engine-docs/src/main/java/io/nosqlbench/engine/docs/NosqlbenchMarkdownManifest.java
index f170de708..9bd03fcea 100644
--- a/engine-docs/src/main/java/io/nosqlbench/engine/docs/NosqlbenchMarkdownManifest.java
+++ b/engine-docs/src/main/java/io/nosqlbench/engine/docs/NosqlbenchMarkdownManifest.java
@@ -10,9 +10,10 @@ public class NosqlbenchMarkdownManifest implements DocsysDynamicManifest {
     @Override
     public DocsBinder getDocs() {
         return new Docs().namespace("docs-for-eb")
-                .addFirstFoundPath("engine-docs/src/main/resources/docs-for-nb/",
-                        "docs-for-nb/")
-                .setEnabledByDefault(true)
+                .addFirstFoundPath(
+                        "engine-docs/src/main/resources/docs-for-nb/",
+                        "docs-for-nb/"
+                ).setEnabledByDefault(true)
                 .asDocsBinder();
     }
 }
diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java b/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
index ba80381fb..d0d734a1e 100644
--- a/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
+++ b/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
@@ -29,6 +29,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.List;

From e6e70f713f4ce8b0957ad8203fe0f2b7e241655c Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:22:20 -0600
Subject: [PATCH 018/164] support DoubleToIntFunction in function matrix

---
 .../io/nosqlbench/virtdata/api/bindings/VirtDataFunctions.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VirtDataFunctions.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VirtDataFunctions.java
index e1b07eb6e..c6dedba74 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VirtDataFunctions.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VirtDataFunctions.java
@@ -18,6 +18,7 @@ public class VirtDataFunctions {
         LongUnaryOperator(java.util.function.LongUnaryOperator.class, long.class),
         IntFunction(java.util.function.IntFunction.class, int.class),
         IntUnaryOperator(java.util.function.IntUnaryOperator.class, int.class),
+        DoubleToIntFunction(java.util.function.DoubleToIntFunction.class, int.class),
         DoubleFunction(java.util.function.DoubleFunction.class, double.class),
         DoubleUnaryOperator(java.util.function.DoubleUnaryOperator.class, double.class),
         Function(java.util.function.Function.class, Object.class);

From 089a29d8466d7462b48063d28105b20db61d5a1e Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:22:35 -0600
Subject: [PATCH 019/164] grafana api tokens

---
 .../engine/clients/grafana/ApiToken.java      | 35 ++++++++++++++++++
 .../grafana/transfer/ApiTokenRequest.java     | 36 +++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/ApiToken.java
 create mode 100644 engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/ApiTokenRequest.java

diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/ApiToken.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/ApiToken.java
new file mode 100644
index 000000000..6b678c65f
--- /dev/null
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/ApiToken.java
@@ -0,0 +1,35 @@
+package io.nosqlbench.engine.clients.grafana;
+
+public class ApiToken {
+    private String name;
+    private String key;
+
+    public ApiToken(String name, String key) {
+        this.name = name;
+        this.key = key;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    @Override
+    public String toString() {
+        return "ApiToken{" +
+                "name='" + name + '\'' +
+                ", key='" + key + '\'' +
+                '}';
+    }
+}
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/ApiTokenRequest.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/ApiTokenRequest.java
new file mode 100644
index 000000000..9e1a5eb49
--- /dev/null
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/ApiTokenRequest.java
@@ -0,0 +1,36 @@
+package io.nosqlbench.engine.clients.grafana.transfer;
+
+import java.util.Set;
+
+public class ApiTokenRequest {
+
+    public static final Set<String> VALID_ROLES = Set.of("Admin", "Editor", "Viewer");
+    private final String name;
+    private final String role;
+    private final long ttl;
+
+    public ApiTokenRequest(String name, String role, long ttl) {
+        this.name = name;
+        this.role = checkRole(role);
+        this.ttl = ttl;
+    }
+
+    private String checkRole(String role) {
+        if (!VALID_ROLES.contains(role)) {
+            throw new RuntimeException("Role '" + role + "' must be one of " + VALID_ROLES.toString());
+        }
+        return role;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getRole() {
+        return role;
+    }
+
+    public long getTtl() {
+        return ttl;
+    }
+}

From 831361394313a90b4e6e2e6f91eb81e56ae8cd1f Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:22:43 -0600
Subject: [PATCH 020/164] generalize op source

---
 .../api/activityapi/planning/OpSequence.java  | 13 ++-------
 .../api/activityapi/planning/OpSource.java    | 27 +++++++++++++++++++
 2 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/OpSource.java

diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/OpSequence.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/OpSequence.java
index 608987dde..4b70099c0 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/OpSequence.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/OpSequence.java
@@ -23,19 +23,10 @@ import java.util.function.Function;
 /**
  * An OpSequence provides fast access to a set of operations in a specific
  * order.
+ *
  * @param <T> The type of element which is to be sequenced
  */
-public interface OpSequence<T> {
-
-    /**
-     * Get the next operation for the given long value. This is simply
-     * the offset indicated by the offset sequence array at a modulo
-     * position.
-     *
-     * @param selector the long value that determines the next op
-     * @return An op of type T
-     */
-    T get(long selector);
+public interface OpSequence<T> extends OpSource<T> {
 
     /**
      * Get the list of individual operations which could be returned by {@link #get(long)}.
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/OpSource.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/OpSource.java
new file mode 100644
index 000000000..20a55326a
--- /dev/null
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/OpSource.java
@@ -0,0 +1,27 @@
+package io.nosqlbench.engine.api.activityapi.planning;
+
+import java.util.function.LongFunction;
+
+/**
+ * An OpSource provides an Op when given an ordinal.
+ * OpSources are expected to be deterministic with respect to inputs.
+ *
+ * @param <T>
+ */
+public interface OpSource<T> extends LongFunction<T> {
+
+    /**
+     * Get the next operation for the given long value. This is simply
+     * the offset indicated by the offset sequence array at a modulo
+     * position.
+     *
+     * @param selector the long value that determines the next op
+     * @return An op of type T
+     */
+    T get(long selector);
+
+    @Override
+    default T apply(long value) {
+        return get(value);
+    }
+}

From a3a513814e3d9f4eb7f21fa10fe5db5dc74d3276 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:27:40 -0600
Subject: [PATCH 021/164] update inactive coords

---
 nb/pom.xml | 400 ++++++++++++++++++++++++++---------------------------
 1 file changed, 200 insertions(+), 200 deletions(-)

diff --git a/nb/pom.xml b/nb/pom.xml
index d71d03574..2d28f3325 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -1,234 +1,234 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
 
 
-    <parent>
-        <artifactId>mvn-defaults</artifactId>
-        <groupId>io.nosqlbench</groupId>
-        <version>3.12.155-SNAPSHOT</version>
-        <relativePath>../mvn-defaults</relativePath>
-    </parent>
+  <parent>
+    <artifactId>mvn-defaults</artifactId>
+    <groupId>io.nosqlbench</groupId>
+    <version>3.12.155-SNAPSHOT</version>
+    <relativePath>../mvn-defaults</relativePath>
+  </parent>
 
-    <artifactId>nb</artifactId>
-    <packaging>jar</packaging>
-    <name>${project.artifactId}</name>
-    <description>CLI for nosqlbench.</description>
+  <artifactId>nb</artifactId>
+  <packaging>jar</packaging>
+  <name>${project.artifactId}</name>
+  <description>CLI for nosqlbench.</description>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <javadoc.name>nosqlbench Command Line</javadoc.name>
-    </properties>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <javadoc.name>nosqlbench Command Line</javadoc.name>
+  </properties>
 
-    <dependencies>
+  <dependencies>
 
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>engine-rest</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
-        </dependency>
+    <dependency>
+      <groupId>io.nosqlbench</groupId>
+      <artifactId>engine-rest</artifactId>
+      <version>3.12.155-SNAPSHOT</version>
+    </dependency>
 
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>engine-cli</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
-        </dependency>
+    <dependency>
+      <groupId>io.nosqlbench</groupId>
+      <artifactId>engine-cli</artifactId>
+      <version>3.12.155-SNAPSHOT</version>
+    </dependency>
 
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>engine-docs</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
-        </dependency>
+    <dependency>
+      <groupId>io.nosqlbench</groupId>
+      <artifactId>engine-docs</artifactId>
+      <version>3.12.155-SNAPSHOT</version>
+    </dependency>
 
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>engine-core</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
-        </dependency>
+    <dependency>
+      <groupId>io.nosqlbench</groupId>
+      <artifactId>engine-core</artifactId>
+      <version>3.12.155-SNAPSHOT</version>
+    </dependency>
 
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>engine-extensions</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
-        </dependency>
+    <dependency>
+      <groupId>io.nosqlbench</groupId>
+      <artifactId>engine-extensions</artifactId>
+      <version>3.12.155-SNAPSHOT</version>
+    </dependency>
 
-        <!--        <dependency>-->
-        <!--            <groupId>io.nosqlbench</groupId>-->
-        <!--            <artifactId>driver-web</artifactId>-->
-        <!--            <version>3.12.83-SNAPSHOT</version>-->
-        <!--        </dependency>-->
+    <!--        <dependency>-->
+    <!--            <groupId>io.nosqlbench</groupId>-->
+    <!--            <artifactId>driver-web</artifactId>-->
+    <!--            <version>3.12.83-SNAPSHOT</version>-->
+    <!--        </dependency>-->
 
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>driver-web</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
-        </dependency>
+    <dependency>
+      <groupId>io.nosqlbench</groupId>
+      <artifactId>driver-web</artifactId>
+      <version>3.12.155-SNAPSHOT</version>
+    </dependency>
 
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>driver-kafka</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
-        </dependency>
+    <dependency>
+      <groupId>io.nosqlbench</groupId>
+      <artifactId>driver-kafka</artifactId>
+      <version>3.12.155-SNAPSHOT</version>
+    </dependency>
 
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>driver-stdout</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
-        </dependency>
+    <dependency>
+      <groupId>io.nosqlbench</groupId>
+      <artifactId>driver-stdout</artifactId>
+      <version>3.12.155-SNAPSHOT</version>
+    </dependency>
 
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>driver-diag</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
-        </dependency>
+    <dependency>
+      <groupId>io.nosqlbench</groupId>
+      <artifactId>driver-diag</artifactId>
+      <version>3.12.155-SNAPSHOT</version>
+    </dependency>
 
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>driver-tcp</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
-        </dependency>
+    <dependency>
+      <groupId>io.nosqlbench</groupId>
+      <artifactId>driver-tcp</artifactId>
+      <version>3.12.155-SNAPSHOT</version>
+    </dependency>
 
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>driver-http</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
-        </dependency>
+    <dependency>
+      <groupId>io.nosqlbench</groupId>
+      <artifactId>driver-http</artifactId>
+      <version>3.12.155-SNAPSHOT</version>
+    </dependency>
 
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>driver-jmx</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
-        </dependency>
+    <dependency>
+      <groupId>io.nosqlbench</groupId>
+      <artifactId>driver-jmx</artifactId>
+      <version>3.12.155-SNAPSHOT</version>
+    </dependency>
 
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>driver-cql-shaded</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
-        </dependency>
+    <dependency>
+      <groupId>io.nosqlbench</groupId>
+      <artifactId>driver-cql-shaded</artifactId>
+      <version>3.12.155-SNAPSHOT</version>
+    </dependency>
 
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>driver-cqlverify</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
-        </dependency>
+    <dependency>
+      <groupId>io.nosqlbench</groupId>
+      <artifactId>driver-cqlverify</artifactId>
+      <version>3.12.155-SNAPSHOT</version>
+    </dependency>
 
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>driver-mongodb</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
-        </dependency>
+    <dependency>
+      <groupId>io.nosqlbench</groupId>
+      <artifactId>driver-mongodb</artifactId>
+      <version>3.12.155-SNAPSHOT</version>
+    </dependency>
 
-        <!--        <dependency>-->
-        <!--            <groupId>io.nosqlbench</groupId>-->
-        <!--            <artifactId>nb-runtime</artifactId>-->
-        <!--            <version>2.12.51-SNAPSHOT</version>-->
-        <!--        </dependency>-->
+    <!--        <dependency>-->
+    <!--            <groupId>io.nosqlbench</groupId>-->
+    <!--            <artifactId>nb-runtime</artifactId>-->
+    <!--            <version>2.12.51-SNAPSHOT</version>-->
+    <!--        </dependency>-->
 
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+    </dependency>
 
-        <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-        </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+    </dependency>
 
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
+    <!--        <dependency>-->
+    <!--            <groupId>com.github.docker-java</groupId>-->
+    <!--            <artifactId>docker-java-api</artifactId>-->
+    <!--        </dependency>-->
 
-<!--        <dependency>-->
-<!--            <groupId>com.github.docker-java</groupId>-->
-<!--            <artifactId>docker-java-api</artifactId>-->
-<!--        </dependency>-->
+    <!--        <dependency>-->
+    <!--            <groupId>com.github.docker-java</groupId>-->
+    <!--            <artifactId>docker-java-core</artifactId>-->
+    <!--        </dependency>-->
 
-<!--        <dependency>-->
-<!--            <groupId>com.github.docker-java</groupId>-->
-<!--            <artifactId>docker-java-core</artifactId>-->
-<!--        </dependency>-->
+  </dependencies>
 
-    </dependencies>
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
 
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>3.3.0</version>
+        <configuration>
+          <descriptors>
+            <descriptor>assembly.xml</descriptor>
+          </descriptors>
+          <archive>
+            <manifest>
+              <mainClass>io.nosqlbench.engine.cli.NBCLI</mainClass>
+            </manifest>
+            <manifestEntries>
+              <Multi-Release>true</Multi-Release>
+            </manifestEntries>
+          </archive>
+        </configuration>
+        <executions>
+          <execution>
+            <id>assemble-nb</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
 
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.3.0</version>
-                <configuration>
-                    <descriptors>
-                        <descriptor>assembly.xml</descriptor>
-                    </descriptors>
-                    <archive>
-                        <manifest>
-                            <mainClass>io.nosqlbench.engine.cli.NBCLI</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>assemble-nb</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+      <!--            <filters>-->
+      <!--                <filter>-->
+      <!--                    <artifact>*:*</artifact>-->
+      <!--                    <excludes>-->
+      <!--                        <exclude>META-INF/*.SF</exclude>-->
+      <!--                        <exclude>META-INF/*.DSA</exclude>-->
+      <!--                        <exclude>META-INF/*.RSA</exclude>-->
+      <!--                    </excludes>-->
+      <!--                </filter>-->
+      <!--            </filters>-->
 
-<!--            <filters>-->
-<!--                <filter>-->
-<!--                    <artifact>*:*</artifact>-->
-<!--                    <excludes>-->
-<!--                        <exclude>META-INF/*.SF</exclude>-->
-<!--                        <exclude>META-INF/*.DSA</exclude>-->
-<!--                        <exclude>META-INF/*.RSA</exclude>-->
-<!--                    </excludes>-->
-<!--                </filter>-->
-<!--            </filters>-->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>link-nb-jar-name</id>
+            <phase>package</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <environmentVariables>
+                <NBJAR_VERSION>${project.version}</NBJAR_VERSION>
+              </environmentVariables>
+              <basedir>${project.basedir}</basedir>
+              <executable>${project.basedir}/nb-scripts/link-jar-name.sh</executable>
+            </configuration>
+          </execution>
+          <execution>
+            <id>build-static-guidebook</id>
+            <phase>package</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <basedir>${project.basedir}</basedir>
+              <executable>${project.basedir}/gendocs.sh</executable>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
 
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>link-nb-jar-name</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <environmentVariables>
-                                <NBJAR_VERSION>${project.version}</NBJAR_VERSION>
-                            </environmentVariables>
-                            <basedir>${project.basedir}</basedir>
-                            <executable>${project.basedir}/nb-scripts/link-jar-name.sh</executable>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>build-static-guidebook</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <basedir>${project.basedir}</basedir>
-                            <executable>${project.basedir}/gendocs.sh</executable>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
+    </plugins>
+  </build>
 
   <profiles>
     <profile>
@@ -316,7 +316,7 @@
     </profile>
 
 
-    </profiles>
+  </profiles>
 
 
 </project>

From 2c09b8ae7ae4a64b1bade9606d7afdcdb53c315e Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:27:48 -0600
Subject: [PATCH 022/164] typos, culling, and alignment

---
 .../nosqlbench/engine/cli/ConsoleLogging.java | 75 -------------------
 1 file changed, 75 deletions(-)
 delete mode 100644 engine-cli/src/main/java/io/nosqlbench/engine/cli/ConsoleLogging.java

diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/ConsoleLogging.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/ConsoleLogging.java
deleted file mode 100644
index cfc7999d8..000000000
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/ConsoleLogging.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- *
- *    Copyright 2016 jshook
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * /
- */
-
-package io.nosqlbench.engine.cli;
-
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.Logger;
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.classic.spi.LoggingEvent;
-import ch.qos.logback.core.ConsoleAppender;
-import ch.qos.logback.core.filter.AbstractMatcherFilter;
-import ch.qos.logback.core.spi.FilterReply;
-import org.slf4j.LoggerFactory;
-
-public class ConsoleLogging {
-
-    public static void enableConsoleLogging(Level level, String loggingPattern) {
-
-        LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
-        //List<LoggerContextListener> copyOfListenerList = loggerContext.getCopyOfListenerList();
-
-        ConsoleAppender<ILoggingEvent> ca = new ConsoleAppender<>();
-        ca.setContext(loggerContext);
-
-        PatternLayoutEncoder ple = new PatternLayoutEncoder();
-        ple.setPattern(loggingPattern);
-        ple.setContext(loggerContext);
-        ple.start();
-        ca.setEncoder(ple);
-        LevelFilter<ILoggingEvent> levelFilter = new LevelFilter<>(level);
-        levelFilter.start();
-        ca.addFilter(levelFilter);
-        ca.start();
-
-        Logger root = loggerContext.getLogger("ROOT");
-        root.addAppender(ca);
-        root.setLevel(Level.TRACE);
-    }
-
-    private static class LevelFilter<E> extends AbstractMatcherFilter<E> {
-
-        private final Level filterLevel;
-
-        public LevelFilter(Level filterLevel) {
-            this.filterLevel = filterLevel;
-        }
-        @Override
-        public FilterReply decide(Object event) {
-            if (!isStarted()) {
-                return FilterReply.NEUTRAL;
-            }
-            LoggingEvent loggingEvent = (LoggingEvent) event;
-            if (((LoggingEvent) event).getLevel().isGreaterOrEqual(filterLevel)) {
-                return FilterReply.ACCEPT;
-            }
-            return FilterReply.DENY;
-        }
-    }
-}

From a97db87f845aa77dfd987a5a99edba2e98f63318 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:27:58 -0600
Subject: [PATCH 023/164] include JSON support in project API

---
 nb-api/pom.xml                                | 39 +++++++++++--------
 .../src/test/resources/importable-config.json |  6 +++
 virtdata-userlibs/pom.xml                     |  5 ---
 3 files changed, 28 insertions(+), 22 deletions(-)
 create mode 100644 nb-api/src/test/resources/importable-config.json

diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 5a41f6031..f00001771 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -58,26 +58,31 @@
             <artifactId>log4j-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-        </dependency>
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-core</artifactId>
+      </dependency>
 
-        <dependency>
-            <groupId>net.sf.jopt-simple</groupId>
-            <artifactId>jopt-simple</artifactId>
-            <version>5.0.3</version>
-        </dependency>
+      <dependency>
+        <groupId>net.sf.jopt-simple</groupId>
+        <artifactId>jopt-simple</artifactId>
+        <version>5.0.3</version>
+      </dependency>
 
-        <!-- perf testing -->
+      <dependency>
+        <groupId>com.google.code.gson</groupId>
+        <artifactId>gson</artifactId>
+      </dependency>
 
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-annprocess</artifactId>
+      <!-- perf testing -->
+
+      <dependency>
+        <groupId>org.openjdk.jmh</groupId>
+        <artifactId>jmh-core</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>org.openjdk.jmh</groupId>
+        <artifactId>jmh-generator-annprocess</artifactId>
         </dependency>
 
         <!-- TODO: Move this down to virtdata if it is the only module group using it -->
diff --git a/nb-api/src/test/resources/importable-config.json b/nb-api/src/test/resources/importable-config.json
new file mode 100644
index 000000000..004d0f757
--- /dev/null
+++ b/nb-api/src/test/resources/importable-config.json
@@ -0,0 +1,6 @@
+{
+  "a": "B",
+  "b": "C",
+  "c": 123,
+  "d": 45.6
+}
\ No newline at end of file
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index fd434bd34..0142b6716 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -58,11 +58,6 @@
             <version>3.12.155-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-        </dependency>
-
     </dependencies>
 
     <build>

From 897a8389c9797b999f85c63c069e76f1a29214c7 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:28:10 -0600
Subject: [PATCH 024/164] generalize log level to NB

---
 .../java/io/nosqlbench/engine/cli/NBCLI.java  |  1 +
 .../nosqlbench/engine/cli/NBCLIOptions.java   | 29 ++++++-------
 .../nosqlbench/nb/api/logging/NBLogLevel.java | 42 +++++++++++++++++++
 3 files changed, 58 insertions(+), 14 deletions(-)
 create mode 100644 nb-api/src/main/java/io/nosqlbench/nb/api/logging/NBLogLevel.java

diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
index db6f08530..34ee57d16 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
@@ -21,6 +21,7 @@ import io.nosqlbench.nb.api.annotation.Annotator;
 import io.nosqlbench.nb.api.content.Content;
 import io.nosqlbench.nb.api.content.NBIO;
 import io.nosqlbench.nb.api.errors.BasicError;
+import io.nosqlbench.nb.api.logging.NBLogLevel;
 import io.nosqlbench.nb.api.markdown.exporter.MarkdownExporter;
 import io.nosqlbench.virtdata.userlibs.apps.VirtDataMainApp;
 import org.slf4j.Logger;
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
index 807377d0a..10bafb9c2 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
@@ -108,7 +108,7 @@ public class NBCLIOptions {
     private String wantsMetricsForActivity;
     private String sessionName = "";
     private boolean showScript = false;
-    private Level consoleLevel = Level.WARN;
+    private NBLogLevel consoleLevel = NBLogLevel.WARN;
     private final List<String> histoLoggerConfigs = new ArrayList<>();
     private final List<String> statsLoggerConfigs = new ArrayList<>();
     private final List<String> classicHistoConfigs = new ArrayList<>();
@@ -120,8 +120,8 @@ public class NBCLIOptions {
     private String[] rleDumpOptions = new String[0];
     private String[] cyclelogImportOptions = new String[0];
     private String consoleLoggingPattern = DEFAULT_CONSOLE_LOGGING_PATTERN;
-    private String logsLevel = "INFO";
-    private Map<String, Level> logLevelsOverrides = new HashMap<>();
+    private NBLogLevel logsLevel = NBLogLevel.INFO;
+    private Map<String, String> logLevelsOverrides = new HashMap<>();
     private boolean enableChart = false;
     private boolean dockerMetrics = false;
     private boolean wantsScenariosList = false;
@@ -393,7 +393,8 @@ public class NBCLIOptions {
                     break;
                 case LOGS_LEVEL:
                     arglist.removeFirst();
-                    logsLevel = readWordOrThrow(arglist, "a log level");
+                    String loglevel = readWordOrThrow(arglist, "a log level");
+                    this.logsLevel = NBLogLevel.valueOfName(loglevel);
                     break;
                 case LOG_LEVEL_OVERRIDE:
                     arglist.removeFirst();
@@ -464,15 +465,15 @@ public class NBCLIOptions {
                     wantsMarkerTypes = true;
                     break;
                 case DASH_V_INFO:
-                    consoleLevel = Level.INFO;
+                    consoleLevel = NBLogLevel.INFO;
                     arglist.removeFirst();
                     break;
                 case DASH_VV_DEBUG:
-                    consoleLevel = Level.DEBUG;
+                    consoleLevel = NBLogLevel.DEBUG;
                     arglist.removeFirst();
                     break;
                 case DASH_VVV_TRACE:
-                    consoleLevel = Level.TRACE;
+                    consoleLevel = NBLogLevel.TRACE;
                     arglist.removeFirst();
                     break;
                 case WITH_LOGGING_PATTERN:
@@ -508,14 +509,14 @@ public class NBCLIOptions {
         return wantsToIncludePaths.toArray(new String[0]);
     }
 
-    private Map<String, Level> parseLogLevelOverrides(String levelsSpec) {
-        Map<String, Level> levels = new HashMap<>();
+    private Map<String, String> parseLogLevelOverrides(String levelsSpec) {
+        Map<String, String> levels = new HashMap<>();
         Arrays.stream(levelsSpec.split("[,;]")).forEach(kp -> {
             String[] ll = kp.split(":");
             if (ll.length != 2) {
                 throw new RuntimeException("Log level must have name:level format");
             }
-            levels.put(ll[0], Level.toLevel(ll[1]));
+            levels.put(ll[0], ll[1]);
         });
         return levels;
     }
@@ -618,7 +619,7 @@ public class NBCLIOptions {
         return sessionName;
     }
 
-    public Level wantsConsoleLogLevel() {
+    public NBLogLevel wantsConsoleLogLevel() {
         return consoleLevel;
     }
 
@@ -642,7 +643,7 @@ public class NBCLIOptions {
     public String getProgressSpec() {
         ProgressSpec spec = parseProgressSpec(this.progressSpec);// sanity check
         if (spec.indicatorMode == IndicatorMode.console) {
-            if (Level.INFO.isGreaterOrEqual(wantsConsoleLogLevel())) {
+            if (NBLogLevel.INFO.isGreaterOrEqualTo(wantsConsoleLogLevel())) {
                 logger.warn("Console is already logging info or more, so progress data on console is suppressed.");
                 spec.indicatorMode = IndicatorMode.logonly;
             } else if (this.getCommands().stream().anyMatch(cmd -> cmd.getCmdType().equals(Cmd.CmdType.script))) {
@@ -677,7 +678,7 @@ public class NBCLIOptions {
         return logsMax;
     }
 
-    public String getLogsLevel() {
+    public NBLogLevel getScenarioLogLevel() {
         return logsLevel;
     }
 
@@ -721,7 +722,7 @@ public class NBCLIOptions {
         return consoleLoggingPattern;
     }
 
-    public Map<String, Level> getLogLevelOverrides() {
+    public Map<String, String> getLogLevelOverrides() {
         return logLevelsOverrides;
     }
 
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/logging/NBLogLevel.java b/nb-api/src/main/java/io/nosqlbench/nb/api/logging/NBLogLevel.java
new file mode 100644
index 000000000..a726a7dc1
--- /dev/null
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/logging/NBLogLevel.java
@@ -0,0 +1,42 @@
+package io.nosqlbench.nb.api.logging;
+
+public enum NBLogLevel {
+    NONE(0L),
+    FATAL(1L << 0),
+    ERROR(1L << 1),
+    WARN(1L << 2),
+    INFO(1L << 3),
+    DEBUG(1L << 4),
+    TRACE(1L << 5),
+    ALL(1L << 30),
+    ;
+
+    private final long level;
+
+    NBLogLevel(long level) {
+        this.level = level;
+    }
+
+    public static NBLogLevel valueOfName(String name) {
+        for (NBLogLevel possible : NBLogLevel.values()) {
+            if (name.toUpperCase().equals(possible.toString())) {
+                return possible;
+            }
+        }
+        throw new RuntimeException("Unable to find NBLogLevel for " + name);
+    }
+
+    public static NBLogLevel max(NBLogLevel... levels) {
+        NBLogLevel max = NBLogLevel.NONE;
+        for (NBLogLevel level : levels) {
+            if (level.level > max.level) {
+                max = level;
+            }
+        }
+        return max;
+    }
+
+    public boolean isGreaterOrEqualTo(NBLogLevel other) {
+        return level >= other.level;
+    }
+}

From e9d2b48985b7f3bb844c42eb479d51571b8f44be Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:28:19 -0600
Subject: [PATCH 025/164] environment API improvements

---
 .../src/main/java/io/nosqlbench/nb/api}/Environment.java  | 8 ++++----
 .../test/java/io/nosqlbench/nb/api}/EnvironmentTest.java  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename {engine-cli/src/main/java/io/nosqlbench/engine/cli => nb-api/src/main/java/io/nosqlbench/nb/api}/Environment.java (97%)
 rename {engine-cli/src/test/java/io/nosqlbench/engine/cli => nb-api/src/test/java/io/nosqlbench/nb/api}/EnvironmentTest.java (92%)

diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/Environment.java b/nb-api/src/main/java/io/nosqlbench/nb/api/Environment.java
similarity index 97%
rename from engine-cli/src/main/java/io/nosqlbench/engine/cli/Environment.java
rename to nb-api/src/main/java/io/nosqlbench/nb/api/Environment.java
index adf3da550..4d92c0c93 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/Environment.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/Environment.java
@@ -1,8 +1,8 @@
-package io.nosqlbench.engine.cli;
+package io.nosqlbench.nb.api;
 
 import io.nosqlbench.nb.api.errors.BasicError;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.*;
 import java.util.regex.Matcher;
@@ -36,7 +36,7 @@ import java.util.regex.Pattern;
  * invalid in this API, except when provided as a default value.
  */
 public class Environment {
-    private final static Logger logger = LoggerFactory.getLogger(Environment.class);
+    private final static Logger logger = LogManager.getLogger("ENVIRONMENT");
 
     // package private for testing
     Environment() {
diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/EnvironmentTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/EnvironmentTest.java
similarity index 92%
rename from engine-cli/src/test/java/io/nosqlbench/engine/cli/EnvironmentTest.java
rename to nb-api/src/test/java/io/nosqlbench/nb/api/EnvironmentTest.java
index c65b069f1..55b99eaee 100644
--- a/engine-cli/src/test/java/io/nosqlbench/engine/cli/EnvironmentTest.java
+++ b/nb-api/src/test/java/io/nosqlbench/nb/api/EnvironmentTest.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.engine.cli;
+package io.nosqlbench.nb.api;
 
 import org.junit.Test;
 

From e0498ff29b71b9d5983f84e8472a72f260a3f06f Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:28:26 -0600
Subject: [PATCH 026/164] docs updates

---
 engine-cli/src/main/resources/argsfile.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/engine-cli/src/main/resources/argsfile.md b/engine-cli/src/main/resources/argsfile.md
index 6dba1011c..7803a29b6 100644
--- a/engine-cli/src/main/resources/argsfile.md
+++ b/engine-cli/src/main/resources/argsfile.md
@@ -99,3 +99,9 @@ To simply set global defaults, you can run nosqlbench with a command
 line like this:
 
     ./nb --pin --docker-metrics-at metricsnode --pin --annotate all
+
+# Compatibility
+
+You should use the --pin and --unpin options to make any changes to the
+ argsfile when integrating or automating workflows. This ensures that
+ any changes to file format are handled for you by nb.
\ No newline at end of file

From 4996d206c71dfd5cd8d62a97b4bc67fbab4b3242 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:28:39 -0600
Subject: [PATCH 027/164] config API improvements

---
 .../nb/api/config/ConfigLoader.java           | 115 ++++++++++++++++++
 .../nosqlbench/nb/api/config/ConfigModel.java |  16 +--
 .../nb/api/config/MutableConfigModel.java     | 110 +++++++++++++++--
 .../nb/api/config/ConfigLoaderTest.java       |  49 ++++++++
 .../basics/shared/stateful/LoadElement.java   |   8 +-
 5 files changed, 273 insertions(+), 25 deletions(-)
 create mode 100644 nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigLoader.java
 create mode 100644 nb-api/src/test/java/io/nosqlbench/nb/api/config/ConfigLoaderTest.java

diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigLoader.java b/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigLoader.java
new file mode 100644
index 000000000..a4e693a58
--- /dev/null
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigLoader.java
@@ -0,0 +1,115 @@
+package io.nosqlbench.nb.api.config;
+
+import com.google.gson.*;
+import io.nosqlbench.nb.api.content.NBIO;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * <P>The config loader is meant to be the way that configurations
+ * for objects or subsystems are loaded generically.</P>
+ *
+ * <p>It supports value which are defined as JSON objects, lists
+ * of JSON objects, or as a fall-back simple parameter maps according to
+ * {@link ParamsParser} rules.</p>
+ *
+ * If a block of config data begins with a '[' (open square bracket),
+ * it is taken as a JSON list of configs. If it starts with a '{' (open curly
+ * brace), it is taken as a single config. Otherwise it is taken as a simple
+ * set of named parameters using '=' as an assignment operator.
+ *
+ * An empty string represents the null value.
+ *
+ * Users of this interface should be prepared to receive a null, or a list
+ * of zero or more config elements of the requested type.
+ *
+ * <H1>Importing configs</H1>
+ * <p>
+ * Configs can be imported from local files, classpath resources, or URLs.
+ * This is supported with the form of <pre>{@code IMPORT{URL}}</pre>
+ * where URL can be any form mentioned above. This syntax is obtuse and
+ * strange, but the point of this is to use something
+ * that should never occur in the wild, to avoid collisions with actual
+ * configuration content, but which is also clearly doing what it says.</p>
+ */
+public class ConfigLoader {
+    private static final Gson gson = new GsonBuilder().setPrettyPrinting().create();
+    private final static Logger logger = LogManager.getLogger("CONFIG");
+
+    /**
+     * Load a string into an ordered map of objects, with the key being defined
+     * by an extractor function over the objects. Any duplicate keys are treated
+     * as an error. This is a useful method for loading configuration blocks
+     * which must be distinctly named.
+     *
+     * @param source The config data
+     * @param type   The type of configuration object to be stored in the map values
+     * @param keyer  The function that extracts the key
+     * @param <V>    The generic parameter for the type field
+     * @return A map of named configuration objects
+     */
+    public <V> LinkedHashMap<String, V> loadMap(
+            CharSequence source,
+            Class<? extends V> type,
+            Function<V, String> keyer) {
+
+        LinkedHashMap<String, V> mapOf = new LinkedHashMap<>();
+        List<V> elems = load(source, type);
+
+        for (V elem : elems) {
+            String key = keyer.apply(elem);
+            if (mapOf.containsKey(key)) {
+                throw new RuntimeException("Duplicitous key mappings are disallowed here.");
+            }
+            mapOf.put(key, elem);
+        }
+        return mapOf;
+    }
+
+    public <T> List<T> load(CharSequence source, Class<? extends T> type) {
+        List<T> cfgs = new ArrayList<>();
+
+        String data = source.toString();
+        data = data.trim();
+        if (data.isEmpty()) {
+            return null;
+        }
+
+        if (data.startsWith("IMPORT{") && data.endsWith("}")) {
+            String filename = data.substring("IMPORT{".length(), data.length() - 1);
+            Path filepath = Path.of(filename);
+
+            data = NBIO.all().name(filename).first()
+                    .map(c -> {
+                        logger.debug("found 'data' at " + c.getURI());
+                        return c.asString();
+                    }).orElseThrow();
+        }
+
+        if (data.startsWith("{") || data.startsWith("[")) {
+            JsonParser parser = new JsonParser();
+
+            JsonElement jsonElement = parser.parse(data);
+            if (jsonElement.isJsonArray()) {
+                JsonArray asJsonArray = jsonElement.getAsJsonArray();
+                for (JsonElement element : asJsonArray) {
+                    T object = gson.fromJson(element, type);
+                    cfgs.add(object);
+                }
+            } else if (jsonElement.isJsonObject()) {
+                cfgs.add(gson.fromJson(jsonElement, type));
+            }
+        } else if (Map.class.isAssignableFrom(type)) {
+            Map<String, String> parsedMap = ParamsParser.parse(data, false);
+            cfgs.add(type.cast(parsedMap));
+        }
+        return cfgs;
+    }
+}
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigModel.java b/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigModel.java
index 4a1eff0ce..0043275a9 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigModel.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigModel.java
@@ -1,17 +1,13 @@
 package io.nosqlbench.nb.api.config;
 
-import java.util.List;
+import java.util.Map;
 
 public interface ConfigModel {
-    List<Element> getElements();
+    Map<String, ConfigElement> getElements();
 
-    class Element {
-        public final String name;
-        public final Class<?> type;
+    Class<?> getOf();
 
-        public Element(String name, Class<?> type) {
-            this.name = name;
-            this.type = type;
-        }
-    }
+    void assertValidConfig(Map<String, ?> config);
+
+    ConfigReader apply(Map<String, ?> config);
 }
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/MutableConfigModel.java b/nb-api/src/main/java/io/nosqlbench/nb/api/config/MutableConfigModel.java
index 18790b595..16f3ed183 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/config/MutableConfigModel.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/config/MutableConfigModel.java
@@ -1,22 +1,52 @@
 package io.nosqlbench.nb.api.config;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 public class MutableConfigModel implements ConfigModel {
 
-    private final List<ConfigModel.Element> elements = new ArrayList<>();
+    private final LinkedHashMap<String, ConfigElement> elements = new LinkedHashMap<>();
+    private final Class<?> ofType;
 
-    public MutableConfigModel() {}
+    public MutableConfigModel(Class<?> ofType) {
+        this.ofType = ofType;
+    }
 
-    public MutableConfigModel add(String name, Class<?> clazz) {
-        add(new ConfigModel.Element(name, clazz));
+    public MutableConfigModel(Object ofObject) {
+        this.ofType = ofObject.getClass();
+    }
+
+    public MutableConfigModel optional(String name, Class<?> clazz) {
+        add(new ConfigElement(name, clazz, "", false, null));
         return this;
     }
 
-    private void add(ConfigModel.Element element) {
-        this.elements.add(element);
+    public MutableConfigModel optional(String name, Class<?> clazz, String description) {
+        add(new ConfigElement(name, clazz, description, false, null));
+        return this;
+    }
+
+    public MutableConfigModel required(String name, Class<?> clazz, String description) {
+        add(new ConfigElement(name, clazz, description, true, null));
+        return this;
+    }
+
+    public MutableConfigModel required(String name, Class<?> clazz) {
+        add(new ConfigElement(name, clazz, "", true, null));
+        return this;
+    }
+
+    public MutableConfigModel defaultto(String name, Object defaultValue) {
+        add(new ConfigElement(name, defaultValue.getClass(), "", true, defaultValue));
+        return this;
+    }
+
+    public MutableConfigModel defaultto(String name, Object defaultValue, String description) {
+        add(new ConfigElement(name, defaultValue.getClass(), description, true, defaultValue));
+        return this;
+    }
+
+    private void add(ConfigElement element) {
+        this.elements.put(element.name, element);
     }
 
     public ConfigModel asReadOnly() {
@@ -24,7 +54,65 @@ public class MutableConfigModel implements ConfigModel {
     }
 
     @Override
-    public List<Element> getElements() {
-        return Collections.unmodifiableList(elements);
+    public Map<String, ConfigElement> getElements() {
+        return Collections.unmodifiableMap(elements);
+    }
+
+    @Override
+    public Class<?> getOf() {
+        return ofType;
+    }
+
+    @Override
+    public void assertValidConfig(Map<String, ?> config) {
+        for (String configkey : config.keySet()) {
+            ConfigElement element = this.elements.get(configkey);
+            if (element == null) {
+                throw new RuntimeException(
+                        "Unknown config parameter in config model '" + configkey + "'\n" +
+                                "while configuring a " + getOf().getSimpleName());
+            }
+            Object value = config.get(configkey);
+            if (!element.getType().isAssignableFrom(value.getClass())) {
+                throw new RuntimeException("Unable to assign provided configuration\n" +
+                        "of type '" + value.getClass().getSimpleName() + " to config\n" +
+                        "parameter of type '" + element.getType().getSimpleName() + "'\n" +
+                        "while configuring a " + getOf().getSimpleName());
+            }
+        }
+        for (ConfigElement element : elements.values()) {
+            if (element.isRequired() && element.getDefaultValue() == null) {
+                if (!config.containsKey(element.getName())) {
+                    throw new RuntimeException("A required config element named '" + element.getName() +
+                            "' and type '" + element.getType().getSimpleName() + "' was not found\n" +
+                            "for configuring a " + getOf().getSimpleName());
+                }
+            }
+        }
+    }
+
+    @Override
+    public ConfigReader apply(Map<String, ?> config) {
+        assertValidConfig(config);
+        LinkedHashMap<String, Object> validConfig = new LinkedHashMap<>();
+
+        elements.forEach((k, v) -> {
+            String name = v.getName();
+            Class<?> type = v.getType();
+            Object cval = config.get(name);
+            if (cval == null && v.isRequired()) {
+                cval = v.getDefaultValue();
+            }
+            if (cval != null) {
+                if (type.isAssignableFrom(cval.getClass())) {
+                    validConfig.put(name, cval);
+                } else {
+                    throw new RuntimeException("Unable to assign a " + cval.getClass().getSimpleName() +
+                            " to a " + type.getSimpleName());
+                }
+            }
+        });
+
+        return new ConfigReader(this.asReadOnly(), validConfig);
     }
 }
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/config/ConfigLoaderTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/config/ConfigLoaderTest.java
new file mode 100644
index 000000000..9ad30c9d2
--- /dev/null
+++ b/nb-api/src/test/java/io/nosqlbench/nb/api/config/ConfigLoaderTest.java
@@ -0,0 +1,49 @@
+package io.nosqlbench.nb.api.config;
+
+import org.junit.Test;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+
+public class ConfigLoaderTest {
+
+    @Test
+    public void testSingleParams() {
+        ConfigLoader cl = new ConfigLoader();
+        List<Map> cfg1 = cl.load("a=b c=234", Map.class);
+        assertThat(cfg1).contains(Map.of("a", "b", "c", "234"));
+    }
+
+    @Test
+    public void testSingleJsonObject() {
+        ConfigLoader cl = new ConfigLoader();
+        List<Map> cfg1 = cl.load("{a:'b', c:'234'}", Map.class);
+        assertThat(cfg1).contains(Map.of("a", "b", "c", "234"));
+    }
+
+    @Test
+    public void testJsonArray() {
+        ConfigLoader cl = new ConfigLoader();
+        List<Map> cfg1 = cl.load("[{a:'b', c:'234'}]", Map.class);
+        assertThat(cfg1).contains(Map.of("a", "b", "c", "234"));
+
+    }
+
+    @Test
+    public void testImportSingle() {
+        ConfigLoader cl = new ConfigLoader();
+        List<Map> imported = cl.load("IMPORT{importable-config.json}", Map.class);
+        assertThat(imported).contains(Map.of("a", "B", "b", "C", "c", 123.0, "d", 45.6));
+    }
+
+    @Test
+    public void testEmpty() {
+        ConfigLoader cl = new ConfigLoader();
+        List<Map> cfg1 = cl.load("", Map.class);
+        assertThat(cfg1).isNull();
+
+    }
+}
\ No newline at end of file
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadElement.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadElement.java
index ac810cc8a..1b9ada6f5 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadElement.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadElement.java
@@ -42,15 +42,15 @@ public class LoadElement implements Function<Object,Object>, ConfigAware {
     }
 
     @Override
-    public void applyConfig(Map<String, ?> elements) {
-        Map<String,?> vars = (Map<String, ?>) elements.get(mapname);
-        if (vars!=null) {
+    public void applyConfig(Map<String, ?> providedConfig) {
+        Map<String, ?> vars = (Map<String, ?>) providedConfig.get(mapname);
+        if (vars != null) {
             this.vars = vars;
         }
     }
 
     @Override
     public ConfigModel getConfigModel() {
-        return new MutableConfigModel().add("<mapname>",Map.class);
+        return new MutableConfigModel(this).optional("<mapname>", Map.class);
     }
 }

From fa85704b837d32f95765582712b206e28b081a58 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:28:54 -0600
Subject: [PATCH 028/164] add SPI impl selector field 'selector'

---
 .../src/main/java/io/nosqlbench/nb/annotations/Service.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nb-annotations/src/main/java/io/nosqlbench/nb/annotations/Service.java b/nb-annotations/src/main/java/io/nosqlbench/nb/annotations/Service.java
index c2a79ec6e..8b8aa60b9 100644
--- a/nb-annotations/src/main/java/io/nosqlbench/nb/annotations/Service.java
+++ b/nb-annotations/src/main/java/io/nosqlbench/nb/annotations/Service.java
@@ -30,4 +30,6 @@ import java.lang.annotation.Target;
 @Target(ElementType.TYPE)
 public @interface Service {
     Class<?> value();
+
+    String selector() default "";
 }

From a3e0739ade4f8b0a7f99950547a15b205bdddb2b Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:29:11 -0600
Subject: [PATCH 029/164] add FixedValues for double

---
 .../from_long/to_double/FixedValues.java      | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/FixedValues.java

diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/FixedValues.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/FixedValues.java
new file mode 100644
index 000000000..edd566a72
--- /dev/null
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/FixedValues.java
@@ -0,0 +1,23 @@
+package io.nosqlbench.virtdata.library.basics.shared.from_long.to_double;
+
+import io.nosqlbench.virtdata.api.annotations.Example;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
+
+import java.util.function.LongToDoubleFunction;
+
+@ThreadSafeMapper
+public class FixedValues implements LongToDoubleFunction {
+
+    private final long[] fixedValues;
+
+    @Example({"FixedValues(3D,53D,73d)", "Yield 3D, 53D, 73D, 3D, 53D, 73D, 3D, ..."})
+    public FixedValues(long... values) {
+        this.fixedValues = values;
+    }
+
+    @Override
+    public double applyAsDouble(long value) {
+        int index = (int) (value % Integer.MAX_VALUE) % fixedValues.length;
+        return fixedValues[index];
+    }
+}

From 60fa052951f75eb25725871709ffd2cd25be4b68 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:29:17 -0600
Subject: [PATCH 030/164] add default log4j configs

---
 docsys/src/main/resources/logback-docsys.xml  | 39 ------------------
 engine-api/src/test/resources/log4j-test.xml  | 41 +++++++++++++++++++
 .../src/test/resources/logback-test.xml       | 14 -------
 engine-cli/src/main/resources/log4j.xml       | 41 +++++++++++++++++++
 engine-cli/src/main/resources/logback.xml     | 34 ---------------
 engine-cli/src/test/resources/log4j-test.xml  | 41 +++++++++++++++++++
 .../src/test/resources/logback-test.xml       | 15 -------
 engine-core/src/main/resources/log4j.xml      | 41 +++++++++++++++++++
 engine-core/src/main/resources/logback.xml    | 14 -------
 engine-core/src/test/resources/log4j-test.xml | 41 +++++++++++++++++++
 .../src/test/resources/logback-test.xml       | 16 --------
 nb/src/main/resources/log4j.xml               | 41 +++++++++++++++++++
 nb/src/main/resources/logback.xml             | 40 ------------------
 .../src/test/resources/log4j-test.xml         | 41 +++++++++++++++++++
 .../src/test/resources/logback-test.xml       | 13 ------
 .../src/test/resources/log4j-test.xml         | 41 +++++++++++++++++++
 .../src/test/resources/logback-test.xml       | 14 -------
 .../src/main/resources/log4j.xml              | 41 +++++++++++++++++++
 .../src/main/resources/logback.xml            | 15 -------
 .../src/test/resources/log4j-test.xml         | 41 +++++++++++++++++++
 .../src/test/resources/logback-test.xml       | 13 ------
 21 files changed, 410 insertions(+), 227 deletions(-)
 delete mode 100644 docsys/src/main/resources/logback-docsys.xml
 create mode 100644 engine-api/src/test/resources/log4j-test.xml
 delete mode 100644 engine-api/src/test/resources/logback-test.xml
 create mode 100644 engine-cli/src/main/resources/log4j.xml
 delete mode 100644 engine-cli/src/main/resources/logback.xml
 create mode 100644 engine-cli/src/test/resources/log4j-test.xml
 delete mode 100644 engine-cli/src/test/resources/logback-test.xml
 create mode 100644 engine-core/src/main/resources/log4j.xml
 delete mode 100644 engine-core/src/main/resources/logback.xml
 create mode 100644 engine-core/src/test/resources/log4j-test.xml
 delete mode 100644 engine-core/src/test/resources/logback-test.xml
 create mode 100644 nb/src/main/resources/log4j.xml
 delete mode 100644 nb/src/main/resources/logback.xml
 create mode 100644 virtdata-lang/src/test/resources/log4j-test.xml
 delete mode 100644 virtdata-lang/src/test/resources/logback-test.xml
 create mode 100644 virtdata-lib-basics/src/test/resources/log4j-test.xml
 delete mode 100644 virtdata-lib-basics/src/test/resources/logback-test.xml
 create mode 100644 virtdata-userlibs/src/main/resources/log4j.xml
 delete mode 100644 virtdata-userlibs/src/main/resources/logback.xml
 create mode 100644 virtdata-userlibs/src/test/resources/log4j-test.xml
 delete mode 100644 virtdata-userlibs/src/test/resources/logback-test.xml

diff --git a/docsys/src/main/resources/logback-docsys.xml b/docsys/src/main/resources/logback-docsys.xml
deleted file mode 100644
index 75ee168cf..000000000
--- a/docsys/src/main/resources/logback-docsys.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
-
-    <appender name="DOCSLOGS" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <param name="Append" value="false"/>
-        <append>false</append>
-        <file>logs/docserver.log</file>
-        <encoder>
-            <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
-        </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <append>false</append>
-            <fileNamePattern>logs/archived/app.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-            <!-- each archived file, size max 10MB -->
-            <maxFileSize>50MB</maxFileSize>
-            <!-- total size of all archive files, if total size > 20GB, it will delete old archived file -->
-            <totalSizeCap>250GB</totalSizeCap>
-            <!-- 60 days to keep -->
-            <maxHistory>1</maxHistory>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-    </appender>
-    <logger name="io.nosqlbench.docsys" level="debug" additivity="false">
-        <appender-ref ref="DOCSLOGS"/>
-    </logger>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
-        </encoder>
-    </appender>
-
-    <root level="trace">
-        <appender-ref ref="STDOUT"/>
-<!--        <appender-ref ref="DOCSLOGS"/>-->
-    </root>
-
-</configuration>
\ No newline at end of file
diff --git a/engine-api/src/test/resources/log4j-test.xml b/engine-api/src/test/resources/log4j-test.xml
new file mode 100644
index 000000000..70176aaf6
--- /dev/null
+++ b/engine-api/src/test/resources/log4j-test.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="debug" strict="true" name="XMLConfigTest"
+               packages="org.apache.logging.log4j.test">
+
+  <Filter type="ThresholdFilter" level="trace"/>
+
+  <Appenders>
+    <Appender type="Console" name="STDOUT">
+      <Layout type="PatternLayout" pattern="%7r %-5level [%t] %-12logger{0} %msg%n%throwable"/>
+      <Filters>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="DENY" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="DENY" onMismatch="ACCEPT"/>
+      </Filters>
+    </Appender>
+    <Appender type="Console" name="FLOW">
+      <Layout type="PatternLayout" pattern="%C{1}.%M %m %ex%n"/><!-- class and line number -->
+      <Filters>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="ACCEPT" onMismatch="DENY"/>
+      </Filters>
+    </Appender>
+    <Appender type="File" name="APPSLOG" fileName="docs/apps.log">
+      <Layout type="PatternLayout">
+        <Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
+      </Layout>
+    </Appender>
+  </Appenders>
+
+  <Loggers>
+
+    <Logger name="io.nosqlbench.docsys" level="info" additivity="false" specificity="trace">
+      <AppenderRef ref="APPSLOG"/>
+    </Logger>
+
+    <Root level="trace">
+      <AppenderRef ref="STDOUT"/>
+    </Root>
+
+  </Loggers>
+
+</Configuration>
\ No newline at end of file
diff --git a/engine-api/src/test/resources/logback-test.xml b/engine-api/src/test/resources/logback-test.xml
deleted file mode 100644
index b352084ec..000000000
--- a/engine-api/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- logback-test.xml for engine-api -->
-<configuration debug="true">
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <layout class="ch.qos.logback.classic.PatternLayout">
-      <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
-    </layout>
-  </appender>
-
-  <root level="debug">
-    <appender-ref ref="STDOUT"/>
-  </root>
-</configuration>
\ No newline at end of file
diff --git a/engine-cli/src/main/resources/log4j.xml b/engine-cli/src/main/resources/log4j.xml
new file mode 100644
index 000000000..70176aaf6
--- /dev/null
+++ b/engine-cli/src/main/resources/log4j.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="debug" strict="true" name="XMLConfigTest"
+               packages="org.apache.logging.log4j.test">
+
+  <Filter type="ThresholdFilter" level="trace"/>
+
+  <Appenders>
+    <Appender type="Console" name="STDOUT">
+      <Layout type="PatternLayout" pattern="%7r %-5level [%t] %-12logger{0} %msg%n%throwable"/>
+      <Filters>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="DENY" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="DENY" onMismatch="ACCEPT"/>
+      </Filters>
+    </Appender>
+    <Appender type="Console" name="FLOW">
+      <Layout type="PatternLayout" pattern="%C{1}.%M %m %ex%n"/><!-- class and line number -->
+      <Filters>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="ACCEPT" onMismatch="DENY"/>
+      </Filters>
+    </Appender>
+    <Appender type="File" name="APPSLOG" fileName="docs/apps.log">
+      <Layout type="PatternLayout">
+        <Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
+      </Layout>
+    </Appender>
+  </Appenders>
+
+  <Loggers>
+
+    <Logger name="io.nosqlbench.docsys" level="info" additivity="false" specificity="trace">
+      <AppenderRef ref="APPSLOG"/>
+    </Logger>
+
+    <Root level="trace">
+      <AppenderRef ref="STDOUT"/>
+    </Root>
+
+  </Loggers>
+
+</Configuration>
\ No newline at end of file
diff --git a/engine-cli/src/main/resources/logback.xml b/engine-cli/src/main/resources/logback.xml
deleted file mode 100644
index 7513a2819..000000000
--- a/engine-cli/src/main/resources/logback.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- logback.xml for engine-cli -->
-<configuration>
-    <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
-        </encoder>
-    </appender>
-
-    <appender name="DOCSLOGS" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>logs/docserver.log</file>
-        <encoder>
-            <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
-        </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>logs/archived/app.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-            <!-- each archived file, size max 10MB -->
-            <maxFileSize>50MB</maxFileSize>
-            <!-- total size of all archive files, if total size > 20GB, it will delete old archived file -->
-            <totalSizeCap>250GB</totalSizeCap>
-            <!-- 60 days to keep -->
-            <maxHistory>1</maxHistory>
-        </rollingPolicy>
-    </appender>
-
-    <logger name="io.nosqlbench.docsys" level="info" additivity="true">
-        <appender-ref ref="DOCSLOGS"/>
-    </logger>
-
-    <!--<logger name="io.nosqlbench" specificity="TRACE"/>-->
-
-</configuration>
\ No newline at end of file
diff --git a/engine-cli/src/test/resources/log4j-test.xml b/engine-cli/src/test/resources/log4j-test.xml
new file mode 100644
index 000000000..70176aaf6
--- /dev/null
+++ b/engine-cli/src/test/resources/log4j-test.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="debug" strict="true" name="XMLConfigTest"
+               packages="org.apache.logging.log4j.test">
+
+  <Filter type="ThresholdFilter" level="trace"/>
+
+  <Appenders>
+    <Appender type="Console" name="STDOUT">
+      <Layout type="PatternLayout" pattern="%7r %-5level [%t] %-12logger{0} %msg%n%throwable"/>
+      <Filters>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="DENY" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="DENY" onMismatch="ACCEPT"/>
+      </Filters>
+    </Appender>
+    <Appender type="Console" name="FLOW">
+      <Layout type="PatternLayout" pattern="%C{1}.%M %m %ex%n"/><!-- class and line number -->
+      <Filters>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="ACCEPT" onMismatch="DENY"/>
+      </Filters>
+    </Appender>
+    <Appender type="File" name="APPSLOG" fileName="docs/apps.log">
+      <Layout type="PatternLayout">
+        <Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
+      </Layout>
+    </Appender>
+  </Appenders>
+
+  <Loggers>
+
+    <Logger name="io.nosqlbench.docsys" level="info" additivity="false" specificity="trace">
+      <AppenderRef ref="APPSLOG"/>
+    </Logger>
+
+    <Root level="trace">
+      <AppenderRef ref="STDOUT"/>
+    </Root>
+
+  </Loggers>
+
+</Configuration>
\ No newline at end of file
diff --git a/engine-cli/src/test/resources/logback-test.xml b/engine-cli/src/test/resources/logback-test.xml
deleted file mode 100644
index b5e147ade..000000000
--- a/engine-cli/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- logback-test for nb-test -->
-<configuration>
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <layout class="ch.qos.logback.classic.PatternLayout">
-      <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
-    </layout>
-  </appender>
-
-  <root level="trace">
-    <appender-ref ref="STDOUT" />
-  </root>
-</configuration>
\ No newline at end of file
diff --git a/engine-core/src/main/resources/log4j.xml b/engine-core/src/main/resources/log4j.xml
new file mode 100644
index 000000000..70176aaf6
--- /dev/null
+++ b/engine-core/src/main/resources/log4j.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="debug" strict="true" name="XMLConfigTest"
+               packages="org.apache.logging.log4j.test">
+
+  <Filter type="ThresholdFilter" level="trace"/>
+
+  <Appenders>
+    <Appender type="Console" name="STDOUT">
+      <Layout type="PatternLayout" pattern="%7r %-5level [%t] %-12logger{0} %msg%n%throwable"/>
+      <Filters>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="DENY" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="DENY" onMismatch="ACCEPT"/>
+      </Filters>
+    </Appender>
+    <Appender type="Console" name="FLOW">
+      <Layout type="PatternLayout" pattern="%C{1}.%M %m %ex%n"/><!-- class and line number -->
+      <Filters>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="ACCEPT" onMismatch="DENY"/>
+      </Filters>
+    </Appender>
+    <Appender type="File" name="APPSLOG" fileName="docs/apps.log">
+      <Layout type="PatternLayout">
+        <Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
+      </Layout>
+    </Appender>
+  </Appenders>
+
+  <Loggers>
+
+    <Logger name="io.nosqlbench.docsys" level="info" additivity="false" specificity="trace">
+      <AppenderRef ref="APPSLOG"/>
+    </Logger>
+
+    <Root level="trace">
+      <AppenderRef ref="STDOUT"/>
+    </Root>
+
+  </Loggers>
+
+</Configuration>
\ No newline at end of file
diff --git a/engine-core/src/main/resources/logback.xml b/engine-core/src/main/resources/logback.xml
deleted file mode 100644
index 12e2f501d..000000000
--- a/engine-core/src/main/resources/logback.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- logback.xml for engine-core -->
-<configuration>
-<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
-
-<!--<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">-->
-    <!--<encoder>-->
-      <!--<Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>-->
-    <!--</encoder>-->
-  <!--</appender>-->
-
-  <logger name="io.nosqlbench" specificity="TRACE"/>
-
-</configuration>
diff --git a/engine-core/src/test/resources/log4j-test.xml b/engine-core/src/test/resources/log4j-test.xml
new file mode 100644
index 000000000..70176aaf6
--- /dev/null
+++ b/engine-core/src/test/resources/log4j-test.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="debug" strict="true" name="XMLConfigTest"
+               packages="org.apache.logging.log4j.test">
+
+  <Filter type="ThresholdFilter" level="trace"/>
+
+  <Appenders>
+    <Appender type="Console" name="STDOUT">
+      <Layout type="PatternLayout" pattern="%7r %-5level [%t] %-12logger{0} %msg%n%throwable"/>
+      <Filters>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="DENY" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="DENY" onMismatch="ACCEPT"/>
+      </Filters>
+    </Appender>
+    <Appender type="Console" name="FLOW">
+      <Layout type="PatternLayout" pattern="%C{1}.%M %m %ex%n"/><!-- class and line number -->
+      <Filters>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="ACCEPT" onMismatch="DENY"/>
+      </Filters>
+    </Appender>
+    <Appender type="File" name="APPSLOG" fileName="docs/apps.log">
+      <Layout type="PatternLayout">
+        <Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
+      </Layout>
+    </Appender>
+  </Appenders>
+
+  <Loggers>
+
+    <Logger name="io.nosqlbench.docsys" level="info" additivity="false" specificity="trace">
+      <AppenderRef ref="APPSLOG"/>
+    </Logger>
+
+    <Root level="trace">
+      <AppenderRef ref="STDOUT"/>
+    </Root>
+
+  </Loggers>
+
+</Configuration>
\ No newline at end of file
diff --git a/engine-core/src/test/resources/logback-test.xml b/engine-core/src/test/resources/logback-test.xml
deleted file mode 100644
index 5fd8688bc..000000000
--- a/engine-core/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- logback-test for engine-core -->
-<configuration>
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <layout class="ch.qos.logback.classic.PatternLayout">
-      <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
-    </layout>
-  </appender>
-
-  <logger name="io.nosqlbench" specificity="INFO"/>
-
-  <root level="debug">
-    <appender-ref ref="STDOUT" />
-  </root>
-</configuration>
\ No newline at end of file
diff --git a/nb/src/main/resources/log4j.xml b/nb/src/main/resources/log4j.xml
new file mode 100644
index 000000000..70176aaf6
--- /dev/null
+++ b/nb/src/main/resources/log4j.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="debug" strict="true" name="XMLConfigTest"
+               packages="org.apache.logging.log4j.test">
+
+  <Filter type="ThresholdFilter" level="trace"/>
+
+  <Appenders>
+    <Appender type="Console" name="STDOUT">
+      <Layout type="PatternLayout" pattern="%7r %-5level [%t] %-12logger{0} %msg%n%throwable"/>
+      <Filters>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="DENY" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="DENY" onMismatch="ACCEPT"/>
+      </Filters>
+    </Appender>
+    <Appender type="Console" name="FLOW">
+      <Layout type="PatternLayout" pattern="%C{1}.%M %m %ex%n"/><!-- class and line number -->
+      <Filters>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="ACCEPT" onMismatch="DENY"/>
+      </Filters>
+    </Appender>
+    <Appender type="File" name="APPSLOG" fileName="docs/apps.log">
+      <Layout type="PatternLayout">
+        <Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
+      </Layout>
+    </Appender>
+  </Appenders>
+
+  <Loggers>
+
+    <Logger name="io.nosqlbench.docsys" level="info" additivity="false" specificity="trace">
+      <AppenderRef ref="APPSLOG"/>
+    </Logger>
+
+    <Root level="trace">
+      <AppenderRef ref="STDOUT"/>
+    </Root>
+
+  </Loggers>
+
+</Configuration>
\ No newline at end of file
diff --git a/nb/src/main/resources/logback.xml b/nb/src/main/resources/logback.xml
deleted file mode 100644
index 4016f4bf8..000000000
--- a/nb/src/main/resources/logback.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- logback.xml for engine-core -->
-<configuration>
-    <statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
-
-    <!--<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">-->
-    <!--<encoder>-->
-    <!--<Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>-->
-    <!--</encoder>-->
-    <!--</appender>-->
-
-    <logger name="io.nosqlbench" specificity="TRACE"/>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
-        </encoder>
-    </appender>
-
-    <appender name="DOCSLOGS" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>logs/docserver.log</file>
-        <encoder>
-            <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
-        </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>logs/archived/app.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-            <!-- each archived file, size max 10MB -->
-            <maxFileSize>50MB</maxFileSize>
-            <!-- total size of all archive files, if total size > 20GB, it will delete old archived file -->
-            <totalSizeCap>250GB</totalSizeCap>
-            <!-- 60 days to keep -->
-            <maxHistory>1</maxHistory>
-        </rollingPolicy>
-    </appender>
-
-    <logger name="io.nosqlbench.docsys" level="info" additivity="true">
-        <appender-ref ref="DOCSLOGS"/>
-    </logger>
-
-</configuration>
diff --git a/virtdata-lang/src/test/resources/log4j-test.xml b/virtdata-lang/src/test/resources/log4j-test.xml
new file mode 100644
index 000000000..70176aaf6
--- /dev/null
+++ b/virtdata-lang/src/test/resources/log4j-test.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="debug" strict="true" name="XMLConfigTest"
+               packages="org.apache.logging.log4j.test">
+
+  <Filter type="ThresholdFilter" level="trace"/>
+
+  <Appenders>
+    <Appender type="Console" name="STDOUT">
+      <Layout type="PatternLayout" pattern="%7r %-5level [%t] %-12logger{0} %msg%n%throwable"/>
+      <Filters>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="DENY" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="DENY" onMismatch="ACCEPT"/>
+      </Filters>
+    </Appender>
+    <Appender type="Console" name="FLOW">
+      <Layout type="PatternLayout" pattern="%C{1}.%M %m %ex%n"/><!-- class and line number -->
+      <Filters>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="ACCEPT" onMismatch="DENY"/>
+      </Filters>
+    </Appender>
+    <Appender type="File" name="APPSLOG" fileName="docs/apps.log">
+      <Layout type="PatternLayout">
+        <Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
+      </Layout>
+    </Appender>
+  </Appenders>
+
+  <Loggers>
+
+    <Logger name="io.nosqlbench.docsys" level="info" additivity="false" specificity="trace">
+      <AppenderRef ref="APPSLOG"/>
+    </Logger>
+
+    <Root level="trace">
+      <AppenderRef ref="STDOUT"/>
+    </Root>
+
+  </Loggers>
+
+</Configuration>
\ No newline at end of file
diff --git a/virtdata-lang/src/test/resources/logback-test.xml b/virtdata-lang/src/test/resources/logback-test.xml
deleted file mode 100644
index 5060e6eed..000000000
--- a/virtdata-lang/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <layout class="ch.qos.logback.classic.PatternLayout">
-      <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
-    </layout>
-  </appender>
-
-  <root level="debug">
-    <appender-ref ref="STDOUT" />
-  </root>
-</configuration>
\ No newline at end of file
diff --git a/virtdata-lib-basics/src/test/resources/log4j-test.xml b/virtdata-lib-basics/src/test/resources/log4j-test.xml
new file mode 100644
index 000000000..70176aaf6
--- /dev/null
+++ b/virtdata-lib-basics/src/test/resources/log4j-test.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="debug" strict="true" name="XMLConfigTest"
+               packages="org.apache.logging.log4j.test">
+
+  <Filter type="ThresholdFilter" level="trace"/>
+
+  <Appenders>
+    <Appender type="Console" name="STDOUT">
+      <Layout type="PatternLayout" pattern="%7r %-5level [%t] %-12logger{0} %msg%n%throwable"/>
+      <Filters>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="DENY" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="DENY" onMismatch="ACCEPT"/>
+      </Filters>
+    </Appender>
+    <Appender type="Console" name="FLOW">
+      <Layout type="PatternLayout" pattern="%C{1}.%M %m %ex%n"/><!-- class and line number -->
+      <Filters>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="ACCEPT" onMismatch="DENY"/>
+      </Filters>
+    </Appender>
+    <Appender type="File" name="APPSLOG" fileName="docs/apps.log">
+      <Layout type="PatternLayout">
+        <Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
+      </Layout>
+    </Appender>
+  </Appenders>
+
+  <Loggers>
+
+    <Logger name="io.nosqlbench.docsys" level="info" additivity="false" specificity="trace">
+      <AppenderRef ref="APPSLOG"/>
+    </Logger>
+
+    <Root level="trace">
+      <AppenderRef ref="STDOUT"/>
+    </Root>
+
+  </Loggers>
+
+</Configuration>
\ No newline at end of file
diff --git a/virtdata-lib-basics/src/test/resources/logback-test.xml b/virtdata-lib-basics/src/test/resources/logback-test.xml
deleted file mode 100644
index c38e933b1..000000000
--- a/virtdata-lib-basics/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <layout class="ch.qos.logback.classic.PatternLayout">
-      <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
-    </layout>
-  </appender>
-
-  <root level="trace">
-    <appender-ref ref="STDOUT" />
-  </root>
-
-</configuration>
\ No newline at end of file
diff --git a/virtdata-userlibs/src/main/resources/log4j.xml b/virtdata-userlibs/src/main/resources/log4j.xml
new file mode 100644
index 000000000..70176aaf6
--- /dev/null
+++ b/virtdata-userlibs/src/main/resources/log4j.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="debug" strict="true" name="XMLConfigTest"
+               packages="org.apache.logging.log4j.test">
+
+  <Filter type="ThresholdFilter" level="trace"/>
+
+  <Appenders>
+    <Appender type="Console" name="STDOUT">
+      <Layout type="PatternLayout" pattern="%7r %-5level [%t] %-12logger{0} %msg%n%throwable"/>
+      <Filters>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="DENY" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="DENY" onMismatch="ACCEPT"/>
+      </Filters>
+    </Appender>
+    <Appender type="Console" name="FLOW">
+      <Layout type="PatternLayout" pattern="%C{1}.%M %m %ex%n"/><!-- class and line number -->
+      <Filters>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="ACCEPT" onMismatch="DENY"/>
+      </Filters>
+    </Appender>
+    <Appender type="File" name="APPSLOG" fileName="docs/apps.log">
+      <Layout type="PatternLayout">
+        <Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
+      </Layout>
+    </Appender>
+  </Appenders>
+
+  <Loggers>
+
+    <Logger name="io.nosqlbench.docsys" level="info" additivity="false" specificity="trace">
+      <AppenderRef ref="APPSLOG"/>
+    </Logger>
+
+    <Root level="trace">
+      <AppenderRef ref="STDOUT"/>
+    </Root>
+
+  </Loggers>
+
+</Configuration>
\ No newline at end of file
diff --git a/virtdata-userlibs/src/main/resources/logback.xml b/virtdata-userlibs/src/main/resources/logback.xml
deleted file mode 100644
index 01e836ef0..000000000
--- a/virtdata-userlibs/src/main/resources/logback.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender" >
-    <encoder>
-      <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
-    </encoder>
-  </appender>
-
-  <root level="trace">
-    <appender-ref ref="STDOUT" />
-  </root>
-
-</configuration>
\ No newline at end of file
diff --git a/virtdata-userlibs/src/test/resources/log4j-test.xml b/virtdata-userlibs/src/test/resources/log4j-test.xml
new file mode 100644
index 000000000..70176aaf6
--- /dev/null
+++ b/virtdata-userlibs/src/test/resources/log4j-test.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="debug" strict="true" name="XMLConfigTest"
+               packages="org.apache.logging.log4j.test">
+
+  <Filter type="ThresholdFilter" level="trace"/>
+
+  <Appenders>
+    <Appender type="Console" name="STDOUT">
+      <Layout type="PatternLayout" pattern="%7r %-5level [%t] %-12logger{0} %msg%n%throwable"/>
+      <Filters>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="DENY" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="DENY" onMismatch="ACCEPT"/>
+      </Filters>
+    </Appender>
+    <Appender type="Console" name="FLOW">
+      <Layout type="PatternLayout" pattern="%C{1}.%M %m %ex%n"/><!-- class and line number -->
+      <Filters>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="ACCEPT" onMismatch="DENY"/>
+      </Filters>
+    </Appender>
+    <Appender type="File" name="APPSLOG" fileName="docs/apps.log">
+      <Layout type="PatternLayout">
+        <Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
+      </Layout>
+    </Appender>
+  </Appenders>
+
+  <Loggers>
+
+    <Logger name="io.nosqlbench.docsys" level="info" additivity="false" specificity="trace">
+      <AppenderRef ref="APPSLOG"/>
+    </Logger>
+
+    <Root level="trace">
+      <AppenderRef ref="STDOUT"/>
+    </Root>
+
+  </Loggers>
+
+</Configuration>
\ No newline at end of file
diff --git a/virtdata-userlibs/src/test/resources/logback-test.xml b/virtdata-userlibs/src/test/resources/logback-test.xml
deleted file mode 100644
index 8c7d3db36..000000000
--- a/virtdata-userlibs/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <layout class="ch.qos.logback.classic.PatternLayout">
-      <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
-    </layout>
-  </appender>
-
-  <root level="trace">
-    <appender-ref ref="STDOUT" />
-  </root>
-</configuration>
\ No newline at end of file

From 667fbdbae9fa8f44164187dcf9b6365c7e836af5 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:29:35 -0600
Subject: [PATCH 031/164] add log4j2 programmatic configuration

---
 .../java/io/nosqlbench/engine/cli/NBCLI.java  |  34 +--
 .../nosqlbench/engine/cli/NBCLIOptions.java   |   8 +-
 .../engine/core/ScenarioLogger.java           | 176 ---------------
 .../engine/core/logging/LoggerConfig.java     | 152 +++++++++++++
 .../engine/core/logging/ScenarioLogger.java   |  27 +++
 .../engine/core/logging/SessionLogConfig.java | 204 ++++++++++++++++++
 .../engine/core/script/ScenariosExecutor.java |   6 +-
 .../script/AsyncScriptIntegrationTests.java   |   5 +-
 8 files changed, 418 insertions(+), 194 deletions(-)
 delete mode 100644 engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioLogger.java
 create mode 100644 engine-core/src/main/java/io/nosqlbench/engine/core/logging/LoggerConfig.java
 create mode 100644 engine-core/src/main/java/io/nosqlbench/engine/core/logging/ScenarioLogger.java
 create mode 100644 engine-core/src/main/java/io/nosqlbench/engine/core/logging/SessionLogConfig.java

diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
index 34ee57d16..14c2d50a1 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
@@ -40,8 +40,7 @@ import java.util.stream.Collectors;
 
 public class NBCLI {
 
-    private static final Logger logger = LoggerFactory.getLogger("NBCLI");
-    private static final Logger EVENTS = LoggerFactory.getLogger("EVENTS");
+    private static Logger logger;
 
     private static final String CHART_HDR_LOG_NAME = "hdrdata-for-chart.log";
 
@@ -68,6 +67,14 @@ public class NBCLI {
 
     public void run(String[] args) {
 
+        // Initial logging config covers only command line parsing
+        // We don't want anything to go to console here unless it is a real problem
+        // as some integrations will depend on a stable and parsable program output
+        LoggerConfig loggerConfig = new LoggerConfig(NBLogLevel.ERROR, NBLogLevel.ERROR);
+
+        ConfigurationFactory.setConfigurationFactory(loggerConfig);
+        logger = LogManager.getLogger("NBCLI");
+
         NBCLIOptions globalOptions = new NBCLIOptions(args, NBCLIOptions.Mode.ParseGlobalsOnly);
 
         // Global only processing
@@ -128,11 +135,10 @@ public class NBCLI {
 
         String sessionName = new SessionNamer().format(options.getSessionName());
 
-        ConsoleLogging.enableConsoleLogging(options.wantsConsoleLogLevel(), options.getConsoleLoggingPattern());
-
-        Annotators.init(options.getAnnotatorsConfig());
-        Annotators.recordAnnotation(sessionName, 0L, 0L,
-                Map.of(), Map.of());
+        SessionLogConfig sessionLogConfig = new SessionLogConfig(sessionName);
+        sessionLogConfig.setConsolePattern(options.getConsoleLoggingPattern());
+        sessionLogConfig.setLevel(options.wantsConsoleLogLevel());
+        sessionLogConfig.start();
 
         ActivityMetrics.setHdrDigits(options.getHdrDigits());
 
@@ -312,13 +318,12 @@ public class NBCLI {
         }
 
 
-        Level consoleLogLevel = options.wantsConsoleLogLevel();
-        Level scenarioLogLevel = Level.toLevel(options.getLogsLevel());
-        if (scenarioLogLevel.toInt() > consoleLogLevel.toInt()) {
+        NBLogLevel consoleLogLevel = options.wantsConsoleLogLevel();
+        NBLogLevel scenarioLogLevel = options.getScenarioLogLevel();
+        if (scenarioLogLevel.isGreaterOrEqualTo(consoleLogLevel)) {
             logger.info("raising scenario logging level to accommodate console logging level");
         }
-
-        Level maxLevel = Level.toLevel(Math.min(consoleLogLevel.toInt(), scenarioLogLevel.toInt()));
+        NBLogLevel maxLevel = NBLogLevel.max(consoleLogLevel, scenarioLogLevel);
 
         // Execute Scenario!
         if (options.getCommands().size() == 0) {
@@ -330,7 +335,10 @@ public class NBCLI {
         ScriptParams scriptParams = new ScriptParams();
         scriptParams.putAll(buffer.getCombinedParams());
         scenario.addScenarioScriptParams(scriptParams);
-        ScenarioLogger sl = new ScenarioLogger(scenario)
+
+        Path scenarioLogPath = SessionLogConfig.composeSessionLogName(options.getLogsDirectory(), scenario.getScenarioName());
+        logger.info("Configuring scenario log at " + scenarioLogPath.toString());
+        ScenarioLogger sl = new SessionLogConfig(scenario.getScenarioName())
                 .setLogDir(options.getLogsDirectory())
                 .setMaxLogs(options.getLogsMax())
                 .setLevel(maxLevel)
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
index 10bafb9c2..f8e5c1308 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
@@ -90,7 +90,9 @@ public class NBCLIOptions {
     private static final String GRAALJS_COMPAT = "--graaljs-compat";
     private static final String DOCKER_GRAFANA_TAG = "--docker-grafana-tag";
 
-    private static final String DEFAULT_CONSOLE_LOGGING_PATTERN = "%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n";
+    private static final String DEFAULT_CONSOLE_LOGGING_PATTERN = "%7r %-5level [%t] %-12logger{0} %msg%n%throwable";
+
+    //    private static final String DEFAULT_CONSOLE_LOGGING_PATTERN = "%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n";
     public static final String NBSTATEDIR = "NBSTATEDIR";
 
     private final LinkedList<Cmd> cmdList = new LinkedList<>();
@@ -670,8 +672,8 @@ public class NBCLIOptions {
         return reportCsvTo;
     }
 
-    public String getLogsDirectory() {
-        return logsDirectory;
+    public Path getLogsDirectory() {
+        return Path.of(logsDirectory);
     }
 
     public int getLogsMax() {
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioLogger.java b/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioLogger.java
deleted file mode 100644
index 0b5482971..000000000
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioLogger.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- *
- *    Copyright 2016 jshook
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * /
- */
-
-package io.nosqlbench.engine.core;
-
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.Logger;
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.ConsoleAppender;
-import ch.qos.logback.core.FileAppender;
-import io.nosqlbench.engine.core.script.Scenario;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.*;
-import java.util.stream.Collectors;
-
-public class ScenarioLogger {
-
-    private final Scenario scenario;
-    private File loggerDir = new File("logs");
-    private int maxLogfiles = 10;
-    private Level logLevel = Level.INFO;
-    private Map<String, Level> logLevelOverrides = new HashMap<>();
-
-    public ScenarioLogger(Scenario scenario) {
-        this.scenario = scenario;
-    }
-
-    public ScenarioLogger setLogDir(String logDir) {
-        this.loggerDir = new File(logDir);
-        return this;
-    }
-
-    public ScenarioLogger setMaxLogs(int maxLogfiles) {
-        this.maxLogfiles = maxLogfiles;
-        return this;
-    }
-
-    public ScenarioLogger setLevel(Level level) {
-        this.logLevel = level;
-        return this;
-    }
-
-    public ScenarioLogger setLevel(String levelname) {
-        this.logLevel = Level.toLevel(levelname);
-        return this;
-    }
-
-    public ScenarioLogger start() {
-
-        if (!loggerDir.exists()) {
-            if (!loggerDir.mkdirs()) {
-                throw new RuntimeException("Unable to create logger directory:" + loggerDir.getPath());
-            }
-        }
-
-        LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
-        //List<LoggerContextListener> copyOfListenerList = loggerContext.getCopyOfListenerList();
-
-        ConsoleAppender<ILoggingEvent> ca = new ConsoleAppender<>();
-        ca.setContext(loggerContext);
-
-        PatternLayoutEncoder ple = new PatternLayoutEncoder();
-//        ple.setPattern("%date %level [%thread] %logger{10} [%file:%line] %msg%n");
-
-        ple.setPattern("%date %level [%thread] %logger{10} [%file:%line] %msg%n");
-        ple.setContext(loggerContext);
-        ple.start();
-
-        String scenarioLog = loggerDir.getPath() + File.separator + scenario.getScenarioName()+".log";
-        scenarioLog = scenarioLog.replaceAll("\\s","_");
-        FileAppender<ILoggingEvent> fileAppender = new FileAppender<ILoggingEvent>();
-        fileAppender.setFile(scenarioLog);
-        fileAppender.setEncoder(ple);
-        fileAppender.setContext(loggerContext);
-        fileAppender.setImmediateFlush(true);
-        System.err.println("Logging to " + scenarioLog);
-        fileAppender.start();
-
-        Logger logger = (Logger) LoggerFactory.getLogger("ROOT");
-        logger.addAppender(fileAppender);
-
-        logLevelOverrides.forEach((loggerName,loggingLevel) -> {
-            logger.debug("Overriding log level for " + loggerName + " to " + loggingLevel);
-            Logger toOverride = (Logger) LoggerFactory.getLogger(loggerName);
-            toOverride.setLevel(loggingLevel);
-            toOverride.debug("Log level was set to " + loggingLevel +
-                    " by CLI option.");
-        });
-
-        logger.setLevel(logLevel);
-        logger.setAdditive(true); /* set to true if root should log too */
-
-        purgeOldFiles(logger);
-
-        return this;
-    }
-
-    private void purgeOldFiles(Logger logger) {
-        if (maxLogfiles==0) {
-            logger.debug("Not purging old files, since maxLogFiles is 0.");
-            return;
-        }
-
-
-        File[] files = loggerDir.listFiles(new FileFilter() {
-            @Override
-            public boolean accept(File pathname) {
-                return pathname.getPath().endsWith(".log");
-            }
-        });
-        if (files==null) {
-            return;
-        }
-
-        List<File> filesList = Arrays.asList(files);
-        int remove = filesList.size() - maxLogfiles;
-        if (remove<=0) {
-            return;
-        }
-
-        List<File> toDelete = filesList.stream()
-                .sorted(fileTimeComparator)
-                .limit(remove)
-                .collect(Collectors.toList());
-
-        for (File file : toDelete) {
-            logger.info("removing extra logfile: " + file.getPath());
-            if (!file.delete()) {
-                logger.warn("unable to delete: " + file);
-                try {
-                    Files.delete(file.toPath());
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }
-    }
-
-    private static final Comparator<File> fileTimeComparator = new Comparator<File>() {
-        @Override
-        public int compare(File o1, File o2) {
-            return Long.compare(o1.lastModified(),o2.lastModified());
-        }
-    };
-
-
-    public ScenarioLogger setLogLevelOverrides(Map<String, Level> logLevelOverrides) {
-        this.logLevelOverrides = logLevelOverrides;
-        return this;
-    }
-
-    public String getLogDir() {
-        return this.loggerDir.toString();
-    }
-}
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/logging/LoggerConfig.java b/engine-core/src/main/java/io/nosqlbench/engine/core/logging/LoggerConfig.java
new file mode 100644
index 000000000..6427ecdb2
--- /dev/null
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/logging/LoggerConfig.java
@@ -0,0 +1,152 @@
+package io.nosqlbench.engine.core.logging;
+
+import io.nosqlbench.nb.api.logging.NBLogLevel;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.appender.ConsoleAppender;
+import org.apache.logging.log4j.core.appender.RollingFileAppender;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.ConfigurationFactory;
+import org.apache.logging.log4j.core.config.ConfigurationSource;
+import org.apache.logging.log4j.core.config.builder.api.AppenderComponentBuilder;
+import org.apache.logging.log4j.core.config.builder.api.ComponentBuilder;
+import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder;
+import org.apache.logging.log4j.core.config.builder.api.LayoutComponentBuilder;
+import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
+
+import java.net.URI;
+
+//@Plugin(name = "CustomConfigurationFactory", category = ConfigurationFactory.CATEGORY)
+//@Order(50)
+// Can't use plugin injection, since we need a tailored instance before logging
+public class LoggerConfig extends ConfigurationFactory {
+
+    private static final String LOG_PATTERN = "%d{DEFAULT}{GMT} [%t] %-5level: %msg%n";
+    private static final String CONSOLE_PATTERN = "%7r %-5level [%t] %-12logger{0} %msg%n%throwable";
+    public static final Level ROOT_LOG_LEVEL = Level.ALL;
+    private final NBLogLevel consoleLevel;
+    private final NBLogLevel fileLevel;
+
+    public LoggerConfig(NBLogLevel consoleLevel, NBLogLevel fileLevel) {
+        this.consoleLevel = consoleLevel;
+        this.fileLevel = fileLevel;
+    }
+
+    Configuration createConfiguration(final String name, ConfigurationBuilder<BuiltConfiguration> builder) {
+
+        Level internalLoggingStatusThreshold = Level.ERROR;
+        Level builderThresholdLevel = Level.INFO;
+//        Level rootLoggingLevel = Level.INFO;
+
+        builder.setConfigurationName(name);
+
+        builder.setStatusLevel(internalLoggingStatusThreshold);
+
+//        builder.add(
+//                builder.newFilter(
+//                        "ThresholdFilter",
+//                        Filter.Result.ACCEPT,
+//                        Filter.Result.NEUTRAL
+//                ).addAttribute("level", builderThresholdLevel)
+//        );
+
+        // CONSOLE appender
+        AppenderComponentBuilder appenderBuilder =
+                builder.newAppender("Stdout", "CONSOLE")
+                        .addAttribute("target", ConsoleAppender.Target.SYSTEM_OUT);
+
+        appenderBuilder.add(builder.newLayout("PatternLayout")
+                .addAttribute("pattern", CONSOLE_PATTERN));
+
+//        appenderBuilder.add(
+//                builder.newFilter("MarkerFilter", Filter.Result.DENY, Filter.Result.NEUTRAL)
+//                        .addAttribute("marker", "FLOW")
+//        );
+        builder.add(appenderBuilder);
+
+        // Log4J internal logging
+        builder.add(builder.newLogger("org.apache.logging.log4j", Level.DEBUG)
+                .add(builder.newAppenderRef("Stdout"))
+                .addAttribute("additivity", false));
+
+
+        // LOGFILE appender
+
+        LayoutComponentBuilder logfileLayout = builder.newLayout("PatternLayout")
+                .addAttribute("pattern", LOG_PATTERN);
+
+        ComponentBuilder triggeringPolicy = builder.newComponent("Policies")
+                .addComponent(builder.newComponent("CronTriggeringPolicy").addAttribute("schedule", "0 0 0 * * ?"))
+                .addComponent(builder.newComponent("SizeBasedTriggeringPolicy").addAttribute("size", "100M"));
+
+        AppenderComponentBuilder logsAppenderBuilder =
+                builder.newAppender("LOGS_APPENDER", RollingFileAppender.PLUGIN_NAME)
+                        .addAttribute("fileName", "logs/irengine.log")
+                        .addAttribute("filePattern", "logs/irengine-%d{MM-dd-yy}.log.gz")
+                        .addAttribute("append", true)
+                        .add(logfileLayout)
+                        .addComponent(triggeringPolicy);
+        builder.add(logsAppenderBuilder);
+
+//        LoggerComponentBuilder payloadBuilder =
+//                builder.newLogger(PAYLOADS, Level.TRACE)
+//                        .addAttribute("additivity", false);
+//
+//
+//        if (consoleConfig.isPaylaodsEnabled()) {
+//            payloadBuilder = payloadBuilder.add(builder.newAppenderRef("Stdout").addAttribute("level",
+//                    consoleConfig.getLogLevel()));
+//        }
+//        if (fileConfig.isPaylaodsEnabled()) {
+//            payloadBuilder = payloadBuilder.add(builder.newAppenderRef("LOGS_APPENDER").addAttribute("level",
+//                    fileConfig.getLogLevel()));
+//        }
+//        builder.add(payloadBuilder);
+
+
+//        LoggerComponentBuilder stacktracesBuilder =
+//                builder.newLogger(STACKTRACES, Level.TRACE)
+//                        .addAttribute("additivity", false);
+//        if (consoleConfig.isStackTracesEnabled()) {
+//            stacktracesBuilder = payloadBuilder.add(builder.newAppenderRef("Stdout").addAttribute("level",
+//                    consoleConfig.getLogLevel()));
+//        }
+//        if (fileConfig.isStackTracesEnabled()) {
+//            stacktracesBuilder = payloadBuilder.add(builder.newAppenderRef("LOGS_APPENDER").addAttribute("level",
+//                    fileConfig.getLogLevel()));
+//        }
+//        builder.add(stacktracesBuilder);
+
+        // ROOT logging and appender
+        builder.add(
+                builder.newRootLogger(ROOT_LOG_LEVEL)
+                        .add(
+                                builder.newAppenderRef("Stdout")
+                                        .addAttribute("level", Level.valueOf(consoleLevel.toString()))
+                        )
+                        .add(
+                                builder.newAppenderRef("LOGS_APPENDER")
+                                        .addAttribute("level", Level.valueOf(fileLevel.toString()))
+                        )
+        );
+
+
+        return builder.build();
+    }
+
+    @Override
+    public Configuration getConfiguration(final LoggerContext loggerContext, final ConfigurationSource source) {
+        return getConfiguration(loggerContext, source.toString(), null);
+    }
+
+    @Override
+    public Configuration getConfiguration(final LoggerContext loggerContext, final String name, final URI configLocation) {
+        ConfigurationBuilder<BuiltConfiguration> builder = newConfigurationBuilder();
+        return createConfiguration(name, builder);
+    }
+
+    @Override
+    protected String[] getSupportedTypes() {
+        return new String[]{"*"};
+    }
+}
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/logging/ScenarioLogger.java b/engine-core/src/main/java/io/nosqlbench/engine/core/logging/ScenarioLogger.java
new file mode 100644
index 000000000..3cc0b6a9a
--- /dev/null
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/logging/ScenarioLogger.java
@@ -0,0 +1,27 @@
+package io.nosqlbench.engine.core.logging;
+
+import io.nosqlbench.nb.api.logging.NBLogLevel;
+import org.apache.logging.log4j.Logger;
+
+import java.nio.file.Path;
+import java.util.Map;
+
+public interface ScenarioLogger {
+
+    ScenarioLogger setLogDir(Path logDir);
+
+    Path getLogDir();
+
+    ScenarioLogger setMaxLogs(int maxLogfiles);
+
+    void purgeOldFiles(Logger logger);
+
+    ScenarioLogger setLevel(NBLogLevel levelname);
+
+    NBLogLevel getLevel();
+
+    ScenarioLogger start();
+
+    ScenarioLogger setLogLevelOverrides(Map<String, String> logLevelOverrides);
+
+}
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/logging/SessionLogConfig.java b/engine-core/src/main/java/io/nosqlbench/engine/core/logging/SessionLogConfig.java
new file mode 100644
index 000000000..d34221691
--- /dev/null
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/logging/SessionLogConfig.java
@@ -0,0 +1,204 @@
+package io.nosqlbench.engine.core.logging;
+
+import io.nosqlbench.nb.api.logging.NBLogLevel;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.appender.ConsoleAppender;
+import org.apache.logging.log4j.core.config.Configurator;
+import org.apache.logging.log4j.core.config.builder.api.AppenderComponentBuilder;
+import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder;
+import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilderFactory;
+import org.apache.logging.log4j.core.config.builder.api.LayoutComponentBuilder;
+import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
+import org.apache.logging.log4j.spi.LoggerContext;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class SessionLogConfig implements ScenarioLogger {
+
+    //    private static final String LOG_PATTERN = "%d{DEFAULT}{GMT} [%t] %-5level: %msg%n";
+    private static final String DEFAULT_CONSOLE_PATTERN = "%7r %-5level [%t] %-12logger{0} %msg%n%throwable";
+    private final String session;
+    private String consolePattern = DEFAULT_CONSOLE_PATTERN;
+    //    private final Scenario scenario;
+    private Path loggerDir = Path.of("logs");
+    private NBLogLevel logLevel;
+    private int maxLogfiles = 100;
+    private Map<String, String> logLevelOverrides = new LinkedHashMap<>();
+
+    public SessionLogConfig(String session) {
+        this.session = session;
+    }
+
+    public ScenarioLogger setConsolePattern(String consolePattern) {
+        this.consolePattern = consolePattern;
+        return this;
+    }
+
+    public String getConsolePattern() {
+        return consolePattern;
+    }
+
+    public void configure() {
+        ConfigurationBuilder<BuiltConfiguration> builder = ConfigurationBuilderFactory.newConfigurationBuilder();
+        builder.setStatusLevel(Level.WARN);
+
+        builder.setConfigurationName("ScenarioLogger");
+
+        // Append simple format to stdout
+
+        AppenderComponentBuilder appenderBuilder =
+                builder.newAppender("console", "CONSOLE")
+                        .addAttribute("target", ConsoleAppender.Target.SYSTEM_OUT);
+
+        appenderBuilder.add(builder.newLayout("PatternLayout")
+                .addAttribute("pattern", consolePattern));
+
+        builder.add(appenderBuilder);
+
+
+// create a rolling file appender
+
+        Path scenarioLog = composeSessionLogName(loggerDir, session);
+
+        LayoutComponentBuilder layoutBuilder = builder.newLayout("PatternLayout")
+//                .addAttribute("pattern", "%d [%t] %-5level: %msg%n");
+                .addAttribute("pattern", "%date %level [%thread] %logger{10} [%file:%line] %msg%n");
+
+        appenderBuilder = builder.newAppender("scenariolog", "File")
+                .addAttribute("fileName", scenarioLog.getFileName())
+                .addAttribute("append", false)
+                .add(layoutBuilder);
+        builder.add(appenderBuilder);
+
+        // Assemble the scenario logger instance
+        Level level = Level.valueOf(logLevel.toString());
+        builder.add(builder.newRootLogger(level)
+                .add(builder.newAppenderRef("console"))
+                .add(builder.newAppenderRef("scenariolog"))
+                .addAttribute("additivity", true));
+
+        logLevelOverrides.forEach((k, v) -> {
+            Level olevel = Level.valueOf(v);
+            builder.add(builder.newLogger(k, olevel)
+                    .add(builder.newAppenderRef("console"))
+                    .add(builder.newAppenderRef("scenariolog"))
+                    .addAttribute("additivity", true));
+        });
+
+        LoggerContext ctx = Configurator.initialize(builder.build());
+    }
+
+    public static Path composeSessionLogName(Path loggerDir, String session) {
+        String logfilePath = loggerDir.toString() + File.separator + ".log";
+        Path resolved = loggerDir.resolve(session.replaceAll("\\s", "_") + ".log");
+        return resolved;
+    }
+
+    @Override
+    public ScenarioLogger setLogDir(Path logDir) {
+        this.loggerDir = logDir;
+        return this;
+    }
+
+    @Override
+    public Path getLogDir() {
+        return this.loggerDir;
+    }
+
+    @Override
+    public ScenarioLogger setMaxLogs(int maxLogfiles) {
+        this.maxLogfiles = maxLogfiles;
+        return this;
+    }
+
+    @Override
+    public void purgeOldFiles(Logger logger) {
+        if (maxLogfiles == 0) {
+            logger.debug("Not purging old files, since maxLogFiles is 0.");
+            return;
+        }
+
+
+        File[] files = loggerDir.toFile().listFiles(new FileFilter() {
+            @Override
+            public boolean accept(File pathname) {
+                return pathname.getPath().endsWith(".log");
+            }
+        });
+        if (files == null) {
+            return;
+        }
+
+        List<File> filesList = Arrays.asList(files);
+        int remove = filesList.size() - maxLogfiles;
+        if (remove <= 0) {
+            return;
+        }
+
+        List<File> toDelete = filesList.stream()
+                .sorted(fileTimeComparator)
+                .limit(remove)
+                .collect(Collectors.toList());
+
+        for (File file : toDelete) {
+            logger.info("removing extra logfile: " + file.getPath());
+            if (!file.delete()) {
+                logger.warn("unable to delete: " + file);
+                try {
+                    Files.delete(file.toPath());
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+    }
+
+    private static final Comparator<File> fileTimeComparator = new Comparator<File>() {
+        @Override
+        public int compare(File o1, File o2) {
+            return Long.compare(o1.lastModified(), o2.lastModified());
+        }
+    };
+
+    @Override
+    public ScenarioLogger setLevel(NBLogLevel levelname) {
+        this.logLevel = levelname;
+        return this;
+    }
+
+    @Override
+    public NBLogLevel getLevel() {
+        return logLevel;
+    }
+
+    @Override
+    public ScenarioLogger start() {
+        if (!Files.exists(loggerDir)) {
+            try {
+                Files.createDirectories(loggerDir);
+            } catch (Exception e) {
+                throw new RuntimeException("Unable to create logger directory:" + loggerDir);
+            }
+        }
+
+        configure();
+        org.apache.logging.log4j.Logger logger = LogManager.getLogger("LOGGER");
+
+        purgeOldFiles(logger);
+        return this;
+    }
+
+    @Override
+    public ScenarioLogger setLogLevelOverrides(Map<String, String> logLevelOverrides) {
+        this.logLevelOverrides = logLevelOverrides;
+        return this;
+    }
+}
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java
index 566302dfb..26a8ab152 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java
@@ -48,7 +48,11 @@ public class ScenariosExecutor {
     }
 
     public synchronized void execute(Scenario scenario) {
-        execute(scenario, new ScenarioLogger(scenario).setLogDir("logs").setMaxLogs(0));
+        ScenarioLogger logs = new SessionLogConfig(scenario.getScenarioName())
+                .setLogDir(Path.of("logs"))
+                .setMaxLogs(0)
+                .start();
+        execute(scenario, logs);
     }
 
     public synchronized void execute(Scenario scenario, ScenarioLogger scenarioLogger) {
diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java b/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
index d0d734a1e..37e822d81 100644
--- a/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
+++ b/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
@@ -68,7 +68,10 @@ public class AsyncScriptIntegrationTests {
         }
         s.addScriptText(script);
 //        s.addScriptText("load('classpath:scripts/async/" + scriptname + ".js');");
-        ScenarioLogger scenarioLogger = new ScenarioLogger(s).setMaxLogs(0).setLogDir("logs/test").start();
+        ScenarioLogger scenarioLogger = new SessionLogConfig(scenarioName)
+                .setMaxLogs(0)
+                .setLogDir(Path.of("logs/test"))
+                .start();
         e.execute(s, scenarioLogger);
         ScenariosResults scenariosResults = e.awaitAllResults();
         ScenarioResult scenarioResult = scenariosResults.getOne();

From a88d03760d4c94ccff49129d478bac141bd165b7 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:29:45 -0600
Subject: [PATCH 032/164] docker-metrics improvements

---
 .../src/main/java/io/nosqlbench/engine/cli/NBCLI.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
index 14c2d50a1..5549ae556 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
@@ -87,10 +87,11 @@ public class NBCLI {
         String dockerMetricsAt = globalOptions.wantsDockerMetricsAt();
         String reportGraphiteTo = globalOptions.wantsReportGraphiteTo();
         int mOpts = (dockerMetrics ? 1 : 0) + (dockerMetricsAt != null ? 1 : 0) + (reportGraphiteTo != null ? 1 : 0);
-        if (mOpts > 1) {
+        if (mOpts > 1 && (reportGraphiteTo == null || annotatorsConfig == null)) {
             throw new BasicError("You have multiple conflicting options which attempt to set\n" +
                     " the destination for metrics and annotations. Please select only one of\n" +
-                    " --docker-metrics, --docker-metrics-at <addr>, or --report-graphite-to <addr>\n" +
+                    " --docker-metrics, --docker-metrics-at <addr>, or other options like \n" +
+                    " --report-graphite-to <addr> and --annotators <config>\n" +
                     " For more details, see run 'nb help docker-metrics'");
         }
 
@@ -114,7 +115,8 @@ public class NBCLI {
 
         if (metricsAddr != null) {
             reportGraphiteTo = metricsAddr + ":9109";
-            Annotators.init("{type:'grafana',url:'http://" + metricsAddr + ":3000/'}");
+            annotatorsConfig = "[{type:'log'},{type:'grafana',baseurl:'http://" + metricsAddr + ":3000/'," +
+                    "tags:'appname:nosqlbench',timeoutms:5000,onerror:'warn'}]";
         }
 
         if (args.length > 0 && args[0].toLowerCase().equals("virtdata")) {

From 67eefbbebbdea2b193762fcb894708943b2e765e Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:29:53 -0600
Subject: [PATCH 033/164] fix activity run state bug

---
 .../java/io/nosqlbench/engine/core/ActivityExecutor.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/ActivityExecutor.java b/engine-core/src/main/java/io/nosqlbench/engine/core/ActivityExecutor.java
index e0fb0a911..daa80c130 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/ActivityExecutor.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/ActivityExecutor.java
@@ -108,12 +108,13 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
     public synchronized void stopActivity() {
         activitylogger.debug("STOP/before alias=(" + activity.getAlias() + ")");
 
-        activity.setRunState(RunState.Stopped);
+        activity.setRunState(RunState.Stopping);
         logger.info("stopping activity in progress: " + this.getActivityDef().getAlias());
         motors.forEach(Motor::requestStop);
         motors.forEach(m -> awaitRequiredMotorState(m, 30000, 50, RunState.Stopped, RunState.Finished));
         activity.shutdownActivity();
         activity.closeAutoCloseables();
+        activity.setRunState(RunState.Stopped);
         logger.info("stopped: " + this.getActivityDef().getAlias() + " with " + motors.size() + " slots");
         activitylogger.debug("STOP/after alias=(" + activity.getAlias() + ")");
 
@@ -181,7 +182,6 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
     public boolean requestStopExecutor(int secondsToWait) {
         activitylogger.debug("REQUEST STOP/before alias=(" + activity.getAlias() + ")");
 
-        activity.setRunState(RunState.Stopped);
 
         logger.info("Stopping executor for " + activity.getAlias() + " when work completes.");
 
@@ -200,6 +200,7 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
             activity.shutdownActivity();
             logger.trace("closing auto-closeables");
             activity.closeAutoCloseables();
+            activity.setRunState(RunState.Stopped);
         }
         if (stoppingException != null) {
             logger.trace("an exception caused the activity to stop:" + stoppingException.getMessage());

From 6a523dc48405efcb035d6689bf19fd756ce5e4a9 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:30:06 -0600
Subject: [PATCH 034/164] remove slf4j

---
 driver-diag/pom.xml    |  5 -----
 driver-kafka/pom.xml   | 24 ++++++++++++------------
 engine-api/pom.xml     | 10 ----------
 engine-cli/pom.xml     |  7 -------
 engine-core/pom.xml    |  5 -----
 engine-rest/pom.xml    |  6 ------
 mvn-defaults/pom.xml   | 37 ++++++++++++++++++-------------------
 nb-annotations/pom.xml | 10 ----------
 nb-api/pom.xml         | 10 ----------
 9 files changed, 30 insertions(+), 84 deletions(-)

diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index 876af26e0..adb9200d2 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -29,11 +29,6 @@
             <version>3.12.155-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
     </dependencies>
 
 
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index 63fe03ed0..d4d9d6bc6 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -43,21 +43,21 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <artifactId>engine-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+          <artifactId>engine-api</artifactId>
+          <version>3.12.155-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>driver-stdout</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
-        </dependency>
+      <dependency>
+        <groupId>io.nosqlbench</groupId>
+        <artifactId>driver-stdout</artifactId>
+        <version>3.12.155-SNAPSHOT</version>
+      </dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.25</version>
-        </dependency>
+      <!--        <dependency>-->
+      <!--            <groupId>org.slf4j</groupId>-->
+      <!--            <artifactId>slf4j-api</artifactId>-->
+      <!--            <version>1.7.25</version>-->
+      <!--        </dependency>-->
 
     </dependencies>
     <repositories>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index cc264b70b..df0d69b2f 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -49,16 +49,6 @@
             <artifactId>graal-sdk</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index a5e010a26..ddc1efb6d 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -32,13 +32,6 @@
             <version>3.12.155-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
-        </dependency>
-
-
     </dependencies>
 
     <build>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index 12a95183f..ef918eec9 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -37,11 +37,6 @@
             <version>3.12.155-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index cccec2954..8ed0d58e9 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -50,12 +50,6 @@
             <version>3.12.155-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
-        </dependency>
-
     </dependencies>
 
 </project>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 97cb7bfb4..7d44e8a69 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -40,8 +40,7 @@
         <jmh.version>1.22</jmh.version>
         <joda.time.version>2.9.9</joda.time.version>
         <junit.jupiter.version>5.3.2</junit.jupiter.version>
-        <log4j.version>2.13.3</log4j.version>
-        <logback.version>1.2.3</logback.version>
+
         <lz4.version>1.4.1</lz4.version>
         <metrics.reservoir.version>1.1.0</metrics.reservoir.version>
         <metrics.version>4.0.7</metrics.version>
@@ -50,7 +49,7 @@
         <netty.version>4.1.47.Final</netty.version>
         <!--        <netty.version>4.1.31.Final</netty.version>-->
         <number.to.words.version>1.0.0</number.to.words.version>
-        <slf4j.version>1.7.29</slf4j.version>
+<!--        <slf4j.version>1.7.29</slf4j.version>-->
         <snakeyaml.version>1.23</snakeyaml.version>
         <snappy.version>1.1.2.6</snappy.version>
 
@@ -152,15 +151,15 @@
 
             <dependency>
                 <groupId>io.dropwizard.metrics</groupId>
-                <artifactId>metrics-core</artifactId>
-                <version>${metrics.version}</version>
+              <artifactId>metrics-core</artifactId>
+              <version>${metrics.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-text</artifactId>
-                <version>${commons.text.version}</version>
-            </dependency>
+          <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>${commons.text.version}</version>
+          </dependency>
 
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -168,15 +167,15 @@
                 <version>${slf4j.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.openjdk.jmh</groupId>
-                <artifactId>jmh-core</artifactId>
-                <version>${jmh.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.openjdk.jmh</groupId>
-                <artifactId>jmh-generator-annprocess</artifactId>
-                <version>${jmh.version}</version>
+          <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>${jmh.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <version>${jmh.version}</version>
             </dependency>
 
             <dependency>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index 9ea4bb229..75ed9dbaf 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -21,16 +21,6 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
-
         <!-- TODO: Move this down to virtdata if it is the only module group using it -->
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index f00001771..19f3d3eb9 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -34,16 +34,6 @@
             <version>3.12.155-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-yaml-front-matter</artifactId>

From a09efbe9948ba5cccdc073517d66125c98566165 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:30:20 -0600
Subject: [PATCH 035/164] consolidate to log4j2

---
 .../cql/codecsupport/UDTCodecInjector.java    |  10 +-
 .../cql/codecsupport/UserCodecProvider.java   |   8 +-
 .../activitytype/cql/core/CQLOptions.java     |   6 +-
 .../activitytype/cql/core/CqlAction.java      |   6 +-
 .../activitytype/cql/core/CqlActivity.java    |   6 +-
 .../activitytype/cql/core/CqlAsyncAction.java |   6 +-
 .../long_string/ModuloCSVLineToUUID.java      |  10 +-
 .../functions/to_tuple/CustomFunc955.java     |   8 +-
 .../cql/errorhandling/CQLExceptionEnum.java   |   8 +-
 .../errorhandling/HashedCQLErrorHandler.java  |  10 +-
 .../errorhandling/NBCycleErrorHandler.java    |  10 +-
 .../binders/DiagnosticPreparedBinder.java     |   6 +-
 .../binders/DirectArrayValuesBinder.java      |   6 +-
 .../binders/UnsettableValuesBinder.java       |   6 +-
 .../cql/statements/core/CQLSessionCache.java  |   6 +-
 .../cql/statements/core/CQLStatementDef.java  |   6 +-
 .../core/CQLStatementDefParser.java           |  18 +-
 .../core/ReadyCQLStatementTemplate.java       |   6 +-
 .../core/YamlCQLStatementLoader.java          |  10 +-
 .../cql/statements/rowoperators/Save.java     |   6 +-
 .../rsoperators/CqlResultSetLogger.java       |   6 +-
 .../statements/rsoperators/TraceLogger.java   |   8 +-
 .../cqld4/codecsupport/UDTCodecInjector.java  |   8 +-
 .../cqld4/codecsupport/UserCodecProvider.java |   8 +-
 .../activitytype/cqld4/core/CQLOptions.java   |   2 +-
 .../activitytype/cqld4/core/CqlAction.java    |   6 +-
 .../activitytype/cqld4/core/CqlActivity.java  |   6 +-
 .../cqld4/core/CqlAsyncAction.java            |   6 +-
 .../cqld4/errorhandling/CQLExceptionEnum.java |  16 +-
 .../errorhandling/HashedCQLErrorHandler.java  |  10 +-
 .../errorhandling/NBCycleErrorHandler.java    |   6 +-
 .../binders/DiagnosticPreparedBinder.java     |   6 +-
 .../binders/DirectArrayValuesBinder.java      |   6 +-
 .../binders/UnsettableValuesBinder.java       |   8 +-
 .../statements/core/CQLSessionCache.java      |  10 +-
 .../statements/core/CQLStatementDef.java      |   6 +-
 .../core/CQLStatementDefParser.java           |  18 +-
 .../core/ReadyCQLStatementTemplate.java       |   6 +-
 .../core/YamlCQLStatementLoader.java          |   6 +-
 .../cqld4/statements/rowoperators/Save.java   |   8 +-
 .../rsoperators/CqlD4ResultSetLogger.java     |   6 +-
 .../statements/rsoperators/TraceLogger.java   |   8 +-
 .../cqlverify/CqlVerifyActivity.java          |   6 +-
 .../activitytype/diag/AsyncDiagAction.java    |  10 +-
 .../activitytype/diag/DiagAction.java         |   8 +-
 .../diag/DiagActionDispenser.java             |   9 +-
 .../activitytype/diag/DiagActivityType.java   |   6 +-
 .../activitytype/diag/SequenceBlocker.java    |   6 +-
 .../activitytype/http/HttpAction.java         |   6 +-
 .../activitytype/http/HttpActivity.java       |   6 +-
 .../activitytype/http/HttpActivityType.java   |   6 +-
 .../http/async/HttpAsyncAction.java           |   6 +-
 .../io/nosqlbench/driver/jmx/JMXAction.java   |   6 +-
 .../io/nosqlbench/driver/jmx/SecureUtils.java |   7 +-
 .../io/nosqlbench/driver/jmx/ops/JmxOp.java   |   6 +-
 .../ebdrivers/kafkaproducer/KafkaAction.java  |   6 +-
 .../kafkaproducer/KafkaProducerActivity.java  |  18 +-
 .../kafkaproducer/KafkaStatement.java         |   6 +-
 .../driver/mongodb/MongoAction.java           |   6 +-
 .../driver/mongodb/MongoActivity.java         |   6 +-
 .../mongodb/ReadyMongoStatementTest.java      |  30 +-
 .../stdout/AsyncStdoutAction.java             |   6 +-
 .../activitytype/stdout/StdoutAction.java     |  20 +-
 .../activitytype/stdout/StdoutActivity.java   |   6 +-
 .../tcpclient/TCPClientActivity.java          |   6 +-
 .../tcpserver/TCPServerActivity.java          |  12 +-
 .../driver/webdriver/WebContext.java          |  10 +-
 .../driver/webdriver/WebDriverAction.java     |   8 +-
 .../driver/webdriver/WebDriverActivity.java   |  13 +-
 .../driver/webdriver/verbs/AssertElement.java |   9 +-
 .../driver/webdriver/verbs/FindElement.java   |   7 +-
 .../driver/webdriver/verbs/FindElements.java  |   7 +-
 .../driver/webdriver/verbs/Get.java           |   6 +-
 .../webdriver/verbs/WebDriverVerbs.java       |   6 +-
 .../api/activityapi/core/BaseAsyncAction.java |   6 +-
 .../CycleResultsRLEBufferTarget.java          |  12 +-
 .../tristate/EnumReadableMappingFilter.java   |   8 +-
 .../inputs/cyclelog/CycleLogInput.java        |   6 +-
 .../ReorderingConcurrentResultBuffer.java     |  10 +-
 .../outputs/cyclelog/CycleLogOutput.java      |  10 +-
 .../outputs/cyclelog/CycleLogOutputType.java  |   8 +-
 .../logger/LoggingMarkerDispenser.java        |   8 +-
 .../outputs/logger/LoggingOutput.java         |   8 +-
 .../errorhandling/CycleErrorHandlers.java     |   6 +-
 .../errorhandling/HashedErrorHandler.java     |  12 +-
 .../activityapi/planning/SequencePlanner.java |   6 +-
 .../ratelimits/HybridRateLimiter.java         |   8 +-
 .../activityapi/ratelimits/RateLimiters.java  |   6 +-
 .../api/activityapi/ratelimits/RateSpec.java  |  11 +-
 .../activityapi/ratelimits/TokenFiller.java   |   8 +-
 .../api/activityapi/ratelimits/TokenPool.java |   6 +-
 .../api/activityapi/sysperf/SysPerf.java      |   6 +-
 .../activityapi/sysperf/SysPerfBaseliner.java |   6 +-
 .../engine/api/activityconfig/ParsedStmt.java |   6 +-
 .../api/activityconfig/StatementsLoader.java  |   6 +-
 .../activityconfig/rawyaml/RawStmtFields.java |   6 +-
 .../rawyaml/RawStmtsLoader.java               |   2 +-
 .../engine/api/activityimpl/ActivityDef.java  |  10 +-
 .../engine/api/activityimpl/CpuInfo.java      |   6 +-
 .../engine/api/activityimpl/ParameterMap.java |   8 +-
 .../api/activityimpl/SimpleActivity.java      |   6 +-
 .../api/activityimpl/SlotStateTracker.java    |   6 +-
 .../api/activityimpl/action/CoreAction.java   |   6 +-
 .../action/CoreActionDispenser.java           |   8 +-
 .../api/activityimpl/input/AtomicInput.java   |   6 +-
 .../marker/ContiguousOutputChunker.java       |  20 +-
 .../api/activityimpl/motor/CoreMotor.java     |  16 +-
 .../api/activityimpl/motor/StrideTracker.java |   6 +-
 .../api/extensions/ScriptingPluginInfo.java   |   2 +-
 .../engine/api/metrics/ActivityMetrics.java   |  10 +-
 .../api/metrics/ClassicHistoListener.java     |  18 +-
 .../api/metrics/ClassicTimerListener.java     |  18 +-
 .../metrics/DeltaHdrHistogramReservoir.java   |   8 +-
 .../api/metrics/HistoIntervalLogger.java      |  14 +-
 .../api/metrics/HistoLogChartGenerator.java   |   8 +-
 .../api/metrics/HistoStatsCSVWriter.java      |   6 +-
 .../engine/api/metrics/HistoStatsLogger.java  |  14 +-
 .../engine/api/metrics/PeriodicRunnable.java  |  10 +-
 .../api/scenarios/NBCLIScenarioParser.java    |   6 +-
 .../api/scripting/NashornEvaluator.java       |   6 +-
 .../api/templating/CommandTemplate.java       |   8 +-
 .../engine/api/util/SSLKsFactory.java         |   6 +-
 .../engine/api/util/SimpleServiceLoader.java  |   6 +-
 .../io/nosqlbench/engine/api/util/Unit.java   |  26 +-
 .../rawyaml/BindingEscapingTest.java          |   6 +-
 .../rawyaml/RawYamlStatementLoaderTest.java   |   6 +-
 .../activityconfig/rawyaml/StmtDefTest.java   |   6 +-
 .../rawyaml/StmtEscapingTest.java             |   6 +-
 .../rawyaml/StmtVariationTests.java           |   6 +-
 .../activityconfig/yaml/ParsedStmtTest.java   |   6 +-
 .../yaml/StmtDetailOverrideTest.java          |   6 +-
 .../activityconfig/yaml/StmtsDocListTest.java |  12 +-
 .../engine/cli/BasicScriptBuffer.java         |   6 +-
 .../java/io/nosqlbench/engine/cli/Cmd.java    |   6 +-
 .../java/io/nosqlbench/engine/cli/NBCLI.java  |  11 +-
 .../nosqlbench/engine/cli/NBCLIArgsFile.java  |   7 +-
 .../nosqlbench/engine/cli/NBCLIOptions.java   |   9 +-
 .../engine/cli/PathCanonicalizer.java         |   6 +-
 .../engine/core/ActivityExecutor.java         |   8 +-
 .../core/ActivityProgressIndicator.java       |   6 +-
 .../engine/core/MarkdownDocInfo.java          |  12 +-
 .../core/PolyglotScenarioController.java      |   7 +-
 .../engine/core/ScenarioController.java       |   8 +-
 .../engine/core/ScenarioErrorHandler.java     |   6 +-
 .../engine/core/ScenarioResult.java           |  10 +-
 .../engine/core/ScenariosResults.java         |   6 +-
 .../core/logging/Log4JMetricsReporter.java    | 418 ++++++++++++++++++
 .../engine/core/metrics/MetricMap.java        |   6 +-
 .../engine/core/metrics/MetricReporters.java  |  12 +-
 .../NashornMetricRegistryBindings.java        |  10 +-
 .../PolyglotMetricRegistryBindings.java       |   8 +-
 .../engine/core/script/MetricsMapper.java     |  12 +-
 .../engine/core/script/Scenario.java          |  33 +-
 .../engine/core/script/ScenariosExecutor.java |  14 +-
 .../engine/core/script/ScriptParams.java      |   9 +-
 .../engine/core/ActivityExecutorTest.java     |   8 +-
 .../engine/docker/DockerHelper.java           |   6 +-
 .../engine/docker/DockerMetricsManager.java   |   6 +-
 .../nosqlbench/engine/docker/RestHelper.java  |   7 +-
 .../extensions/csvmetrics/CSVMetrics.java     |   4 +-
 .../csvmetrics/CSVMetricsPlugin.java          |   2 +-
 .../csvmetrics/CSVMetricsPluginData.java      |   2 +-
 .../extensions/example/ExamplePluginData.java |   2 +-
 .../files/FileAccessPluginData.java           |   2 +-
 .../GlobalVarsScriptingPluginData.java        |   2 +-
 .../histologger/HdrHistoLogPlugin.java        |   8 +-
 .../histologger/HdrHistoLogPluginData.java    |   2 +-
 .../histostatslogger/HistoStatsPlugin.java    |   8 +-
 .../HistoStatsPluginData.java                 |   2 +-
 .../extensions/http/HttpPluginData.java       |   3 +-
 .../optimizers/BobyqaOptimizerInstance.java   |   4 +-
 .../optimizers/BobyqaOptimizerPlugin.java     |   2 +-
 .../optimizers/BobyqaOptimizerPluginData.java |   2 +-
 .../optimizers/MultivariateArrayScript.java   |   4 +-
 .../optimizers/MultivariateDynamicScript.java |   4 +-
 .../NashornMultivariateObjectScript.java      |   4 +-
 .../PolyglotMultivariateObjectScript.java     |   2 +-
 .../scriptingmetrics/ScriptingMetrics.java    |   8 +-
 .../ScriptingMetricsPluginData.java           |   2 +-
 .../resources/ScenarioExecutorEndpoint.java   |  36 +-
 mvn-defaults/pom.xml                          |  20 +-
 .../io/nosqlbench/nb/api/config/Synonyms.java |   2 +-
 .../nosqlbench/nb/api/content/PathFinder.java |   6 +-
 .../nb/api/content/ResolverForURL.java        |   8 +-
 .../script/AsyncScriptIntegrationTests.java   |   3 +-
 .../core/script/NBCliIntegrationTests.java    |   6 +-
 .../core/script/ScriptIntegrationTests.java   |   9 +-
 187 files changed, 1153 insertions(+), 756 deletions(-)
 create mode 100644 engine-core/src/main/java/io/nosqlbench/engine/core/logging/Log4JMetricsReporter.java

diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UDTCodecInjector.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UDTCodecInjector.java
index c2fb720c9..85acc8973 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UDTCodecInjector.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UDTCodecInjector.java
@@ -3,18 +3,18 @@ package io.nosqlbench.activitytype.cql.codecsupport;
 import com.datastax.driver.core.CodecRegistry;
 import com.datastax.driver.core.Session;
 import com.datastax.driver.core.UserType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ServiceLoader;
 
 public class UDTCodecInjector {
-    private final static Logger logger = LoggerFactory.getLogger(UDTCodecInjector.class);
+    private final static Logger logger = LogManager.getLogger(UDTCodecInjector.class);
 
-    private List<UserCodecProvider> codecProviders = new ArrayList<>();
-    private List<UserType> userTypes = new ArrayList<>();
+    private final List<UserCodecProvider> codecProviders = new ArrayList<>();
+    private final List<UserType> userTypes = new ArrayList<>();
 
     public void injectUserProvidedCodecs(Session session, boolean allowAcrossKeyspaces) {
 
diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UserCodecProvider.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UserCodecProvider.java
index 3a9cb4efa..d9998ed27 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UserCodecProvider.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UserCodecProvider.java
@@ -1,8 +1,8 @@
 package io.nosqlbench.activitytype.cql.codecsupport;
 
 import com.datastax.driver.core.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.lang.reflect.Constructor;
 import java.util.*;
@@ -10,7 +10,7 @@ import java.util.stream.Collectors;
 
 public abstract class UserCodecProvider {
 
-    private final static Logger logger = LoggerFactory.getLogger(UserCodecProvider.class);
+    private final static Logger logger = LogManager.getLogger(UserCodecProvider.class);
 
     public List<UDTTransformCodec> registerCodecsForCluster(
             Session session,
@@ -131,7 +131,7 @@ public abstract class UserCodecProvider {
                 .orElseThrow(
                         () -> new RuntimeException("Unable to find UDTJavaType annotation for " + codecClass.getCanonicalName())
                 );
-        return (Class<?>) javaType;
+        return javaType;
     }
 
 
diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CQLOptions.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CQLOptions.java
index 660bc5fc5..27fbd5b29 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CQLOptions.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CQLOptions.java
@@ -4,8 +4,8 @@ import com.datastax.driver.core.*;
 import com.datastax.driver.core.policies.*;
 import io.netty.util.HashedWheelTimer;
 import io.nosqlbench.nb.api.errors.BasicError;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.net.InetSocketAddress;
 import java.util.*;
@@ -16,7 +16,7 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 public class CQLOptions {
-    private final static Logger logger = LoggerFactory.getLogger(CQLOptions.class);
+    private final static Logger logger = LogManager.getLogger(CQLOptions.class);
 
     private final static Pattern CORE_AND_MAX_RQ_PATTERN = Pattern.compile("(?<core>\\d+)(:(?<max>\\d+)(:(?<rq>\\d+))?)?(,(?<rcore>\\d+)(:(?<rmax>\\d+)(:(?<rrq>\\d+))?)?)?(,?heartbeat_interval_s:(?<heartbeatinterval>\\d+))?(,?idle_timeout_s:(?<idletimeout>\\d+))?(,?pool_timeout_ms:(?<pooltimeout>\\d+))?");
     private final static Pattern PERCENTILE_EAGER_PATTERN = Pattern.compile("^p(?<pctile>[^:]+)(:(?<executions>\\d+))?(:(?<tracked>\\d+)ms)?$");
diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAction.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAction.java
index 7ce4c6107..04613f3f8 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAction.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAction.java
@@ -19,8 +19,8 @@ import io.nosqlbench.engine.api.activityapi.core.MultiPhaseAction;
 import io.nosqlbench.engine.api.activityapi.core.SyncAction;
 import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit;
 @SuppressWarnings("Duplicates")
 public class CqlAction implements SyncAction, MultiPhaseAction, ActivityDefObserver {
 
-    private final static Logger logger = LoggerFactory.getLogger(CqlAction.class);
+    private final static Logger logger = LogManager.getLogger(CqlAction.class);
     private final int slot;
     private final CqlActivity cqlActivity;
     private final ActivityDef activityDef;
diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivity.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivity.java
index 5aa718fd8..23f0f9ece 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivity.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivity.java
@@ -44,8 +44,8 @@ import io.nosqlbench.engine.api.util.TagFilter;
 import io.nosqlbench.engine.api.util.Unit;
 import io.nosqlbench.nb.api.errors.BasicError;
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.FileWriter;
 import java.io.IOException;
@@ -56,7 +56,7 @@ import java.util.*;
 @SuppressWarnings("Duplicates")
 public class CqlActivity extends SimpleActivity implements Activity, ActivityDefObserver {
 
-    private final static Logger logger = LoggerFactory.getLogger(CqlActivity.class);
+    private final static Logger logger = LogManager.getLogger(CqlActivity.class);
     private final ExceptionCountMetrics exceptionCountMetrics;
     private final ExceptionHistoMetrics exceptionHistoMetrics;
     private final ActivityDef activityDef;
diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAsyncAction.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAsyncAction.java
index 43f16f7ef..695b7852e 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAsyncAction.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAsyncAction.java
@@ -23,8 +23,8 @@ import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.SucceededOp
 import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.TrackedOp;
 import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -33,7 +33,7 @@ import java.util.function.LongFunction;
 @SuppressWarnings("Duplicates")
 public class CqlAsyncAction extends BaseAsyncAction<CqlOpData, CqlActivity> {
 
-    private final static Logger logger = LoggerFactory.getLogger(CqlAsyncAction.class);
+    private final static Logger logger = LogManager.getLogger(CqlAsyncAction.class);
     private final ActivityDef activityDef;
 
     private List<RowCycleOperator> rowOps;
diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_string/ModuloCSVLineToUUID.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_string/ModuloCSVLineToUUID.java
index 838c329fa..9af56f0f4 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_string/ModuloCSVLineToUUID.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_string/ModuloCSVLineToUUID.java
@@ -25,8 +25,8 @@ import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.ModuloLineToString;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVRecord;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,11 +40,11 @@ import java.util.function.LongFunction;
  */
 @ThreadSafeMapper
 public class ModuloCSVLineToUUID implements LongFunction<UUID> {
-    private final static Logger logger = LoggerFactory.getLogger(ModuloLineToString.class);
+    private final static Logger logger = LogManager.getLogger(ModuloLineToString.class);
 
-    private List<String> lines = new ArrayList<>();
+    private final List<String> lines = new ArrayList<>();
 
-    private String filename;
+    private final String filename;
 
     @Example({"ModuloCSVLineToUUID('data/myfile.csv','lat')","load values for 'lat' from the CSV file myfile.csv."})
     public ModuloCSVLineToUUID(String filename, String fieldname) {
diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_tuple/CustomFunc955.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_tuple/CustomFunc955.java
index b3e359c87..c3d80306c 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_tuple/CustomFunc955.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_tuple/CustomFunc955.java
@@ -71,8 +71,8 @@ public class CustomFunc955 implements LongFunction<Map<?,?>>, ConfigAware {
     }
 
     @Override
-    public void applyConfig(Map<String, ?> elements) {
-        this.cluster = Optional.ofNullable(elements.get("cluster"))
+    public void applyConfig(Map<String, ?> providedConfig) {
+        this.cluster = Optional.ofNullable(providedConfig.get("cluster"))
             .map(Cluster.class::cast)
             .orElseThrow();
         this.tupleType = cluster.getMetadata().newTupleType(DataType.cint(), DataType.bigint());
@@ -80,8 +80,8 @@ public class CustomFunc955 implements LongFunction<Map<?,?>>, ConfigAware {
 
     @Override
     public ConfigModel getConfigModel() {
-        return new MutableConfigModel()
-            .add("<cluster>", Cluster.class)
+        return new MutableConfigModel(this)
+            .optional("<cluster>", Cluster.class)
             .asReadOnly();
     }
 }
diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/CQLExceptionEnum.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/CQLExceptionEnum.java
index 0e5723e45..83fe72e1f 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/CQLExceptionEnum.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/CQLExceptionEnum.java
@@ -3,8 +3,8 @@ package io.nosqlbench.activitytype.cql.errorhandling;
 import com.datastax.driver.core.exceptions.*;
 import io.nosqlbench.activitytype.cql.errorhandling.exceptions.*;
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -64,10 +64,10 @@ public enum CQLExceptionEnum implements ResultReadable {
     EbdseCycleException(CqlGenericCycleException.class, 42),
     MaxTriesExhaustedException(io.nosqlbench.activitytype.cql.errorhandling.exceptions.MaxTriesExhaustedException.class,43);
 
-    private final static Logger logger = LoggerFactory.getLogger(CQLExceptionEnum.class);
+    private final static Logger logger = LogManager.getLogger(CQLExceptionEnum.class);
 
     private static Map<String, Integer> codesByName = getCodesByName();
-    private static String[] namesByCode = getNamesByCode();
+    private static final String[] namesByCode = getNamesByCode();
 
     private final Class<? extends Exception> exceptionClass;
     private final int resultCode;
diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/HashedCQLErrorHandler.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/HashedCQLErrorHandler.java
index 2a4dcdc79..e23069ce2 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/HashedCQLErrorHandler.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/HashedCQLErrorHandler.java
@@ -8,18 +8,18 @@ import io.nosqlbench.activitytype.cql.errorhandling.exceptions.RowVerificationEx
 import io.nosqlbench.engine.api.activityapi.errorhandling.CycleErrorHandler;
 import io.nosqlbench.engine.api.activityapi.errorhandling.HashedErrorHandler;
 import io.nosqlbench.engine.api.metrics.ExceptionCountMetrics;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 public class HashedCQLErrorHandler extends HashedErrorHandler<Throwable, ErrorStatus> {
-    private static final Logger logger = LoggerFactory.getLogger(HashedCQLErrorHandler.class);
+    private static final Logger logger = LogManager.getLogger(HashedCQLErrorHandler.class);
 
 //    private static Set<Class<? extends Throwable>> UNVERIFIED_ERRORS = new HashSet<Class<? extends Throwable>>() {{
 //        add(RowVerificationException.class);
 //        add(ResultSetVerificationException.class);
 //    }};
-    private ExceptionCountMetrics exceptionCountMetrics;
-    private static ThreadLocal<Integer> tlResultCode = ThreadLocal.withInitial(() -> (0));
+    private final ExceptionCountMetrics exceptionCountMetrics;
+    private static final ThreadLocal<Integer> tlResultCode = ThreadLocal.withInitial(() -> (0));
 
     public HashedCQLErrorHandler(ExceptionCountMetrics exceptionCountMetrics) {
         this.exceptionCountMetrics = exceptionCountMetrics;
diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/NBCycleErrorHandler.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/NBCycleErrorHandler.java
index 43f36c6a1..88ed8e17d 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/NBCycleErrorHandler.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/NBCycleErrorHandler.java
@@ -6,8 +6,8 @@ import io.nosqlbench.activitytype.cql.errorhandling.exceptions.CQLExceptionDetai
 import io.nosqlbench.engine.api.activityapi.errorhandling.CycleErrorHandler;
 import io.nosqlbench.engine.api.metrics.ExceptionCountMetrics;
 import io.nosqlbench.engine.api.metrics.ExceptionHistoMetrics;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 /**
  * A contextualized error handler that can catch a cycle-specific error.
@@ -42,10 +42,10 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings("Duplicates")
 public class NBCycleErrorHandler implements CycleErrorHandler<Throwable, ErrorStatus> {
 
-    private static final Logger logger = LoggerFactory.getLogger(NBCycleErrorHandler.class);
+    private static final Logger logger = LogManager.getLogger(NBCycleErrorHandler.class);
 
-    private ErrorResponse errorResponse;
-    private ExceptionCountMetrics exceptionCountMetrics;
+    private final ErrorResponse errorResponse;
+    private final ExceptionCountMetrics exceptionCountMetrics;
     private final ExceptionHistoMetrics exceptionHistoMetrics;
     private boolean throwExceptionOnStop=false;
 
diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DiagnosticPreparedBinder.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DiagnosticPreparedBinder.java
index 2c7a2fe2f..238911192 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DiagnosticPreparedBinder.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DiagnosticPreparedBinder.java
@@ -3,8 +3,8 @@ package io.nosqlbench.activitytype.cql.statements.binders;
 import com.datastax.driver.core.*;
 import io.nosqlbench.activitytype.cql.core.CQLBindHelper;
 import io.nosqlbench.virtdata.core.bindings.ValuesArrayBinder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.List;
 
@@ -15,7 +15,7 @@ import java.util.List;
  * order to explain in more detail what is happening for users.
  */
 public class DiagnosticPreparedBinder implements ValuesArrayBinder<PreparedStatement, Statement> {
-    public static final Logger logger = LoggerFactory.getLogger(DiagnosticPreparedBinder.class);
+    public static final Logger logger = LogManager.getLogger(DiagnosticPreparedBinder.class);
     @Override
     public Statement bindValues(PreparedStatement prepared, Object[] values) {
         ColumnDefinitions columnDefinitions = prepared.getVariables();
diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DirectArrayValuesBinder.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DirectArrayValuesBinder.java
index 7d9a1aa3b..046781c24 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DirectArrayValuesBinder.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DirectArrayValuesBinder.java
@@ -3,8 +3,8 @@ package io.nosqlbench.activitytype.cql.statements.binders;
 import com.datastax.driver.core.PreparedStatement;
 import com.datastax.driver.core.Statement;
 import io.nosqlbench.virtdata.core.bindings.ValuesArrayBinder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.Arrays;
 
@@ -19,7 +19,7 @@ import java.util.Arrays;
  * will become the default.
  */
 public class DirectArrayValuesBinder implements ValuesArrayBinder<PreparedStatement, Statement> {
-    public final static Logger logger = LoggerFactory.getLogger(DirectArrayValuesBinder.class);
+    public final static Logger logger = LogManager.getLogger(DirectArrayValuesBinder.class);
 
     @Override
     public Statement bindValues(PreparedStatement preparedStatement, Object[] objects) {
diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/UnsettableValuesBinder.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/UnsettableValuesBinder.java
index 64fa5484c..5a8c1cc44 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/UnsettableValuesBinder.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/UnsettableValuesBinder.java
@@ -3,14 +3,14 @@ package io.nosqlbench.activitytype.cql.statements.binders;
 import com.datastax.driver.core.*;
 import io.nosqlbench.virtdata.api.bindings.VALUE;
 import io.nosqlbench.virtdata.core.bindings.ValuesArrayBinder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.nio.ByteBuffer;
 import java.util.List;
 
 public class UnsettableValuesBinder implements ValuesArrayBinder<PreparedStatement, Statement> {
-    private final static Logger logger = LoggerFactory.getLogger(UnsettableValuesBinder.class);
+    private final static Logger logger = LogManager.getLogger(UnsettableValuesBinder.class);
 
     private final Session session;
     private final CodecRegistry codecRegistry;
diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java
index a274bf451..db84e375e 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java
@@ -14,8 +14,8 @@ import io.nosqlbench.engine.api.metrics.ActivityMetrics;
 import io.nosqlbench.engine.api.scripting.NashornEvaluator;
 import io.nosqlbench.engine.api.util.SSLKsFactory;
 import io.nosqlbench.nb.api.errors.BasicError;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import javax.net.ssl.SSLContext;
 import java.io.File;
@@ -28,7 +28,7 @@ import java.util.*;
 
 public class CQLSessionCache implements Shutdownable {
 
-    private final static Logger logger = LoggerFactory.getLogger(CQLSessionCache.class);
+    private final static Logger logger = LogManager.getLogger(CQLSessionCache.class);
     private final static String DEFAULT_SESSION_ID = "default";
     private static final CQLSessionCache instance = new CQLSessionCache();
     private final Map<String, Session> sessionCache = new HashMap<>();
diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDef.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDef.java
index 043cea6c6..27edcbb19 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDef.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDef.java
@@ -1,14 +1,14 @@
 package io.nosqlbench.activitytype.cql.statements.core;
 
 import com.datastax.driver.core.ConsistencyLevel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.*;
 import java.util.stream.Collectors;
 
 public class CQLStatementDef {
-    private final static Logger logger = LoggerFactory.getLogger(CQLStatementDef.class);
+    private final static Logger logger = LogManager.getLogger(CQLStatementDef.class);
 
     private Map<String,String> params = new HashMap<>();
     private String name = "";
diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java
index c82b124b0..7e4ddc076 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java
@@ -1,7 +1,7 @@
 package io.nosqlbench.activitytype.cql.statements.core;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.*;
 import java.util.regex.Matcher;
@@ -9,7 +9,7 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 public class CQLStatementDefParser {
-    private final static Logger logger = LoggerFactory.getLogger(CQLStatementDefParser.class);
+    private final static Logger logger = LogManager.getLogger(CQLStatementDefParser.class);
     //    private final static Pattern templateToken = Pattern.compile("<<(\\w+(:(.+?))?)>>");
     private final static Pattern stmtToken = Pattern.compile("\\?(\\w+[-_\\d\\w]*)|\\{(\\w+[-_\\d\\w.]*)}");
     private final static String UNSET_VALUE = "UNSET-VALUE";
@@ -93,9 +93,7 @@ public class CQLStatementDefParser {
             if (!namedBindings.contains(tokenName)) {
                 missingBindings.add(tokenName);
             } else {
-                if (missingAnchors.contains(tokenName)) {
-                    missingAnchors.remove(tokenName);
-                }
+                missingAnchors.remove(tokenName);
             }
 
         }
@@ -114,11 +112,11 @@ public class CQLStatementDefParser {
     }
 
     public static class ParseResult {
-        private Set<String> missingGenerators;
-        private Set<String> missingAnchors;
-        private String statement;
+        private final Set<String> missingGenerators;
+        private final Set<String> missingAnchors;
+        private final String statement;
         private Map<String,String> bindings;
-        private String name;
+        private final String name;
 
         public ParseResult(String stmt, String name, Map<String,String> bindings, Set<String> missingGenerators, Set<String> missingAnchors) {
             this.missingGenerators = missingGenerators;
diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementTemplate.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementTemplate.java
index f76fc422e..6f5ad5813 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementTemplate.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementTemplate.java
@@ -15,15 +15,15 @@ import io.nosqlbench.engine.api.metrics.ActivityMetrics;
 import io.nosqlbench.virtdata.core.bindings.BindingsTemplate;
 import io.nosqlbench.virtdata.core.bindings.ContextualBindingsArrayTemplate;
 import io.nosqlbench.virtdata.core.bindings.ValuesArrayBinder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.Writer;
 import java.util.Map;
 
 public class ReadyCQLStatementTemplate {
 
-    private final static Logger logger = LoggerFactory.getLogger(ReadyCQLStatementTemplate.class);
+    private final static Logger logger = LogManager.getLogger(ReadyCQLStatementTemplate.class);
     private final Session session;
     private final ContextualBindingsArrayTemplate<?, Statement> template;
     private final long ratio;
diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java
index ec2be1090..109772f73 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java
@@ -3,25 +3,21 @@ package io.nosqlbench.activitytype.cql.statements.core;
 import io.nosqlbench.engine.api.activityimpl.ActivityInitializationError;
 import io.nosqlbench.nb.api.content.Content;
 import io.nosqlbench.nb.api.content.NBIO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.yaml.snakeyaml.TypeDescription;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
 @SuppressWarnings("ALL")
 public class YamlCQLStatementLoader {
 
-    private final static Logger logger = LoggerFactory.getLogger(YamlCQLStatementLoader.class);
+    private final static Logger logger = LogManager.getLogger(YamlCQLStatementLoader.class);
     List<Function<String, String>> transformers = new ArrayList<>();
 
     public YamlCQLStatementLoader() {
diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Save.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Save.java
index 5517f622c..6fae4d104 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Save.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Save.java
@@ -4,8 +4,8 @@ import com.datastax.driver.core.ColumnDefinitions;
 import com.datastax.driver.core.Row;
 import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
 import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -16,7 +16,7 @@ import java.util.stream.Collectors;
  * Save specific variables to the thread local object map
  */
 public class Save implements RowCycleOperator {
-    private final static Logger logger = LoggerFactory.getLogger(Save.class);
+    private final static Logger logger = LogManager.getLogger(Save.class);
 
     ThreadLocal<HashMap<String, Object>> tl_objectMap = SharedState.tl_ObjectMap;
 
diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/CqlResultSetLogger.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/CqlResultSetLogger.java
index b7ee30db5..b4149e749 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/CqlResultSetLogger.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/CqlResultSetLogger.java
@@ -2,15 +2,15 @@ package io.nosqlbench.activitytype.cql.statements.rsoperators;
 
 import com.datastax.driver.core.*;
 import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 /**
  * Logs a trace-level event for the result set, including
  * cycles, rows, fetched row count, and the statement.
  */
 public class CqlResultSetLogger implements ResultSetCycleOperator {
-    private final static Logger logger = LoggerFactory.getLogger(CqlResultSetLogger.class);
+    private final static Logger logger = LogManager.getLogger(CqlResultSetLogger.class);
 
     private static String getQueryString(Statement stmt) {
         if (stmt instanceof PreparedStatement) {
diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/TraceLogger.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/TraceLogger.java
index a432bd669..81f86a243 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/TraceLogger.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/TraceLogger.java
@@ -7,8 +7,8 @@ import com.datastax.driver.core.Statement;
 import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
 import io.nosqlbench.activitytype.cql.statements.modifiers.StatementModifier;
 import io.nosqlbench.engine.api.util.SimpleConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.FileDescriptor;
 import java.io.FileWriter;
@@ -18,9 +18,9 @@ import java.util.Date;
 
 public class TraceLogger implements ResultSetCycleOperator, StatementModifier {
 
-    private final static Logger logger = LoggerFactory.getLogger(TraceLogger.class);
+    private final static Logger logger = LogManager.getLogger(TraceLogger.class);
 
-    private static SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss.SSS");
+    private static final SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss.SSS");
     private final long modulo;
     private final String filename;
     private final FileWriter writer;
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/codecsupport/UDTCodecInjector.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/codecsupport/UDTCodecInjector.java
index d5acdc7fa..76d94c59f 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/codecsupport/UDTCodecInjector.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/codecsupport/UDTCodecInjector.java
@@ -2,17 +2,17 @@ package io.nosqlbench.activitytype.cqld4.codecsupport;
 
 import com.datastax.oss.driver.api.core.session.Session;
 import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ServiceLoader;
 
 public class UDTCodecInjector {
-    private final static Logger logger = LoggerFactory.getLogger(UDTCodecInjector.class);
+    private final static Logger logger = LogManager.getLogger(UDTCodecInjector.class);
 
-    private List<UserCodecProvider> codecProviders = new ArrayList<>();
+    private final List<UserCodecProvider> codecProviders = new ArrayList<>();
 
     public void injectUserProvidedCodecs(Session session, boolean allowAcrossKeyspaces) {
 
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/codecsupport/UserCodecProvider.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/codecsupport/UserCodecProvider.java
index c0ea70137..4b02f6b8a 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/codecsupport/UserCodecProvider.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/codecsupport/UserCodecProvider.java
@@ -6,8 +6,8 @@ import com.datastax.oss.driver.api.core.type.UserDefinedType;
 import com.datastax.oss.driver.api.core.type.codec.TypeCodec;
 import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry;
 import com.datastax.oss.driver.api.core.type.codec.registry.MutableCodecRegistry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.lang.reflect.Constructor;
 import java.util.*;
@@ -15,7 +15,7 @@ import java.util.stream.Collectors;
 
 public abstract class UserCodecProvider {
 
-    private final static Logger logger = LoggerFactory.getLogger(UserCodecProvider.class);
+    private final static Logger logger = LogManager.getLogger(UserCodecProvider.class);
 
     public List<UDTTransformCodec<?>> registerCodecsForCluster(
             Session session,
@@ -139,7 +139,7 @@ public abstract class UserCodecProvider {
                 .orElseThrow(
                         () -> new RuntimeException("Unable to find UDTJavaType annotation for " + codecClass.getCanonicalName())
                 );
-        return (Class<?>) javaType;
+        return javaType;
     }
 
 
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CQLOptions.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CQLOptions.java
index 9143026a8..60262dad8 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CQLOptions.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CQLOptions.java
@@ -1,7 +1,7 @@
 package io.nosqlbench.activitytype.cqld4.core;
 
 public class CQLOptions {
-//    private final static Logger logger = LoggerFactory.getLogger(CQLOptions.class);
+//    private final static Logger logger = LogManager.getLogger(CQLOptions.class);
 //
 //    private final static Pattern CORE_AND_MAX_RQ_PATTERN = Pattern.compile("(?<core>\\d+)(:(?<max>\\d+)(:(?<rq>\\d+))?)?(,(?<rcore>\\d+)(:(?<rmax>\\d+)(:(?<rrq>\\d+))?)?)?(,?heartbeat_interval_s:(?<heartbeatinterval>\\d+))?(,?idle_timeout_s:(?<idletimeout>\\d+))?(,?pool_timeout_ms:(?<pooltimeout>\\d+))?");
 //    private final static Pattern PERCENTILE_EAGER_PATTERN = Pattern.compile("^p(?<pctile>[^:]+)(:(?<executions>\\d+))?(:(?<tracked>\\d+)ms)?$");
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlAction.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlAction.java
index a23e7961c..00d370e93 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlAction.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlAction.java
@@ -17,8 +17,8 @@ import io.nosqlbench.engine.api.activityapi.core.MultiPhaseAction;
 import io.nosqlbench.engine.api.activityapi.core.SyncAction;
 import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.List;
 import java.util.concurrent.CompletionStage;
@@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit;
 @SuppressWarnings("Duplicates")
 public class CqlAction implements SyncAction, MultiPhaseAction, ActivityDefObserver {
 
-    private final static Logger logger = LoggerFactory.getLogger(CqlAction.class);
+    private final static Logger logger = LogManager.getLogger(CqlAction.class);
     private final int slot;
     private final CqlActivity cqlActivity;
     private final ActivityDef activityDef;
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlActivity.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlActivity.java
index f6048798b..4e9cc05bf 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlActivity.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlActivity.java
@@ -45,8 +45,8 @@ import io.nosqlbench.engine.api.util.SimpleConfig;
 import io.nosqlbench.engine.api.templating.StrInterpolator;
 import io.nosqlbench.engine.api.util.TagFilter;
 import io.nosqlbench.engine.api.util.Unit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.FileWriter;
 import java.io.IOException;
@@ -57,7 +57,7 @@ import java.util.*;
 @SuppressWarnings("Duplicates")
 public class CqlActivity extends SimpleActivity implements Activity, ActivityDefObserver {
 
-    private final static Logger logger = LoggerFactory.getLogger(CqlActivity.class);
+    private final static Logger logger = LogManager.getLogger(CqlActivity.class);
     private final ExceptionCountMetrics exceptionCountMetrics;
     private final ExceptionHistoMetrics exceptionHistoMetrics;
     private final ActivityDef activityDef;
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlAsyncAction.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlAsyncAction.java
index 1702eb60e..f00f6f2f2 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlAsyncAction.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlAsyncAction.java
@@ -22,8 +22,8 @@ import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.SucceededOp
 import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.TrackedOp;
 import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.List;
 import java.util.concurrent.CompletionStage;
@@ -33,7 +33,7 @@ import java.util.function.LongFunction;
 @SuppressWarnings("Duplicates")
 public class CqlAsyncAction extends BaseAsyncAction<CqlOpData, CqlActivity> {
 
-    private final static Logger logger = LoggerFactory.getLogger(CqlAsyncAction.class);
+    private final static Logger logger = LogManager.getLogger(CqlAsyncAction.class);
     private final ActivityDef activityDef;
 
     private List<RowCycleOperator> rowOps;
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/CQLExceptionEnum.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/CQLExceptionEnum.java
index 5d4a81909..8968319a4 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/CQLExceptionEnum.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/CQLExceptionEnum.java
@@ -1,18 +1,12 @@
 package io.nosqlbench.activitytype.cqld4.errorhandling;
 
-import com.datastax.dse.driver.api.core.servererrors.UnfitClientException;
-import com.datastax.oss.driver.api.core.*;
+import com.datastax.oss.driver.api.core.RequestThrottlingException;
 import com.datastax.oss.driver.api.core.connection.ClosedConnectionException;
-import com.datastax.oss.driver.api.core.connection.ConnectionInitException;
-import com.datastax.oss.driver.api.core.connection.FrameTooLongException;
-import com.datastax.oss.driver.api.core.connection.HeartbeatException;
 import com.datastax.oss.driver.api.core.servererrors.*;
-import com.datastax.oss.driver.internal.core.channel.ClusterNameMismatchException;
-import com.datastax.oss.driver.shaded.guava.common.collect.ComputationException;
 import io.nosqlbench.activitytype.cqld4.errorhandling.exceptions.CqlGenericCycleException;
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -92,10 +86,10 @@ public enum CQLExceptionEnum implements ResultReadable {
     RequestThrottlingException(RequestThrottlingException.class,57),
     CqlGenericCycleException(CqlGenericCycleException.class,58);
 
-    private final static Logger logger = LoggerFactory.getLogger(CQLExceptionEnum.class);
+    private final static Logger logger = LogManager.getLogger(CQLExceptionEnum.class);
 
     private static Map<String, Integer> codesByName = getCodesByName();
-    private static String[] namesByCode = getNamesByCode();
+    private static final String[] namesByCode = getNamesByCode();
 
     private final Class<? extends Exception> exceptionClass;
     private final int resultCode;
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/HashedCQLErrorHandler.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/HashedCQLErrorHandler.java
index 8d4cae63c..6d5dd4ef5 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/HashedCQLErrorHandler.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/HashedCQLErrorHandler.java
@@ -16,18 +16,18 @@ import io.nosqlbench.activitytype.cqld4.errorhandling.exceptions.RowVerification
 import io.nosqlbench.engine.api.activityapi.errorhandling.CycleErrorHandler;
 import io.nosqlbench.engine.api.activityapi.errorhandling.HashedErrorHandler;
 import io.nosqlbench.engine.api.metrics.ExceptionCountMetrics;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 public class HashedCQLErrorHandler extends HashedErrorHandler<Throwable, ErrorStatus> {
-    private static final Logger logger = LoggerFactory.getLogger(HashedCQLErrorHandler.class);
+    private static final Logger logger = LogManager.getLogger(HashedCQLErrorHandler.class);
 
 //    private static Set<Class<? extends Throwable>> UNVERIFIED_ERRORS = new HashSet<Class<? extends Throwable>>() {{
 //        add(RowVerificationException.class);
 //        add(ResultSetVerificationException.class);
 //    }};
-    private ExceptionCountMetrics exceptionCountMetrics;
-    private static ThreadLocal<Integer> tlResultCode = ThreadLocal.withInitial(() -> (0));
+    private final ExceptionCountMetrics exceptionCountMetrics;
+    private static final ThreadLocal<Integer> tlResultCode = ThreadLocal.withInitial(() -> (0));
 
     public HashedCQLErrorHandler(ExceptionCountMetrics exceptionCountMetrics) {
         this.exceptionCountMetrics = exceptionCountMetrics;
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/NBCycleErrorHandler.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/NBCycleErrorHandler.java
index 0f6fb88c6..526a0e683 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/NBCycleErrorHandler.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/NBCycleErrorHandler.java
@@ -5,8 +5,8 @@ import io.nosqlbench.activitytype.cqld4.errorhandling.exceptions.CQLCycleWithSta
 import io.nosqlbench.engine.api.activityapi.errorhandling.CycleErrorHandler;
 import io.nosqlbench.engine.api.metrics.ExceptionCountMetrics;
 import io.nosqlbench.engine.api.metrics.ExceptionHistoMetrics;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 /**
  * A contextualized error handler that can catch a cycle-specific error.
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings("Duplicates")
 public class NBCycleErrorHandler implements CycleErrorHandler<Throwable, ErrorStatus> {
 
-    private static final Logger logger = LoggerFactory.getLogger(NBCycleErrorHandler.class);
+    private static final Logger logger = LogManager.getLogger(NBCycleErrorHandler.class);
 
     private final ErrorResponse errorResponse;
     private final ExceptionCountMetrics exceptionCountMetrics;
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/DiagnosticPreparedBinder.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/DiagnosticPreparedBinder.java
index 354d71746..71dc6c48d 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/DiagnosticPreparedBinder.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/DiagnosticPreparedBinder.java
@@ -5,8 +5,8 @@ import com.datastax.oss.driver.api.core.cql.*;
 import com.datastax.oss.driver.api.core.type.DataType;
 import io.nosqlbench.activitytype.cqld4.core.CQLBindHelper;
 import io.nosqlbench.virtdata.core.bindings.ValuesArrayBinder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -19,7 +19,7 @@ import java.util.List;
  */
 public class DiagnosticPreparedBinder implements ValuesArrayBinder<PreparedStatement, Statement<?>> {
 
-    public static final Logger logger = LoggerFactory.getLogger(DiagnosticPreparedBinder.class);
+    public static final Logger logger = LogManager.getLogger(DiagnosticPreparedBinder.class);
     private final CqlSession session;
 
     public DiagnosticPreparedBinder(CqlSession session) {
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/DirectArrayValuesBinder.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/DirectArrayValuesBinder.java
index 2b10dba55..1341b5207 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/DirectArrayValuesBinder.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/DirectArrayValuesBinder.java
@@ -4,8 +4,8 @@ import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.cql.PreparedStatement;
 import com.datastax.oss.driver.api.core.cql.Statement;
 import io.nosqlbench.virtdata.core.bindings.ValuesArrayBinder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.Arrays;
 
@@ -20,7 +20,7 @@ import java.util.Arrays;
  * will become the default.
  */
 public class DirectArrayValuesBinder implements ValuesArrayBinder<PreparedStatement, Statement<?>> {
-    public final static Logger logger = LoggerFactory.getLogger(DirectArrayValuesBinder.class);
+    public final static Logger logger = LogManager.getLogger(DirectArrayValuesBinder.class);
     private final CqlSession session;
 
     public DirectArrayValuesBinder(CqlSession session) {
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/UnsettableValuesBinder.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/UnsettableValuesBinder.java
index 25177543c..d9048a397 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/UnsettableValuesBinder.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/UnsettableValuesBinder.java
@@ -1,6 +1,5 @@
 package io.nosqlbench.activitytype.cqld4.statements.binders;
 
-import com.datastax.driver.core.*;
 import com.datastax.oss.driver.api.core.ProtocolVersion;
 import com.datastax.oss.driver.api.core.cql.*;
 import com.datastax.oss.driver.api.core.session.Session;
@@ -9,16 +8,15 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodec;
 import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry;
 import io.nosqlbench.virtdata.api.bindings.VALUE;
 import io.nosqlbench.virtdata.core.bindings.ValuesArrayBinder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 public class UnsettableValuesBinder implements ValuesArrayBinder<PreparedStatement, Statement<?>> {
-    private final static Logger logger = LoggerFactory.getLogger(UnsettableValuesBinder.class);
+    private final static Logger logger = LogManager.getLogger(UnsettableValuesBinder.class);
 
     private final Session session;
     private final CodecRegistry codecRegistry;
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java
index 9aaae99ed..7026e7fa7 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java
@@ -23,8 +23,8 @@ import io.nosqlbench.engine.api.scripting.NashornEvaluator;
 import io.nosqlbench.engine.api.util.SSLKsFactory;
 import org.apache.tinkerpop.gremlin.driver.Cluster;
 import org.graalvm.options.OptionMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.File;
 import java.io.IOException;
@@ -37,10 +37,10 @@ import java.util.concurrent.ConcurrentHashMap;
 
 public class CQLSessionCache implements Shutdownable {
 
-    private final static Logger logger = LoggerFactory.getLogger(CQLSessionCache.class);
+    private final static Logger logger = LogManager.getLogger(CQLSessionCache.class);
     private final static String DEFAULT_SESSION_ID = "default";
-    private static CQLSessionCache instance = new CQLSessionCache();
-    private Map<String, SessionConfig> sessionCache = new HashMap<>();
+    private static final CQLSessionCache instance = new CQLSessionCache();
+    private final Map<String, SessionConfig> sessionCache = new HashMap<>();
 
 
     public final static class SessionConfig extends ConcurrentHashMap<String,String> {
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLStatementDef.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLStatementDef.java
index 33cdca1ce..cf236d32a 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLStatementDef.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLStatementDef.java
@@ -1,14 +1,14 @@
 package io.nosqlbench.activitytype.cqld4.statements.core;
 
 import com.datastax.oss.driver.api.core.ConsistencyLevel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.*;
 import java.util.stream.Collectors;
 
 public class CQLStatementDef {
-    private final static Logger logger = LoggerFactory.getLogger(CQLStatementDef.class);
+    private final static Logger logger = LogManager.getLogger(CQLStatementDef.class);
 
     private Map<String,String> params = new HashMap<>();
     private String name = "";
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLStatementDefParser.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLStatementDefParser.java
index a750a8cc9..361ca7edf 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLStatementDefParser.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLStatementDefParser.java
@@ -1,7 +1,7 @@
 package io.nosqlbench.activitytype.cqld4.statements.core;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.*;
 import java.util.regex.Matcher;
@@ -9,7 +9,7 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 public class CQLStatementDefParser {
-    private final static Logger logger = LoggerFactory.getLogger(CQLStatementDefParser.class);
+    private final static Logger logger = LogManager.getLogger(CQLStatementDefParser.class);
     //    private final static Pattern templateToken = Pattern.compile("<<(\\w+(:(.+?))?)>>");
     private final static Pattern stmtToken = Pattern.compile("\\?(\\w+[-_\\d\\w]*)|\\{(\\w+[-_\\d\\w.]*)}");
     private final static String UNSET_VALUE = "UNSET-VALUE";
@@ -93,9 +93,7 @@ public class CQLStatementDefParser {
             if (!namedBindings.contains(tokenName)) {
                 missingBindings.add(tokenName);
             } else {
-                if (missingAnchors.contains(tokenName)) {
-                    missingAnchors.remove(tokenName);
-                }
+                missingAnchors.remove(tokenName);
             }
 
         }
@@ -114,11 +112,11 @@ public class CQLStatementDefParser {
     }
 
     public static class ParseResult {
-        private Set<String> missingGenerators;
-        private Set<String> missingAnchors;
-        private String statement;
+        private final Set<String> missingGenerators;
+        private final Set<String> missingAnchors;
+        private final String statement;
         private Map<String,String> bindings;
-        private String name;
+        private final String name;
 
         public ParseResult(String stmt, String name, Map<String,String> bindings, Set<String> missingGenerators, Set<String> missingAnchors) {
             this.missingGenerators = missingGenerators;
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/ReadyCQLStatementTemplate.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/ReadyCQLStatementTemplate.java
index d29c7219f..8496ea6e0 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/ReadyCQLStatementTemplate.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/ReadyCQLStatementTemplate.java
@@ -16,15 +16,15 @@ import io.nosqlbench.engine.api.metrics.ActivityMetrics;
 import io.nosqlbench.virtdata.core.bindings.BindingsTemplate;
 import io.nosqlbench.virtdata.core.bindings.ContextualBindingsArrayTemplate;
 import io.nosqlbench.virtdata.core.bindings.ValuesArrayBinder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.Writer;
 import java.util.Map;
 
 public class ReadyCQLStatementTemplate {
 
-    private final static Logger logger = LoggerFactory.getLogger(ReadyCQLStatementTemplate.class);
+    private final static Logger logger = LogManager.getLogger(ReadyCQLStatementTemplate.class);
     private final Session session;
     private final ContextualBindingsArrayTemplate<?, Statement<?>> template;
     private final long ratio;
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/YamlCQLStatementLoader.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/YamlCQLStatementLoader.java
index 8eaf8fced..9806c9876 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/YamlCQLStatementLoader.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/YamlCQLStatementLoader.java
@@ -3,8 +3,8 @@ package io.nosqlbench.activitytype.cqld4.statements.core;
 import io.nosqlbench.engine.api.activityimpl.ActivityInitializationError;
 import io.nosqlbench.nb.api.content.Content;
 import io.nosqlbench.nb.api.content.NBIO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.yaml.snakeyaml.TypeDescription;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
@@ -17,7 +17,7 @@ import java.util.function.Function;
 @SuppressWarnings("ALL")
 public class YamlCQLStatementLoader {
 
-    private final static Logger logger = LoggerFactory.getLogger(YamlCQLStatementLoader.class);
+    private final static Logger logger = LogManager.getLogger(YamlCQLStatementLoader.class);
     List<Function<String, String>> transformers = new ArrayList<>();
 
     public YamlCQLStatementLoader() {
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/rowoperators/Save.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/rowoperators/Save.java
index fc01f6934..99fefc89b 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/rowoperators/Save.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/rowoperators/Save.java
@@ -4,8 +4,8 @@ import com.datastax.oss.driver.api.core.cql.ColumnDefinition;
 import com.datastax.oss.driver.api.core.cql.Row;
 import io.nosqlbench.activitytype.cqld4.api.RowCycleOperator;
 import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -17,11 +17,11 @@ import java.util.stream.StreamSupport;
  * Save specific variables to the thread local object map
  */
 public class Save implements RowCycleOperator {
-    private final static Logger logger = LoggerFactory.getLogger(Save.class);
+    private final static Logger logger = LogManager.getLogger(Save.class);
 
     ThreadLocal<HashMap<String, Object>> tl_objectMap = SharedState.tl_ObjectMap;
 
-    private String[] varnames;
+    private final String[] varnames;
 
     public Save(String... varnames) {
         this.varnames = varnames;
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/rsoperators/CqlD4ResultSetLogger.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/rsoperators/CqlD4ResultSetLogger.java
index 8ddce18c7..57e6b3863 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/rsoperators/CqlD4ResultSetLogger.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/rsoperators/CqlD4ResultSetLogger.java
@@ -2,15 +2,15 @@ package io.nosqlbench.activitytype.cqld4.statements.rsoperators;
 
 import com.datastax.oss.driver.api.core.cql.*;
 import io.nosqlbench.activitytype.cqld4.api.D4ResultSetCycleOperator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 /**
  * Logs a trace-level event for the result set, including
  * cycles, rows, fetched row count, and the statement.
  */
 public class CqlD4ResultSetLogger implements D4ResultSetCycleOperator {
-    private final static Logger logger = LoggerFactory.getLogger(CqlD4ResultSetLogger.class);
+    private final static Logger logger = LogManager.getLogger(CqlD4ResultSetLogger.class);
 
     private static String getQueryString(Statement stmt) {
         if (stmt instanceof PreparedStatement) {
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/rsoperators/TraceLogger.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/rsoperators/TraceLogger.java
index 263197529..c38189e96 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/rsoperators/TraceLogger.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/rsoperators/TraceLogger.java
@@ -4,8 +4,8 @@ import com.datastax.oss.driver.api.core.cql.*;
 import io.nosqlbench.activitytype.cqld4.api.D4ResultSetCycleOperator;
 import io.nosqlbench.activitytype.cqld4.core.StatementModifier;
 import io.nosqlbench.engine.api.util.SimpleConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.FileDescriptor;
 import java.io.FileWriter;
@@ -15,9 +15,9 @@ import java.util.Date;
 
 public class TraceLogger implements D4ResultSetCycleOperator, StatementModifier {
 
-    private final static Logger logger = LoggerFactory.getLogger(TraceLogger.class);
+    private final static Logger logger = LogManager.getLogger(TraceLogger.class);
 
-    private static SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss.SSS");
+    private static final SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss.SSS");
     private final long modulo;
     private final String filename;
     private final FileWriter writer;
diff --git a/driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivity.java b/driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivity.java
index d20f479a9..487008c89 100644
--- a/driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivity.java
+++ b/driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivity.java
@@ -5,8 +5,8 @@ import io.nosqlbench.activitytype.cql.statements.rsoperators.AssertSingleRowResu
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.virtdata.core.bindings.Bindings;
 import io.nosqlbench.virtdata.core.bindings.BindingsTemplate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -15,7 +15,7 @@ import java.util.Optional;
 
 public class CqlVerifyActivity extends CqlActivity {
 
-    private final static Logger logger = LoggerFactory.getLogger(CqlVerifyActivity.class);
+    private final static Logger logger = LogManager.getLogger(CqlVerifyActivity.class);
     private BindingsTemplate expectedValuesTemplate;
     private VerificationMetrics verificationMetrics;
 
diff --git a/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/AsyncDiagAction.java b/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/AsyncDiagAction.java
index d2d127167..1f67a1016 100644
--- a/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/AsyncDiagAction.java
+++ b/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/AsyncDiagAction.java
@@ -24,8 +24,8 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.op_output.StrideOut
 import io.nosqlbench.engine.api.activityapi.ratelimits.RateLimiter;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.activityimpl.ParameterMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.List;
 import java.util.concurrent.BlockingQueue;
@@ -38,7 +38,7 @@ import java.util.stream.Collectors;
 
 public class AsyncDiagAction extends BaseAsyncAction<DiagOpData, DiagActivity> implements Thread.UncaughtExceptionHandler, StrideOutputConsumer<DiagOpData> {
 
-    private final static Logger logger = LoggerFactory.getLogger(AsyncDiagAction.class);
+    private final static Logger logger = LogManager.getLogger(AsyncDiagAction.class);
 
     private long lastUpdate;
     private long quantizedInterval;
@@ -213,8 +213,8 @@ public class AsyncDiagAction extends BaseAsyncAction<DiagOpData, DiagActivity> i
         private final AsyncDiagAction action;
         AsyncDiagAction mainContext;
         private volatile boolean running = true;
-        private Thread thread;
-        private String name;
+        private final Thread thread;
+        private final String name;
 
         public OpFinisher(String name, BlockingQueue<StartedOp<DiagOpData>> queue, AsyncDiagAction action) {
             this.queue = queue;
diff --git a/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagAction.java b/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagAction.java
index 0bab6740e..5f84a400c 100644
--- a/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagAction.java
+++ b/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagAction.java
@@ -20,16 +20,16 @@ import io.nosqlbench.engine.api.activityapi.core.MultiPhaseAction;
 import io.nosqlbench.engine.api.activityapi.core.SyncAction;
 import io.nosqlbench.engine.api.activityapi.ratelimits.RateLimiter;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 public class DiagAction implements SyncAction, ActivityDefObserver, MultiPhaseAction {
 
-    private final static Logger logger = LoggerFactory.getLogger(DiagAction.class);
+    private final static Logger logger = LogManager.getLogger(DiagAction.class);
     private final ActivityDef activityDef;
     private final DiagActivity diagActivity;
 
-    private int slot;
+    private final int slot;
     private long lastUpdate;
     private long quantizedInterval;
     private long reportModulo;
diff --git a/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActionDispenser.java b/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActionDispenser.java
index 1ff3a45c3..c961844f1 100644
--- a/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActionDispenser.java
+++ b/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActionDispenser.java
@@ -16,14 +16,13 @@ package io.nosqlbench.activitytype.diag;
 
 import io.nosqlbench.engine.api.activityapi.core.Action;
 import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
-import org.slf4j.Logger;
-
-import static org.slf4j.LoggerFactory.getLogger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class DiagActionDispenser implements ActionDispenser {
 
-    private final static Logger logger = getLogger(DiagActionDispenser.class);
-    private DiagActivity activity;
+    private final static Logger logger = LogManager.getLogger(DiagActionDispenser.class);
+    private final DiagActivity activity;
 
     public DiagActionDispenser(DiagActivity activity) {
         this.activity = activity;
diff --git a/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivityType.java b/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivityType.java
index 8196384c5..27083fe2f 100644
--- a/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivityType.java
+++ b/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivityType.java
@@ -19,8 +19,8 @@ import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
 import io.nosqlbench.engine.api.activityapi.core.ActivityType;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.nb.annotations.Service;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 /**
  * The DiagActivity, aka "diag", is simply a diagnostic activity.
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
 @Service(ActivityType.class)
 public class DiagActivityType implements ActivityType<DiagActivity> {
 
-    private static final Logger logger = LoggerFactory.getLogger(DiagActivityType.class);
+    private static final Logger logger = LogManager.getLogger(DiagActivityType.class);
 
     @Override
     public String getName() {
diff --git a/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/SequenceBlocker.java b/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/SequenceBlocker.java
index af96a1225..550cb353d 100644
--- a/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/SequenceBlocker.java
+++ b/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/SequenceBlocker.java
@@ -17,14 +17,14 @@
 
 package io.nosqlbench.activitytype.diag;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.security.InvalidParameterException;
 import java.util.concurrent.atomic.AtomicLong;
 
 public class SequenceBlocker {
-    private final static Logger logger = LoggerFactory.getLogger(SequenceBlocker.class);
+    private final static Logger logger = LogManager.getLogger(SequenceBlocker.class);
     private final AtomicLong sequence;
     private final AtomicLong waiting=new AtomicLong(0L);
     private final boolean errorsAreFatal;
diff --git a/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpAction.java b/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpAction.java
index 327b79c6c..b97425c47 100644
--- a/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpAction.java
+++ b/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpAction.java
@@ -8,8 +8,8 @@ import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.nb.api.errors.BasicError;
 import io.nosqlbench.virtdata.core.templates.StringBindings;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.*;
 import java.net.http.HttpClient;
@@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit;
 
 public class HttpAction implements SyncAction {
 
-    private final static Logger logger = LoggerFactory.getLogger(HttpAction.class);
+    private final static Logger logger = LogManager.getLogger(HttpAction.class);
 
     private final HttpActivity httpActivity;
     private final int slot;
diff --git a/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivity.java b/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivity.java
index f0169b7b6..01d40da6c 100644
--- a/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivity.java
+++ b/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivity.java
@@ -10,14 +10,14 @@ import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.activityimpl.SimpleActivity;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.net.http.HttpClient;
 import java.util.function.Function;
 
 public class HttpActivity extends SimpleActivity implements Activity, ActivityDefObserver {
-    private final static Logger logger = LoggerFactory.getLogger(HttpActivity.class);
+    private final static Logger logger = LogManager.getLogger(HttpActivity.class);
     private final ActivityDef activityDef;
     public HttpConsoleFormats console;
 
diff --git a/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivityType.java b/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivityType.java
index 800e5bd24..6d24956dc 100644
--- a/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivityType.java
+++ b/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivityType.java
@@ -4,13 +4,13 @@ import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
 import io.nosqlbench.engine.api.activityapi.core.ActivityType;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.nb.annotations.Service;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 @Service(ActivityType.class)
 public class HttpActivityType implements ActivityType<HttpActivity> {
 
-    private static final Logger logger = LoggerFactory.getLogger(HttpActivityType.class);
+    private static final Logger logger = LogManager.getLogger(HttpActivityType.class);
 
     @Override
     public String getName() {
diff --git a/driver-http/src/main/java/io/nosqlbench/activitytype/http/async/HttpAsyncAction.java b/driver-http/src/main/java/io/nosqlbench/activitytype/http/async/HttpAsyncAction.java
index 676e335e6..461a66088 100644
--- a/driver-http/src/main/java/io/nosqlbench/activitytype/http/async/HttpAsyncAction.java
+++ b/driver-http/src/main/java/io/nosqlbench/activitytype/http/async/HttpAsyncAction.java
@@ -7,8 +7,8 @@ import io.nosqlbench.activitytype.http.HttpActivity;
 import io.nosqlbench.engine.api.activityapi.core.BaseAsyncAction;
 import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.TrackedOp;
 import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.net.http.HttpClient;
 import java.net.http.HttpResponse;
@@ -17,7 +17,7 @@ import java.util.function.LongFunction;
 
 public class HttpAsyncAction extends BaseAsyncAction<HttpAsyncOp, HttpActivity> {
 
-    private final static Logger logger = LoggerFactory.getLogger(HttpAsyncAction.class);
+    private final static Logger logger = LogManager.getLogger(HttpAsyncAction.class);
 
     private OpSequence<ReadyHttpOp> sequencer;
     private HttpClient client;
diff --git a/driver-jmx/src/main/java/io/nosqlbench/driver/jmx/JMXAction.java b/driver-jmx/src/main/java/io/nosqlbench/driver/jmx/JMXAction.java
index fdd6d0010..b5e22ed46 100644
--- a/driver-jmx/src/main/java/io/nosqlbench/driver/jmx/JMXAction.java
+++ b/driver-jmx/src/main/java/io/nosqlbench/driver/jmx/JMXAction.java
@@ -4,12 +4,12 @@ import io.nosqlbench.driver.jmx.ops.JmxOp;
 import io.nosqlbench.engine.api.activityapi.core.SyncAction;
 import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 public class JMXAction implements SyncAction {
 
-    private final static Logger logger = LoggerFactory.getLogger(JMXAction.class);
+    private final static Logger logger = LogManager.getLogger(JMXAction.class);
 
     private final ActivityDef activityDef;
     private final int slot;
diff --git a/driver-jmx/src/main/java/io/nosqlbench/driver/jmx/SecureUtils.java b/driver-jmx/src/main/java/io/nosqlbench/driver/jmx/SecureUtils.java
index e103540bd..7934ecbe7 100644
--- a/driver-jmx/src/main/java/io/nosqlbench/driver/jmx/SecureUtils.java
+++ b/driver-jmx/src/main/java/io/nosqlbench/driver/jmx/SecureUtils.java
@@ -1,16 +1,15 @@
 package io.nosqlbench.driver.jmx;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
-import java.io.Console;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
 public class SecureUtils {
-    private final static Logger logger = LoggerFactory.getLogger(SecureUtils.class);
+    private final static Logger logger = LogManager.getLogger(SecureUtils.class);
 
     public static String readSecret(String description, String source) {
         if (source==null) {
diff --git a/driver-jmx/src/main/java/io/nosqlbench/driver/jmx/ops/JmxOp.java b/driver-jmx/src/main/java/io/nosqlbench/driver/jmx/ops/JmxOp.java
index 99a5985ae..abd006fa8 100644
--- a/driver-jmx/src/main/java/io/nosqlbench/driver/jmx/ops/JmxOp.java
+++ b/driver-jmx/src/main/java/io/nosqlbench/driver/jmx/ops/JmxOp.java
@@ -1,7 +1,7 @@
 package io.nosqlbench.driver.jmx.ops;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
@@ -12,7 +12,7 @@ import javax.management.remote.JMXConnector;
  */
 public abstract class JmxOp {
 
-    protected final static Logger logger = LoggerFactory.getLogger(JmxOp.class);
+    protected final static Logger logger = LogManager.getLogger(JmxOp.class);
 
     protected JMXConnector connector;
     protected ObjectName objectName;
diff --git a/driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaAction.java b/driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaAction.java
index f01b3e82b..c34143c2c 100644
--- a/driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaAction.java
+++ b/driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaAction.java
@@ -2,13 +2,13 @@ package com.datastax.ebdrivers.kafkaproducer;
 
 import io.nosqlbench.engine.api.activityapi.core.SyncAction;
 import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 
 public class KafkaAction implements SyncAction {
 
-    private final static Logger logger = LoggerFactory.getLogger(KafkaAction.class);
+    private final static Logger logger = LogManager.getLogger(KafkaAction.class);
 
     private final KafkaProducerActivity activity;
     private final int slot;
diff --git a/driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaProducerActivity.java b/driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaProducerActivity.java
index 30189c531..54ec6513b 100644
--- a/driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaProducerActivity.java
+++ b/driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaProducerActivity.java
@@ -4,7 +4,6 @@ import com.codahale.metrics.Timer;
 import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
 import io.nosqlbench.engine.api.activityapi.planning.SequencePlanner;
 import io.nosqlbench.engine.api.activityapi.planning.SequencerType;
-import io.nosqlbench.engine.api.activityconfig.ParsedStmt;
 import io.nosqlbench.engine.api.activityconfig.StatementsLoader;
 import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplate;
 import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList;
@@ -12,22 +11,15 @@ import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.activityimpl.SimpleActivity;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
 import io.nosqlbench.engine.api.templating.StrInterpolator;
-import io.nosqlbench.virtdata.core.bindings.BindingsTemplate;
-import io.nosqlbench.virtdata.core.templates.StringBindings;
-import io.nosqlbench.virtdata.core.templates.StringBindingsTemplate;
-import org.apache.kafka.clients.producer.*;
-import org.apache.kafka.common.serialization.StringSerializer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
-import java.util.*;
-import java.util.concurrent.Future;
-import java.util.function.Function;
-import java.util.regex.Pattern;
+import java.util.Arrays;
+import java.util.List;
 import java.util.stream.Collectors;
 
 public class KafkaProducerActivity extends SimpleActivity {
-    private final static Logger logger = LoggerFactory.getLogger(KafkaProducerActivity.class);
+    private final static Logger logger = LogManager.getLogger(KafkaProducerActivity.class);
     private String yamlLoc;
     private String clientId;
     private String servers;
diff --git a/driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaStatement.java b/driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaStatement.java
index e0323248c..20796b233 100644
--- a/driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaStatement.java
+++ b/driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaStatement.java
@@ -9,8 +9,8 @@ import io.nosqlbench.virtdata.core.templates.StringBindings;
 import io.nosqlbench.virtdata.core.templates.StringBindingsTemplate;
 import org.apache.kafka.clients.producer.*;
 import org.apache.kafka.common.serialization.StringSerializer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -20,7 +20,7 @@ import java.util.Properties;
 import java.util.concurrent.Future;
 
 public class KafkaStatement {
-    private final static Logger logger = LoggerFactory.getLogger(KafkaStatement.class);
+    private final static Logger logger = LogManager.getLogger(KafkaStatement.class);
 
     private Producer<Object,Object> producer = null;
     private final StringBindings bindings;
diff --git a/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoAction.java b/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoAction.java
index 4a97622fe..beaad3839 100644
--- a/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoAction.java
+++ b/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoAction.java
@@ -2,8 +2,8 @@ package io.nosqlbench.driver.mongodb;
 
 import java.util.concurrent.TimeUnit;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import com.codahale.metrics.Timer;
 import io.nosqlbench.engine.api.activityapi.core.SyncAction;
@@ -13,7 +13,7 @@ import org.bson.conversions.Bson;
 
 public class MongoAction implements SyncAction {
 
-    private final static Logger logger = LoggerFactory.getLogger(MongoAction.class);
+    private final static Logger logger = LogManager.getLogger(MongoAction.class);
 
     private final MongoActivity activity;
     private final int slot;
diff --git a/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoActivity.java b/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoActivity.java
index 47f2d1bc0..73434d7a2 100644
--- a/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoActivity.java
+++ b/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoActivity.java
@@ -5,8 +5,8 @@ import java.util.Objects;
 import java.util.function.Function;
 
 import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.Timer;
@@ -37,7 +37,7 @@ import static org.bson.codecs.configuration.CodecRegistries.fromRegistries;
 
 public class MongoActivity extends SimpleActivity implements ActivityDefObserver {
 
-    private final static Logger logger = LoggerFactory.getLogger(MongoActivity.class);
+    private final static Logger logger = LogManager.getLogger(MongoActivity.class);
 
     private String yamlLoc;
     private String connectionString;
diff --git a/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/ReadyMongoStatementTest.java b/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/ReadyMongoStatementTest.java
index 8d4071700..99d462045 100644
--- a/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/ReadyMongoStatementTest.java
+++ b/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/ReadyMongoStatementTest.java
@@ -1,28 +1,26 @@
 package io.nosqlbench.driver.mongodb;
 
+import io.nosqlbench.engine.api.activityconfig.ParsedStmt;
+import io.nosqlbench.engine.api.activityconfig.StatementsLoader;
+import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplate;
+import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList;
+import io.nosqlbench.engine.api.activityimpl.ActivityDef;
+import io.nosqlbench.engine.api.templating.StrInterpolator;
+import io.nosqlbench.virtdata.core.templates.BindPoint;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bson.conversions.Bson;
+import org.junit.Before;
+import org.junit.Test;
+
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
 
-import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplate;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.nosqlbench.engine.api.activityconfig.ParsedStmt;
-import io.nosqlbench.engine.api.activityconfig.StatementsLoader;
-import io.nosqlbench.engine.api.activityconfig.yaml.StmtDef;
-import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList;
-import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import io.nosqlbench.engine.api.templating.StrInterpolator;
-import io.nosqlbench.virtdata.core.templates.BindPoint;
-import org.bson.conversions.Bson;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class ReadyMongoStatementTest {
-    private final static Logger logger = LoggerFactory.getLogger(ReadyMongoStatementTest.class);
+    private final static Logger logger = LogManager.getLogger(ReadyMongoStatementTest.class);
 
     private ActivityDef activityDef;
     private StmtsDocList stmtsDocList;
diff --git a/driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/AsyncStdoutAction.java b/driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/AsyncStdoutAction.java
index 89c9363c2..56c27ef7f 100644
--- a/driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/AsyncStdoutAction.java
+++ b/driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/AsyncStdoutAction.java
@@ -7,14 +7,14 @@ import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.TrackedOp;
 import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.virtdata.core.templates.StringBindings;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.function.LongFunction;
 
 @SuppressWarnings("Duplicates")
 public class AsyncStdoutAction extends BaseAsyncAction<StdoutOpContext, StdoutActivity> {
-    private final static Logger logger = LoggerFactory.getLogger(AsyncStdoutAction.class);
+    private final static Logger logger = LogManager.getLogger(AsyncStdoutAction.class);
 
     private OpSequence<StringBindings> sequencer;
 
diff --git a/driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutAction.java b/driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutAction.java
index 14ff703a6..0212634dc 100644
--- a/driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutAction.java
+++ b/driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutAction.java
@@ -19,20 +19,20 @@ package io.nosqlbench.activitytype.stdout;
 
 import com.codahale.metrics.Timer;
 import io.nosqlbench.engine.api.activityapi.core.SyncAction;
-import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
+import io.nosqlbench.engine.api.activityapi.planning.OpSource;
 import io.nosqlbench.virtdata.core.templates.StringBindings;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 @SuppressWarnings("Duplicates")
 public class StdoutAction implements SyncAction {
 
-    private static final Logger logger = LoggerFactory.getLogger(StdoutAction.class);
-    private int slot;
-    private StdoutActivity activity;
-    private int maxTries = 10;
+    private static final Logger logger = LogManager.getLogger(StdoutAction.class);
+    private final int slot;
+    private final StdoutActivity activity;
+    private final int maxTries = 10;
     private boolean showstmts;
-    private OpSequence<StringBindings> sequencer;
+    private OpSource<StringBindings> opsource;
 
     public StdoutAction(int slot, StdoutActivity activity) {
         this.slot = slot;
@@ -41,7 +41,7 @@ public class StdoutAction implements SyncAction {
 
     @Override
     public void init() {
-        this.sequencer = activity.getOpSequence();
+        this.opsource = activity.getOpSequence();
     }
 
     @Override
@@ -49,7 +49,7 @@ public class StdoutAction implements SyncAction {
         StringBindings stringBindings;
         String statement = null;
         try (Timer.Context bindTime = activity.bindTimer.time()) {
-            stringBindings = sequencer.get(cycleValue);
+            stringBindings = opsource.get(cycleValue);
             statement = stringBindings.bind(cycleValue);
             showstmts = activity.getShowstmts();
             if (showstmts) {
diff --git a/driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivity.java b/driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivity.java
index 82aa41aed..a830b6e99 100644
--- a/driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivity.java
+++ b/driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivity.java
@@ -36,8 +36,8 @@ import io.nosqlbench.engine.api.templating.StrInterpolator;
 import io.nosqlbench.virtdata.core.bindings.BindingsTemplate;
 import io.nosqlbench.virtdata.core.templates.StringBindings;
 import io.nosqlbench.virtdata.core.templates.StringBindingsTemplate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.FileNotFoundException;
 import java.io.PrintWriter;
@@ -48,7 +48,7 @@ import java.util.regex.Pattern;
 
 @SuppressWarnings("Duplicates")
 public class StdoutActivity extends SimpleActivity implements ActivityDefObserver {
-    private final static Logger logger = LoggerFactory.getLogger(StdoutActivity.class);
+    private final static Logger logger = LogManager.getLogger(StdoutActivity.class);
     private final Boolean showstmts;
     private final StmtsDocList stmtsDocList;
     public Timer bindTimer;
diff --git a/driver-tcp/src/main/java/io/nosqlbench/activitytype/tcpclient/TCPClientActivity.java b/driver-tcp/src/main/java/io/nosqlbench/activitytype/tcpclient/TCPClientActivity.java
index dfa814968..f65d9c262 100644
--- a/driver-tcp/src/main/java/io/nosqlbench/activitytype/tcpclient/TCPClientActivity.java
+++ b/driver-tcp/src/main/java/io/nosqlbench/activitytype/tcpclient/TCPClientActivity.java
@@ -20,8 +20,8 @@ package io.nosqlbench.activitytype.tcpclient;
 import io.nosqlbench.activitytype.stdout.StdoutActivity;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.util.SSLKsFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import javax.net.SocketFactory;
 import java.io.IOException;
@@ -29,7 +29,7 @@ import java.io.PrintWriter;
 import java.net.Socket;
 
 public class TCPClientActivity extends StdoutActivity {
-    private final static Logger logger = LoggerFactory.getLogger(TCPClientActivity.class);
+    private final static Logger logger = LogManager.getLogger(TCPClientActivity.class);
 
     public TCPClientActivity(ActivityDef activityDef) {
         super(activityDef);
diff --git a/driver-tcp/src/main/java/io/nosqlbench/activitytype/tcpserver/TCPServerActivity.java b/driver-tcp/src/main/java/io/nosqlbench/activitytype/tcpserver/TCPServerActivity.java
index da758c9aa..caf83f0a2 100644
--- a/driver-tcp/src/main/java/io/nosqlbench/activitytype/tcpserver/TCPServerActivity.java
+++ b/driver-tcp/src/main/java/io/nosqlbench/activitytype/tcpserver/TCPServerActivity.java
@@ -20,8 +20,8 @@ package io.nosqlbench.activitytype.tcpserver;
 import io.nosqlbench.activitytype.stdout.StdoutActivity;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.util.SSLKsFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import javax.net.ServerSocketFactory;
 import javax.net.ssl.SSLServerSocketFactory;
@@ -41,11 +41,11 @@ import java.util.concurrent.LinkedBlockingQueue;
 
 public class TCPServerActivity extends StdoutActivity {
 
-    private final static Logger logger = LoggerFactory.getLogger(TCPServerActivity.class);
+    private final static Logger logger = LogManager.getLogger(TCPServerActivity.class);
     private final ServerSocketFactory socketFactory;
-    private LinkedBlockingQueue<String> queue;
+    private final LinkedBlockingQueue<String> queue;
     private ServerSocket listenerSocket;
-    private List<Shutdown> managedShutdown = new ArrayList<>();
+    private final List<Shutdown> managedShutdown = new ArrayList<>();
     private int capacity=10;
 
 
@@ -118,7 +118,7 @@ public class TCPServerActivity extends StdoutActivity {
 
     }
 
-    private static interface Shutdown {
+    private interface Shutdown {
         void shutdown();
     }
 
diff --git a/driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebContext.java b/driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebContext.java
index ce61fa79e..c67e084f8 100644
--- a/driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebContext.java
+++ b/driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebContext.java
@@ -1,8 +1,8 @@
 package io.nosqlbench.driver.webdriver;
 
 import org.openqa.selenium.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -10,14 +10,14 @@ import java.util.LinkedList;
 import java.util.List;
 
 public class WebContext {
-    private final static Logger logger = LoggerFactory.getLogger(WebContext.class);
+    private final static Logger logger = LogManager.getLogger(WebContext.class);
 
     private final WebDriver rootwindow;
     WebDriver focus;
 
     LinkedList<WebElement> elements = new LinkedList<>();
-    private LinkedList<Cookie> cookies = new LinkedList<>();
-    private HashMap<String,Object> vars = new HashMap<>();
+    private final LinkedList<Cookie> cookies = new LinkedList<>();
+    private final HashMap<String,Object> vars = new HashMap<>();
     private Alert alert;
 
     public WebContext(WebDriver initial) {
diff --git a/driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebDriverAction.java b/driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebDriverAction.java
index be85b8b24..39a393f69 100644
--- a/driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebDriverAction.java
+++ b/driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebDriverAction.java
@@ -5,16 +5,14 @@ import io.nosqlbench.engine.api.activityapi.core.ActivityDefObserver;
 import io.nosqlbench.engine.api.activityapi.core.SyncAction;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.templating.CommandTemplate;
-import io.nosqlbench.nb.api.errors.BasicError;
-import org.openqa.selenium.WebDriver;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 /**
  * Holds the definition and tracking state for a web driver command.
  */
 public class WebDriverAction implements SyncAction, ActivityDefObserver {
-    private final static Logger logger = LoggerFactory.getLogger(WebDriverAction.class);
+    private final static Logger logger = LogManager.getLogger(WebDriverAction.class);
 
     private final WebDriverActivity activity;
     private final int slot;
diff --git a/driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebDriverActivity.java b/driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebDriverActivity.java
index e780eccc6..0f9a5d787 100644
--- a/driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebDriverActivity.java
+++ b/driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebDriverActivity.java
@@ -10,7 +10,6 @@ import io.nosqlbench.engine.api.activityapi.planning.SequencePlanner;
 import io.nosqlbench.engine.api.activityapi.planning.SequencerType;
 import io.nosqlbench.engine.api.activityconfig.StatementsLoader;
 import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplate;
-import io.nosqlbench.engine.api.activityconfig.yaml.StmtDef;
 import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.activityimpl.SimpleActivity;
@@ -18,27 +17,29 @@ import io.nosqlbench.engine.api.templating.CommandTemplate;
 import io.nosqlbench.engine.api.templating.StrInterpolator;
 import io.nosqlbench.nb.api.content.NBIO;
 import io.nosqlbench.nb.api.errors.BasicError;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.chrome.ChromeOptions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class WebDriverActivity extends SimpleActivity {
 
-    private final static Logger logger = LoggerFactory.getLogger(WebDriverActivity.class);
+    private final static Logger logger = LogManager.getLogger(WebDriverActivity.class);
 
     //    private final StmtsDocList stmtsDocList;
     private OpSequence<CommandTemplate> opSequence;
 
-    private ConcurrentHashMap<Integer,WebContext> contexts = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<Integer,WebContext> contexts = new ConcurrentHashMap<>();
 //    private static ThreadLocal<WebContext> TL_WebContext = new ThreadLocal<>();
 
     public WebDriverActivity(ActivityDef activityDef) {
diff --git a/driver-web/src/main/java/io/nosqlbench/driver/webdriver/verbs/AssertElement.java b/driver-web/src/main/java/io/nosqlbench/driver/webdriver/verbs/AssertElement.java
index 7a0bb7c97..c0daf5b09 100644
--- a/driver-web/src/main/java/io/nosqlbench/driver/webdriver/verbs/AssertElement.java
+++ b/driver-web/src/main/java/io/nosqlbench/driver/webdriver/verbs/AssertElement.java
@@ -1,16 +1,13 @@
 package io.nosqlbench.driver.webdriver.verbs;
 
 import io.nosqlbench.driver.webdriver.WebContext;
-import io.nosqlbench.nb.api.errors.BasicError;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openqa.selenium.By;
-import org.openqa.selenium.NoSuchElementException;
-import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class AssertElement implements WebDriverVerb {
-    private final static Logger logger = LoggerFactory.getLogger(AssertElement.class);
+    private final static Logger logger = LogManager.getLogger(AssertElement.class);
     private final By by;
 
     public AssertElement(By by) {
diff --git a/driver-web/src/main/java/io/nosqlbench/driver/webdriver/verbs/FindElement.java b/driver-web/src/main/java/io/nosqlbench/driver/webdriver/verbs/FindElement.java
index 535b2a9a5..0991cad67 100644
--- a/driver-web/src/main/java/io/nosqlbench/driver/webdriver/verbs/FindElement.java
+++ b/driver-web/src/main/java/io/nosqlbench/driver/webdriver/verbs/FindElement.java
@@ -1,15 +1,14 @@
 package io.nosqlbench.driver.webdriver.verbs;
 
 import io.nosqlbench.driver.webdriver.WebContext;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
-import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class FindElement implements WebDriverVerb {
-    private final static Logger logger = LoggerFactory.getLogger(FindElement.class);
+    private final static Logger logger = LogManager.getLogger(FindElement.class);
 
     private final By by;
 
diff --git a/driver-web/src/main/java/io/nosqlbench/driver/webdriver/verbs/FindElements.java b/driver-web/src/main/java/io/nosqlbench/driver/webdriver/verbs/FindElements.java
index 1bd842111..8c2015b05 100644
--- a/driver-web/src/main/java/io/nosqlbench/driver/webdriver/verbs/FindElements.java
+++ b/driver-web/src/main/java/io/nosqlbench/driver/webdriver/verbs/FindElements.java
@@ -1,17 +1,16 @@
 package io.nosqlbench.driver.webdriver.verbs;
 
 import io.nosqlbench.driver.webdriver.WebContext;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
-import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
 public class FindElements implements WebDriverVerb {
-    private final static Logger logger = LoggerFactory.getLogger(FindElements.class);
+    private final static Logger logger = LogManager.getLogger(FindElements.class);
 
     private final By by;
 
diff --git a/driver-web/src/main/java/io/nosqlbench/driver/webdriver/verbs/Get.java b/driver-web/src/main/java/io/nosqlbench/driver/webdriver/verbs/Get.java
index 9370aff7a..b5c958d26 100644
--- a/driver-web/src/main/java/io/nosqlbench/driver/webdriver/verbs/Get.java
+++ b/driver-web/src/main/java/io/nosqlbench/driver/webdriver/verbs/Get.java
@@ -1,11 +1,11 @@
 package io.nosqlbench.driver.webdriver.verbs;
 
 import io.nosqlbench.driver.webdriver.WebContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 public class Get implements WebDriverVerb {
-    private final static Logger logger = LoggerFactory.getLogger(Get.class);
+    private final static Logger logger = LogManager.getLogger(Get.class);
 
     private final String target;
 
diff --git a/driver-web/src/main/java/io/nosqlbench/driver/webdriver/verbs/WebDriverVerbs.java b/driver-web/src/main/java/io/nosqlbench/driver/webdriver/verbs/WebDriverVerbs.java
index b03f8df49..7d32e1ce6 100644
--- a/driver-web/src/main/java/io/nosqlbench/driver/webdriver/verbs/WebDriverVerbs.java
+++ b/driver-web/src/main/java/io/nosqlbench/driver/webdriver/verbs/WebDriverVerbs.java
@@ -3,8 +3,8 @@ package io.nosqlbench.driver.webdriver.verbs;
 import io.nosqlbench.driver.webdriver.WebContext;
 import io.nosqlbench.engine.api.templating.CommandTemplate;
 import io.nosqlbench.nb.api.errors.BasicError;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.security.InvalidParameterException;
 import java.util.Map;
@@ -19,7 +19,7 @@ import java.util.function.Function;
  *     The JUnit exporter command generator</a>
  */
 public class WebDriverVerbs {
-    private final static Logger logger = LoggerFactory.getLogger(WebDriverVerbs.class);
+    private final static Logger logger = LogManager.getLogger(WebDriverVerbs.class);
     public final static String COMMAND = "command";
 
     public enum Verb {
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/BaseAsyncAction.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/BaseAsyncAction.java
index 7d6ccc655..fc299a8d8 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/BaseAsyncAction.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/BaseAsyncAction.java
@@ -20,8 +20,8 @@ package io.nosqlbench.engine.api.activityapi.core;
 import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.TrackedOp;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.activityimpl.ParameterMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 /**
  *
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
  * @param <A> An type of of an Activity, a state holder for a runtime instance of an Activity
  */
 public abstract class BaseAsyncAction<D, A extends Activity> implements AsyncAction<D>, Stoppable, ActivityDefObserver {
-    private final static Logger logger = LoggerFactory.getLogger("BaseAsyncAction");
+    private final static Logger logger = LogManager.getLogger("BaseAsyncAction");
 
     protected final A activity;
 
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferTarget.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferTarget.java
index 83ff87acd..c599e21f3 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferTarget.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferTarget.java
@@ -21,8 +21,8 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable;
 import io.nosqlbench.engine.api.activityapi.cyclelog.inputs.cyclelog.CanFilterResultValue;
 import io.nosqlbench.engine.api.activityapi.output.Output;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.nio.ByteBuffer;
 import java.util.function.Predicate;
@@ -40,7 +40,7 @@ import java.util.function.Predicate;
  * will be deemed invalid and will cause an exception to be thrown.
  */
 public class CycleResultsRLEBufferTarget implements Output,CanFilterResultValue {
-    private final static Logger logger = LoggerFactory.getLogger(CycleResultsRLEBufferTarget.class);
+    private final static Logger logger = LogManager.getLogger(CycleResultsRLEBufferTarget.class);
 
     public final static int BYTES = Long.BYTES + Long.BYTES + Byte.BYTES;
 
@@ -49,8 +49,8 @@ public class CycleResultsRLEBufferTarget implements Output,CanFilterResultValue
     private long lastResult = Integer.MIN_VALUE;
     private long runlength = 0L;
     private boolean flushed = false;
-    private long count=0L;
-    private long min=Long.MAX_VALUE;
+    private final long count=0L;
+    private final long min=Long.MAX_VALUE;
     private Predicate<ResultReadable> filter;
 
     /**
@@ -147,7 +147,7 @@ public class CycleResultsRLEBufferTarget implements Output,CanFilterResultValue
     }
 
     private static class ResultReadableWrapper implements ResultReadable {
-        private int result;
+        private final int result;
         ResultReadableWrapper(int result) {
             this.result = result;
         }
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/EnumReadableMappingFilter.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/EnumReadableMappingFilter.java
index 55c0fde5b..6d75c3470 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/EnumReadableMappingFilter.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/EnumReadableMappingFilter.java
@@ -18,8 +18,8 @@
 package io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate;
 
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.regex.Pattern;
 
@@ -31,10 +31,10 @@ import java.util.regex.Pattern;
  * @param <E> The type of the Enum which implements TristateFilter
  */
 public class EnumReadableMappingFilter<E extends Enum<E> & ResultReadable> implements TristateFilter<ResultReadable> {
-    private final static Logger logger = LoggerFactory.getLogger(EnumReadableMappingFilter.class);
+    private final static Logger logger = LogManager.getLogger(EnumReadableMappingFilter.class);
 
     private final E[] enumValues;
-    private ResultMappingArrayFilter arrayFilter = new ResultMappingArrayFilter();
+    private final ResultMappingArrayFilter arrayFilter = new ResultMappingArrayFilter();
 
     public EnumReadableMappingFilter(E[] enumValues, Policy defaultPolicy) {
         this.enumValues = enumValues;
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInput.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInput.java
index 6e4a0e40a..9a6ba5e61 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInput.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInput.java
@@ -27,8 +27,8 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle.CycleRe
 import io.nosqlbench.engine.api.activityapi.input.Input;
 import io.nosqlbench.engine.api.util.SimpleConfig;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.File;
 import java.io.RandomAccessFile;
@@ -38,7 +38,7 @@ import java.util.Iterator;
 import java.util.function.Predicate;
 
 public class CycleLogInput implements Input, AutoCloseable, Iterable<CycleResultsSegment>, CanFilterResultValue {
-    private final static Logger logger = LoggerFactory.getLogger(CycleLogInput.class);
+    private final static Logger logger = LogManager.getLogger(CycleLogInput.class);
     private final Iterator<CycleResultsSegment> cycleResultSegmentIterator;
     private RandomAccessFile raf;
     private MappedByteBuffer mbb;
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/ReorderingConcurrentResultBuffer.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/ReorderingConcurrentResultBuffer.java
index 0cfc456c0..064555c05 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/ReorderingConcurrentResultBuffer.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/ReorderingConcurrentResultBuffer.java
@@ -23,8 +23,8 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable;
 import io.nosqlbench.engine.api.activityapi.cyclelog.inputs.cyclelog.CanFilterResultValue;
 import io.nosqlbench.engine.api.activityapi.output.Output;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.Collections;
 import java.util.LinkedList;
@@ -36,10 +36,10 @@ import java.util.function.Predicate;
  */
 public class ReorderingConcurrentResultBuffer implements Output, CanFilterResultValue {
 
-    private final static Logger logger = LoggerFactory.getLogger(ReorderingConcurrentResultBuffer.class);
+    private final static Logger logger = LogManager.getLogger(ReorderingConcurrentResultBuffer.class);
 
-    private LinkedList<CycleResultsSegment> segments = new LinkedList<>();
-    private Output downstream;
+    private final LinkedList<CycleResultsSegment> segments = new LinkedList<>();
+    private final Output downstream;
     private final int threshold;
     private int currentCount;
     private int segmentCount;
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutput.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutput.java
index 2f88d00e8..c39b2e884 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutput.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutput.java
@@ -26,8 +26,8 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle.CycleSp
 import io.nosqlbench.engine.api.activityapi.cyclelog.inputs.cyclelog.CanFilterResultValue;
 import io.nosqlbench.engine.api.activityapi.output.Output;
 import io.nosqlbench.engine.api.util.SimpleConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.File;
 import java.io.RandomAccessFile;
@@ -51,13 +51,13 @@ import java.util.function.Predicate;
 public class CycleLogOutput implements Output, CanFilterResultValue {
 
     // For use in allocating file data, etc
-    private final static Logger logger = LoggerFactory.getLogger(CycleLogOutput.class);
+    private final static Logger logger = LogManager.getLogger(CycleLogOutput.class);
     private MappedByteBuffer mbb;
     private RandomAccessFile file;
     //    private FileBufferConfig config;
     private CycleResultsRLEBufferTarget targetBuffer;
-    private int extentSizeInSpans;
-    private File outputFile;
+    private final int extentSizeInSpans;
+    private final File outputFile;
     private Predicate<ResultReadable> filter;
 
     public CycleLogOutput(Activity activity) {
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutputType.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutputType.java
index edec07937..c71fcdbe6 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutputType.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutputType.java
@@ -24,8 +24,8 @@ import io.nosqlbench.engine.api.activityapi.output.Output;
 import io.nosqlbench.engine.api.activityapi.output.OutputDispenser;
 import io.nosqlbench.engine.api.activityapi.output.OutputType;
 import io.nosqlbench.nb.annotations.Service;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 @Service(OutputType.class)
 public class CycleLogOutputType implements OutputType {
@@ -41,10 +41,10 @@ public class CycleLogOutputType implements OutputType {
     }
 
     public static class Dispenser implements OutputDispenser {
-        private final static Logger logger = LoggerFactory.getLogger(OutputDispenser.class);
+        private final static Logger logger = LogManager.getLogger(OutputDispenser.class);
 
         private final Output output;
-        private Activity activity;
+        private final Activity activity;
 
         public Dispenser(Activity activity) {
             this.activity = activity;
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingMarkerDispenser.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingMarkerDispenser.java
index b88c081b1..9846bf278 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingMarkerDispenser.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingMarkerDispenser.java
@@ -21,14 +21,14 @@ import io.nosqlbench.engine.api.activityapi.core.Activity;
 import io.nosqlbench.engine.api.activityapi.output.Output;
 import io.nosqlbench.engine.api.activityapi.output.OutputDispenser;
 import io.nosqlbench.nb.annotations.Service;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 @Service(OutputDispenser.class)
 public class LoggingMarkerDispenser implements OutputDispenser {
 
-    private final static Logger logger = LoggerFactory.getLogger(LoggingMarkerDispenser.class);
-    private Activity activity;
+    private final static Logger logger = LogManager.getLogger(LoggingMarkerDispenser.class);
+    private final Activity activity;
 
     public LoggingMarkerDispenser(Activity activity) {
         this.activity = activity;
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingOutput.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingOutput.java
index 892c31d07..499c68747 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingOutput.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingOutput.java
@@ -21,13 +21,13 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReada
 import io.nosqlbench.engine.api.activityapi.cyclelog.inputs.cyclelog.CanFilterResultValue;
 import io.nosqlbench.engine.api.activityapi.output.Output;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.function.Predicate;
 
 public class LoggingOutput implements Output,CanFilterResultValue {
-    private final static Logger logger = LoggerFactory.getLogger(LoggingOutput.class);
+    private final static Logger logger = LogManager.getLogger(LoggingOutput.class);
 
     private final ActivityDef def;
     private final long slot;
@@ -63,7 +63,7 @@ public class LoggingOutput implements Output,CanFilterResultValue {
     }
 
     private static class ResultReadableWrapper implements ResultReadable {
-        private int result;
+        private final int result;
         public ResultReadableWrapper(int result) {
             this.result = result;
         }
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/CycleErrorHandlers.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/CycleErrorHandlers.java
index 89ae0127c..24c8bebb7 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/CycleErrorHandlers.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/CycleErrorHandlers.java
@@ -17,8 +17,8 @@
 
 package io.nosqlbench.engine.api.activityapi.errorhandling;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.List;
 
@@ -27,7 +27,7 @@ import java.util.List;
  */
 public class CycleErrorHandlers {
 
-    private final static Logger logger = LoggerFactory.getLogger(CycleErrorHandlers.class);
+    private final static Logger logger = LogManager.getLogger(CycleErrorHandlers.class);
 
     public static <T extends Throwable, R> CycleErrorHandler<T, R> log(R result) {
         return (cycle, error, errMsg) -> {
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/HashedErrorHandler.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/HashedErrorHandler.java
index 9e1efade8..79d335be1 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/HashedErrorHandler.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/HashedErrorHandler.java
@@ -17,8 +17,8 @@
 
 package io.nosqlbench.engine.api.activityapi.errorhandling;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -59,15 +59,15 @@ import java.util.stream.Collectors;
  * @param <R> The result type that will be produced by these error handlers.
  */
 public class HashedErrorHandler<T extends Throwable, R> implements CycleErrorHandler<T, R> {
-    private final static Logger logger = LoggerFactory.getLogger(HashedErrorHandler.class);
+    private final static Logger logger = LogManager.getLogger(HashedErrorHandler.class);
 
     private final CycleErrorHandler<T, R> DEFAULT_defaultHandler = (cycle, error, errMsg) -> {
         throw new RuntimeException("no handler defined for type " + error.getClass() + " in cycle " + cycle + ", " + errMsg);
     };
     private Class<? extends Throwable> upperBound = Throwable.class;
-    private Map<String, Set<Class<? extends T>>> errorGroups = new ConcurrentHashMap<>();
-    private Map<Class<? extends T>, CycleErrorHandler<T, R>> handlers = new ConcurrentHashMap<>();
-    private Set<Class<? extends T>> validClasses = new HashSet<>();
+    private final Map<String, Set<Class<? extends T>>> errorGroups = new ConcurrentHashMap<>();
+    private final Map<Class<? extends T>, CycleErrorHandler<T, R>> handlers = new ConcurrentHashMap<>();
+    private final Set<Class<? extends T>> validClasses = new HashSet<>();
     private CycleErrorHandler<T, R> defaultHandler = DEFAULT_defaultHandler;
 
     /**
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/SequencePlanner.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/SequencePlanner.java
index 21b76095d..cb38258d9 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/SequencePlanner.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/SequencePlanner.java
@@ -17,15 +17,15 @@
 
 package io.nosqlbench.engine.api.activityapi.planning;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.ToLongFunction;
 
 public class SequencePlanner<T> {
-    private final static Logger logger = LoggerFactory.getLogger(SequencePlanner.class);
+    private final static Logger logger = LogManager.getLogger(SequencePlanner.class);
     private final SequencerType sequencerType;
     private List<T> elements = new ArrayList<>();
     private final List<Long> ratios = new ArrayList<>();
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java
index 5efd5c1f9..b97cf281c 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java
@@ -21,8 +21,8 @@ import com.codahale.metrics.Gauge;
 import io.nosqlbench.engine.api.activityapi.core.Startable;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -78,7 +78,7 @@ import java.util.concurrent.atomic.AtomicLong;
  */
 public class HybridRateLimiter implements Startable, RateLimiter {
 
-    private final static Logger logger = LoggerFactory.getLogger(HybridRateLimiter.class);
+    private final static Logger logger = LogManager.getLogger(HybridRateLimiter.class);
 
     private volatile TokenFiller filler;
     private volatile long starttime;
@@ -98,7 +98,7 @@ public class HybridRateLimiter implements Startable, RateLimiter {
     // diagnostics
 
     // TODO Doc rate limiter scenarios, including when you want to reset the waittime, and when you don't
-    private AtomicLong cumulativeWaitTimeNanos = new AtomicLong(0L);
+    private final AtomicLong cumulativeWaitTimeNanos = new AtomicLong(0L);
 
     protected HybridRateLimiter() {
     }
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateLimiters.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateLimiters.java
index fdc8bbcb3..19ae2e494 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateLimiters.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateLimiters.java
@@ -19,11 +19,11 @@ package io.nosqlbench.engine.api.activityapi.ratelimits;
 
 import com.codahale.metrics.Gauge;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 public class RateLimiters {
-    private final static Logger logger = LoggerFactory.getLogger(RateLimiters.class);
+    private final static Logger logger = LogManager.getLogger(RateLimiters.class);
 
     public static synchronized RateLimiter createOrUpdate(ActivityDef def, String label, RateLimiter extant, RateSpec spec) {
 
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateSpec.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateSpec.java
index 91fd487f9..81018543a 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateSpec.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateSpec.java
@@ -19,8 +19,8 @@ package io.nosqlbench.engine.api.activityapi.ratelimits;
 
 import io.nosqlbench.engine.api.activityimpl.ParameterMap;
 import io.nosqlbench.engine.api.util.Unit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 /**
  * <H2>Rate Limiter Specifications</H2>
@@ -101,7 +101,7 @@ import org.slf4j.LoggerFactory;
  */
 public class RateSpec {
 
-    private final static Logger logger = LoggerFactory.getLogger(RateSpec.class);
+    private final static Logger logger = LogManager.getLogger(RateSpec.class);
 
     public static final double DEFAULT_RATE_OPS_S = 1.0D;
     public static final double DEFAULT_BURST_RATIO = 1.1D;
@@ -114,7 +114,7 @@ public class RateSpec {
     public double burstRatio = DEFAULT_BURST_RATIO;
     public Verb verb = Verb.start;
 
-    public static enum Verb {
+    public enum Verb {
         /**
          * Specify that a rate limiter should only be configured without affecting its running state.
          * If the rate limiter is already running, then the configuration should take effect immediately.
@@ -223,8 +223,7 @@ public class RateSpec {
         RateSpec rateSpec = (RateSpec) o;
 
         if (Double.compare(rateSpec.opsPerSec, opsPerSec) != 0) return false;
-        if (Double.compare(rateSpec.burstRatio, burstRatio) != 0) return false;
-        return true;
+        return Double.compare(rateSpec.burstRatio, burstRatio) == 0;
     }
 
     @Override
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenFiller.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenFiller.java
index bc1933ed8..359996db3 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenFiller.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenFiller.java
@@ -20,14 +20,14 @@ package io.nosqlbench.engine.api.activityapi.ratelimits;
 import com.codahale.metrics.Timer;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.LockSupport;
 
 public class TokenFiller implements Runnable {
-    private final static Logger logger = LoggerFactory.getLogger(TokenFiller.class);
+    private final static Logger logger = LogManager.getLogger(TokenFiller.class);
 
     public final static double MIN_PER_SECOND = 10D;
     public final static double MAX_PER_SECOND = 1000D;
@@ -40,7 +40,7 @@ public class TokenFiller implements Runnable {
     private RateSpec rateSpec;
     private Thread thread;
     private volatile long lastRefillAt;
-    private Timer timer;
+    private final Timer timer;
 
     /**
      * A token filler adds tokens to a {@link TokenPool} at some rate.
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPool.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPool.java
index f011774b1..1a37ab2ae 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPool.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPool.java
@@ -17,8 +17,8 @@
 
 package io.nosqlbench.engine.api.activityapi.ratelimits;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import static io.nosqlbench.engine.api.util.Colors.*;
 
@@ -44,7 +44,7 @@ import static io.nosqlbench.engine.api.util.Colors.*;
  */
 public class TokenPool {
 
-    private final static Logger logger = LoggerFactory.getLogger(TokenPool.class);
+    private final static Logger logger = LogManager.getLogger(TokenPool.class);
 
     public static final double MIN_CONCURRENT_OPS = 2;
 
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerf.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerf.java
index e5f64e208..7d13aaf04 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerf.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerf.java
@@ -17,8 +17,8 @@
 
 package io.nosqlbench.engine.api.activityapi.sysperf;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.yaml.snakeyaml.Yaml;
 
 import java.io.File;
@@ -31,7 +31,7 @@ import java.nio.file.attribute.FileTime;
 import java.util.Optional;
 
 public class SysPerf {
-    public final static Logger logger = LoggerFactory.getLogger(SysPerf.class);
+    public final static Logger logger = LogManager.getLogger(SysPerf.class);
 
     private static final Charset CHARSET = StandardCharsets.UTF_8;
     private static SysPerfData cachedData;
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfBaseliner.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfBaseliner.java
index 224c66364..0cb22adc8 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfBaseliner.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfBaseliner.java
@@ -21,8 +21,8 @@ import org.openjdk.jmh.results.RunResult;
 import org.openjdk.jmh.runner.Runner;
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.nio.file.Files;
 import java.util.ArrayList;
@@ -32,7 +32,7 @@ import java.util.Map;
 
 public class SysPerfBaseliner {
 
-    private final static Logger logger = LoggerFactory.getLogger(SysPerfBaseliner.class);
+    private final static Logger logger = LogManager.getLogger(SysPerfBaseliner.class);
 
     public static void main(String[] args) {
         try {
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/ParsedStmt.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/ParsedStmt.java
index fed3e8a09..34515067f 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/ParsedStmt.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/ParsedStmt.java
@@ -20,8 +20,8 @@ package io.nosqlbench.engine.api.activityconfig;
 import io.nosqlbench.engine.api.activityconfig.yaml.StmtDef;
 import io.nosqlbench.virtdata.core.templates.BindPoint;
 import io.nosqlbench.virtdata.core.templates.ParsedTemplate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.List;
 import java.util.Map;
@@ -39,7 +39,7 @@ import java.util.regex.Pattern;
 public class ParsedStmt {
 
     private final static Pattern stmtToken = Pattern.compile("\\?(\\w+[-_\\d\\w]*)|\\{(\\w+[-_\\d\\w.]*)}");
-    private final static Logger logger = LoggerFactory.getLogger(ParsedStmt.class);
+    private final static Logger logger = LogManager.getLogger(ParsedStmt.class);
     private ParsedTemplate template;
 
     private final StmtDef stmtDef;
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/StatementsLoader.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/StatementsLoader.java
index 54fd79cf3..2f85aa043 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/StatementsLoader.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/StatementsLoader.java
@@ -22,15 +22,15 @@ import io.nosqlbench.engine.api.activityconfig.rawyaml.RawStmtsLoader;
 import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList;
 import io.nosqlbench.engine.api.templating.StrInterpolator;
 import io.nosqlbench.nb.api.content.Content;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.Map;
 import java.util.function.Function;
 
 public class StatementsLoader {
 
-    private final static Logger logger = LoggerFactory.getLogger(StatementsLoader.class);
+    private final static Logger logger = LogManager.getLogger(StatementsLoader.class);
 
     public enum Loader {
         original,
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtFields.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtFields.java
index 5c2d148cf..556586e08 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtFields.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtFields.java
@@ -18,15 +18,15 @@
 package io.nosqlbench.engine.api.activityconfig.rawyaml;
 
 import io.nosqlbench.nb.api.errors.BasicError;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
 public class RawStmtFields extends Tags {
-    private final static Logger logger = LoggerFactory.getLogger(RawStmtFields.class);
+    private final static Logger logger = LogManager.getLogger(RawStmtFields.class);
 
     private String name = "";
     private String desc = "";
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtsLoader.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtsLoader.java
index 2f11e5f95..87333535e 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtsLoader.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtsLoader.java
@@ -4,7 +4,7 @@ import io.nosqlbench.engine.api.activityimpl.ActivityInitializationError;
 import io.nosqlbench.nb.api.content.Content;
 import io.nosqlbench.nb.api.content.NBIO;
 import io.nosqlbench.nb.api.errors.BasicError;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 import org.yaml.snakeyaml.Yaml;
 
 import java.util.*;
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ActivityDef.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ActivityDef.java
index d7b23bb04..ddcb689ea 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ActivityDef.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ActivityDef.java
@@ -19,8 +19,8 @@
 package io.nosqlbench.engine.api.activityimpl;
 
 import io.nosqlbench.engine.api.util.Unit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.security.InvalidParameterException;
 import java.util.Optional;
@@ -43,7 +43,7 @@ public class ActivityDef {
     public static final String DEFAULT_ATYPE = "stdout  ";
     public static final String DEFAULT_CYCLES = "0";
     public static final int DEFAULT_THREADS = 1;
-    private final static Logger logger = LoggerFactory.getLogger(ActivityDef.class);
+    private final static Logger logger = LogManager.getLogger(ActivityDef.class);
     // an alias with which to control the activity while it is running
     private static final String FIELD_ALIAS = "alias";
     // a file or URL containing the activity: statements, generator bindings, ...
@@ -52,11 +52,11 @@ public class ActivityDef {
     private static final String FIELD_CYCLES = "cycles";
     // initial thread concurrency for this activity
     private static final String FIELD_THREADS = "threads";
-    private static String[] field_list = new String[]{
+    private static final String[] field_list = new String[]{
             FIELD_ALIAS, FIELD_ATYPE, FIELD_CYCLES, FIELD_THREADS
     };
     // parameter map has its own internal atomic map
-    private ParameterMap parameterMap;
+    private final ParameterMap parameterMap;
 
     public ActivityDef(ParameterMap parameterMap) {
         this.parameterMap = parameterMap;
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/CpuInfo.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/CpuInfo.java
index 84b293d3c..56d085753 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/CpuInfo.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/CpuInfo.java
@@ -17,8 +17,8 @@
 
 package io.nosqlbench.engine.api.activityimpl;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import oshi.SystemInfo;
 import oshi.hardware.CentralProcessor;
 import oshi.hardware.HardwareAbstractionLayer;
@@ -27,7 +27,7 @@ import java.util.DoubleSummaryStatistics;
 import java.util.Optional;
 
 public class CpuInfo {
-    private final static Logger logger = LoggerFactory.getLogger(CpuInfo.class);
+    private final static Logger logger = LogManager.getLogger(CpuInfo.class);
 
     final private static SystemInfo SYSTEM_INFO = new SystemInfo();
 
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ParameterMap.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ParameterMap.java
index 8a542f7f7..d3b000e13 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ParameterMap.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ParameterMap.java
@@ -15,13 +15,13 @@
 
 package io.nosqlbench.engine.api.activityimpl;
 
-import io.nosqlbench.engine.api.activityimpl.motor.ParamsParser;
+import io.nosqlbench.nb.api.config.ParamsParser;
 import io.nosqlbench.engine.api.util.Unit;
 
 import org.graalvm.polyglot.Value;
 import org.graalvm.polyglot.proxy.ProxyObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import javax.script.Bindings;
 import java.util.*;
@@ -42,7 +42,7 @@ import java.util.stream.Collectors;
  * generic type is parameterized for Bindings support.</p>
  */
 public class ParameterMap extends ConcurrentHashMap<String,Object> implements Bindings, ProxyObject {
-    private final static Logger logger = LoggerFactory.getLogger(ParameterMap.class);
+    private final static Logger logger = LogManager.getLogger(ParameterMap.class);
 
 
 //    private final ConcurrentHashMap<String, String> paramMap = new ConcurrentHashMap<>(10);
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java
index 9eed87e0e..884a7f569 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java
@@ -20,8 +20,8 @@ import io.nosqlbench.engine.api.metrics.ActivityMetrics;
 import io.nosqlbench.engine.api.templating.CommandTemplate;
 import io.nosqlbench.engine.api.templating.StrInterpolator;
 import io.nosqlbench.nb.api.errors.BasicError;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -35,7 +35,7 @@ import java.util.function.Supplier;
  * A default implementation of an Activity, suitable for building upon.
  */
 public class SimpleActivity implements Activity, ProgressCapable {
-    private final static Logger logger = LoggerFactory.getLogger("ACTIVITY");
+    private final static Logger logger = LogManager.getLogger("ACTIVITY");
 
     protected ActivityDef activityDef;
     private final List<AutoCloseable> closeables = new ArrayList<>();
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SlotStateTracker.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SlotStateTracker.java
index 81fc08958..9c156411a 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SlotStateTracker.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SlotStateTracker.java
@@ -18,8 +18,8 @@
 package io.nosqlbench.engine.api.activityimpl;
 
 import io.nosqlbench.engine.api.activityapi.core.RunState;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicReference;
  */
 public class SlotStateTracker {
     private final AtomicReference<RunState> slotState = new AtomicReference<>(RunState.Uninitialized);
-    private final static Logger logger = LoggerFactory.getLogger(SlotStateTracker.class);
+    private final static Logger logger = LogManager.getLogger(SlotStateTracker.class);
     private final long slotId;
 
     public SlotStateTracker(long slotId) {
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/action/CoreAction.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/action/CoreAction.java
index eea69ceaa..a71dd0037 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/action/CoreAction.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/action/CoreAction.java
@@ -19,11 +19,11 @@ package io.nosqlbench.engine.api.activityimpl.action;
 
 import io.nosqlbench.engine.api.activityapi.core.SyncAction;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 public class CoreAction implements SyncAction {
-    private final static Logger logger = LoggerFactory.getLogger(CoreAction.class);
+    private final static Logger logger = LogManager.getLogger(CoreAction.class);
 
     private final int interval;
     private final int slot;
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/action/CoreActionDispenser.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/action/CoreActionDispenser.java
index 618f6b036..2286edfda 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/action/CoreActionDispenser.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/action/CoreActionDispenser.java
@@ -19,17 +19,17 @@ package io.nosqlbench.engine.api.activityimpl.action;
 import io.nosqlbench.engine.api.activityapi.core.Action;
 import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
 import io.nosqlbench.engine.api.activityapi.core.Activity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 /**
  * An action dispenser that returns a logging action.
  */
 public class CoreActionDispenser implements ActionDispenser {
 
-    private final static Logger logger = LoggerFactory.getLogger(CoreActionDispenser.class);
+    private final static Logger logger = LogManager.getLogger(CoreActionDispenser.class);
 
-    private Activity activity;
+    private final Activity activity;
 
     public CoreActionDispenser(Activity activity) {
         this.activity = activity;
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInput.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInput.java
index 5385d72c9..219b65641 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInput.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInput.java
@@ -22,8 +22,8 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegmen
 import io.nosqlbench.engine.api.activityapi.input.Input;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.util.Unit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.security.InvalidParameterException;
 import java.util.concurrent.atomic.AtomicLong;
@@ -43,7 +43,7 @@ import java.util.concurrent.atomic.AtomicLong;
  * caller to check the value to determine when the input is deemed "used up."</p>
  */
 public class AtomicInput implements Input, ActivityDefObserver, ProgressCapable {
-    private final static Logger logger = LoggerFactory.getLogger(AtomicInput.class);
+    private final static Logger logger = LogManager.getLogger(AtomicInput.class);
 
     private final AtomicLong cycleValue = new AtomicLong(0L);
     private final AtomicLong min = new AtomicLong(0L);
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ContiguousOutputChunker.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ContiguousOutputChunker.java
index fd5c95cb1..62cd7c319 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ContiguousOutputChunker.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ContiguousOutputChunker.java
@@ -22,8 +22,8 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsIntervalSegment;
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment;
 import io.nosqlbench.engine.api.activityapi.output.Output;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -53,16 +53,16 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 public class ContiguousOutputChunker implements Output {
 
-    private final static Logger logger = LoggerFactory.getLogger(ContiguousOutputChunker.class);
+    private final static Logger logger = LogManager.getLogger(ContiguousOutputChunker.class);
     private final int extentSize;
     private final int maxExtents;
-    private List<Output> readers = new ArrayList<>();
-    private AtomicLong min;
-    private AtomicLong nextMin;
-    private AtomicReference<ByteTrackerExtent> markingExtents = new AtomicReference<>();
-    private ReentrantLock lock = new ReentrantLock(false);
-    private Condition nowMarking = lock.newCondition();
-    private Semaphore mutex = new Semaphore(1, false);
+    private final List<Output> readers = new ArrayList<>();
+    private final AtomicLong min;
+    private final AtomicLong nextMin;
+    private final AtomicReference<ByteTrackerExtent> markingExtents = new AtomicReference<>();
+    private final ReentrantLock lock = new ReentrantLock(false);
+    private final Condition nowMarking = lock.newCondition();
+    private final Semaphore mutex = new Semaphore(1, false);
 
     public ContiguousOutputChunker(long min, long nextRangeMin, int extentSize, int maxExtents) {
         this.min = new AtomicLong(min);
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotor.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotor.java
index 27c125faf..73a87d186 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotor.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotor.java
@@ -31,8 +31,8 @@ import io.nosqlbench.engine.api.activityapi.output.Output;
 import io.nosqlbench.engine.api.activityapi.ratelimits.RateLimiter;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.activityimpl.SlotStateTracker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
@@ -52,9 +52,9 @@ import static io.nosqlbench.engine.api.activityapi.core.RunState.*;
  */
 public class CoreMotor<D> implements ActivityDefObserver, Motor<D>, Stoppable {
 
-    private static final Logger logger = LoggerFactory.getLogger(CoreMotor.class);
+    private static final Logger logger = LogManager.getLogger(CoreMotor.class);
 
-    private long slotId;
+    private final long slotId;
 
     private Timer inputTimer;
 
@@ -71,11 +71,11 @@ public class CoreMotor<D> implements ActivityDefObserver, Motor<D>, Stoppable {
 
     private Input input;
     private Action action;
-    private Activity activity;
+    private final Activity activity;
     private Output output;
 
-    private SlotStateTracker slotStateTracker;
-    private AtomicReference<RunState> slotState;
+    private final SlotStateTracker slotStateTracker;
+    private final AtomicReference<RunState> slotState;
     private int stride = 1;
 
     private OpTracker<D> opTracker;
@@ -237,7 +237,7 @@ public class CoreMotor<D> implements ActivityDefObserver, Motor<D>, Stoppable {
 
 
                 @SuppressWarnings("unchecked")
-                AsyncAction<D> async = AsyncAction.class.cast(action);
+                AsyncAction<D> async = (AsyncAction) action;
 
                 opTracker = new OpTrackerImpl<>(activity, slotId);
                 opTracker.setCycleOpFunction(async.getOpInitFunction());
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/StrideTracker.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/StrideTracker.java
index 2b3db2465..f17264c16 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/StrideTracker.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/StrideTracker.java
@@ -24,15 +24,15 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.op_output.StrideOut
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult;
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment;
 import io.nosqlbench.engine.api.activityapi.output.Output;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 public class StrideTracker<D> extends Buffer<CompletedOp<D>> implements OpEvents<D>, CycleResultsSegment {
-    private final static Logger logger = LoggerFactory.getLogger(StrideTracker.class);
+    private final static Logger logger = LogManager.getLogger(StrideTracker.class);
 
     private final Timer strideServiceTimer;
     private final Timer strideResponseTimer;
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/extensions/ScriptingPluginInfo.java b/engine-api/src/main/java/io/nosqlbench/engine/api/extensions/ScriptingPluginInfo.java
index 4fd983bb7..42efd950a 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/extensions/ScriptingPluginInfo.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/extensions/ScriptingPluginInfo.java
@@ -18,7 +18,7 @@
 package io.nosqlbench.engine.api.extensions;
 
 import com.codahale.metrics.MetricRegistry;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 import javax.script.ScriptContext;
 
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ActivityMetrics.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ActivityMetrics.java
index a6d3f55f8..2ebf5e9c3 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ActivityMetrics.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ActivityMetrics.java
@@ -21,8 +21,8 @@ import com.codahale.metrics.*;
 import io.nosqlbench.engine.api.activityapi.core.MetricRegistryService;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.util.Unit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import javax.script.ScriptContext;
 import java.io.File;
@@ -35,7 +35,7 @@ import java.util.regex.Pattern;
 
 public class ActivityMetrics {
 
-    private final static Logger logger = LoggerFactory.getLogger(ActivityMetrics.class);
+    private final static Logger logger = LogManager.getLogger(ActivityMetrics.class);
 
     public static final String HDRDIGITS_PARAM = "hdr_digits";
     public static final int DEFAULT_HDRDIGITS= 4;
@@ -46,7 +46,7 @@ public class ActivityMetrics {
     public static MetricFilter METRIC_FILTER = (name, metric) -> {
         return true;
     };
-    private static List<MetricsCloseable> metricsCloseables = new ArrayList<>();
+    private static final List<MetricsCloseable> metricsCloseables = new ArrayList<>();
 
 
     public static int getHdrDigits() {
@@ -305,7 +305,7 @@ public class ActivityMetrics {
         }
     }
 
-    private static interface MetricProvider {
+    private interface MetricProvider {
         Metric getMetric();
     }
 
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ClassicHistoListener.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ClassicHistoListener.java
index 1c5d0a0ec..35b24f290 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ClassicHistoListener.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ClassicHistoListener.java
@@ -1,8 +1,8 @@
 package io.nosqlbench.engine.api.metrics;
 
 import com.codahale.metrics.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -10,15 +10,15 @@ import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 
 public class ClassicHistoListener extends CapabilityHook<HistogramAttachment> {
-    private final static Logger logger = LoggerFactory.getLogger(ClassicHistoListener.class);
+    private final static Logger logger = LogManager.getLogger(ClassicHistoListener.class);
 
     private final MetricRegistry metricsRegistry;
-    private String sessionName;
-    private String prefix;
-    private Pattern pattern;
-    private String interval;
-    private TimeUnit nanoseconds;
-    private Map<String, Attachment> histos = new HashMap<>();
+    private final String sessionName;
+    private final String prefix;
+    private final Pattern pattern;
+    private final String interval;
+    private final TimeUnit nanoseconds;
+    private final Map<String, Attachment> histos = new HashMap<>();
 
     public ClassicHistoListener(MetricRegistry metricRegistry, String sessionName, String prefix, Pattern pattern, String interval, TimeUnit nanoseconds) {
         this.metricsRegistry = metricRegistry;
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ClassicTimerListener.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ClassicTimerListener.java
index aca9b186e..e86008d27 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ClassicTimerListener.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ClassicTimerListener.java
@@ -3,8 +3,8 @@ package io.nosqlbench.engine.api.metrics;
 import com.codahale.metrics.ExponentiallyDecayingReservoir;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -12,15 +12,15 @@ import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 
 public class ClassicTimerListener extends CapabilityHook<TimerAttachment> {
-    private final static Logger logger = LoggerFactory.getLogger(ClassicTimerListener.class);
+    private final static Logger logger = LogManager.getLogger(ClassicTimerListener.class);
 
     private final MetricRegistry metricsRegistry;
-    private String sessionName;
-    private String prefix;
-    private Pattern pattern;
-    private String interval;
-    private TimeUnit nanoseconds;
-    private Map<String, Attachment> histos = new HashMap<>();
+    private final String sessionName;
+    private final String prefix;
+    private final Pattern pattern;
+    private final String interval;
+    private final TimeUnit nanoseconds;
+    private final Map<String, Attachment> histos = new HashMap<>();
 
     public ClassicTimerListener(MetricRegistry metricRegistry, String sessionName, String prefix, Pattern pattern, String interval, TimeUnit nanoseconds) {
         this.metricsRegistry = metricRegistry;
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/DeltaHdrHistogramReservoir.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/DeltaHdrHistogramReservoir.java
index 8707dc1f1..8c0f510f1 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/DeltaHdrHistogramReservoir.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/DeltaHdrHistogramReservoir.java
@@ -22,8 +22,8 @@ import com.codahale.metrics.Snapshot;
 import org.HdrHistogram.Histogram;
 import org.HdrHistogram.HistogramLogWriter;
 import org.HdrHistogram.Recorder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 /**
  * A custom wrapping of snapshotting logic on the HdrHistogram. This histogram will always report the last histogram
@@ -36,14 +36,14 @@ import org.slf4j.LoggerFactory;
  *
  */
 public final class DeltaHdrHistogramReservoir implements Reservoir {
-    private final static Logger logger = LoggerFactory.getLogger(DeltaHdrHistogramReservoir.class);
+    private final static Logger logger = LogManager.getLogger(DeltaHdrHistogramReservoir.class);
 
     private final Recorder recorder;
     private Histogram lastHistogram;
 
     private Histogram intervalHistogram;
     private long intervalHistogramEndTime = System.currentTimeMillis();
-    private String metricName;
+    private final String metricName;
     private HistogramLogWriter writer;
 
     /**
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoIntervalLogger.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoIntervalLogger.java
index a98553ca3..1ac5fe668 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoIntervalLogger.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoIntervalLogger.java
@@ -19,8 +19,8 @@ package io.nosqlbench.engine.api.metrics;
 
 import org.HdrHistogram.EncodableHistogram;
 import org.HdrHistogram.HistogramLogWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -36,22 +36,22 @@ import java.util.regex.Pattern;
  * logfile at the configured interval.
  */
 public class HistoIntervalLogger extends  CapabilityHook<HdrDeltaHistogramAttachment> implements Runnable, MetricsCloseable  {
-    private final static Logger logger = LoggerFactory.getLogger(HistoIntervalLogger.class);
+    private final static Logger logger = LogManager.getLogger(HistoIntervalLogger.class);
 
     private final String sessionName;
     //    private final long intervalMillis;
-    private long intervalLength;
+    private final long intervalLength;
 
     public File getLogfile() {
         return logfile;
     }
 
-    private File logfile;
+    private final File logfile;
     private PrintStream logStream;
     private HistogramLogWriter writer;
-    private Pattern pattern;
+    private final Pattern pattern;
 
-    private List<WriterTarget> targets = new CopyOnWriteArrayList<>();
+    private final List<WriterTarget> targets = new CopyOnWriteArrayList<>();
     private PeriodicRunnable<HistoIntervalLogger> executor;
     private long lastRunTime;
 
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoLogChartGenerator.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoLogChartGenerator.java
index 826c9b751..fb96ea7cb 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoLogChartGenerator.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoLogChartGenerator.java
@@ -10,8 +10,8 @@ package io.nosqlbench.engine.api.metrics;
 import com.mitchtalmadge.asciidata.graph.ASCIIGraph;
 import org.HdrHistogram.HistogramLogReader;
 import org.HdrHistogram.Histogram;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -29,8 +29,8 @@ public class HistoLogChartGenerator {
     public static final String ANSI_CYAN = "\u001B[36m";
     public static final String ANSI_WHITE = "\u001B[37m";
 
-    private static Map<String, ArrayList<Histogram>> histogramsOverTime = new HashMap<>();
-    private static Logger logger = LoggerFactory.getLogger(HistoLogChartGenerator.class);
+    private static final Map<String, ArrayList<Histogram>> histogramsOverTime = new HashMap<>();
+    private static final Logger logger = LogManager.getLogger(HistoLogChartGenerator.class);
 
     public static void generateChartFromHistoLog(HistoIntervalLogger histoIntervalLogger) {
         File logFile = histoIntervalLogger.getLogfile();
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsCSVWriter.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsCSVWriter.java
index f1d34ab8e..693c1c754 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsCSVWriter.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsCSVWriter.java
@@ -18,8 +18,8 @@
 package io.nosqlbench.engine.api.metrics;
 
 import org.HdrHistogram.Histogram;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.*;
 import java.util.Date;
@@ -27,7 +27,7 @@ import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
 public class HistoStatsCSVWriter {
-    private final static Logger logger = LoggerFactory.getLogger(HistoStatsCSVWriter.class);
+    private final static Logger logger = LogManager.getLogger(HistoStatsCSVWriter.class);
     private final static String logFormatVersion = "1.0";
     private final File csvfile;
     //    FileWriter writer;
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsLogger.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsLogger.java
index 860953671..e323b864b 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsLogger.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsLogger.java
@@ -19,8 +19,8 @@ package io.nosqlbench.engine.api.metrics;
 
 import org.HdrHistogram.EncodableHistogram;
 import org.HdrHistogram.Histogram;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.File;
 import java.util.List;
@@ -36,17 +36,17 @@ import java.util.regex.Pattern;
  */
 public class HistoStatsLogger extends CapabilityHook<HdrDeltaHistogramAttachment>
         implements Runnable, MetricsCloseable  {
-    private final static Logger logger = LoggerFactory.getLogger(HistoStatsLogger.class);
+    private final static Logger logger = LogManager.getLogger(HistoStatsLogger.class);
 
     private final String sessionName;
     private final TimeUnit timeUnit;
     //    private final long intervalMillis;
-    private long intervalLength;
-    private File logfile;
+    private final long intervalLength;
+    private final File logfile;
     private HistoStatsCSVWriter writer;
-    private Pattern pattern;
+    private final Pattern pattern;
 
-    private List<WriterTarget> targets = new CopyOnWriteArrayList<>();
+    private final List<WriterTarget> targets = new CopyOnWriteArrayList<>();
     private PeriodicRunnable<HistoStatsLogger> executor;
     private long lastRunTime=0L;
 
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/PeriodicRunnable.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/PeriodicRunnable.java
index 23ce5a1da..c7c0b0b4c 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/PeriodicRunnable.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/PeriodicRunnable.java
@@ -17,17 +17,17 @@
 
 package io.nosqlbench.engine.api.metrics;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 /**
  * This is a simple and light way to run a periodic task
  */
 public class PeriodicRunnable<T extends Runnable> implements Runnable, AutoCloseable {
-    private static Logger logger = LoggerFactory.getLogger(PeriodicRunnable.class);
+    private static final Logger logger = LogManager.getLogger(PeriodicRunnable.class);
 
-    private long intervalMillis;
-    private T action;
+    private final long intervalMillis;
+    private final T action;
     private Thread thread;
     private volatile boolean running = false;
 
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java b/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java
index b77e0b3c1..5eaf7b9dd 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java
@@ -9,8 +9,8 @@ import io.nosqlbench.nb.api.content.Content;
 import io.nosqlbench.nb.api.content.NBIO;
 import io.nosqlbench.nb.api.content.NBPathsAPI;
 import io.nosqlbench.nb.api.errors.BasicError;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.IOException;
 import java.nio.file.FileSystems;
@@ -28,7 +28,7 @@ public class NBCLIScenarioParser {
     public final static String VERBOSE_LOCKED = "===";
     public final static String UNLOCKED = "=";
 
-    private final static Logger logger = LoggerFactory.getLogger(NBCLIScenarioParser.class);
+    private final static Logger logger = LogManager.getLogger(NBCLIScenarioParser.class);
     private static final String SEARCH_IN = "activities";
     public static final String WORKLOAD_SCENARIO_STEP = "WORKLOAD_SCENARIO_STEP";
 
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/scripting/NashornEvaluator.java b/engine-api/src/main/java/io/nosqlbench/engine/api/scripting/NashornEvaluator.java
index 7622eab28..4a9572728 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/scripting/NashornEvaluator.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/scripting/NashornEvaluator.java
@@ -17,8 +17,8 @@
 
 package io.nosqlbench.engine.api.scripting;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import javax.script.*;
 
@@ -28,7 +28,7 @@ import javax.script.*;
  * @param <T> generic parameter for return types from this evaluator
  */
 public class NashornEvaluator<T> implements Evaluator<T> {
-    private final static Logger logger = LoggerFactory.getLogger(NashornEvaluator.class);
+    private final static Logger logger = LogManager.getLogger(NashornEvaluator.class);
 
     private static final ScriptEngineManager engineManager = new ScriptEngineManager();
     private final ScriptEngine scriptEngine;
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/templating/CommandTemplate.java b/engine-api/src/main/java/io/nosqlbench/engine/api/templating/CommandTemplate.java
index 9c335f404..d8380b0bd 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/templating/CommandTemplate.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/templating/CommandTemplate.java
@@ -1,13 +1,13 @@
 package io.nosqlbench.engine.api.templating;
 
 import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplate;
-import io.nosqlbench.engine.api.activityimpl.motor.ParamsParser;
+import io.nosqlbench.nb.api.config.ParamsParser;
 import io.nosqlbench.virtdata.core.bindings.BindingsTemplate;
 import io.nosqlbench.virtdata.core.templates.ParsedTemplate;
 import io.nosqlbench.virtdata.core.templates.StringBindings;
 import io.nosqlbench.virtdata.core.templates.StringBindingsTemplate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.*;
 import java.util.function.Function;
@@ -29,7 +29,7 @@ import java.util.function.Function;
  */
 public class CommandTemplate {
 
-    private final static Logger logger = LoggerFactory.getLogger(CommandTemplate.class);
+    private final static Logger logger = LogManager.getLogger(CommandTemplate.class);
 
     private final String name;
     private final Map<String, String> statics = new HashMap<>();
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/util/SSLKsFactory.java b/engine-api/src/main/java/io/nosqlbench/engine/api/util/SSLKsFactory.java
index 7975e62f4..0beb4dcaa 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/util/SSLKsFactory.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/util/SSLKsFactory.java
@@ -18,8 +18,8 @@
 package io.nosqlbench.engine.api.util;
 
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import javax.net.ServerSocketFactory;
 import javax.net.SocketFactory;
@@ -40,7 +40,7 @@ import java.util.Optional;
 import java.util.regex.Pattern;
 
 public class SSLKsFactory {
-    private final static Logger logger = LoggerFactory.getLogger(SSLKsFactory.class);
+    private final static Logger logger = LogManager.getLogger(SSLKsFactory.class);
 
     private static final SSLKsFactory instance = new SSLKsFactory();
 
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/util/SimpleServiceLoader.java b/engine-api/src/main/java/io/nosqlbench/engine/api/util/SimpleServiceLoader.java
index 3b8ecafcf..b662ebc3c 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/util/SimpleServiceLoader.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/util/SimpleServiceLoader.java
@@ -18,8 +18,8 @@
 package io.nosqlbench.engine.api.util;
 
 import io.nosqlbench.nb.spi.Named;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 
 public class SimpleServiceLoader<T extends Named> {
 
-    private static final Logger logger = LoggerFactory.getLogger(SimpleServiceLoader.class);
+    private static final Logger logger = LogManager.getLogger(SimpleServiceLoader.class);
     private final Class<? extends T> serviceType;
     private static SimpleServiceLoader instance;
 
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/util/Unit.java b/engine-api/src/main/java/io/nosqlbench/engine/api/util/Unit.java
index 85666b6a3..9769f08af 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/util/Unit.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/util/Unit.java
@@ -17,8 +17,8 @@
 
 package io.nosqlbench.engine.api.util;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.security.InvalidParameterException;
 import java.util.Optional;
@@ -27,14 +27,14 @@ import java.util.regex.Pattern;
 
 public class Unit {
 
-    private final static Logger logger = LoggerFactory.getLogger(Unit.class);
+    private final static Logger logger = LogManager.getLogger(Unit.class);
 
-    private static Pattern numberFmtPattern = Pattern.compile(" *(?<number>(?<whole>[0-9]+)(?<fractional>\\.[0-9]+)?(?<to10power>E[0-9]+)?) *(?<unit>[^ ]+?)? *");
-    private static Pattern numberExponentPattern = Pattern.compile(" *(?<pre>.*?)?(?<number>([0-9]+)(\\.[0-9]+)?+)\\^(?<exponent>[0-9]+)(?<post>.*?)?");
+    private static final Pattern numberFmtPattern = Pattern.compile(" *(?<number>(?<whole>[0-9]+)(?<fractional>\\.[0-9]+)?(?<to10power>E[0-9]+)?) *(?<unit>[^ ]+?)? *");
+    private static final Pattern numberExponentPattern = Pattern.compile(" *(?<pre>.*?)?(?<number>([0-9]+)(\\.[0-9]+)?+)\\^(?<exponent>[0-9]+)(?<post>.*?)?");
 
-    private static long nanoPerSecond = 1000000000;
-    private static long bytesPerGB = 1000000000;
-    private static long BytesPerGiB = 1024 * 1024 * 1024;
+    private static final long nanoPerSecond = 1000000000;
+    private static final long bytesPerGB = 1000000000;
+    private static final long BytesPerGiB = 1024 * 1024 * 1024;
 
     public static Optional<Long> msFor(String duration) {
         return durationFor(Duration.MS, duration);
@@ -90,7 +90,7 @@ public class Unit {
             double base= Double.valueOf(e.group("number"));
             double exponent = Double.valueOf(e.group("exponent"));
             double value= Math.pow(base, exponent);
-            spec = e.group("pre")+ String.valueOf(value) + e.group("post");
+            spec = e.group("pre")+ value + e.group("post");
         }
         Matcher m = numberFmtPattern.matcher(spec);
         if (m.matches()) {
@@ -181,7 +181,7 @@ public class Unit {
                     throw new InvalidParameterException("Exponent for powers of two must be 63 or less. It is " + exponent);
                 }
                 long value = 1L << exponent;
-                spec= exponentMatcher.group("pre") + String.valueOf(value) + exponentMatcher.group("post");
+                spec= exponentMatcher.group("pre") + value + exponentMatcher.group("post");
             } else {
                 spec= exponentMatcher.group("pre") + (long) Math.pow(number, exponent) + exponentMatcher.group("post");
             }
@@ -217,7 +217,7 @@ public class Unit {
 
     }
 
-    public static enum Count {
+    public enum Count {
         UNIT("U", "unit", 1.0),
         KILO("K", "kilo", 1000.0),
         MEGA("M", "mega", 1000000.0),
@@ -257,7 +257,7 @@ public class Unit {
         }
     }
 
-    public static enum Bytes {
+    public enum Bytes {
         BYTE("B", "byte", 1),
         KB("KB", "kilobyte", 1000),
         MB("MB", "megabyte", 1000000),
@@ -310,7 +310,7 @@ public class Unit {
         }
     }
 
-    public static enum Duration {
+    public enum Duration {
         SECOND("s", "seconds", nanoPerSecond),
         MS("ms", "milliseconds", 1000000),
         US("µs", "microseconds", 1000),
diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/BindingEscapingTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/BindingEscapingTest.java
index e39cd303b..10413036c 100644
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/BindingEscapingTest.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/BindingEscapingTest.java
@@ -19,15 +19,15 @@ package io.nosqlbench.engine.api.activityconfig.rawyaml;
 
 import io.nosqlbench.virtdata.core.bindings.DataMapper;
 import io.nosqlbench.virtdata.core.bindings.VirtData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class BindingEscapingTest {
 
-    private final static Logger logger = LoggerFactory.getLogger(BindingEscapingTest.class);
+    private final static Logger logger = LogManager.getLogger(BindingEscapingTest.class);
 
     @Test
     public void testThatEscapesAreNotUnescapedInSingleQuotes() {
diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoaderTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoaderTest.java
index bd6a16908..61fd88c27 100644
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoaderTest.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoaderTest.java
@@ -17,8 +17,8 @@
 
 package io.nosqlbench.engine.api.activityconfig.rawyaml;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.junit.Test;
 
 import java.util.List;
@@ -27,7 +27,7 @@ import java.util.Map;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class RawYamlStatementLoaderTest {
-    private final static Logger logger = LoggerFactory.getLogger(RawYamlStatementLoaderTest.class);
+    private final static Logger logger = LogManager.getLogger(RawYamlStatementLoaderTest.class);
 
     @Test
     public void testLoadPropertiesBlock() {
diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtDefTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtDefTest.java
index 5205a15c0..fd9aab188 100644
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtDefTest.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtDefTest.java
@@ -23,8 +23,8 @@ import io.nosqlbench.engine.api.activityconfig.yaml.StmtsBlock;
 import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDoc;
 import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.List;
 import java.util.Map;
@@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class StmtDefTest {
 
-    private final static Logger logger = LoggerFactory.getLogger(StmtDefTest.class);
+    private final static Logger logger = LogManager.getLogger(StmtDefTest.class);
 
     @Test
     public void testLayering() {
diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtEscapingTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtEscapingTest.java
index fd230ebdf..faf33cb97 100644
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtEscapingTest.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtEscapingTest.java
@@ -20,8 +20,8 @@ package io.nosqlbench.engine.api.activityconfig.rawyaml;
 import io.nosqlbench.engine.api.activityconfig.StatementsLoader;
 import io.nosqlbench.engine.api.activityconfig.yaml.*;
 import org.junit.BeforeClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.junit.Test;
 
 import java.util.List;
@@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class StmtEscapingTest {
 
-    private final static Logger logger = LoggerFactory.getLogger(StmtEscapingTest.class);
+    private final static Logger logger = LogManager.getLogger(StmtEscapingTest.class);
     private static List<OpTemplate> defs;
 
     @BeforeClass
diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtVariationTests.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtVariationTests.java
index 8da316159..3b510b09a 100644
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtVariationTests.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtVariationTests.java
@@ -17,8 +17,8 @@
 
 package io.nosqlbench.engine.api.activityconfig.rawyaml;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.junit.Test;
 
 import java.util.List;
@@ -27,7 +27,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class StmtVariationTests {
 
-    private final static Logger logger = LoggerFactory.getLogger(StmtVariationTests.class);
+    private final static Logger logger = LogManager.getLogger(StmtVariationTests.class);
 
     @Test
     public void testListStmtsOnly() {
diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/ParsedStmtTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/ParsedStmtTest.java
index 2d77e92cf..9ad188fb3 100644
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/ParsedStmtTest.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/ParsedStmtTest.java
@@ -20,14 +20,14 @@ package io.nosqlbench.engine.api.activityconfig.yaml;
 import io.nosqlbench.engine.api.activityconfig.StatementsLoader;
 import io.nosqlbench.engine.api.activityconfig.ParsedStmt;
 import org.junit.BeforeClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class ParsedStmtTest {
-    private static final Logger logger = LoggerFactory.getLogger(ParsedStmtTest.class);
+    private static final Logger logger = LogManager.getLogger(ParsedStmtTest.class);
     private static StmtsDocList doclist;
 
     @BeforeClass
diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtDetailOverrideTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtDetailOverrideTest.java
index 88230ae9d..5e61eaf17 100644
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtDetailOverrideTest.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtDetailOverrideTest.java
@@ -18,8 +18,8 @@
 package io.nosqlbench.engine.api.activityconfig.yaml;
 
 import io.nosqlbench.engine.api.activityconfig.StatementsLoader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.junit.Test;
 
 import java.util.List;
@@ -27,7 +27,7 @@ import java.util.List;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class StmtDetailOverrideTest {
-    private static final Logger logger = LoggerFactory.getLogger(StmtDetailOverrideTest.class);
+    private static final Logger logger = LogManager.getLogger(StmtDetailOverrideTest.class);
 
     @Test
     public void testStmtOverrides() {
diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsDocListTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsDocListTest.java
index 09c7f359b..4751bfcd9 100644
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsDocListTest.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsDocListTest.java
@@ -20,8 +20,8 @@ package io.nosqlbench.engine.api.activityconfig.yaml;
 import io.nosqlbench.engine.api.activityconfig.StatementsLoader;
 import org.assertj.core.data.MapEntry;
 import org.junit.BeforeClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.junit.Test;
 
 import java.util.LinkedHashMap;
@@ -32,19 +32,19 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class StmtsDocListTest {
 
-    private static final Logger logger = LoggerFactory.getLogger(StmtsDocListTest.class);
+    private static final Logger logger = LogManager.getLogger(StmtsDocListTest.class);
     private static StmtsDocList doclist;
 
-    private LinkedHashMap<String, String> doc0bindings = new LinkedHashMap<String, String>() {{
+    private final LinkedHashMap<String, String> doc0bindings = new LinkedHashMap<String, String>() {{
         put("b2", "b2d");
         put("b1", "b1d");
     }};
 
-    private LinkedHashMap<String, String> doc0params = new LinkedHashMap<String,String>() {{
+    private final LinkedHashMap<String, String> doc0params = new LinkedHashMap<String,String>() {{
         put("param1","value1");
     }};
 
-    private LinkedHashMap<String, String> doc0tags = new LinkedHashMap<String,String>() {{
+    private final LinkedHashMap<String, String> doc0tags = new LinkedHashMap<String,String>() {{
         put("atagname","atagvalue");
     }};
 
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/BasicScriptBuffer.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/BasicScriptBuffer.java
index 1e4e47414..d343b61d0 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/BasicScriptBuffer.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/BasicScriptBuffer.java
@@ -3,8 +3,8 @@ package io.nosqlbench.engine.cli;
 import io.nosqlbench.engine.api.templating.StrInterpolator;
 import io.nosqlbench.nb.api.content.Content;
 import io.nosqlbench.nb.api.content.NBIO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -14,7 +14,7 @@ import java.util.Map;
 
 public class BasicScriptBuffer implements ScriptBuffer {
 
-    private final static Logger logger = LoggerFactory.getLogger(Cmd.class);
+    private final static Logger logger = LogManager.getLogger(Cmd.class);
     private final List<Cmd> commands = new ArrayList<>();
     private final StringBuilder sb = new StringBuilder();
     private final Map<String, String> scriptParams = new HashMap<>();
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/Cmd.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/Cmd.java
index 2c1a43eda..4538dfebd 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/Cmd.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/Cmd.java
@@ -1,7 +1,7 @@
 package io.nosqlbench.engine.cli;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.security.InvalidParameterException;
 import java.util.*;
@@ -14,7 +14,7 @@ import java.util.function.Function;
  */
 public class Cmd {
 
-    private final static Logger logger = LoggerFactory.getLogger(Cmd.class);
+    private final static Logger logger = LogManager.getLogger(Cmd.class);
 
     public enum CmdType {
         run(),
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
index 5549ae556..245d0e299 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
@@ -1,6 +1,5 @@
 package io.nosqlbench.engine.cli;
 
-import ch.qos.logback.classic.Level;
 import io.nosqlbench.docsys.core.DocServerApp;
 import io.nosqlbench.engine.api.activityapi.core.ActivityType;
 import io.nosqlbench.engine.api.activityapi.cyclelog.outputs.cyclelog.CycleLogDumperUtility;
@@ -10,7 +9,9 @@ import io.nosqlbench.engine.api.activityapi.output.OutputType;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
 import io.nosqlbench.engine.core.*;
 import io.nosqlbench.engine.core.annotation.Annotators;
-import io.nosqlbench.engine.core.metrics.GrafanaMetricsAnnotator;
+import io.nosqlbench.engine.core.logging.LoggerConfig;
+import io.nosqlbench.engine.core.logging.SessionLogConfig;
+import io.nosqlbench.engine.core.logging.ScenarioLogger;
 import io.nosqlbench.engine.core.metrics.MetricReporters;
 import io.nosqlbench.engine.core.script.MetricsMapper;
 import io.nosqlbench.engine.core.script.Scenario;
@@ -24,8 +25,10 @@ import io.nosqlbench.nb.api.errors.BasicError;
 import io.nosqlbench.nb.api.logging.NBLogLevel;
 import io.nosqlbench.nb.api.markdown.exporter.MarkdownExporter;
 import io.nosqlbench.virtdata.userlibs.apps.VirtDataMainApp;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import joptsimple.internal.Strings;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.config.ConfigurationFactory;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIArgsFile.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIArgsFile.java
index ec047e94f..0d597a14a 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIArgsFile.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIArgsFile.java
@@ -1,9 +1,10 @@
 package io.nosqlbench.engine.cli;
 
+import io.nosqlbench.nb.api.Environment;
 import io.nosqlbench.nb.api.errors.BasicError;
 import joptsimple.internal.Strings;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -55,7 +56,7 @@ import java.util.stream.Collectors;
  * will cause an error to be thrown.
  */
 public class NBCLIArgsFile {
-    private final static Logger logger = LoggerFactory.getLogger("ARGSFILE");
+    private final static Logger logger = LogManager.getLogger("ARGSFILE");
 
     // Options which may contextualize other CLI options or commands.
     // These must be parsed first
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
index f8e5c1308..b94d9e913 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
@@ -1,12 +1,13 @@
 package io.nosqlbench.engine.cli;
 
-import ch.qos.logback.classic.Level;
 import io.nosqlbench.engine.api.metrics.IndicatorMode;
 import io.nosqlbench.engine.api.util.Unit;
 import io.nosqlbench.engine.core.script.Scenario;
+import io.nosqlbench.nb.api.Environment;
+import io.nosqlbench.nb.api.logging.NBLogLevel;
 import io.nosqlbench.nb.api.errors.BasicError;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.File;
 import java.io.IOException;
@@ -23,7 +24,7 @@ import java.util.stream.Collectors;
  */
 public class NBCLIOptions {
 
-    private final static Logger logger = LoggerFactory.getLogger("OPTIONS");
+    private final static Logger logger = LogManager.getLogger("OPTIONS");
 
     private final static String NB_STATE_DIR = "--statedir";
     private final static String NB_STATEDIR_PATHS = "$NBSTATEDIR:$PWD/.nosqlbench:$HOME/.nosqlbench";
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/PathCanonicalizer.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/PathCanonicalizer.java
index 6ddb1b090..725bbbf47 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/PathCanonicalizer.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/PathCanonicalizer.java
@@ -2,14 +2,14 @@ package io.nosqlbench.engine.cli;
 
 import io.nosqlbench.nb.api.content.Content;
 import io.nosqlbench.nb.api.content.NBIO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.nio.file.FileSystems;
 import java.util.Optional;
 
 public class PathCanonicalizer {
-    private final static Logger logger = LoggerFactory.getLogger(Cmd.class);
+    private final static Logger logger = LogManager.getLogger(Cmd.class);
 
     private final String[] includes;
 
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/ActivityExecutor.java b/engine-core/src/main/java/io/nosqlbench/engine/core/ActivityExecutor.java
index daa80c130..6b0a55a88 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/ActivityExecutor.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/ActivityExecutor.java
@@ -18,8 +18,8 @@ import io.nosqlbench.engine.api.activityapi.core.*;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.activityimpl.ParameterMap;
 import io.nosqlbench.engine.api.activityimpl.input.ProgressCapable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.*;
 import java.util.concurrent.ExecutorService;
@@ -46,8 +46,8 @@ import java.util.stream.Collectors;
 
 public class ActivityExecutor implements ActivityController, ParameterMap.Listener, ProgressCapable {
 
-    private static final Logger logger = LoggerFactory.getLogger(ActivityExecutor.class);
-    private static final Logger activitylogger = LoggerFactory.getLogger("ACTIVITY");
+    private static final Logger logger = LogManager.getLogger(ActivityExecutor.class);
+    private static final Logger activitylogger = LogManager.getLogger("ACTIVITY");
 
     private final List<Motor<?>> motors = new ArrayList<>();
     private final Activity activity;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/ActivityProgressIndicator.java b/engine-core/src/main/java/io/nosqlbench/engine/core/ActivityProgressIndicator.java
index b4d325767..85a26fcd3 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/ActivityProgressIndicator.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/ActivityProgressIndicator.java
@@ -22,8 +22,8 @@ import io.nosqlbench.engine.api.activityimpl.ProgressAndStateMeter;
 import io.nosqlbench.engine.api.metrics.IndicatorMode;
 import io.nosqlbench.engine.api.metrics.PeriodicRunnable;
 import io.nosqlbench.engine.api.util.Unit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -32,7 +32,7 @@ import java.util.Set;
 
 public class ActivityProgressIndicator implements Runnable {
 
-    private final static Logger logger = LoggerFactory.getLogger(ActivityProgressIndicator.class);
+    private final static Logger logger = LogManager.getLogger(ActivityProgressIndicator.class);
     private final String indicatorSpec;
     private final ScenarioController sc;
     private PeriodicRunnable<ActivityProgressIndicator> runnable;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/MarkdownDocInfo.java b/engine-core/src/main/java/io/nosqlbench/engine/core/MarkdownDocInfo.java
index 1a714a464..4fa7d545e 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/MarkdownDocInfo.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/MarkdownDocInfo.java
@@ -3,17 +3,13 @@ package io.nosqlbench.engine.core;
 import io.nosqlbench.engine.api.activityapi.core.ActivityType;
 import io.nosqlbench.nb.api.content.Content;
 import io.nosqlbench.nb.api.content.NBIO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Optional;
 
 public class MarkdownDocInfo {
-    private final static Logger logger = LoggerFactory.getLogger(MarkdownDocInfo.class);
+    private final static Logger logger = LogManager.getLogger(MarkdownDocInfo.class);
 
     public static Optional<String> forHelpTopic(String topic) {
         String help = null;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/PolyglotScenarioController.java b/engine-core/src/main/java/io/nosqlbench/engine/core/PolyglotScenarioController.java
index f332f93dc..cd9b0fca4 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/PolyglotScenarioController.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/PolyglotScenarioController.java
@@ -1,17 +1,16 @@
 package io.nosqlbench.engine.core;
 
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.graalvm.polyglot.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.xml.sax.helpers.AttributesImpl;
 
 import java.security.InvalidParameterException;
 import java.util.Map;
 
 public class PolyglotScenarioController {
 
-    private static final Logger logger = LoggerFactory.getLogger("SCENARIO/POLYGLOT");
+    private static final Logger logger = LogManager.getLogger("SCENARIO/POLYGLOT");
 
     private final ScenarioController controller;
 
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioController.java b/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioController.java
index 337240fb5..9566333a3 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioController.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioController.java
@@ -21,8 +21,8 @@ import io.nosqlbench.engine.api.activityimpl.ParameterMap;
 import io.nosqlbench.engine.api.activityimpl.ProgressAndStateMeter;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
 import io.nosqlbench.nb.api.errors.BasicError;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.security.InvalidParameterException;
 import java.util.*;
@@ -34,8 +34,8 @@ import java.util.stream.Collectors;
  */
 public class ScenarioController {
 
-    private static final Logger logger = LoggerFactory.getLogger(ScenarioController.class);
-    private static final Logger scenariologger = LoggerFactory.getLogger("SCENARIO");
+    private static final Logger logger = LogManager.getLogger(ScenarioController.class);
+    private static final Logger scenariologger = LogManager.getLogger("SCENARIO");
 
     private final Map<String, ActivityExecutor> activityExecutors = new ConcurrentHashMap<>();
 
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioErrorHandler.java b/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioErrorHandler.java
index f831b0930..b149f4dff 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioErrorHandler.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioErrorHandler.java
@@ -2,8 +2,8 @@ package io.nosqlbench.engine.core;
 
 import io.nosqlbench.nb.api.errors.BasicError;
 import org.graalvm.polyglot.PolyglotException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import javax.script.ScriptException;
 
@@ -26,7 +26,7 @@ import javax.script.ScriptException;
  */
 public class ScenarioErrorHandler {
 
-    private final static Logger logger = LoggerFactory.getLogger(ScenarioErrorHandler.class);
+    private final static Logger logger = LogManager.getLogger(ScenarioErrorHandler.class);
 
     public static String handle(Throwable t, boolean wantsStackTraces) {
         if (t instanceof ScriptException) {
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioResult.java b/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioResult.java
index 3f2b58065..61e491e01 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioResult.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioResult.java
@@ -19,17 +19,17 @@
 package io.nosqlbench.engine.core;
 
 import com.codahale.metrics.MetricFilter;
-import com.codahale.metrics.Slf4jReporter;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.nosqlbench.engine.core.logging.Log4JMetricsReporter;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 public class ScenarioResult {
 
-    private final static Logger logger = LoggerFactory.getLogger(ScenarioResult.class);
+    private final static Logger logger = LogManager.getLogger(ScenarioResult.class);
 
     private Exception exception;
     private final String iolog;
@@ -45,7 +45,7 @@ public class ScenarioResult {
 
     public void reportToLog() {
         logger.info("-- BEGIN METRICS DETAIL --");
-        Slf4jReporter reporter = Slf4jReporter.forRegistry(ActivityMetrics.getMetricRegistry())
+        Log4JMetricsReporter reporter = Log4JMetricsReporter.forRegistry(ActivityMetrics.getMetricRegistry())
                 .convertDurationsTo(TimeUnit.MICROSECONDS)
                 .convertRatesTo(TimeUnit.SECONDS)
                 .filter(MetricFilter.ALL)
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenariosResults.java b/engine-core/src/main/java/io/nosqlbench/engine/core/ScenariosResults.java
index 85ebacb85..bcaa05a26 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenariosResults.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/ScenariosResults.java
@@ -19,15 +19,15 @@ package io.nosqlbench.engine.core;
 
 import io.nosqlbench.engine.core.script.Scenario;
 import io.nosqlbench.engine.core.script.ScenariosExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
 public class ScenariosResults {
 
-    private static final Logger logger = LoggerFactory.getLogger(ScenariosResults.class);
+    private static final Logger logger = LogManager.getLogger(ScenariosResults.class);
 
     private final String scenariosExecutorName;
     private final Map<Scenario, ScenarioResult> scenarioResultMap = new LinkedHashMap<>();
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/logging/Log4JMetricsReporter.java b/engine-core/src/main/java/io/nosqlbench/engine/core/logging/Log4JMetricsReporter.java
new file mode 100644
index 000000000..d7d7ab6f6
--- /dev/null
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/logging/Log4JMetricsReporter.java
@@ -0,0 +1,418 @@
+package io.nosqlbench.engine.core.logging;
+
+import com.codahale.metrics.*;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.Marker;
+
+import java.util.Map.Entry;
+import java.util.SortedMap;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * This is a Log4J targeted metrics logging reporter, derived from
+ * {@link com.codahale.metrics.Slf4jReporter}. This implementation
+ * was built to allow for consolidating internal logging dependencies
+ * to log4j only.
+ */
+public class Log4JMetricsReporter extends ScheduledReporter {
+    /**
+     * Returns a new {@link Builder} for {@link Log4JMetricsReporter}.
+     *
+     * @param registry the registry to report
+     * @return a {@link Builder} instance for a {@link Log4JMetricsReporter}
+     */
+    public static Builder forRegistry(MetricRegistry registry) {
+        return new Builder(registry);
+    }
+
+    public enum LoggingLevel { TRACE, DEBUG, INFO, WARN, ERROR }
+
+    /**
+     * A builder for {@link Log4JMetricsReporter} instances. Defaults to logging to {@code metrics}, not
+     * using a marker, converting rates to events/second, converting durations to milliseconds, and
+     * not filtering metrics.
+     */
+    public static class Builder {
+        private final MetricRegistry registry;
+        private Logger logger;
+        private LoggingLevel loggingLevel;
+        private Marker marker;
+        private String prefix;
+        private TimeUnit rateUnit;
+        private TimeUnit durationUnit;
+        private MetricFilter filter;
+        private ScheduledExecutorService executor;
+        private boolean shutdownExecutorOnStop;
+
+        private Builder(MetricRegistry registry) {
+            this.registry = registry;
+            this.logger = LogManager.getLogger("metrics");
+            this.marker = null;
+            this.prefix = "";
+            this.rateUnit = TimeUnit.SECONDS;
+            this.durationUnit = TimeUnit.MILLISECONDS;
+            this.filter = MetricFilter.ALL;
+            this.loggingLevel = LoggingLevel.INFO;
+            this.executor = null;
+            this.shutdownExecutorOnStop = true;
+        }
+
+        /**
+         * Specifies whether or not, the executor (used for reporting) will be stopped with same time with reporter.
+         * Default value is true.
+         * Setting this parameter to false, has the sense in combining with providing external managed executor via {@link #scheduleOn(ScheduledExecutorService)}.
+         *
+         * @param shutdownExecutorOnStop if true, then executor will be stopped in same time with this reporter
+         * @return {@code this}
+         */
+        public Builder shutdownExecutorOnStop(boolean shutdownExecutorOnStop) {
+            this.shutdownExecutorOnStop = shutdownExecutorOnStop;
+            return this;
+        }
+
+        /**
+         * Specifies the executor to use while scheduling reporting of metrics.
+         * Default value is null.
+         * Null value leads to executor will be auto created on start.
+         *
+         * @param executor the executor to use while scheduling reporting of metrics.
+         * @return {@code this}
+         */
+        public Builder scheduleOn(ScheduledExecutorService executor) {
+            this.executor = executor;
+            return this;
+        }
+
+        /**
+         * Log metrics to the given logger.
+         *
+         * @param logger an SLF4J {@link Logger}
+         * @return {@code this}
+         */
+        public Builder outputTo(Logger logger) {
+            this.logger = logger;
+            return this;
+        }
+
+        /**
+         * Mark all logged metrics with the given marker.
+         *
+         * @param marker an SLF4J {@link Marker}
+         * @return {@code this}
+         */
+        public Builder markWith(Marker marker) {
+            this.marker = marker;
+            return this;
+        }
+
+        /**
+         * Prefix all metric names with the given string.
+         *
+         * @param prefix the prefix for all metric names
+         * @return {@code this}
+         */
+        public Builder prefixedWith(String prefix) {
+            this.prefix = prefix;
+            return this;
+        }
+
+        /**
+         * Convert rates to the given time unit.
+         *
+         * @param rateUnit a unit of time
+         * @return {@code this}
+         */
+        public Builder convertRatesTo(TimeUnit rateUnit) {
+            this.rateUnit = rateUnit;
+            return this;
+        }
+
+        /**
+         * Convert durations to the given time unit.
+         *
+         * @param durationUnit a unit of time
+         * @return {@code this}
+         */
+        public Builder convertDurationsTo(TimeUnit durationUnit) {
+            this.durationUnit = durationUnit;
+            return this;
+        }
+
+        /**
+         * Only report metrics which match the given filter.
+         *
+         * @param filter a {@link MetricFilter}
+         * @return {@code this}
+         */
+        public Builder filter(MetricFilter filter) {
+            this.filter = filter;
+            return this;
+        }
+
+        /**
+         * Use Logging Level when reporting.
+         *
+         * @param loggingLevel a (@link Slf4jReporter.LoggingLevel}
+         * @return {@code this}
+         */
+        public Builder withLoggingLevel(LoggingLevel loggingLevel) {
+            this.loggingLevel = loggingLevel;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Log4JMetricsReporter} with the given properties.
+         *
+         * @return a {@link Log4JMetricsReporter}
+         */
+        public Log4JMetricsReporter build() {
+            LoggerProxy loggerProxy;
+            switch (loggingLevel) {
+                case TRACE:
+                    loggerProxy = new TraceLoggerProxy(logger);
+                    break;
+                case INFO:
+                    loggerProxy = new InfoLoggerProxy(logger);
+                    break;
+                case WARN:
+                    loggerProxy = new WarnLoggerProxy(logger);
+                    break;
+                case ERROR:
+                    loggerProxy = new ErrorLoggerProxy(logger);
+                    break;
+                default:
+                case DEBUG:
+                    loggerProxy = new DebugLoggerProxy(logger);
+                    break;
+            }
+            return new Log4JMetricsReporter(registry, loggerProxy, marker, prefix, rateUnit, durationUnit, filter, executor, shutdownExecutorOnStop);
+        }
+    }
+
+    private final LoggerProxy loggerProxy;
+    private final Marker marker;
+    private final String prefix;
+
+    private Log4JMetricsReporter(MetricRegistry registry,
+                                 LoggerProxy loggerProxy,
+                                 Marker marker,
+                                 String prefix,
+                                 TimeUnit rateUnit,
+                                 TimeUnit durationUnit,
+                                 MetricFilter filter,
+                                 ScheduledExecutorService executor,
+                                 boolean shutdownExecutorOnStop) {
+        super(registry, "logger-reporter", filter, rateUnit, durationUnit, executor, shutdownExecutorOnStop);
+        this.loggerProxy = loggerProxy;
+        this.marker = marker;
+        this.prefix = prefix;
+    }
+
+    @Override
+    @SuppressWarnings("rawtypes")
+    public void report(SortedMap<String, Gauge> gauges,
+                       SortedMap<String, Counter> counters,
+                       SortedMap<String, Histogram> histograms,
+                       SortedMap<String, Meter> meters,
+                       SortedMap<String, Timer> timers) {
+        if (loggerProxy.isEnabled(marker)) {
+            for (Entry<String, Gauge> entry : gauges.entrySet()) {
+                logGauge(entry.getKey(), entry.getValue());
+            }
+
+            for (Entry<String, Counter> entry : counters.entrySet()) {
+                logCounter(entry.getKey(), entry.getValue());
+            }
+
+            for (Entry<String, Histogram> entry : histograms.entrySet()) {
+                logHistogram(entry.getKey(), entry.getValue());
+            }
+
+            for (Entry<String, Meter> entry : meters.entrySet()) {
+                logMeter(entry.getKey(), entry.getValue());
+            }
+
+            for (Entry<String, Timer> entry : timers.entrySet()) {
+                logTimer(entry.getKey(), entry.getValue());
+            }
+        }
+    }
+
+    private void logTimer(String name, Timer timer) {
+        final Snapshot snapshot = timer.getSnapshot();
+        loggerProxy.log(marker,
+                "type={}, name={}, count={}, min={}, max={}, mean={}, stddev={}, median={}, " +
+                        "p75={}, p95={}, p98={}, p99={}, p999={}, mean_rate={}, m1={}, m5={}, " +
+                        "m15={}, rate_unit={}, duration_unit={}",
+                "TIMER",
+                prefix(name),
+                timer.getCount(),
+                convertDuration(snapshot.getMin()),
+                convertDuration(snapshot.getMax()),
+                convertDuration(snapshot.getMean()),
+                convertDuration(snapshot.getStdDev()),
+                convertDuration(snapshot.getMedian()),
+                convertDuration(snapshot.get75thPercentile()),
+                convertDuration(snapshot.get95thPercentile()),
+                convertDuration(snapshot.get98thPercentile()),
+                convertDuration(snapshot.get99thPercentile()),
+                convertDuration(snapshot.get999thPercentile()),
+                convertRate(timer.getMeanRate()),
+                convertRate(timer.getOneMinuteRate()),
+                convertRate(timer.getFiveMinuteRate()),
+                convertRate(timer.getFifteenMinuteRate()),
+                getRateUnit(),
+                getDurationUnit());
+    }
+
+    private void logMeter(String name, Meter meter) {
+        loggerProxy.log(marker,
+                "type={}, name={}, count={}, mean_rate={}, m1={}, m5={}, m15={}, rate_unit={}",
+                "METER",
+                prefix(name),
+                meter.getCount(),
+                convertRate(meter.getMeanRate()),
+                convertRate(meter.getOneMinuteRate()),
+                convertRate(meter.getFiveMinuteRate()),
+                convertRate(meter.getFifteenMinuteRate()),
+                getRateUnit());
+    }
+
+    private void logHistogram(String name, Histogram histogram) {
+        final Snapshot snapshot = histogram.getSnapshot();
+        loggerProxy.log(marker,
+                "type={}, name={}, count={}, min={}, max={}, mean={}, stddev={}, " +
+                        "median={}, p75={}, p95={}, p98={}, p99={}, p999={}",
+                "HISTOGRAM",
+                prefix(name),
+                histogram.getCount(),
+                snapshot.getMin(),
+                snapshot.getMax(),
+                snapshot.getMean(),
+                snapshot.getStdDev(),
+                snapshot.getMedian(),
+                snapshot.get75thPercentile(),
+                snapshot.get95thPercentile(),
+                snapshot.get98thPercentile(),
+                snapshot.get99thPercentile(),
+                snapshot.get999thPercentile());
+    }
+
+    private void logCounter(String name, Counter counter) {
+        loggerProxy.log(marker, "type={}, name={}, count={}", "COUNTER", prefix(name), counter.getCount());
+    }
+
+    private void logGauge(String name, Gauge<?> gauge) {
+        loggerProxy.log(marker, "type={}, name={}, value={}", "GAUGE", prefix(name), gauge.getValue());
+    }
+
+    @Override
+    protected String getRateUnit() {
+        return "events/" + super.getRateUnit();
+    }
+
+    private String prefix(String... components) {
+        return MetricRegistry.name(prefix, components);
+    }
+
+    /* private class to allow logger configuration */
+    static abstract class LoggerProxy {
+        protected final Logger logger;
+
+        public LoggerProxy(Logger logger) {
+            this.logger = logger;
+        }
+
+        abstract void log(Marker marker, String format, Object... arguments);
+
+        abstract boolean isEnabled(Marker marker);
+    }
+
+    /* private class to allow logger configuration */
+    private static class DebugLoggerProxy extends LoggerProxy {
+        public DebugLoggerProxy(Logger logger) {
+            super(logger);
+        }
+
+        @Override
+        public void log(Marker marker, String format, Object... arguments) {
+            logger.debug(marker, format, arguments);
+        }
+
+        @Override
+        public boolean isEnabled(Marker marker) {
+            return logger.isDebugEnabled(marker);
+        }
+    }
+
+    /* private class to allow logger configuration */
+    private static class TraceLoggerProxy extends LoggerProxy {
+        public TraceLoggerProxy(Logger logger) {
+            super(logger);
+        }
+
+        @Override
+        public void log(Marker marker, String format, Object... arguments) {
+            logger.trace(marker, format, arguments);
+        }
+
+        @Override
+        public boolean isEnabled(Marker marker) {
+            return logger.isTraceEnabled(marker);
+        }
+    }
+
+    /* private class to allow logger configuration */
+    private static class InfoLoggerProxy extends LoggerProxy {
+        public InfoLoggerProxy(Logger logger) {
+            super(logger);
+        }
+
+        @Override
+        public void log(Marker marker, String format, Object... arguments) {
+            logger.info(marker, format, arguments);
+        }
+
+        @Override
+        public boolean isEnabled(Marker marker) {
+            return logger.isInfoEnabled(marker);
+        }
+    }
+
+    /* private class to allow logger configuration */
+    private static class WarnLoggerProxy extends LoggerProxy {
+        public WarnLoggerProxy(Logger logger) {
+            super(logger);
+        }
+
+        @Override
+        public void log(Marker marker, String format, Object... arguments) {
+            logger.warn(marker, format, arguments);
+        }
+
+        @Override
+        public boolean isEnabled(Marker marker) {
+            return logger.isWarnEnabled(marker);
+        }
+    }
+
+    /* private class to allow logger configuration */
+    private static class ErrorLoggerProxy extends LoggerProxy {
+        public ErrorLoggerProxy(Logger logger) {
+            super(logger);
+        }
+
+        @Override
+        public void log(Marker marker, String format, Object... arguments) {
+            logger.error(marker, format, arguments);
+        }
+
+        @Override
+        public boolean isEnabled(Marker marker) {
+            return logger.isErrorEnabled(marker);
+        }
+    }
+
+}
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricMap.java b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricMap.java
index e5b444c64..69c314050 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricMap.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricMap.java
@@ -3,13 +3,13 @@ package io.nosqlbench.engine.core.metrics;
 import com.codahale.metrics.Metric;
 import org.graalvm.polyglot.Value;
 import org.graalvm.polyglot.proxy.ProxyObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import java.util.*;
 
 public class MetricMap implements ProxyObject {
 
-    private final static Logger logger = LoggerFactory.getLogger(MetricMap.class);
+    private final static Logger logger = LogManager.getLogger(MetricMap.class);
     private final String name;
     private final String parent_name;
     private final HashMap<String, Object> map = new HashMap<>();
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricReporters.java b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricReporters.java
index 8574f6edb..1b0a072ec 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricReporters.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricReporters.java
@@ -23,8 +23,9 @@ import com.codahale.metrics.graphite.GraphiteReporter;
 import io.nosqlbench.engine.api.activityapi.core.Shutdownable;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
 import io.nosqlbench.engine.core.ShutdownManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.nosqlbench.engine.core.logging.Log4JMetricsReporter;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.File;
 import java.net.InetSocketAddress;
@@ -34,7 +35,7 @@ import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
 public class MetricReporters implements Shutdownable {
-    private final static Logger logger = LoggerFactory.getLogger(MetricReporters.class);
+    private final static Logger logger = LogManager.getLogger(MetricReporters.class);
     private static final MetricReporters instance = new MetricReporters();
 
     private final List<PrefixedRegistry> metricRegistries = new ArrayList<>();
@@ -123,13 +124,14 @@ public class MetricReporters implements Shutdownable {
 
         for (PrefixedRegistry prefixedRegistry : metricRegistries) {
 
-            Slf4jReporter loggerReporter = Slf4jReporter.forRegistry(prefixedRegistry.metricRegistry)
+            Log4JMetricsReporter reporter4j = Log4JMetricsReporter.forRegistry(prefixedRegistry.metricRegistry)
                     .convertRatesTo(TimeUnit.SECONDS)
                     .convertDurationsTo(TimeUnit.NANOSECONDS)
                     .filter(ActivityMetrics.METRIC_FILTER)
                     .outputTo(logger)
                     .build();
-            scheduledReporters.add(loggerReporter);
+
+            scheduledReporters.add(reporter4j);
         }
         return this;
     }
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/NashornMetricRegistryBindings.java b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/NashornMetricRegistryBindings.java
index 9b8d2879e..eb361ab8e 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/NashornMetricRegistryBindings.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/NashornMetricRegistryBindings.java
@@ -20,19 +20,19 @@ package io.nosqlbench.engine.core.metrics;
 import com.codahale.metrics.*;
 import com.codahale.metrics.Timer;
 import io.nosqlbench.engine.core.script.ReadOnlyBindings;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.*;
 import java.util.stream.Collectors;
 
 public class NashornMetricRegistryBindings extends ReadOnlyBindings implements MetricRegistryListener {
 
-    private final static Logger logger = LoggerFactory.getLogger(NashornMetricRegistryBindings.class);
+    private final static Logger logger = LogManager.getLogger(NashornMetricRegistryBindings.class);
 
     private final MetricRegistry registry;
-    private MetricMap metricMap = new MetricMap("ROOT");
-    private boolean failfast = true;
+    private final MetricMap metricMap = new MetricMap("ROOT");
+    private final boolean failfast = true;
 
     public NashornMetricRegistryBindings(MetricRegistry registry) {
         this.registry = registry;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/PolyglotMetricRegistryBindings.java b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/PolyglotMetricRegistryBindings.java
index beb4e327f..883f2b88f 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/PolyglotMetricRegistryBindings.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/PolyglotMetricRegistryBindings.java
@@ -17,22 +17,20 @@
 
 package io.nosqlbench.engine.core.metrics;
 
-import com.codahale.metrics.Timer;
 import com.codahale.metrics.*;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.graalvm.polyglot.Value;
 import org.graalvm.polyglot.proxy.ProxyObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
-import java.util.Set;
 
 /**
  * A view of metrics objects as an object tree.
  */
 public class PolyglotMetricRegistryBindings implements ProxyObject, MetricRegistryListener {
 
-    private final static Logger logger = LoggerFactory.getLogger(PolyglotMetricRegistryBindings.class);
+    private final static Logger logger = LogManager.getLogger(PolyglotMetricRegistryBindings.class);
 
     private final MetricRegistry registry;
     MetricMap metrics = new MetricMap("ROOT",null);
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/MetricsMapper.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/MetricsMapper.java
index 30822b3b9..361e67411 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/MetricsMapper.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/MetricsMapper.java
@@ -20,8 +20,8 @@ import io.nosqlbench.engine.api.activityapi.core.ActivityType;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
 import io.nosqlbench.engine.core.metrics.NashornMetricRegistryBindings;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.lang.reflect.Method;
 import java.util.*;
@@ -34,8 +34,8 @@ import java.util.stream.Collectors;
  * Find the metrics associated with an activity type by instantiating the activity in idle mode.
  */
 public class MetricsMapper {
-    private final static Logger logger = LoggerFactory.getLogger(MetricsMapper.class);
-    private static Set<Class<?>> metricsElements = new HashSet<>() {{
+    private final static Logger logger = LogManager.getLogger(MetricsMapper.class);
+    private static final Set<Class<?>> metricsElements = new HashSet<>() {{
         add(Meter.class);
         add(Counter.class);
         add(Timer.class);
@@ -43,12 +43,12 @@ public class MetricsMapper {
         add(Gauge.class);
         add(Snapshot.class);
     }};
-    private static Predicate<Method> isSimpleGetter = method ->
+    private static final Predicate<Method> isSimpleGetter = method ->
             method.getName().startsWith("get")
                     && method.getParameterCount() == 0
                     && !method.getName().equals("getClass");
 
-    private static Function<Method, String> getPropertyName = method ->
+    private static final Function<Method, String> getPropertyName = method ->
     {
         String mName = method.getName().substring(3, 4).toLowerCase() + method.getName().substring(4);
         return mName;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
index 3c8a49e1e..046a36019 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
@@ -14,20 +14,33 @@
  */
 package io.nosqlbench.engine.core.script;
 
-import ch.qos.logback.classic.Logger;
 import com.codahale.metrics.MetricRegistry;
 import com.oracle.truffle.js.scriptengine.GraalJSScriptEngine;
-import io.nosqlbench.engine.core.*;
-import io.nosqlbench.engine.core.metrics.PolyglotMetricRegistryBindings;
 import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
-import io.nosqlbench.engine.core.metrics.NashornMetricRegistryBindings;
 import io.nosqlbench.engine.api.scripting.ScriptEnvBuffer;
+import io.nosqlbench.engine.core.ActivityProgressIndicator;
+import io.nosqlbench.engine.core.PolyglotScenarioController;
+import io.nosqlbench.engine.core.ScenarioController;
+import io.nosqlbench.engine.core.ScenarioResult;
+import io.nosqlbench.engine.core.annotation.Annotators;
+import io.nosqlbench.engine.core.logging.ScenarioLogger;
+import io.nosqlbench.engine.core.metrics.NashornMetricRegistryBindings;
+import io.nosqlbench.engine.core.metrics.PolyglotMetricRegistryBindings;
+import io.nosqlbench.nb.api.Layer;
+import io.nosqlbench.nb.api.annotations.Annotation;
 import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
-import org.graalvm.polyglot.*;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.EnvironmentAccess;
+import org.graalvm.polyglot.HostAccess;
+import org.graalvm.polyglot.PolyglotAccess;
 
-import javax.script.*;
+import javax.script.Compilable;
+import javax.script.CompiledScript;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -46,7 +59,7 @@ import java.util.stream.Collectors;
 
 public class Scenario implements Callable<ScenarioResult> {
 
-    private static final Logger logger = (Logger) LoggerFactory.getLogger("SCENARIO");
+    private static final Logger logger = LogManager.getLogger("SCENARIO");
 
     private State state = State.Scheduled;
 
@@ -202,8 +215,8 @@ public class Scenario implements Callable<ScenarioResult> {
                 continue;
             }
 
-            org.slf4j.Logger extensionLogger =
-                LoggerFactory.getLogger("extensions." + extensionDescriptor.getBaseVariableName());
+            Logger extensionLogger =
+                LogManager.getLogger("extensions." + extensionDescriptor.getBaseVariableName());
             Object extensionObject = extensionDescriptor.getExtensionObject(
                 extensionLogger,
                 metricRegistry,
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java
index 26a8ab152..6a0c2927f 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java
@@ -17,18 +17,24 @@
 
 package io.nosqlbench.engine.core.script;
 
+import io.nosqlbench.engine.core.IndexedThreadFactory;
+import io.nosqlbench.engine.core.ScenarioController;
+import io.nosqlbench.engine.core.ScenarioResult;
+import io.nosqlbench.engine.core.ScenariosResults;
+import io.nosqlbench.engine.core.logging.SessionLogConfig;
+import io.nosqlbench.engine.core.logging.ScenarioLogger;
 import io.nosqlbench.nb.api.errors.BasicError;
-import io.nosqlbench.engine.core.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
+import java.nio.file.Path;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
 public class ScenariosExecutor {
 
-    private final static Logger logger = LoggerFactory.getLogger(ScenariosExecutor.class);
+    private final static Logger logger = LogManager.getLogger(ScenariosExecutor.class);
     private final LinkedHashMap<String, SubmittedScenario> submitted = new LinkedHashMap<>();
 
     private final ExecutorService executor;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScriptParams.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScriptParams.java
index eae775033..622ff3a78 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScriptParams.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScriptParams.java
@@ -17,20 +17,17 @@
 
 package io.nosqlbench.engine.core.script;
 
-import ch.qos.logback.classic.Logger;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import io.nosqlbench.nb.api.errors.BasicError;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.graalvm.polyglot.Value;
-import org.graalvm.polyglot.proxy.Proxy;
 import org.graalvm.polyglot.proxy.ProxyObject;
-import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Flow;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -39,7 +36,7 @@ import java.util.stream.Collectors;
  */
 public class ScriptParams extends HashMap<String, String> implements ProxyObject {
 
-    private static final Logger logger = (Logger) LoggerFactory.getLogger(ScriptParams.class);
+    private static final Logger logger = LogManager.getLogger(ScriptParams.class);
     private static final Gson gson = new GsonBuilder().setPrettyPrinting().create();
 
     public ScriptParams withOverrides(Object overrides) {
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java
index daa6bed16..f0c2c33ed 100644
--- a/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java
+++ b/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java
@@ -12,8 +12,8 @@ import io.nosqlbench.engine.api.activityimpl.input.CoreInputDispenser;
 import io.nosqlbench.engine.api.activityimpl.input.AtomicInput;
 import io.nosqlbench.engine.api.activityimpl.motor.CoreMotor;
 import io.nosqlbench.engine.api.activityimpl.motor.CoreMotorDispenser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.junit.Test;
 
 import java.util.Optional;
@@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 *   limitations under the License.
 */
 public class ActivityExecutorTest {
-    private static final Logger logger = LoggerFactory.getLogger(ActivityExecutorTest.class);
+    private static final Logger logger = LogManager.getLogger(ActivityExecutorTest.class);
 
     @Test
     public void testRestart() {
@@ -148,7 +148,7 @@ public class ActivityExecutorTest {
     }
 
     private static class DelayedInitActivity extends SimpleActivity {
-        private static Logger logger = LoggerFactory.getLogger(DelayedInitActivity.class);
+        private static final Logger logger = LogManager.getLogger(DelayedInitActivity.class);
 
         public DelayedInitActivity(ActivityDef activityDef) {
             super(activityDef);
diff --git a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java
index 812b737b4..b18a8855b 100644
--- a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java
+++ b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java
@@ -12,8 +12,8 @@ import com.github.dockerjava.core.command.LogContainerResultCallback;
 import com.github.dockerjava.core.command.PullImageResultCallback;
 import com.github.dockerjava.okhttp.OkHttpDockerCmdExecFactory;
 import com.sun.security.auth.module.UnixSystem;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -30,7 +30,7 @@ public class DockerHelper {
 
     private final DockerClientConfig config;
     private final DockerClient dockerClient;
-    private final Logger logger = LoggerFactory.getLogger(DockerHelper.class);
+    private final Logger logger = LogManager.getLogger(DockerHelper.class);
 
     public DockerHelper() {
         System.getProperties().setProperty(DOCKER_HOST, DOCKER_HOST_ADDR);
diff --git a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java
index eac7a6edd..3cf593765 100644
--- a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java
+++ b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java
@@ -14,8 +14,8 @@ import com.github.dockerjava.core.async.ResultCallbackTemplate;
 import com.github.dockerjava.core.command.LogContainerResultCallback;
 import io.nosqlbench.nb.api.content.Content;
 import io.nosqlbench.nb.api.content.NBIO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.*;
 import java.nio.file.Files;
@@ -34,7 +34,7 @@ public class DockerMetricsManager {
 
     String userHome = System.getProperty("user.home");
 
-    private final Logger logger = LoggerFactory.getLogger(DockerMetricsManager.class);
+    private final Logger logger = LogManager.getLogger(DockerMetricsManager.class);
 
     public DockerMetricsManager() {
         dh = new DockerHelper();
diff --git a/engine-docker/src/main/java/io/nosqlbench/engine/docker/RestHelper.java b/engine-docker/src/main/java/io/nosqlbench/engine/docker/RestHelper.java
index 2dd3fc03c..323a67818 100644
--- a/engine-docker/src/main/java/io/nosqlbench/engine/docker/RestHelper.java
+++ b/engine-docker/src/main/java/io/nosqlbench/engine/docker/RestHelper.java
@@ -1,9 +1,8 @@
 package io.nosqlbench.engine.docker;
 
-import io.nosqlbench.nb.api.content.NBIO;
 import io.nosqlbench.nb.api.errors.BasicError;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.net.URI;
 import java.net.http.HttpClient;
@@ -13,7 +12,7 @@ import java.util.Base64;
 import java.util.function.Supplier;
 
 public class RestHelper {
-    private static Logger logger = LoggerFactory.getLogger(RestHelper.class);
+    private static final Logger logger = LogManager.getLogger(RestHelper.class);
 
     static HttpClient.Builder clientBuilder = HttpClient.newBuilder();
     static HttpClient httpClient = clientBuilder.build();
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/csvmetrics/CSVMetrics.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/csvmetrics/CSVMetrics.java
index 983944c20..d05bffe14 100644
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/csvmetrics/CSVMetrics.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/csvmetrics/CSVMetrics.java
@@ -20,7 +20,7 @@ package io.nosqlbench.engine.extensions.csvmetrics;
 import com.codahale.metrics.CsvReporter;
 import com.codahale.metrics.Metric;
 import com.codahale.metrics.MetricRegistry;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 import java.io.File;
 import java.util.concurrent.TimeUnit;
@@ -90,7 +90,7 @@ public class CSVMetrics {
         return this;
     }
 
-    private MetricInstanceFilter filter = new MetricInstanceFilter();
+    private final MetricInstanceFilter filter = new MetricInstanceFilter();
 
     public CSVMetrics stop() {
         reporter.stop();
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/csvmetrics/CSVMetricsPlugin.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/csvmetrics/CSVMetricsPlugin.java
index 083e2b62f..f6f4bb69e 100644
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/csvmetrics/CSVMetricsPlugin.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/csvmetrics/CSVMetricsPlugin.java
@@ -18,7 +18,7 @@
 package io.nosqlbench.engine.extensions.csvmetrics;
 
 import com.codahale.metrics.MetricRegistry;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 import javax.script.ScriptContext;
 import java.io.IOException;
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/csvmetrics/CSVMetricsPluginData.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/csvmetrics/CSVMetricsPluginData.java
index 90b127d5c..4ea0f8a54 100644
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/csvmetrics/CSVMetricsPluginData.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/csvmetrics/CSVMetricsPluginData.java
@@ -20,7 +20,7 @@ package io.nosqlbench.engine.extensions.csvmetrics;
 import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo;
 import io.nosqlbench.nb.annotations.Service;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 import javax.script.ScriptContext;
 
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/ExamplePluginData.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/ExamplePluginData.java
index 231abe85b..76e04dd61 100644
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/ExamplePluginData.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/ExamplePluginData.java
@@ -20,7 +20,7 @@ package io.nosqlbench.engine.extensions.example;
 import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo;
 import io.nosqlbench.nb.annotations.Service;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 import javax.script.ScriptContext;
 
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/files/FileAccessPluginData.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/files/FileAccessPluginData.java
index e1b82d94f..cada7c61a 100644
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/files/FileAccessPluginData.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/files/FileAccessPluginData.java
@@ -20,7 +20,7 @@ package io.nosqlbench.engine.extensions.files;
 import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo;
 import io.nosqlbench.nb.annotations.Service;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 import javax.script.ScriptContext;
 
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/GlobalVarsScriptingPluginData.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/GlobalVarsScriptingPluginData.java
index f0435ec70..977aa1002 100644
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/GlobalVarsScriptingPluginData.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/GlobalVarsScriptingPluginData.java
@@ -4,7 +4,7 @@ import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo;
 import io.nosqlbench.nb.annotations.Service;
 import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 import javax.script.ScriptContext;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histologger/HdrHistoLogPlugin.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histologger/HdrHistoLogPlugin.java
index 9f620e572..c4b5ba203 100644
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histologger/HdrHistoLogPlugin.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histologger/HdrHistoLogPlugin.java
@@ -19,14 +19,14 @@ package io.nosqlbench.engine.extensions.histologger;
 
 import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 import javax.script.ScriptContext;
 
 public class HdrHistoLogPlugin {
-    private Logger logger;
-    private MetricRegistry metricRegistry;
-    private ScriptContext scriptContext;
+    private final Logger logger;
+    private final MetricRegistry metricRegistry;
+    private final ScriptContext scriptContext;
 
     public HdrHistoLogPlugin(Logger logger, MetricRegistry metricRegistry, ScriptContext scriptContext) {
         this.logger = logger;
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histologger/HdrHistoLogPluginData.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histologger/HdrHistoLogPluginData.java
index 54fd1848b..12358340f 100644
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histologger/HdrHistoLogPluginData.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histologger/HdrHistoLogPluginData.java
@@ -20,7 +20,7 @@ package io.nosqlbench.engine.extensions.histologger;
 import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo;
 import io.nosqlbench.nb.annotations.Service;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 import javax.script.ScriptContext;
 
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histostatslogger/HistoStatsPlugin.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histostatslogger/HistoStatsPlugin.java
index 25530b804..50bd667f9 100644
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histostatslogger/HistoStatsPlugin.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histostatslogger/HistoStatsPlugin.java
@@ -19,15 +19,15 @@ package io.nosqlbench.engine.extensions.histostatslogger;
 
 import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 import javax.script.ScriptContext;
 
 public class HistoStatsPlugin {
 
-    private Logger logger;
-    private MetricRegistry metricRegistry;
-    private ScriptContext scriptContext;
+    private final Logger logger;
+    private final MetricRegistry metricRegistry;
+    private final ScriptContext scriptContext;
 
     public HistoStatsPlugin(Logger logger, MetricRegistry metricRegistry, ScriptContext scriptContext) {
         this.logger = logger;
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histostatslogger/HistoStatsPluginData.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histostatslogger/HistoStatsPluginData.java
index 143243d35..b511736f7 100644
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histostatslogger/HistoStatsPluginData.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histostatslogger/HistoStatsPluginData.java
@@ -20,7 +20,7 @@ package io.nosqlbench.engine.extensions.histostatslogger;
 import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo;
 import io.nosqlbench.nb.annotations.Service;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 import javax.script.ScriptContext;
 
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/HttpPluginData.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/HttpPluginData.java
index bfaf28171..98b4063c8 100644
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/HttpPluginData.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/HttpPluginData.java
@@ -2,9 +2,8 @@ package io.nosqlbench.engine.extensions.http;
 
 import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo;
-import io.nosqlbench.engine.extensions.optimizers.BobyqaOptimizerPlugin;
 import io.nosqlbench.nb.annotations.Service;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 import javax.script.ScriptContext;
 
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerInstance.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerInstance.java
index 951b0faac..58366bdfc 100644
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerInstance.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerInstance.java
@@ -24,7 +24,7 @@ import org.apache.commons.math3.optim.*;
 import org.apache.commons.math3.optim.nonlinear.scalar.GoalType;
 import org.apache.commons.math3.optim.nonlinear.scalar.ObjectiveFunction;
 import org.apache.commons.math3.optim.nonlinear.scalar.noderiv.BOBYQAOptimizer;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 import javax.script.ScriptContext;
 import java.util.Arrays;
@@ -41,7 +41,7 @@ public class BobyqaOptimizerInstance {
     private double initialTrustRegionRadius = Double.MAX_VALUE;
     private double stoppingTrustRegionRadius = 1.0D;
 
-    private MVParams params = new MVParams();
+    private final MVParams params = new MVParams();
 
     private MultivariateFunction objectiveFunctionFromScript;
     private SimpleBounds bounds;
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerPlugin.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerPlugin.java
index 52ff2385b..c8e23ab63 100644
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerPlugin.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerPlugin.java
@@ -18,7 +18,7 @@
 package io.nosqlbench.engine.extensions.optimizers;
 
 import com.codahale.metrics.MetricRegistry;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 import javax.script.ScriptContext;
 
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerPluginData.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerPluginData.java
index 5cdc97fe8..c7e1cb139 100644
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerPluginData.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerPluginData.java
@@ -20,7 +20,7 @@ package io.nosqlbench.engine.extensions.optimizers;
 import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo;
 import io.nosqlbench.nb.annotations.Service;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 import javax.script.ScriptContext;
 
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/MultivariateArrayScript.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/MultivariateArrayScript.java
index 808cc924e..b8a1231a7 100644
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/MultivariateArrayScript.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/MultivariateArrayScript.java
@@ -2,7 +2,7 @@ package io.nosqlbench.engine.extensions.optimizers;
 
 import jdk.nashorn.api.scripting.ScriptObjectMirror;
 import org.apache.commons.math3.analysis.MultivariateFunction;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 import java.security.InvalidParameterException;
 import java.util.HashMap;
@@ -11,7 +11,7 @@ import java.util.Map;
 public class MultivariateArrayScript implements MultivariateFunction {
     private final ScriptObjectMirror script;
     private final MVParams params;
-    private Logger logger;
+    private final Logger logger;
 
     public MultivariateArrayScript(Logger logger, MVParams params, ScriptObjectMirror script) {
         this.logger = logger;
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/MultivariateDynamicScript.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/MultivariateDynamicScript.java
index a5d4d3f58..59bc90855 100644
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/MultivariateDynamicScript.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/MultivariateDynamicScript.java
@@ -2,7 +2,7 @@ package io.nosqlbench.engine.extensions.optimizers;
 
 import jdk.nashorn.api.scripting.ScriptObjectMirror;
 import org.apache.commons.math3.analysis.MultivariateFunction;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 import java.security.InvalidParameterException;
 import java.util.Arrays;
@@ -10,7 +10,7 @@ import java.util.Arrays;
 public class MultivariateDynamicScript implements MultivariateFunction {
     private final ScriptObjectMirror script;
     private final int varcount;
-    private Logger logger;
+    private final Logger logger;
 
     public MultivariateDynamicScript(Logger logger, int varcount, ScriptObjectMirror script) {
         this.logger = logger;
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/NashornMultivariateObjectScript.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/NashornMultivariateObjectScript.java
index 2a0cd70a0..a4d2940c5 100644
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/NashornMultivariateObjectScript.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/NashornMultivariateObjectScript.java
@@ -2,7 +2,7 @@ package io.nosqlbench.engine.extensions.optimizers;
 
 import jdk.nashorn.api.scripting.ScriptObjectMirror;
 import org.apache.commons.math3.analysis.MultivariateFunction;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 import java.security.InvalidParameterException;
 import java.util.HashMap;
@@ -11,7 +11,7 @@ import java.util.Map;
 public class NashornMultivariateObjectScript implements MultivariateFunction {
     private final ScriptObjectMirror script;
     private final MVParams params;
-    private Logger logger;
+    private final Logger logger;
 
     public NashornMultivariateObjectScript(Logger logger, MVParams params, ScriptObjectMirror script) {
         this.logger = logger;
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/PolyglotMultivariateObjectScript.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/PolyglotMultivariateObjectScript.java
index c4d9be30d..03532c39e 100644
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/PolyglotMultivariateObjectScript.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/PolyglotMultivariateObjectScript.java
@@ -2,7 +2,7 @@ package io.nosqlbench.engine.extensions.optimizers;
 
 import org.apache.commons.math3.analysis.MultivariateFunction;
 import org.graalvm.polyglot.proxy.ProxyObject;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 import java.security.InvalidParameterException;
 import java.util.HashMap;
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/scriptingmetrics/ScriptingMetrics.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/scriptingmetrics/ScriptingMetrics.java
index 5918f541a..2f9785dba 100644
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/scriptingmetrics/ScriptingMetrics.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/scriptingmetrics/ScriptingMetrics.java
@@ -19,14 +19,14 @@ package io.nosqlbench.engine.extensions.scriptingmetrics;
 
 import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 import javax.script.ScriptContext;
 
 public class ScriptingMetrics {
-    private Logger logger;
-    private MetricRegistry metricRegistry;
-    private ScriptContext scriptContext;
+    private final Logger logger;
+    private final MetricRegistry metricRegistry;
+    private final ScriptContext scriptContext;
 
     public ScriptingMetrics(Logger logger, MetricRegistry metricRegistry, ScriptContext scriptContext) {
 
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/scriptingmetrics/ScriptingMetricsPluginData.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/scriptingmetrics/ScriptingMetricsPluginData.java
index 1547a5caf..5596ed36b 100644
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/scriptingmetrics/ScriptingMetricsPluginData.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/scriptingmetrics/ScriptingMetricsPluginData.java
@@ -20,7 +20,7 @@ package io.nosqlbench.engine.extensions.scriptingmetrics;
 import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo;
 import io.nosqlbench.nb.annotations.Service;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 import javax.script.ScriptContext;
 
diff --git a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java
index 276f3b494..d28f7fdae 100644
--- a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java
+++ b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java
@@ -5,8 +5,9 @@ import io.nosqlbench.engine.cli.BasicScriptBuffer;
 import io.nosqlbench.engine.cli.Cmd;
 import io.nosqlbench.engine.cli.NBCLICommandParser;
 import io.nosqlbench.engine.cli.ScriptBuffer;
-import io.nosqlbench.engine.core.ScenarioLogger;
 import io.nosqlbench.engine.core.ScenarioResult;
+import io.nosqlbench.engine.core.logging.SessionLogConfig;
+import io.nosqlbench.engine.core.logging.ScenarioLogger;
 import io.nosqlbench.engine.core.script.Scenario;
 import io.nosqlbench.engine.core.script.ScenariosExecutor;
 import io.nosqlbench.engine.rest.services.WorkSpace;
@@ -45,7 +46,7 @@ public class ScenarioExecutorEndpoint implements WebServiceObject {
     public synchronized Response cancelScenario(@PathParam("scenario") String scenario) {
         try {
             executor.deleteScenario(scenario);
-            return Response.ok("canceled '" + scenario +"' and removed it").build();
+            return Response.ok("canceled '" + scenario + "' and removed it").build();
         } catch (Exception e) {
             return Response.serverError().entity(e.getMessage()).build();
         }
@@ -57,8 +58,8 @@ public class ScenarioExecutorEndpoint implements WebServiceObject {
     @Produces(MediaType.APPLICATION_JSON)
     public synchronized Response stopScenario(@PathParam("scenario") String scenario) {
         try {
-            executor.stopScenario(scenario,false);
-            return Response.ok("stopped '" + scenario +"' without removing it").build();
+            executor.stopScenario(scenario, false);
+            return Response.ok("stopped '" + scenario + "' without removing it").build();
         } catch (Exception e) {
             return Response.serverError().entity(e.getMessage()).build();
         }
@@ -77,9 +78,9 @@ public class ScenarioExecutorEndpoint implements WebServiceObject {
             rq.setScenarioName("scenario" + System.currentTimeMillis());
         }
         org.joda.time.format.DateTimeFormatter dtf = DateTimeFormat.forPattern("yyyyMMddHHmmssSSS");
-        name=name.replaceAll("EPOCHMS", String.valueOf(System.currentTimeMillis()));
-        name=name.replaceAll("DATESTAMP", dtf.print(new DateTime()));
-        name=name.replaceAll("[:/ ]","");
+        name = name.replaceAll("EPOCHMS", String.valueOf(System.currentTimeMillis()));
+        name = name.replaceAll("DATESTAMP", dtf.print(new DateTime()));
+        name = name.replaceAll("[:/ ]", "");
         rq.setScenarioName(name);
 
         WorkSpace workspace = new WorkspaceFinder(config).getWorkspace(rq.getWorkspace());
@@ -103,24 +104,25 @@ public class ScenarioExecutorEndpoint implements WebServiceObject {
         buffer.add(cmdList.toArray(new Cmd[0]));
 
         Scenario scenario = new Scenario(
-            rq.getScenarioName(),
-            "",
-            Scenario.Engine.Graalvm,
-            "disabled",
-            false,
-            true,
-            false
+                rq.getScenarioName(),
+                "",
+                Scenario.Engine.Graalvm,
+                "disabled",
+                false,
+                true,
+                false
         );
 
         scenario.addScriptText(buffer.getParsedScript());
 
-        ScenarioLogger logger = new ScenarioLogger(scenario)
-            .setLogDir(workspace.getWorkspacePath().resolve("logs").toString());
+        ScenarioLogger logger = new SessionLogConfig(scenario.getScenarioName())
+                .setLogDir(workspace.getWorkspacePath().resolve("logs"))
+                .start();
 
         executor.execute(scenario, logger);
 
         return Response.created(UriBuilder.fromResource(ScenarioExecutorEndpoint.class).path(
-            "scenario/" + rq.getScenarioName()).build()).entity("started").build();
+                "scenario/" + rq.getScenarioName()).build()).entity("started").build();
 
     }
 
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 7d44e8a69..e3711bf9e 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -110,19 +110,13 @@
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-api</artifactId>
-                <version>${log4j.version}</version>
+              <version>2.13.3</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-core</artifactId>
-                <version>${log4j.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>ch.qos.logback</groupId>
-                <artifactId>logback-classic</artifactId>
-                <version>${logback.version}</version>
+              <version>2.13.3</version>
             </dependency>
 
             <dependency>
@@ -161,11 +155,11 @@
             <version>${commons.text.version}</version>
           </dependency>
 
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>${slf4j.version}</version>
-            </dependency>
+          <!--            <dependency>-->
+          <!--                <groupId>org.slf4j</groupId>-->
+          <!--                <artifactId>slf4j-api</artifactId>-->
+          <!--                <version>${slf4j.version}</version>-->
+          <!--            </dependency>-->
 
           <dependency>
             <groupId>org.openjdk.jmh</groupId>
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/Synonyms.java b/nb-api/src/main/java/io/nosqlbench/nb/api/config/Synonyms.java
index 07a562c2e..ff7891f8e 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/config/Synonyms.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/config/Synonyms.java
@@ -1,6 +1,6 @@
 package io.nosqlbench.nb.api.config;
 
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 import java.util.*;
 import java.util.function.BiConsumer;
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/content/PathFinder.java b/nb-api/src/main/java/io/nosqlbench/nb/api/content/PathFinder.java
index 4c5eb4b16..fc478809b 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/content/PathFinder.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/content/PathFinder.java
@@ -1,8 +1,8 @@
 package io.nosqlbench.nb.api.content;
 
 import io.nosqlbench.nb.api.errors.BasicError;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -20,7 +20,7 @@ import java.util.stream.Collectors;
  */
 public class PathFinder {
 
-    private final static Logger logger = LoggerFactory.getLogger(PathFinder.class);
+    private final static Logger logger = LogManager.getLogger(PathFinder.class);
 
     /**
      * Find exactly zero or one matching Paths, and return an {@link Optional} of {@link Path}.
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/content/ResolverForURL.java b/nb-api/src/main/java/io/nosqlbench/nb/api/content/ResolverForURL.java
index f533bec0f..53f609848 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/content/ResolverForURL.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/content/ResolverForURL.java
@@ -1,22 +1,20 @@
 package io.nosqlbench.nb.api.content;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URL;
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 
 public class ResolverForURL implements ContentResolver {
 
     public static final ContentResolver INSTANCE = new ResolverForURL();
-    private final static Logger logger = LoggerFactory.getLogger(ResolverForURL.class);
+    private final static Logger logger = LogManager.getLogger(ResolverForURL.class);
 
     @Override
     public List<Content<?>> resolve(URI uri) {
diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java b/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
index 37e822d81..dddc9c0a3 100644
--- a/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
+++ b/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
@@ -17,9 +17,10 @@
 
 package io.nosqlbench.engine.core.script;
 
-import io.nosqlbench.engine.core.ScenarioLogger;
 import io.nosqlbench.engine.core.ScenarioResult;
 import io.nosqlbench.engine.core.ScenariosResults;
+import io.nosqlbench.engine.core.logging.SessionLogConfig;
+import io.nosqlbench.engine.core.logging.ScenarioLogger;
 import org.apache.commons.compress.utils.IOUtils;
 import org.assertj.core.data.Offset;
 import org.junit.BeforeClass;
diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/NBCliIntegrationTests.java b/nb/src/test/java/io/nosqlbench/engine/core/script/NBCliIntegrationTests.java
index 47743eb8d..13476189f 100644
--- a/nb/src/test/java/io/nosqlbench/engine/core/script/NBCliIntegrationTests.java
+++ b/nb/src/test/java/io/nosqlbench/engine/core/script/NBCliIntegrationTests.java
@@ -20,8 +20,8 @@ package io.nosqlbench.engine.core.script;
 import io.nosqlbench.cli.testing.ProcessInvoker;
 import io.nosqlbench.cli.testing.ProcessResult;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.Optional;
 
@@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class NBCliIntegrationTests {
 
     private final static String JARNAME = "target/nb.jar";
-    private Logger logger = LoggerFactory.getLogger(NBCliIntegrationTests.class);
+    private final Logger logger = LogManager.getLogger(NBCliIntegrationTests.class);
     private final String java = Optional.ofNullable(System.getenv(
         "JAVA_HOME")).map(v -> v+"/bin/java").orElse("java");
 
diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/ScriptIntegrationTests.java b/nb/src/test/java/io/nosqlbench/engine/core/script/ScriptIntegrationTests.java
index 49c3e2542..5d210b544 100644
--- a/nb/src/test/java/io/nosqlbench/engine/core/script/ScriptIntegrationTests.java
+++ b/nb/src/test/java/io/nosqlbench/engine/core/script/ScriptIntegrationTests.java
@@ -17,9 +17,10 @@
 
 package io.nosqlbench.engine.core.script;
 
-import io.nosqlbench.engine.core.ScenarioLogger;
 import io.nosqlbench.engine.core.ScenarioResult;
 import io.nosqlbench.engine.core.ScenariosResults;
+import io.nosqlbench.engine.core.logging.SessionLogConfig;
+import io.nosqlbench.engine.core.logging.ScenarioLogger;
 import org.apache.commons.compress.utils.IOUtils;
 import org.assertj.core.data.Offset;
 import org.junit.BeforeClass;
@@ -28,6 +29,7 @@ import org.junit.Test;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -62,7 +64,10 @@ public class ScriptIntegrationTests {
         }
         s.addScriptText(script);
 //        s.addScriptText("load('classpath:scripts/sync/" + scriptname + ".js');");
-        ScenarioLogger scenarioLogger = new ScenarioLogger(s).setMaxLogs(0).setLogDir("logs/test").start();
+        ScenarioLogger scenarioLogger = new SessionLogConfig(scenarioName)
+                .setMaxLogs(0)
+                .setLogDir(Path.of("logs/test"))
+                .start();
         e.execute(s, scenarioLogger);
         ScenariosResults scenariosResults = e.awaitAllResults();
         ScenarioResult scenarioResult = scenariosResults.getOne();

From c2cec2357ce787ec9c682046aa688786f960f6a3 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:30:30 -0600
Subject: [PATCH 036/164] allow configurable delimiter in params parser

---
 .../nb/api/config}/ParamsParser.java          | 23 +++++++++++--------
 .../activityimpl/motor/ParamsParserTest.java  |  1 +
 2 files changed, 14 insertions(+), 10 deletions(-)
 rename {engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor => nb-api/src/main/java/io/nosqlbench/nb/api/config}/ParamsParser.java (93%)
 rename {engine-api => nb-api}/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java (99%)

diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParser.java b/nb-api/src/main/java/io/nosqlbench/nb/api/config/ParamsParser.java
similarity index 93%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParser.java
rename to nb-api/src/main/java/io/nosqlbench/nb/api/config/ParamsParser.java
index 06fb16af4..6c9402ae0 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParser.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/config/ParamsParser.java
@@ -15,11 +15,10 @@
  * /
  */
 
-package io.nosqlbench.engine.api.activityimpl.motor;
+package io.nosqlbench.nb.api.config;
 
-import io.nosqlbench.nb.api.config.Synonyms;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.*;
 
@@ -74,9 +73,13 @@ import java.util.*;
  *
  */
 public class ParamsParser {
-    private final static Logger logger = LoggerFactory.getLogger(ParamsParser.class);
+    private final static Logger logger = LogManager.getLogger(ParamsParser.class);
 
 
+    public static Map<String, String> parse(String input, boolean canonicalize) {
+        return parse(input, "=:", canonicalize);
+    }
+
     /**
      * Parse a string input as a loose-form param=value list, and be reasonable about formatting
      * conventions that most users would follow in the absence of detailed rules.
@@ -86,7 +89,7 @@ public class ParamsParser {
      * @param canonicalize Whether or not to replace synonyms with modern forms and to warn when old forms are used
      * @return A map of extracted keys and values
      */
-    public static Map<String, String> parse(String input, boolean canonicalize) {
+    public static Map<String, String> parse(String input, String assignmentCharacters, boolean canonicalize) {
 
         ParseState s = ParseState.expectingName;
 
@@ -131,13 +134,13 @@ public class ParamsParser {
                         isEscaped = true;
                     } else if (c == ' ') {
                         String partial = parms.get(lastVarname);
-                        if (partial==null) {
+                        if (partial == null) {
                             throw new RuntimeException("space continuation while reading name or value, but no prior " +
-                                "for " + lastVarname + " exists");
+                                    "for " + lastVarname + " exists");
                         }
-                        parms.put(lastVarname,partial+" "+varname);
+                        parms.put(lastVarname, partial + " " + varname);
                         varname.setLength(0);
-                    } else if (c != '=') {
+                    } else if (assignmentCharacters.indexOf(c) == -1) {
                         varname.append(c);
                     } else {
                         s = ParseState.expectingVal;
diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java b/nb-api/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java
similarity index 99%
rename from engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java
rename to nb-api/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java
index 6f1803a93..45a4ab40a 100644
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java
+++ b/nb-api/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java
@@ -17,6 +17,7 @@
 
 package io.nosqlbench.engine.api.activityimpl.motor;
 
+import io.nosqlbench.nb.api.config.ParamsParser;
 import org.junit.Test;
 
 import java.util.Map;

From 317ffab49c2d1b0defb0170b1874defc1a990483 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:35:04 -0600
Subject: [PATCH 037/164] api for annotations

---
 devdocs/sketches/annotations.md               |  76 ++++++++---
 .../java/io/nosqlbench/engine/cli/NBCLI.java  |  20 ++-
 .../engine/core/annotation/Annotators.java    | 128 +++++++++++++-----
 .../engine/core/metrics/OnError.java          |  15 ++
 .../engine/core/script/Scenario.java          |  13 +-
 .../main/java/io/nosqlbench/nb/api/Layer.java |  38 ++++++
 .../nb/api/annotation/Annotator.java          |  43 ------
 .../nb/api/annotations/Annotation.java        |  76 +++++++++++
 .../nb/api/annotations/AnnotationBuilder.java |  77 +++++++++++
 .../nb/api/annotations/Annotator.java         |  21 +++
 .../nb/api/annotations/BuilderFacets.java     |  58 ++++++++
 .../nb/api/annotations/MutableAnnotation.java | 121 +++++++++++++++++
 .../annotations/AnnotationBuilderTest.java    |  45 ++++++
 13 files changed, 624 insertions(+), 107 deletions(-)
 create mode 100644 engine-core/src/main/java/io/nosqlbench/engine/core/metrics/OnError.java
 create mode 100644 nb-api/src/main/java/io/nosqlbench/nb/api/Layer.java
 delete mode 100644 nb-api/src/main/java/io/nosqlbench/nb/api/annotation/Annotator.java
 create mode 100644 nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotation.java
 create mode 100644 nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilder.java
 create mode 100644 nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotator.java
 create mode 100644 nb-api/src/main/java/io/nosqlbench/nb/api/annotations/BuilderFacets.java
 create mode 100644 nb-api/src/main/java/io/nosqlbench/nb/api/annotations/MutableAnnotation.java
 create mode 100644 nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java

diff --git a/devdocs/sketches/annotations.md b/devdocs/sketches/annotations.md
index fbc8008a9..6dacbf3c9 100644
--- a/devdocs/sketches/annotations.md
+++ b/devdocs/sketches/annotations.md
@@ -4,7 +4,7 @@ NOTE: Here, annotations are notes that are stored in a metrics system for
 review, not _Java Annotations_.
 
 The annotations support in nosqlbench is meant to allow for automatic
- annotation of important timestamps and qualifying details for a
+ grafanaAnnotation of important timestamps and qualifying details for a
   nosqlbench scenario.
 
 # Annotation Semantics
@@ -18,38 +18,72 @@ Annotations always have at least one timestamp, and up to two
 . Annotations with one timestamp mark an instant where an event
  is known to have occurred.
 
-When instrumenting an event for annotation, both positive and negative
+When instrumenting an event for grafanaAnnotation, both positive and negative
  outcomes must be instrumented. That is, if a user is expecting an
-  annotation marker for when an activity was started, they should
-   instead see an error annotation if there indeed was an error. The
+  grafanaAnnotation marker for when an activity was started, they should
+   instead see an error grafanaAnnotation if there indeed was an error. The
     successful outcome of starting an activity is a different event
      than the failure of it, but they both speak to the outcome of
       trying to start an activity.
 
-# NoSQLBench Event Taxonomy
+# NoSQLBench Annotation Level
 
+Each annotation comes from a particular level of execution with
+ NoSQLBench. Starting from the top, each layer is nested within
+ the last. The conceptual view of this would appear as:
+
+              +--------+
+              |   op   |
+            +------------+ 
+            |   motor    |
+          +-----------------+ 
+          |    activity     |
+        +---------------------+ 
+        |     scripting       |
+      +-------------------------+   +---------------+
+      |       scenario          |   |  application  |
+    +-------------------------------------------------+
+    |               CLI ( Command Line Interface )    |
+    +-------------------------------------------------+
+    
+    
+That is, every op happens within a thread motor, every thread motor
+happens within an activity, and so on. 
+ 
 - cli
-  - cli.render
-  - cli.execution
-  - cli.error
+  - cli.render - When the CLI renders a scenario script
+  - cli.execution - When the CLI executes a scenario
+  - cli.error - When there is an error at the CLI level
 - scenario
-  - scenario.start
-  - scenario.stop
-  - scenario.error
+  - scenario.params - When a scenario is configured with parameters
+  - scenario.start - When a scenario is started
+  - scenario.stop - When a scenario is stopped
+  - scenario.error - When a scenario throws an error
+- scripting
+  - extensions - When an extension service object is created
 - activity
-  - activity.start
-  - activity.stop
-  - activity.param
-  - activity.error
-- thread
-  - thread.state
-  - thread.error
-- user
-  - note
-- extension
+  - activity.params - When params are initially set or changed
+  - activity.start - Immediately before an activity is started
+  - activity.stop - When an activity is stopped
+  - activity.error - When an activity throws an error
+- motor
+  - thread.state - When a motor thread changes state 
+  - thread.error - When a motor thread throws an error
+- op
+  -- There are no op-level events at this time
+- application
+  -- There are no application-level events at this time
 
 ## tags
 
+These standard tags should be added to every annotation emitted by
+ NoSQLBench:
+ 
+**appname**: "nosqlbench"
+**layer**: one of the core layers as above
+**event**: The name of the event within the layer as shown above
+
+
 type
 : <specific event name>
 layer
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
index 245d0e299..2024aa140 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
@@ -18,7 +18,8 @@ import io.nosqlbench.engine.core.script.Scenario;
 import io.nosqlbench.engine.core.script.ScenariosExecutor;
 import io.nosqlbench.engine.core.script.ScriptParams;
 import io.nosqlbench.engine.docker.DockerMetricsManager;
-import io.nosqlbench.nb.api.annotation.Annotator;
+import io.nosqlbench.nb.api.annotations.Annotation;
+import io.nosqlbench.nb.api.Layer;
 import io.nosqlbench.nb.api.content.Content;
 import io.nosqlbench.nb.api.content.NBIO;
 import io.nosqlbench.nb.api.errors.BasicError;
@@ -89,6 +90,8 @@ public class NBCLI {
         boolean dockerMetrics = globalOptions.wantsDockerMetrics();
         String dockerMetricsAt = globalOptions.wantsDockerMetricsAt();
         String reportGraphiteTo = globalOptions.wantsReportGraphiteTo();
+        String annotatorsConfig = globalOptions.getAnnotatorsConfig();
+
         int mOpts = (dockerMetrics ? 1 : 0) + (dockerMetricsAt != null ? 1 : 0) + (reportGraphiteTo != null ? 1 : 0);
         if (mOpts > 1 && (reportGraphiteTo == null || annotatorsConfig == null)) {
             throw new BasicError("You have multiple conflicting options which attempt to set\n" +
@@ -249,6 +252,16 @@ public class NBCLI {
             System.exit(0);
         }
 
+        Annotators.init(annotatorsConfig);
+        Annotators.recordAnnotation(
+                Annotation.newBuilder()
+                        .session(sessionName)
+                        .now()
+                        .layer(Layer.CLI)
+                        .detail("cli", Strings.join(args, "\n"))
+                        .build()
+        );
+
         if (reportGraphiteTo != null || options.wantsReportCsvTo() != null) {
             MetricReporters reporters = MetricReporters.getInstance();
             reporters.addRegistry("workloads", ActivityMetrics.getMetricRegistry());
@@ -262,11 +275,6 @@ public class NBCLI {
             reporters.start(10, options.getReportInterval());
         }
 
-        Annotators.recordAnnotation(sessionName,
-                Map.of("event", "command-line", "args", String.join(" ", args)),
-                Map.of()
-        );
-
         if (options.wantsEnableChart()) {
             logger.info("Charting enabled");
             if (options.getHistoLoggerConfigs().size() == 0) {
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/annotation/Annotators.java b/engine-core/src/main/java/io/nosqlbench/engine/core/annotation/Annotators.java
index d0af040ae..dbe55a2d1 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/annotation/Annotators.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/annotation/Annotators.java
@@ -1,60 +1,118 @@
 package io.nosqlbench.engine.core.annotation;
 
-import io.nosqlbench.nb.api.annotation.Annotator;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import io.nosqlbench.nb.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Annotation;
+import io.nosqlbench.nb.api.annotations.Annotator;
+import io.nosqlbench.nb.api.config.ConfigAware;
+import io.nosqlbench.nb.api.config.ConfigLoader;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.*;
 
+/**
+ * Singleton-scoped annotator interface for the local process.
+ * This uses SPI to find the annotators and some config scaffolding
+ * to make configuring them easier.
+ * Any number of annotators is allowed of any supporting interface.
+ * Each instance of a config is used to initialize a single annotator,
+ * and annotations are distributed to each of them in turn.
+ */
 public class Annotators {
+    private final static Logger logger = LogManager.getLogger("ANNOTATORS");
+    private static final Gson gson = new GsonBuilder().setPrettyPrinting().create();
 
     private static List<Annotator> annotators;
-    private static Set<String> names;
 
     /**
-     * Initialize the active annotators.
+     * Initialize the active annotators. This method must be called before any others.
      *
-     * @param annotatorsConfig A comma-separated set of annotator configs, each with optional
-     *                         configuration metadata in name{config} form.
+     * @param annotatorsConfig A (possibly empty) set of annotator configurations, in any form
+     *                         supported by {@link ConfigLoader}
      */
     public synchronized static void init(String annotatorsConfig) {
-        if (annotatorsConfig == null || annotatorsConfig.isEmpty()) {
-            Annotators.names = Set.of();
-        } else {
+
+        ConfigLoader loader = new ConfigLoader();
+        annotators = new ArrayList<>();
+
+        LinkedHashMap<String, ServiceLoader.Provider<Annotator>> providers = getProviders();
+
+        List<Map> configs = loader.load(annotatorsConfig, Map.class);
+
+        if (configs != null) {
+
+            for (Map cmap : configs) {
+                Object typeObj = cmap.remove("type");
+                String typename = typeObj.toString();
+                ServiceLoader.Provider<Annotator> annotatorProvider = providers.get(typename);
+                if (annotatorProvider == null) {
+                    throw new RuntimeException("Annotation provider with selector '" + typename + "' was not found.");
+                }
+                Annotator annotator = annotatorProvider.get();
+
+                if (annotator instanceof ConfigAware) {
+                    ConfigAware configAware = (ConfigAware) annotator;
+                    configAware.applyConfig(cmap);
+                }
+
+                annotators.add(annotator);
+            }
 
         }
-        Annotators.names = names;
+
+        logger.debug("Initialized " + Annotators.annotators.size() + " annotators, since the configuration is empty.");
+
     }
 
-    public synchronized static List<Annotator> getAnnotators() {
-        if (names == null) {
-            throw new RuntimeException("Annotators.init(...) must be called first.");
+    private static List<Annotator> getAnnotators() {
+        if (annotators != null) {
+            return annotators;
         }
-        if (annotators == null) {
-            annotators = new ArrayList<>();
-            ServiceLoader<Annotator> loader = ServiceLoader.load(Annotator.class);
-            loader.stream()
-                    .map(sp -> sp.get())
-                    .filter(an -> names.contains("all") || Annotators.names.contains(an.getName()))
-                    .forEach(an -> {
-                        annotators.add(an);
-                    });
-        }
-        return annotators;
+        logger.debug("Annotations are bypassed as no annotators were configured.");
+        return List.of();
     }
 
-    public static synchronized void recordAnnotation(
-            String sessionName,
-            long startEpochMillis,
-            long endEpochMillis,
-            Map<String, String> target,
-            Map<String, String> details) {
-        getAnnotators().forEach(a -> a.recordAnnotation(sessionName, startEpochMillis, endEpochMillis, target, details));
+    private synchronized static LinkedHashMap<String, ServiceLoader.Provider<Annotator>> getProviders() {
+        ServiceLoader<Annotator> loader = ServiceLoader.load(Annotator.class);
+
+        LinkedHashMap<String, ServiceLoader.Provider<Annotator>> providers;
+        providers = new LinkedHashMap<>();
+
+        loader.stream().forEach(provider -> {
+            Class<? extends Annotator> type = provider.type();
+            if (!type.isAnnotationPresent(Service.class)) {
+                throw new RuntimeException(
+                        "Annotator services must be annotated with distinct selectors\n" +
+                                "such as @Service(Annotator.class,selector=\"myimpl42\")"
+                );
+            }
+            Service service = type.getAnnotation(Service.class);
+            providers.put(service.selector(), provider);
+        });
+
+        return providers;
     }
 
-    public static synchronized void recordAnnotation(
-            String sessionName,
-            Map<String, String> target,
-            Map<String, String> details) {
-        recordAnnotation(sessionName, 0L, 0L, target, details);
+    public static synchronized void recordAnnotation(Annotation annotation) {
+        getAnnotators().forEach(a -> a.recordAnnotation(annotation));
     }
 
+//    public static synchronized void recordAnnotation(
+//            String sessionName,
+//            long startEpochMillis,
+//            long endEpochMillis,
+//            Map<String, String> target,
+//            Map<String, String> details) {
+//        getAnnotators().forEach(a -> a.recordAnnotation(sessionName, startEpochMillis, endEpochMillis, target, details));
+//    }
+
+//    public static synchronized void recordAnnotation(
+//            String sessionName,
+//            Map<String, String> target,
+//            Map<String, String> details) {
+//        recordAnnotation(sessionName, 0L, 0L, target, details);
+//    }
+
 }
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/OnError.java b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/OnError.java
new file mode 100644
index 000000000..4f36af5ba
--- /dev/null
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/OnError.java
@@ -0,0 +1,15 @@
+package io.nosqlbench.engine.core.metrics;
+
+public enum OnError {
+    Warn,
+    Throw;
+
+    public static OnError valueOfName(String name) {
+        for (OnError value : OnError.values()) {
+            if (value.toString().toLowerCase().equals(name.toLowerCase())) {
+                return value;
+            }
+        }
+        throw new RuntimeException("No matching OnError enum value for '" + name + "'");
+    }
+}
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
index 046a36019..5df384fc9 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
@@ -231,9 +231,18 @@ public class Scenario implements Callable<ScenarioResult> {
     }
 
     public void run() {
-        state=State.Running;
+        state = State.Running;
 
-        startedAtMillis=System.currentTimeMillis();
+        startedAtMillis = System.currentTimeMillis();
+        Annotators.recordAnnotation(
+                Annotation.newBuilder()
+                        .session(this.scenarioName)
+                        .now()
+                        .layer(Layer.Scenario)
+                        .label("scenario", getScenarioName())
+                        .detail("engine", this.engine.toString())
+                        .build()
+        );
         init();
         logger.debug("Running control script for " + getScenarioName() + ".");
         for (String script : scripts) {
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/Layer.java b/nb-api/src/main/java/io/nosqlbench/nb/api/Layer.java
new file mode 100644
index 000000000..459358995
--- /dev/null
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/Layer.java
@@ -0,0 +1,38 @@
+package io.nosqlbench.nb.api;
+
+public enum Layer {
+
+    /**
+     * Events which describe command line arguments, such as parsing,
+     * named scenario mapping, or critical errors
+     */
+    CLI,
+
+    /**
+     * Events which describe scenario execution, such as parameters,
+     * lifecycle events, and critical errors
+     */
+    Scenario,
+
+    /**
+     * Events which describe scripting details, such as extensions,
+     * sending programmatic annotations, or critical errors
+     */
+    Script,
+
+    /**
+     * Events which are associated with a particular activity instance,
+     * such as parameters, starting and stopping, and critical errors
+     */
+    Activity,
+
+    /**
+     * Events which are associated with a particular activity thread
+     */
+    Motor,
+
+    /**
+     * Events which are associated with a particular operation or op template
+     */
+    Operation
+}
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotation/Annotator.java b/nb-api/src/main/java/io/nosqlbench/nb/api/annotation/Annotator.java
deleted file mode 100644
index ad5ba272c..000000000
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/annotation/Annotator.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package io.nosqlbench.nb.api.annotation;
-
-import io.nosqlbench.nb.spi.Named;
-
-import java.util.Map;
-
-/**
- * An implementation of this type is responsible for taking annotation details and
- * logging them in a useful place.
- */
-public interface Annotator extends Named {
-
-    /**
-     * Submit an annotation to some type of annotation store or logging or eventing mechanism.
-     * Implementations of this service are responsible for mapping the scenarioName, target,
-     * and details into the native schema of the target annotation or logging system in whichever
-     * way would be the least surprising for a user.
-     *
-     * The target is the nominative data which identifies the identity of the annotation. This
-     * must include enough information to allow the annotation to be homed and located within
-     * a target system such that is is visible where it should be seen. This includes all
-     * metadata which may be used to filter or locate the annotation, including timestamps.
-     *
-     * The details contain payload information to be displayed within the body of the annotation.
-     *
-     * @param sessionName      The name of the scenario
-     * @param startEpochMillis The epoch millisecond instant of the annotation, set this to 0 to have it
-     *                         automatically set to the current system time.
-     * @param endEpochMillis   The epoch millisecond instant at the end of the interval. If this is
-     *                         equal to the start instant, then this is an annotation for a point in time.
-     *                         This will be the default behavior if this value is 0.
-     * @param target           The target of the annotation, fields which are required to associate the
-     *                         annotation with the correct instance of a dashboard, metrics, etc
-     * @param details          A map of details
-     */
-    void recordAnnotation(
-            String sessionName,
-            long startEpochMillis,
-            long endEpochMillis,
-            Map<String, String> target,
-            Map<String, String> details);
-
-}
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotation.java b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotation.java
new file mode 100644
index 000000000..3d2febfff
--- /dev/null
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotation.java
@@ -0,0 +1,76 @@
+package io.nosqlbench.nb.api.annotations;
+
+import io.nosqlbench.nb.api.Layer;
+
+import java.util.Map;
+
+/**
+ * This is a general purpose representation of an event that describes
+ * a significant workflow detail to users running tests. It can be
+ * an event that describes an instant, or it can describe an interval
+ * in time (being associated with the interval of time between two
+ * canonical events.)
+ *
+ * This view of an annotation event captures the semantics of what
+ * any reportable annotation should look like from the perspective of
+ * NoSQLBench. It is up to the downstream consumers to map these
+ * to concrete fields or identifiers as appropriate.
+ */
+public interface Annotation {
+    /**
+     * @return The named session that the annotation is associated with
+     */
+    String getSession();
+
+    /**
+     * If this is the same as {@link #getEnd()}, then the annotation is
+     * for an instant in time.
+     *
+     * @return The beginning of the interval of time that the annotation describes
+     */
+    long getStart();
+
+    /**
+     * If this is the same as {@link #getStart()}, then the annotation
+     * is for an instant in time.
+     *
+     * @return The end of the interval of time that the annotation describes
+     */
+    long getEnd();
+
+    /**
+     * Annotations must be associated with a processing layer in NoSQLBench.
+     * For more details on layers, see {@link Layer}
+     *
+     * @return
+     */
+    Layer getLayer();
+
+    /**
+     * The labels which identify what this annotation pertains to. The following labels
+     * should be provided for every annotation, when available:
+     * <UL>
+     * <LI>appname: "nosqlbench"</LI>
+     * <LI>alias: The name of the activity alias, if available</LI>
+     * <LI>workload: The name of the workload file, if named scenarios are used</LI>
+     * <LI>scenario: The name of the named scenario, if named scenarios are used</LI>
+     * <LI>step: The name of the named scenario step, if named scenario are used</LI>
+     * <LI>usermode: "named_scenario" or "adhoc_activity"</LI>
+     * </UL>
+     *
+     * @return The labels map
+     */
+    Map<String, String> getLabels();
+
+    /**
+     * The details are an ordered map of all the content that you would want the user to see.
+     *
+     * @return The details map
+     */
+    Map<String, String> getDetails();
+
+    static BuilderFacets.WantsSession newBuilder() {
+        return new AnnotationBuilder();
+    }
+
+}
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilder.java b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilder.java
new file mode 100644
index 000000000..4bc83d516
--- /dev/null
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilder.java
@@ -0,0 +1,77 @@
+package io.nosqlbench.nb.api.annotations;
+
+import io.nosqlbench.nb.api.Layer;
+
+import java.util.LinkedHashMap;
+
+public class AnnotationBuilder implements BuilderFacets.All {
+    private String session;
+    private long start;
+    private long end;
+    private final LinkedHashMap<String, String> labels = new LinkedHashMap<>();
+    private final LinkedHashMap<String, String> details = new LinkedHashMap<>();
+    private Layer layer;
+
+    @Override
+    public AnnotationBuilder layer(Layer layer) {
+        this.layer = layer;
+        this.label("layer", layer.toString());
+        return this;
+    }
+
+    @Override
+    public AnnotationBuilder interval(long start, long end) {
+        start(start);
+        end(end);
+        return this;
+    }
+
+    @Override
+    public AnnotationBuilder now() {
+        start(System.currentTimeMillis());
+        end(this.start);
+        return this;
+    }
+
+    private AnnotationBuilder start(long start) {
+        this.start = start;
+        return this;
+    }
+
+    private AnnotationBuilder end(long end) {
+        this.end = end;
+        return this;
+    }
+
+    @Override
+    public AnnotationBuilder at(long at) {
+        this.start(at);
+        this.end(at);
+        return this;
+    }
+
+    @Override
+    public AnnotationBuilder label(String name, String value) {
+        this.labels.put(name, value);
+        return this;
+    }
+
+    @Override
+    public BuilderFacets.WantsMoreDetailsOrBuild detail(String name, String value) {
+        this.details.put(name, value);
+        return this;
+    }
+
+    @Override
+    public Annotation build() {
+        return new MutableAnnotation(session, layer, start, end, labels, details).asReadOnly();
+
+    }
+
+    @Override
+    public BuilderFacets.WantsInterval session(String session) {
+        this.session = session;
+        return this;
+    }
+
+}
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotator.java b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotator.java
new file mode 100644
index 000000000..fde190951
--- /dev/null
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotator.java
@@ -0,0 +1,21 @@
+package io.nosqlbench.nb.api.annotations;
+
+import io.nosqlbench.nb.spi.Named;
+
+/**
+ * An implementation of this type is responsible for taking annotation details and
+ * logging them in a useful place.
+ */
+public interface Annotator extends Named {
+
+    /**
+     * Submit an annotation to some type of annotation store, logging or eventing mechanism.
+     * Implementations of this service are responsible for mapping the scenario and labels
+     * into appropriate key data, and the details in to a native payload. The least surprising
+     * and most obvious mapping should be used in each case.
+     *
+     * For details on constructing a useful annotation to submit to this service, see {@link Annotation#newBuilder()}
+     */
+    void recordAnnotation(Annotation annotation);
+
+}
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/BuilderFacets.java b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/BuilderFacets.java
new file mode 100644
index 000000000..ebee085b0
--- /dev/null
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/BuilderFacets.java
@@ -0,0 +1,58 @@
+package io.nosqlbench.nb.api.annotations;
+
+import io.nosqlbench.nb.api.Layer;
+
+public interface BuilderFacets {
+
+    interface All extends
+            WantsSession, WantsInterval, WantsLayer, WantsLabels, WantsMoreDetailsOrBuild, WantsMoreLabelsOrDetails {
+    }
+
+    interface WantsSession {
+        /**
+         * The session is the global name of a NoSQLBench process which run a scenario. It is required.
+         */
+        WantsInterval session(String session);
+    }
+
+    interface WantsInterval {
+
+        /**
+         * Specify the instant of the annotated event.
+         *
+         * @param epochMillis
+         */
+        WantsLayer at(long epochMillis);
+
+        /**
+         * An interval annotation spans the time between two instants.
+         */
+        WantsLayer interval(long startMillis, long endMillis);
+
+        /**
+         * Use the current UTC time as the annotation instant.
+         */
+        WantsLayer now();
+    }
+
+    interface WantsLayer {
+        WantsMoreLabelsOrDetails layer(Layer layer);
+    }
+
+    interface WantsLabels {
+        WantsMoreLabelsOrDetails label(String name, String value);
+    }
+
+    interface WantsMoreLabelsOrDetails {
+        WantsMoreLabelsOrDetails label(String name, String value);
+
+        WantsMoreDetailsOrBuild detail(String name, String value);
+    }
+
+    interface WantsMoreDetailsOrBuild {
+        WantsMoreDetailsOrBuild detail(String name, String value);
+
+        Annotation build();
+    }
+
+}
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/MutableAnnotation.java b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/MutableAnnotation.java
new file mode 100644
index 000000000..eea57e7f9
--- /dev/null
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/MutableAnnotation.java
@@ -0,0 +1,121 @@
+package io.nosqlbench.nb.api.annotations;
+
+import io.nosqlbench.nb.api.Layer;
+
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class MutableAnnotation implements Annotation {
+
+    private String session = "SESSION_UNNAMED";
+    private Layer layer;
+    private long start = 0L;
+    private long end = 0L;
+    private Map<String, String> labels = new LinkedHashMap<>();
+    private Map<String, String> details = new LinkedHashMap<>();
+
+    public MutableAnnotation(String session, Layer layer, long start, long end, LinkedHashMap<String, String> labels,
+                             LinkedHashMap<String, String> details) {
+        this.session = session;
+        this.layer = layer;
+        this.start = start;
+        this.end = end;
+        this.details = details;
+        this.labels = labels;
+    }
+
+    public void setSession(String sessionName) {
+        this.session = sessionName;
+    }
+
+    public void setStart(long intervalStart) {
+        this.start = intervalStart;
+    }
+
+    public void setEnd(long intervalEnd) {
+        this.end = intervalEnd;
+    }
+
+    public void setLabels(Map<String, String> labels) {
+        this.labels = labels;
+    }
+
+    public void setLayer(Layer layer) {
+        this.layer = layer;
+        this.labels.put("layer", layer.toString());
+    }
+
+    public void setDetails(Map<String, String> details) {
+        this.details = details;
+    }
+
+    @Override
+    public String getSession() {
+        return session;
+    }
+
+    @Override
+    public long getStart() {
+        return start;
+    }
+
+    @Override
+    public long getEnd() {
+        return end;
+    }
+
+    @Override
+    public Layer getLayer() {
+        return this.layer;
+    }
+
+    @Override
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
+    @Override
+    public Map<String, String> getDetails() {
+        return details;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("session: ").append(getSession()).append("\n");
+
+        sb.append("[").append(new Date(getStart()));
+        if (getStart() != getEnd()) {
+            sb.append(" - ").append(new Date(getEnd()));
+        }
+        sb.append("]\n");
+        sb.append("details:\n");
+        formatMap(sb, getDetails());
+        sb.append("labels:\n");
+        formatMap(sb, getLabels());
+        return sb.toString();
+    }
+
+    private void formatMap(StringBuilder sb, Map<String, String> details) {
+        details.forEach((k, v) -> {
+            sb.append(" ").append(k).append(": ");
+            if (v.contains("\n")) {
+                sb.append("\n");
+
+                String[] lines = v.split("\n+");
+                for (String line : lines) {
+                    sb.append("  " + line + "\n");
+                }
+//                Arrays.stream(lines).sequential().map(s -> "  "+s+"\n").forEach(sb::append);
+            } else {
+                sb.append(v).append("\n");
+            }
+        });
+    }
+
+
+    public Annotation asReadOnly() {
+        return this;
+    }
+}
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java
new file mode 100644
index 000000000..adfa377ef
--- /dev/null
+++ b/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java
@@ -0,0 +1,45 @@
+package io.nosqlbench.nb.api.annotations;
+
+import io.nosqlbench.nb.api.Layer;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class AnnotationBuilderTest {
+
+    private static final long time = 1600000000000L;
+
+    @Test
+    public void testBasicAnnotation() {
+
+        Annotation an1 = Annotation.newBuilder()
+                .session("test-session")
+                .at(time)
+                .layer(Layer.Scenario)
+                .label("labelka", "labelvb")
+                .label("labelkc", "labelvd")
+                .detail("detailk1", "detailv1")
+                .detail("detailk2", "detailv21\ndetailv22")
+                .detail("detailk3", "v1\nv2\nv3\n")
+                .build();
+
+        String represented = an1.toString();
+        assertThat(represented).isEqualTo("session: test-session\n" +
+                "[Sun Sep 13 07:26:40 CDT 2020]\n" +
+                "details:\n" +
+                " detailk1: detailv1\n" +
+                " detailk2: \n" +
+                "  detailv21\n" +
+                "  detailv22\n" +
+                " detailk3: \n" +
+                "  v1\n" +
+                "  v2\n" +
+                "  v3\n" +
+                "labels:\n" +
+                " layer: Scenario\n" +
+                " labelka: labelvb\n" +
+                " labelkc: labelvd\n");
+
+    }
+
+}
\ No newline at end of file

From 6c0632fb8d7f80b373779f54b1e49fdd7219efbe Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:35:16 -0600
Subject: [PATCH 038/164] grafana annotator module

---
 .../engine/clients/grafana/GrafanaClient.java | 132 +++++-------
 .../clients/grafana/GrafanaClientConfig.java  | 159 ++++++++++++++
 .../clients/grafana/transfer/Annotations.java |   2 +-
 ...Annotation.java => GrafanaAnnotation.java} |  16 +-
 .../clients/grafana/GrafanaClientTest.java    |  18 +-
 .../core/metrics/GrafanaKeyFileReader.java    |  37 ++++
 .../core/metrics/GrafanaMetricsAnnotator.java | 196 +++++++++++++-----
 7 files changed, 409 insertions(+), 151 deletions(-)
 create mode 100644 engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClientConfig.java
 rename engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/{Annotation.java => GrafanaAnnotation.java} (90%)
 create mode 100644 engine-core/src/main/java/io/nosqlbench/engine/core/metrics/GrafanaKeyFileReader.java

diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClient.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClient.java
index f70a3fd82..597977f81 100644
--- a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClient.java
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClient.java
@@ -2,75 +2,32 @@ package io.nosqlbench.engine.clients.grafana;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import io.nosqlbench.engine.clients.grafana.transfer.Annotation;
+import io.nosqlbench.engine.clients.grafana.transfer.GrafanaAnnotation;
 import io.nosqlbench.engine.clients.grafana.transfer.Annotations;
+import io.nosqlbench.engine.clients.grafana.transfer.ApiTokenRequest;
 
-import java.net.Authenticator;
-import java.net.PasswordAuthentication;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.util.Base64;
 
 /**
  * @see <a href="https://grafana.com/docs/grafana/latest/http_api/annotations/">Grafana Annotations API Docs</a>
  */
 public class GrafanaClient {
 
-    private final URI baseuri;
     private static final Gson gson = new GsonBuilder().setPrettyPrinting().create();
-    Authenticator auth = null;
-    private String username;
-    private String password;
+    private final GrafanaClientConfig config;
 
-    public GrafanaClient(String baseurl) {
-        this.baseuri = initURI(baseurl);
+    public GrafanaClient(GrafanaClientConfig config) {
+        this.config = config;
     }
 
-    public void basicAuth(String username, String password) {
-        this.username = username;
-        this.password = password;
-        this.auth = new Authenticator() {
-            @Override
-            protected PasswordAuthentication getPasswordAuthentication() {
-                return new PasswordAuthentication(username, password.toCharArray());
-            }
-        };
+    public GrafanaClient(String baseuri) {
+        this(new GrafanaClientConfig().setBaseUri(baseuri));
     }
 
-    private URI initURI(String baseurl) {
-        try {
-            URI uri = new URI(baseurl);
-            String userinfo = uri.getRawUserInfo();
-            if (userinfo != null) {
-                String[] unpw = userinfo.split(":");
-                this.username = unpw[0];
-                this.password = unpw[1];
-                uri = new URI(baseurl.replace(userinfo + "@", ""));
-            }
-            return uri;
-        } catch (URISyntaxException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private HttpClient getClient() {
-        HttpClient.Builder cb = HttpClient.newBuilder();
-        if (this.auth != null) {
-            cb.authenticator(auth);
-        }
-        HttpClient client = cb.build();
-        return client;
-    }
-
-    private URI makeUri(String pathAndQuery) {
-        try {
-            return new URI(this.baseuri.toString() + pathAndQuery);
-        } catch (URISyntaxException e) {
-            throw new RuntimeException(e);
-        }
+    public GrafanaClientConfig getConfig() {
+        return config;
     }
 
     /**
@@ -147,12 +104,11 @@ public class GrafanaClient {
     public Annotations findAnnotations(By... by) {
 
         String query = By.fields(by);
-        HttpRequest.Builder rqb = HttpRequest.newBuilder(makeUri("api/annotations?" + query));
-        rqb = addAuth(rqb);
+        HttpRequest.Builder rqb = config.newRequest("api/annotations?" + query);
         rqb.setHeader("Content-Type", "application/json");
         HttpRequest request = rqb.build();
 
-        HttpClient client = getClient();
+        HttpClient client = config.newClient();
         HttpResponse<String> response = null;
 
         try {
@@ -196,14 +152,12 @@ public class GrafanaClient {
      *
      * @return
      */
-    public Annotation createAnnotation(Annotation annotation) {
-        HttpClient client = getClient();
-        HttpRequest.Builder rqb = HttpRequest.newBuilder(makeUri("api/annotations"));
-        rqb = addAuth(rqb);
+    public GrafanaAnnotation createAnnotation(GrafanaAnnotation grafanaAnnotation) {
+        HttpClient client = config.newClient();
+        HttpRequest.Builder rqb = config.newRequest("api/annotations");
         rqb.setHeader("Content-Type", "application/json");
-        String rqBody = gson.toJson(annotation);
+        String rqBody = gson.toJson(grafanaAnnotation);
         rqb = rqb.POST(HttpRequest.BodyPublishers.ofString(rqBody));
-        addAuth(rqb);
 
         HttpResponse<String> response = null;
         try {
@@ -218,22 +172,11 @@ public class GrafanaClient {
         }
         if (response.statusCode() < 200 || response.statusCode() >= 300) {
             throw new RuntimeException("Creating annotation failed with status code " + response.statusCode() + " at " +
-                    "baseurl " + baseuri + ": " + response.body());
+                    "baseuri " + config.getBaseUri() + ": " + response.body());
         }
         String body = response.body();
-        Annotation savedAnnotation = gson.fromJson(body, Annotation.class);
-        return savedAnnotation;
-    }
-
-    private HttpRequest.Builder addAuth(HttpRequest.Builder rqb) {
-        if (this.username != null && this.password != null) {
-            rqb = rqb.setHeader("Authorization", encodeBasicAuth(username, password));
-        }
-        return rqb;
-    }
-
-    private static String encodeBasicAuth(String username, String password) {
-        return "Basic " + Base64.getEncoder().encodeToString((username + ":" + password).getBytes());
+        GrafanaAnnotation savedGrafanaAnnotation = gson.fromJson(body, GrafanaAnnotation.class);
+        return savedGrafanaAnnotation;
     }
 
     /**
@@ -265,8 +208,8 @@ public class GrafanaClient {
      *
      * @return
      */
-    public Annotation createGraphiteAnnotation() {
-        return null;
+    public GrafanaAnnotation createGraphiteAnnotation() {
+        throw new RuntimeException("unimplemented");
     }
 
     /**
@@ -299,7 +242,7 @@ public class GrafanaClient {
      * }</pre>
      */
     public void updateAnnotation() {
-
+        throw new RuntimeException("unimplemented");
     }
 
     /**
@@ -332,7 +275,7 @@ public class GrafanaClient {
      * }</pre>
      */
     public void patchAnnotation() {
-
+        throw new RuntimeException("unimplemented");
     }
 
     /**
@@ -356,7 +299,36 @@ public class GrafanaClient {
      * @param id
      */
     public void deleteAnnotation(long id) {
-
+        throw new RuntimeException("unimplemented");
     }
 
+    public ApiToken createApiToken(String name, String role, long ttl) {
+        ApiTokenRequest r = new ApiTokenRequest(name, role, ttl);
+        ApiToken token = postToGrafana(r, ApiToken.class, "gen api token");
+        return token;
+    }
+
+    private <T> T postToGrafana(Object request, Class<? extends T> clazz, String desc) {
+        HttpRequest rq = config.newJsonPOST("api/auth/keys", request);
+        HttpClient client = config.newClient();
+
+        HttpResponse<String> response = null;
+        try {
+            response = client.send(rq, HttpResponse.BodyHandlers.ofString());
+        } catch (Exception e) {
+            if (e.getMessage().contains("WWW-Authenticate header missing")) {
+                throw new RuntimeException("Java HttpClient was not authorized, and it saw no WWW-Authenticate header" +
+                        " in the response, so this is probably Grafana telling you that the auth scheme failed. Normally " +
+                        "this error would be thrown by Java HttpClient:" + e.getMessage());
+            }
+            throw new RuntimeException(e);
+        }
+        if (response.statusCode() < 200 || response.statusCode() >= 300) {
+            throw new RuntimeException("Request to grafana failed with status code " + response.statusCode() + "\n" +
+                    " while trying to '" + desc + "'\n at baseuri " + config.getBaseUri() + ": " + response.body());
+        }
+        String body = response.body();
+        T result = gson.fromJson(body, clazz);
+        return result;
+    }
 }
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClientConfig.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClientConfig.java
new file mode 100644
index 000000000..1c8893bb4
--- /dev/null
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClientConfig.java
@@ -0,0 +1,159 @@
+package io.nosqlbench.engine.clients.grafana;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+import java.net.Authenticator;
+import java.net.PasswordAuthentication;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.time.Duration;
+import java.util.*;
+import java.util.function.Supplier;
+
+public class GrafanaClientConfig {
+
+    private static final Gson gson = new GsonBuilder().setPrettyPrinting().create();
+
+    @JsonProperty("baseuri")
+    private URI baseUrl;
+
+    @JsonProperty("timeoutms")
+    private int timeoutms;
+
+    private final List<Authenticator> authenticators = new ArrayList<>();
+    //    private LinkedHashMap<String,String> headers = new LinkedHashMap<>();
+    private final List<Supplier<Map<String, String>>> headerSources = new ArrayList<>();
+
+    public GrafanaClientConfig() {
+    }
+
+    public void basicAuth(String username, String pw) {
+        Objects.requireNonNull(username);
+        String authPw = pw != null ? pw : "";
+
+        Authenticator basicAuth = new Authenticator() {
+            @Override
+            protected PasswordAuthentication getPasswordAuthentication() {
+                return new PasswordAuthentication(username, authPw.toCharArray());
+            }
+        };
+
+        addAuthenticator(basicAuth);
+        addHeader("Authorization", encodeBasicAuth(username, authPw));
+    }
+
+
+    public GrafanaClientConfig addAuthenticator(Authenticator authenticator) {
+        authenticators.add(authenticator);
+        return this;
+    }
+
+    public GrafanaClientConfig addHeader(String headername, String... headervals) {
+        String headerVal = String.join(";", Arrays.asList(headervals));
+        addHeaderSource(() -> Map.of(headername, headerVal));
+        return this;
+    }
+
+    /**
+     * Add a dynamic header source to be used for every new request.
+     * Each source provides a map of new headers. If key or value of any
+     * entry is null or empty, that entry is skipped. Otherwise, they are
+     * computed and added to every request anew.
+     *
+     * @param headerSource A source of new headers
+     * @return this GrafanaClientConfig, for method chaining
+     */
+    public GrafanaClientConfig addHeaderSource(Supplier<Map<String, String>> headerSource) {
+        this.headerSources.add(headerSource);
+        return this;
+    }
+
+    public LinkedHashMap<String, String> getHeaders() {
+        LinkedHashMap<String, String> headers = new LinkedHashMap<>();
+        this.headerSources.forEach(hs -> {
+            Map<String, String> entries = hs.get();
+            entries.forEach((k, v) -> {
+                if (k != null && v != null && !k.isEmpty() && !v.isEmpty()) {
+                    headers.put(k, v);
+                }
+            });
+        });
+        return headers;
+    }
+
+    public HttpClient newClient() {
+        HttpClient.Builder cb = HttpClient.newBuilder();
+        cb.connectTimeout(Duration.ofMillis(timeoutms));
+        for (Authenticator authenticator : authenticators) {
+            cb.authenticator(authenticator);
+        }
+        HttpClient client = cb.build();
+        return client;
+    }
+
+    private URI makeUri(String pathAndQuery) {
+        try {
+            return new URI(getBaseUri().toString() + pathAndQuery);
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public HttpRequest.Builder newRequest(String path) {
+        URI requestUri = makeUri(path);
+        HttpRequest.Builder rqb = HttpRequest.newBuilder(requestUri);
+        rqb.timeout(Duration.ofMillis(timeoutms));
+        getHeaders().forEach(rqb::setHeader);
+        return rqb;
+    }
+
+    public GrafanaClientConfig setBaseUri(String baseuri) {
+        try {
+            URI uri = new URI(baseuri);
+            String userinfo = uri.getRawUserInfo();
+            if (userinfo != null) {
+                String[] unpw = userinfo.split(":");
+                basicAuth(unpw[0], unpw.length == 2 ? unpw[1] : "");
+                uri = new URI(baseuri.replace(userinfo + "@", ""));
+            }
+            this.baseUrl = uri;
+
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
+        return this;
+    }
+
+    private static String encodeBasicAuth(String username, String password) {
+        return "Basic " + Base64.getEncoder().encodeToString((username + ":" + password).getBytes());
+    }
+
+    public static GrafanaClientConfig fromJson(CharSequence json) {
+        GrafanaClientConfig grafanaClientConfig = gson.fromJson(json.toString(), GrafanaClientConfig.class);
+        return grafanaClientConfig;
+    }
+
+    public URI getBaseUri() {
+        return baseUrl;
+    }
+
+    public HttpRequest newJsonPOST(String pathAndParams, Object rq) {
+        HttpRequest.Builder rqb = newRequest(pathAndParams);
+        String body = gson.toJson(rq);
+        rqb = rqb.POST(HttpRequest.BodyPublishers.ofString(body));
+        rqb = rqb.setHeader("Content-Type", "application/json");
+        return rqb.build();
+    }
+
+    public int getTimeoutms() {
+        return timeoutms;
+    }
+
+    public void setTimeoutms(int timeoutms) {
+        this.timeoutms = timeoutms;
+    }
+}
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/Annotations.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/Annotations.java
index 02bcc093d..af4b74492 100644
--- a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/Annotations.java
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/Annotations.java
@@ -2,5 +2,5 @@ package io.nosqlbench.engine.clients.grafana.transfer;
 
 import java.util.ArrayList;
 
-public class Annotations extends ArrayList<Annotation> {
+public class Annotations extends ArrayList<GrafanaAnnotation> {
 }
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/Annotation.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GrafanaAnnotation.java
similarity index 90%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/Annotation.java
rename to engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GrafanaAnnotation.java
index 125a1acf6..b492a3a76 100644
--- a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/Annotation.java
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GrafanaAnnotation.java
@@ -1,10 +1,8 @@
 package io.nosqlbench.engine.clients.grafana.transfer;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
-public class Annotation {
+public class GrafanaAnnotation {
 
     private Integer id;
     private Integer alertId;
@@ -19,7 +17,7 @@ public class Annotation {
     private String text;
     private String metric;
     private String type;
-    private List<String> tags = new ArrayList<String>();
+    private Map<String, String> tags = new LinkedHashMap<>();
     private Object data;
 
     public Integer getId() {
@@ -126,18 +124,14 @@ public class Annotation {
         this.type = type;
     }
 
-    public List<String> getTags() {
+    public Map<String, String> getTags() {
         return tags;
     }
 
-    public void setTags(List<String> tags) {
+    public void setTags(Map<String, String> tags) {
         this.tags = tags;
     }
 
-    public void setTags(String tags) {
-        this.tags = Arrays.asList(tags.split("\\\\s,\\\\s"));
-    }
-
     public Object getData() {
         return data;
     }
diff --git a/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/GrafanaClientTest.java b/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/GrafanaClientTest.java
index 09681fa0e..361b0a3ab 100644
--- a/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/GrafanaClientTest.java
+++ b/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/GrafanaClientTest.java
@@ -1,6 +1,6 @@
 package io.nosqlbench.engine.clients.grafana;
 
-import io.nosqlbench.engine.clients.grafana.transfer.Annotation;
+import io.nosqlbench.engine.clients.grafana.transfer.GrafanaAnnotation;
 import io.nosqlbench.engine.clients.grafana.transfer.Annotations;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -12,11 +12,11 @@ public class GrafanaClientTest {
     @Ignore
     public void testCreateAnnotation() {
         GrafanaClient client = new GrafanaClient(testurl);
-        client.basicAuth("admin", "admin");
-        Annotation a = new Annotation();
+        client.getConfig().basicAuth("admin", "admin");
+        GrafanaAnnotation a = new GrafanaAnnotation();
         a.setDashboardId(2);
         a.setText("testingAnnotation");
-        Annotation created = client.createAnnotation(a);
+        GrafanaAnnotation created = client.createAnnotation(a);
         System.out.println(created);
     }
 
@@ -24,9 +24,17 @@ public class GrafanaClientTest {
     @Ignore
     public void testFindAnnotations() {
         GrafanaClient client = new GrafanaClient(testurl);
-        client.basicAuth("admin", "admin");
+        client.getConfig().basicAuth("admin", "admin");
         Annotations annotations = client.findAnnotations(By.id(1));
         System.out.println(annotations);
+    }
 
+    @Test
+    @Ignore
+    public void testGetApiToken() {
+        GrafanaClient client = new GrafanaClient(testurl);
+        client.getConfig().basicAuth("admin", "admin");
+        ApiToken token = client.createApiToken("nosqlbench", "Admin", Long.MAX_VALUE);
+        System.out.println(token);
     }
 }
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/GrafanaKeyFileReader.java b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/GrafanaKeyFileReader.java
new file mode 100644
index 000000000..1c3dc1eba
--- /dev/null
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/GrafanaKeyFileReader.java
@@ -0,0 +1,37 @@
+package io.nosqlbench.engine.core.metrics;
+
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.function.Supplier;
+
+public class GrafanaKeyFileReader implements Supplier<String> {
+    private final static Logger logger = LogManager.getLogger("ANNOTATORS");
+
+    private final Path keyfilePath;
+
+    public GrafanaKeyFileReader(String sourcePath) {
+        this.keyfilePath = Path.of(sourcePath);
+    }
+
+
+    @Override
+    public String get() {
+        if (!Files.exists(keyfilePath)) {
+            logger.warn("apikeyfile does not exist at '" + keyfilePath.toString());
+            return null;
+        } else {
+            try {
+                String apikey = Files.readString(keyfilePath, StandardCharsets.UTF_8);
+                return apikey;
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+}
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/GrafanaMetricsAnnotator.java b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/GrafanaMetricsAnnotator.java
index 8e558b794..00471adee 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/GrafanaMetricsAnnotator.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/GrafanaMetricsAnnotator.java
@@ -1,86 +1,97 @@
 package io.nosqlbench.engine.core.metrics;
 
 import io.nosqlbench.engine.clients.grafana.GrafanaClient;
-import io.nosqlbench.engine.clients.grafana.transfer.Annotation;
-import io.nosqlbench.nb.api.annotation.Annotator;
-import io.nosqlbench.nb.api.config.ConfigAware;
-import io.nosqlbench.nb.api.config.ConfigModel;
-import io.nosqlbench.nb.api.config.MutableConfigModel;
+import io.nosqlbench.engine.clients.grafana.GrafanaClientConfig;
+import io.nosqlbench.engine.clients.grafana.transfer.GrafanaAnnotation;
+import io.nosqlbench.nb.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Annotation;
+import io.nosqlbench.nb.api.annotations.Annotator;
+import io.nosqlbench.nb.api.config.*;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.Supplier;
 
+@Service(value = Annotator.class, selector = "grafana")
 public class GrafanaMetricsAnnotator implements Annotator, ConfigAware {
 
-    private final GrafanaClient client;
+    private final static Logger logger = LogManager.getLogger("ANNOTATORS");
+    private final static Logger annotationsLog = LogManager.getLogger("ANNOTATIONS");
+    private OnError onError = OnError.Warn;
 
-    public GrafanaMetricsAnnotator(String grafanaBaseUrl) {
-        this.client = new GrafanaClient(grafanaBaseUrl);
+    private GrafanaClient client;
+    private Map<String, String> tags = new LinkedHashMap<>();
+
+    public GrafanaMetricsAnnotator() {
     }
 
-
     @Override
-    public void recordAnnotation(String sessionName, long startEpochMillis, long endEpochMillis, Map<String, String> target, Map<String, String> details) {
+    public void recordAnnotation(Annotation annotation) {
+        try {
+            GrafanaAnnotation ga = new GrafanaAnnotation();
 
-        Annotation annotation = new Annotation();
+            ga.setTime(annotation.getStart());
+            ga.setTimeEnd(annotation.getEnd());
 
-        // Target
+            annotation.getLabels().forEach((k, v) -> {
+                ga.getTags().put(k, v);
+            });
+            ga.getTags().put("layer", annotation.getLayer().toString());
 
-        Optional.ofNullable(target.get("type"))
-                .ifPresent(annotation::setType);
+            Map<String, String> labels = annotation.getLabels();
 
-        long startAt = startEpochMillis > 0 ? startEpochMillis : System.currentTimeMillis();
-        annotation.setTime(startAt);
-        annotation.setTimeEnd(endEpochMillis > 0 ? endEpochMillis : startAt);
+            Optional.ofNullable(labels.get("alertId"))
+                    .map(Integer::parseInt).ifPresent(ga::setAlertId);
 
-        String eTime = target.get("timeEnd");
-        annotation.setTimeEnd((eTime != null) ? Long.valueOf(eTime) : null);
+            ga.setData(annotation.toString());
 
-        Optional.ofNullable(target.get("id")).map(Integer::valueOf)
-                .ifPresent(annotation::setId);
+            annotation.getSession();
 
-        Optional.ofNullable(target.get("alertId")).map(Integer::valueOf)
-                .ifPresent(annotation::setAlertId);
 
-        Optional.ofNullable(target.get("dashboardId")).map(Integer::valueOf)
-                .ifPresent(annotation::setDashboardId);
+            // Target
+            Optional.ofNullable(labels.get("type"))
+                    .ifPresent(ga::setType);
 
-        Optional.ofNullable(target.get("panelId")).map(Integer::valueOf)
-                .ifPresent(annotation::setPanelId);
+            Optional.ofNullable(labels.get("id")).map(Integer::valueOf)
+                    .ifPresent(ga::setId);
 
-        Optional.ofNullable(target.get("userId")).map(Integer::valueOf)
-                .ifPresent(annotation::setUserId);
+            Optional.ofNullable(labels.get("alertId")).map(Integer::valueOf)
+                    .ifPresent(ga::setAlertId);
 
-        Optional.ofNullable(target.get("userName"))
-                .ifPresent(annotation::setUserName);
+            Optional.ofNullable(labels.get("dashboardId")).map(Integer::valueOf)
+                    .ifPresent(ga::setDashboardId);
 
-        Optional.ofNullable(target.get("tags"))
-                .ifPresent(annotation::setTags);
+            Optional.ofNullable(labels.get("panelId")).map(Integer::valueOf)
+                    .ifPresent(ga::setPanelId);
 
-        Optional.ofNullable(details.get("metric"))
-                .ifPresent(annotation::setMetric);
+            Optional.ofNullable(labels.get("userId")).map(Integer::valueOf)
+                    .ifPresent(ga::setUserId);
 
-        // Details
+            Optional.ofNullable(labels.get("userName"))
+                    .ifPresent(ga::setUserName);
 
-        StringBuilder sb = new StringBuilder();
-        if (details.containsKey("text")) {
-            annotation.setText(details.get("text"));
-        } else {
-            for (String dkey : details.keySet()) {
-                sb.append(sb).append(": ").append(details.get(dkey)).append("\n");
+            Optional.ofNullable(labels.get("metric"))
+                    .ifPresent(ga::setMetric);
+
+            // Details
+
+            annotationsLog.info("ANNOTATION:" + ga.toString());
+            GrafanaAnnotation created = this.client.createAnnotation(ga);
+
+        } catch (Exception e) {
+            switch (onError) {
+                case Warn:
+                    logger.warn("Error while reporting annotation: " + e.getMessage(), e);
+                    break;
+                case Throw:
+                    throw e;
             }
-            annotation.setText(details.toString());
         }
 
-        Optional.ofNullable(details.get("data"))
-                .ifPresent(annotation::setData);
-
-        Optional.ofNullable(details.get("prevState"))
-                .ifPresent(annotation::setPrevState);
-        Optional.ofNullable(details.get("newState"))
-                .ifPresent(annotation::setNewState);
-
-        Annotation created = this.client.createAnnotation(annotation);
     }
 
     @Override
@@ -89,14 +100,91 @@ public class GrafanaMetricsAnnotator implements Annotator, ConfigAware {
     }
 
     @Override
-    public void applyConfig(Map<String, ?> element) {
+    public void applyConfig(Map<String, ?> providedConfig) {
         ConfigModel configModel = getConfigModel();
+        ConfigReader cfg = configModel.apply(providedConfig);
 
+        GrafanaClientConfig gc = new GrafanaClientConfig();
+        gc.setBaseUri(cfg.param("baseurl", String.class));
 
+        if (cfg.containsKey("tags")) {
+            this.tags = ParamsParser.parse(cfg.param("tags", String.class), false);
+        }
+
+        if (cfg.containsKey("apikeyfile")) {
+            String apikeyfile = cfg.paramEnv("apikeyfile", String.class);
+            AuthWrapper authHeaderSupplier = new AuthWrapper(
+                    "Authorization",
+                    new GrafanaKeyFileReader(apikeyfile),
+                    s -> "Bearer " + s + ";"
+            );
+            gc.addHeaderSource(authHeaderSupplier);
+        }
+
+        if (cfg.containsKey("apikey")) {
+            gc.addHeaderSource(() -> Map.of("Authorization", "Bearer " + cfg.param("apikey", String.class)));
+        }
+
+        if (cfg.containsKey("username")) {
+            if (cfg.containsKey("password")) {
+                gc.basicAuth(
+                        cfg.param("username", String.class),
+                        cfg.param("password", String.class)
+                );
+            } else {
+                gc.basicAuth(cfg.param("username", String.class), "");
+            }
+        }
+
+        this.onError = OnError.valueOfName(cfg.get("onerror").toString());
+
+        this.client = new GrafanaClient(gc);
     }
 
     @Override
     public ConfigModel getConfigModel() {
-        return new MutableConfigModel().add("baseurl", String.class).asReadOnly();
+        return new MutableConfigModel(this)
+                .required("baseurl", String.class,
+                        "The base url of the grafana node, like http://localhost:3000/")
+                .defaultto("apikeyfile", "$NBSTATEDIR/grafana_key",
+                        "The file that contains the api key, supersedes apikey")
+                .optional("apikey", String.class,
+                        "The api key to use, supersedes basic username and password")
+                .optional("username", String.class,
+                        "The username to use for basic auth")
+                .optional("password", String.class,
+                        "The password to use for basic auth")
+                .defaultto("tags", "source:nosqlbench",
+                        "The tags that identify the annotations, in k:v,... form")
+//                .defaultto("onerror", OnError.Warn)
+                .defaultto("onerror", "warn",
+                        "What to do when an error occurs while posting an annotation")
+                .defaultto("timeoutms", 5000,
+                        "connect and transport timeout for the HTTP client")
+                .asReadOnly();
+    }
+
+
+    public static class AuthWrapper implements Supplier<Map<String, String>> {
+
+        private final Function<String, String> valueMapper;
+        private final String headerName;
+        private final Supplier<String> valueSupplier;
+
+        public AuthWrapper(String headerName, Supplier<String> valueSupplier, Function<String, String> valueMapper) {
+            this.headerName = headerName;
+            this.valueSupplier = valueSupplier;
+            this.valueMapper = valueMapper;
+        }
+
+        @Override
+        public Map<String, String> get() {
+            String value = valueSupplier.get();
+            if (value != null) {
+                value = valueMapper.apply(value);
+                return Map.of(headerName, value);
+            }
+            return Map.of();
+        }
     }
 }

From ae419a26d02d7ed0829ec19ec27544fe3d9a03a8 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 16 Nov 2020 17:35:21 -0600
Subject: [PATCH 039/164] logging annotator module

---
 .../engine/core/metrics/LoggingAnnotator.java | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 engine-core/src/main/java/io/nosqlbench/engine/core/metrics/LoggingAnnotator.java

diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/LoggingAnnotator.java b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/LoggingAnnotator.java
new file mode 100644
index 000000000..4926b64c9
--- /dev/null
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/LoggingAnnotator.java
@@ -0,0 +1,60 @@
+package io.nosqlbench.engine.core.metrics;
+
+import io.nosqlbench.nb.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Annotation;
+import io.nosqlbench.nb.api.annotations.Annotator;
+import io.nosqlbench.nb.api.config.ConfigAware;
+import io.nosqlbench.nb.api.config.ConfigModel;
+import io.nosqlbench.nb.api.config.ConfigReader;
+import io.nosqlbench.nb.api.config.MutableConfigModel;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+@Service(value = Annotator.class, selector = "log")
+public class LoggingAnnotator implements Annotator, ConfigAware {
+
+    private final static Logger logger = LogManager.getLogger("ANNOTATORS");
+    private final static Logger annotationsLog = LogManager.getLogger("ANNOTATIONS");
+    private Level level;
+
+    private final Map<String, String> tags = new LinkedHashMap<>();
+
+    public LoggingAnnotator() {
+    }
+
+    @Override
+    public void recordAnnotation(Annotation annotation) {
+        annotationsLog.log(level, annotation.toString());
+    }
+
+    /**
+     * @return The annotated selector of this implementation,
+     * ensuring that selector and name stay the same
+     */
+    @Override
+    public String getName() {
+        String selector = LoggingAnnotator.class.getAnnotation(Service.class).selector();
+        return selector;
+    }
+
+    @Override
+    public void applyConfig(Map<String, ?> providedConfig) {
+        ConfigModel configModel = getConfigModel();
+        ConfigReader cfg = configModel.apply(providedConfig);
+        String levelName = cfg.param("level", String.class);
+        this.level = Level.valueOf(levelName);
+    }
+
+    @Override
+    public ConfigModel getConfigModel() {
+        return new MutableConfigModel(this)
+                .defaultto("level", "INFO",
+                        "The logging level to use for this annotator")
+                .asReadOnly();
+    }
+
+}

From 0ef26c82137744ce9d991af8923a3644e1e29a97 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Tue, 17 Nov 2020 18:08:32 -0600
Subject: [PATCH 040/164] update logger deps for dsegraph

---
 .../com/datastax/ebdrivers/dsegraph/GraphAction.java     | 6 +++---
 .../com/datastax/ebdrivers/dsegraph/GraphActivity.java   | 9 +++------
 .../dsegraph/errorhandling/GraphErrorHandler.java        | 6 +++---
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphAction.java b/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphAction.java
index 576493501..2dff734d6 100644
--- a/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphAction.java
+++ b/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphAction.java
@@ -11,15 +11,15 @@ import io.nosqlbench.engine.api.activityapi.core.ActivityDefObserver;
 import io.nosqlbench.engine.api.activityapi.core.SyncAction;
 import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.List;
 
 @SuppressWarnings("Duplicates")
 public class GraphAction implements SyncAction, ActivityDefObserver {
 
-    private static final Logger logger = LoggerFactory.getLogger(GraphAction.class);
+    private static final Logger logger = LogManager.getLogger(GraphAction.class);
     List<BindableGraphStatement> readyGraphStmts;
     private final int slot;
     private final GraphActivity activity;
diff --git a/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphActivity.java b/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphActivity.java
index efff5f613..51150cd6f 100644
--- a/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphActivity.java
+++ b/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphActivity.java
@@ -17,7 +17,6 @@ import io.nosqlbench.engine.api.activityapi.planning.SequencerType;
 import io.nosqlbench.engine.api.activityconfig.ParsedStmt;
 import io.nosqlbench.engine.api.activityconfig.StatementsLoader;
 import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplate;
-import io.nosqlbench.engine.api.activityconfig.yaml.StmtDef;
 import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.activityimpl.ParameterMap;
@@ -27,8 +26,8 @@ import io.nosqlbench.engine.api.metrics.ExceptionMeterMetrics;
 import io.nosqlbench.engine.api.scripting.NashornEvaluator;
 import io.nosqlbench.engine.api.templating.StrInterpolator;
 import io.nosqlbench.engine.api.util.TagFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -37,12 +36,10 @@ import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
 
 @SuppressWarnings("Duplicates")
 public class GraphActivity extends SimpleActivity implements ActivityDefObserver {
-    private final static Logger logger = LoggerFactory.getLogger(GraphActivity.class);
+    private final static Logger logger = LogManager.getLogger(GraphActivity.class);
 
     public Timer bindTimer;
     public Timer executeTimer;
diff --git a/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/errorhandling/GraphErrorHandler.java b/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/errorhandling/GraphErrorHandler.java
index 971f62fd4..671946e93 100644
--- a/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/errorhandling/GraphErrorHandler.java
+++ b/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/errorhandling/GraphErrorHandler.java
@@ -3,14 +3,14 @@ package com.datastax.ebdrivers.dsegraph.errorhandling;
 import com.datastax.driver.core.exceptions.*;
 import com.datastax.driver.dse.graph.GraphStatement;
 import io.nosqlbench.engine.api.metrics.ExceptionMeterMetrics;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.concurrent.ExecutionException;
 
 @SuppressWarnings("Duplicates")
 public class GraphErrorHandler {
-    private final static Logger logger = LoggerFactory.getLogger(GraphErrorHandler.class);
+    private final static Logger logger = LogManager.getLogger(GraphErrorHandler.class);
 
     private final ErrorResponse realErrorResponse;
     // private final ErrorResponse unappliedResponse;

From 2215fc94edd73c804bf7f3479894e19a0250be73 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Tue, 17 Nov 2020 18:08:35 -0600
Subject: [PATCH 041/164] typos, alignment, cruft

---
 .../java/io/nosqlbench/engine/core/metrics/MetricReporters.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricReporters.java b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricReporters.java
index 1b0a072ec..42528db07 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricReporters.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricReporters.java
@@ -116,7 +116,7 @@ public class MetricReporters implements Shutdownable {
     }
 
     public MetricReporters addLogger() {
-        logger.debug("Adding slf4j reporter for metrics");
+        logger.debug("Adding log4j reporter for metrics");
 
         if (metricRegistries.isEmpty()) {
             throw new RuntimeException("There are no metric registries.");

From b7c246426cc3e9cf03f9d1a837ca787fcb4ff4d8 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Tue, 17 Nov 2020 18:08:39 -0600
Subject: [PATCH 042/164] centralize log4j2 and slf4j stub config

---
 driver-dsegraph-shaded/pom.xml |    6 -
 mvn-defaults/pom.xml           | 1503 ++++++++++++++++----------------
 nb-api/pom.xml                 |  159 ++--
 virtdata-lang/pom.xml          |    9 -
 4 files changed, 832 insertions(+), 845 deletions(-)

diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index 4b34c86fd..da730fc19 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -97,12 +97,6 @@
     <!--            <version>3.7</version>-->
     <!--        </dependency>-->
 
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.25</version>
-    </dependency>
-
     <!-- test only scope -->
 
     <dependency>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 454fc0bd0..97a3d13c5 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -1,770 +1,779 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
 
-    <groupId>io.nosqlbench</groupId>
-    <artifactId>mvn-defaults</artifactId>
-    <version>3.12.156-SNAPSHOT</version>
-    <packaging>pom</packaging>
+  <groupId>io.nosqlbench</groupId>
+  <artifactId>mvn-defaults</artifactId>
+  <version>3.12.156-SNAPSHOT</version>
+  <packaging>pom</packaging>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <javadoc.name>nosqlbench</javadoc.name>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <javadoc.name>nosqlbench</javadoc.name>
 
-        <java.target.version>11</java.target.version>
+    <java.target.version>11</java.target.version>
 
-        <!-- properties for package versions -->
-        <antlr4.version>4.8</antlr4.version>
-        <ascii.data.version>1.2.0</ascii.data.version>
-        <commons.codec.version>1.14</commons.codec.version>
-        <commons.compress.version>1.20</commons.compress.version>
-        <commons.csv.version>1.8</commons.csv.version>
-        <commons.lang.version>3.9</commons.lang.version>
-        <commons.math3.version>3.6.1</commons.math3.version>
-        <commons.text.version>1.8</commons.text.version>
-        <docker.java.version>3.2.1</docker.java.version>
-        <dse.driver.version>1.9.0</dse.driver.version>
-        <flexmark.version>0.61.6</flexmark.version>
-        <greenrobot.version>3.0.0-RC1</greenrobot.version>
-        <hdrhistogram.version>2.1.10</hdrhistogram.version>
-        <jackson.jaxrs.version>2.9.8</jackson.jaxrs.version>
-        <javapoet.version>1.11.1</javapoet.version>
-        <javax.activation.version>1.1.1</javax.activation.version>
-        <javax.ws.rs.version>2.1</javax.ws.rs.version>
-        <jaxb.api.version>2.4.0-b180830.0359</jaxb.api.version>
-        <jaxb.core.version>2.3.0.1</jaxb.core.version>
-        <jaxb.impl.version>2.4.0-b180830.0438</jaxb.impl.version>
-        <jersey.media.version>2.29</jersey.media.version>
-        <jersey.version>2.27</jersey.version>
-        <jetty.version>9.4.25.v20191220</jetty.version>
-        <jmh.version>1.22</jmh.version>
-        <joda.time.version>2.9.9</joda.time.version>
-        <junit.jupiter.version>5.3.2</junit.jupiter.version>
+    <!-- properties for package versions -->
+    <antlr4.version>4.8</antlr4.version>
+    <ascii.data.version>1.2.0</ascii.data.version>
+    <commons.codec.version>1.14</commons.codec.version>
+    <commons.compress.version>1.20</commons.compress.version>
+    <commons.csv.version>1.8</commons.csv.version>
+    <commons.lang.version>3.9</commons.lang.version>
+    <commons.math3.version>3.6.1</commons.math3.version>
+    <commons.text.version>1.8</commons.text.version>
+    <docker.java.version>3.2.1</docker.java.version>
+    <dse.driver.version>1.9.0</dse.driver.version>
+    <flexmark.version>0.61.6</flexmark.version>
+    <greenrobot.version>3.0.0-RC1</greenrobot.version>
+    <hdrhistogram.version>2.1.10</hdrhistogram.version>
+    <jackson.jaxrs.version>2.9.8</jackson.jaxrs.version>
+    <javapoet.version>1.11.1</javapoet.version>
+    <javax.activation.version>1.1.1</javax.activation.version>
+    <javax.ws.rs.version>2.1</javax.ws.rs.version>
+    <jaxb.api.version>2.4.0-b180830.0359</jaxb.api.version>
+    <jaxb.core.version>2.3.0.1</jaxb.core.version>
+    <jaxb.impl.version>2.4.0-b180830.0438</jaxb.impl.version>
+    <jersey.media.version>2.29</jersey.media.version>
+    <jersey.version>2.27</jersey.version>
+    <jetty.version>9.4.25.v20191220</jetty.version>
+    <jmh.version>1.22</jmh.version>
+    <joda.time.version>2.9.9</joda.time.version>
+    <junit.jupiter.version>5.3.2</junit.jupiter.version>
 
-        <lz4.version>1.4.1</lz4.version>
-        <metrics.reservoir.version>1.1.0</metrics.reservoir.version>
-        <metrics.version>4.0.7</metrics.version>
-        <mvel2.version>2.4.10.Final</mvel2.version>
-        <!--        <netty.version>4.1.45.Final</netty.version>-->
-        <netty.version>4.1.47.Final</netty.version>
-        <!--        <netty.version>4.1.31.Final</netty.version>-->
-        <number.to.words.version>1.0.0</number.to.words.version>
-<!--        <slf4j.version>1.7.29</slf4j.version>-->
-        <snakeyaml.version>1.23</snakeyaml.version>
-        <snappy.version>1.1.2.6</snappy.version>
+    <lz4.version>1.4.1</lz4.version>
+    <metrics.reservoir.version>1.1.0</metrics.reservoir.version>
+    <metrics.version>4.0.7</metrics.version>
+    <mvel2.version>2.4.10.Final</mvel2.version>
+    <!--        <netty.version>4.1.45.Final</netty.version>-->
+    <netty.version>4.1.47.Final</netty.version>
+    <!--        <netty.version>4.1.31.Final</netty.version>-->
+    <number.to.words.version>1.0.0</number.to.words.version>
+    <!--        <slf4j.version>1.7.29</slf4j.version>-->
+    <snakeyaml.version>1.23</snakeyaml.version>
+    <snappy.version>1.1.2.6</snappy.version>
 
-        <!-- plugin versions -->
-        <clean.plugin.version>3.1.0</clean.plugin.version>
-        <compiler.plugin.version>3.8.1</compiler.plugin.version>
-        <deploy.plugin.version>3.0.0-M1</deploy.plugin.version>
-        <enforcer.plugin.version>3.0.0-M3</enforcer.plugin.version>
-        <exec.plugin.version>1.6.0</exec.plugin.version>
-        <failsafe.plugin.version>3.0.0-M4</failsafe.plugin.version>
-        <gpg.plugin.version>1.6</gpg.plugin.version>
-        <install.plugin.version>3.0.0-M1</install.plugin.version>
-        <jar.plugin.version>3.1.1</jar.plugin.version>
-        <javadoc.plugin.version>3.1.1</javadoc.plugin.version>
-        <nexus.staging.plugin.version>1.6.8</nexus.staging.plugin.version>
-        <release.plugin.version>2.5.3</release.plugin.version>
-        <resources.plugin.version>3.1.0</resources.plugin.version>
-        <source.plugin.version>3.0.1</source.plugin.version>
-        <surefire.plugin.version>3.0.0-M4</surefire.plugin.version>
-        <graalvm.version>20.1.0</graalvm.version>
-    </properties>
+    <!-- plugin versions -->
+    <clean.plugin.version>3.1.0</clean.plugin.version>
+    <compiler.plugin.version>3.8.1</compiler.plugin.version>
+    <deploy.plugin.version>3.0.0-M1</deploy.plugin.version>
+    <enforcer.plugin.version>3.0.0-M3</enforcer.plugin.version>
+    <exec.plugin.version>1.6.0</exec.plugin.version>
+    <failsafe.plugin.version>3.0.0-M4</failsafe.plugin.version>
+    <gpg.plugin.version>1.6</gpg.plugin.version>
+    <install.plugin.version>3.0.0-M1</install.plugin.version>
+    <jar.plugin.version>3.1.1</jar.plugin.version>
+    <javadoc.plugin.version>3.1.1</javadoc.plugin.version>
+    <nexus.staging.plugin.version>1.6.8</nexus.staging.plugin.version>
+    <release.plugin.version>2.5.3</release.plugin.version>
+    <resources.plugin.version>3.1.0</resources.plugin.version>
+    <source.plugin.version>3.0.1</source.plugin.version>
+    <surefire.plugin.version>3.0.0-M4</surefire.plugin.version>
+    <graalvm.version>20.1.0</graalvm.version>
+  </properties>
 
-    <name>${project.artifactId}</name>
-    <url>http://nosqlbench.io/</url>
-    <description>
-        nosqlbench is the core of a programmable workload simulation runtime.
-        This module acts as the parent pom for nosqlbench Maven modules.
-    </description>
+  <name>${project.artifactId}</name>
+  <url>http://nosqlbench.io/</url>
+  <description>
+    nosqlbench is the core of a programmable workload simulation runtime.
+    This module acts as the parent pom for nosqlbench Maven modules.
+  </description>
 
-    <licenses>
-        <license>
-            <name>The Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-        </license>
-    </licenses>
+  <licenses>
+    <license>
+      <name>The Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
 
-    <issueManagement>
-        <system>GitHub</system>
-        <url>https://github.com/nosqlbench/nosqlbench/issues</url>
-    </issueManagement>
+  <issueManagement>
+    <system>GitHub</system>
+    <url>https://github.com/nosqlbench/nosqlbench/issues</url>
+  </issueManagement>
 
-    <scm>
-        <url>scm:git:https://github.com/nosqlbench/nosqlbench.git</url>
-        <!--        <tag>nosqlbench-2.0.102-SNAPSHOT</tag>-->
-        <tag>HEAD</tag>
-    </scm>
-
-    <dependencyManagement>
-        <dependencies>
-
-            <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <version>5.6.2</version>
-                <artifactId>junit-jupiter</artifactId>
-                <scope>test</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-api</artifactId>
-              <version>2.13.3</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-core</artifactId>
-              <version>2.13.3</version>
-            </dependency>
-
-            <dependency>
-                <groupId>javax.activation</groupId>
-                <artifactId>activation</artifactId>
-                <version>${javax.activation.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.mpierce.metrics.reservoir</groupId>
-                <artifactId>hdrhistogram-metrics-reservoir</artifactId>
-                <version>${metrics.reservoir.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.hdrhistogram</groupId>
-                <artifactId>HdrHistogram</artifactId>
-                <version>${hdrhistogram.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.dropwizard.metrics</groupId>
-                <artifactId>metrics-graphite</artifactId>
-                <version>${metrics.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.dropwizard.metrics</groupId>
-              <artifactId>metrics-core</artifactId>
-              <version>${metrics.version}</version>
-            </dependency>
-
-          <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-text</artifactId>
-            <version>${commons.text.version}</version>
-          </dependency>
-
-          <!--            <dependency>-->
-          <!--                <groupId>org.slf4j</groupId>-->
-          <!--                <artifactId>slf4j-api</artifactId>-->
-          <!--                <version>${slf4j.version}</version>-->
-          <!--            </dependency>-->
-
-          <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-core</artifactId>
-            <version>${jmh.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.yaml</groupId>
-                <artifactId>snakeyaml</artifactId>
-                <version>${snakeyaml.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.mitchtalmadge</groupId>
-                <artifactId>ascii-data</artifactId>
-                <version>${ascii.data.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.datastax.dse</groupId>
-                <artifactId>dse-java-driver-core</artifactId>
-                <version>${dse.driver.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.datastax.dse</groupId>
-                <artifactId>dse-java-driver-extras</artifactId>
-                <version>${dse.driver.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.datastax.dse</groupId>
-                <artifactId>dse-java-driver-mapping</artifactId>
-                <version>${dse.driver.version}</version>
-            </dependency>
-
-            <!-- For CQL compression option -->
-            <dependency>
-                <groupId>org.lz4</groupId>
-                <artifactId>lz4-java</artifactId>
-                <version>${lz4.version}</version>
-            </dependency>
-
-            <!-- For CQL compression option -->
-            <dependency>
-                <groupId>org.xerial.snappy</groupId>
-                <artifactId>snappy-java</artifactId>
-                <version>${snappy.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-handler</artifactId>
-                <version>${netty.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-transport-native-epoll</artifactId>
-                <version>${netty.version}</version>
-                <classifier>linux-x86_64</classifier>
-            </dependency>
-
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-transport-native-kqueue</artifactId>
-                <version>4.1.47.Final</version>
-                <classifier>linux-x86_64</classifier>
-            </dependency>
-
-            <dependency>
-                <groupId>com.github.docker-java</groupId>
-                <artifactId>docker-java-api</artifactId>
-                <version>${docker.java.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.github.docker-java</groupId>
-                <artifactId>docker-java-core</artifactId>
-                <version>${docker.java.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.github.docker-java</groupId>
-                <artifactId>docker-java-transport-okhttp</artifactId>
-                <version>${docker.java.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.github.docker-java</groupId>
-                <artifactId>docker-java</artifactId>
-                <version>${docker.java.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.github.oshi</groupId>
-                <artifactId>oshi-core</artifactId>
-                <version>5.2.2</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.vladsch.flexmark</groupId>
-                <artifactId>flexmark-ext-yaml-front-matter</artifactId>
-                <version>${flexmark.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.vladsch.flexmark</groupId>
-                <artifactId>flexmark-html2md-converter</artifactId>
-                <version>${flexmark.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.google.code.gson</groupId>
-                <artifactId>gson</artifactId>
-                <version>2.8.5</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.elega9t</groupId>
-                <artifactId>number-to-words</artifactId>
-                <version>${number.to.words.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.greenrobot</groupId>
-                <artifactId>essentials</artifactId>
-                <version>${greenrobot.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>${commons.lang.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.squareup</groupId>
-                <artifactId>javapoet</artifactId>
-                <version>${javapoet.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>joda-time</groupId>
-                <artifactId>joda-time</artifactId>
-                <version>${joda.time.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-math3</artifactId>
-                <version>${commons.math3.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-csv</artifactId>
-                <version>${commons.csv.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-codec</groupId>
-                <artifactId>commons-codec</artifactId>
-                <version>${commons.codec.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.mvel</groupId>
-                <artifactId>mvel2</artifactId>
-                <version>${mvel2.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.antlr</groupId>
-                <artifactId>antlr4-runtime</artifactId>
-                <version>${antlr4.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-server</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlets</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-rewrite</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.core</groupId>
-                <artifactId>jersey-server</artifactId>
-                <version>${jersey.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.core</groupId>
-                <artifactId>jersey-common</artifactId>
-                <version>${jersey.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.containers</groupId>
-                <artifactId>jersey-container-jetty-servlet</artifactId>
-                <version>${jersey.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.inject</groupId>
-                <artifactId>jersey-hk2</artifactId>
-                <version>${jersey.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-compress</artifactId>
-                <version>${commons.compress.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>javax.ws.rs</groupId>
-                <artifactId>javax.ws.rs-api</artifactId>
-                <version>${javax.ws.rs.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.glassfish.jersey.media</groupId>
-                <artifactId>jersey-media-json-jackson</artifactId>
-                <version>${jersey.media.version}</version>
-            </dependency>
-
-
-            <dependency>
-                <groupId>com.fasterxml.jackson.jaxrs</groupId>
-                <artifactId>jackson-jaxrs-json-provider</artifactId>
-                <version>${jackson.jaxrs.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>javax.xml.bind</groupId>
-                <artifactId>jaxb-api</artifactId>
-                <version>${jaxb.api.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-core</artifactId>
-                <version>${jaxb.core.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-impl</artifactId>
-                <version>${jaxb.impl.version}</version>
-            </dependency>
-
-            <!-- graalvm -->
-            <dependency>
-                <groupId>org.graalvm.sdk</groupId>
-                <artifactId>graal-sdk</artifactId>
-                <version>${graalvm.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.graalvm.js</groupId>
-                <artifactId>js</artifactId>
-                <version>${graalvm.version}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.graalvm.js</groupId>
-                <artifactId>js-scriptengine</artifactId>
-                <version>${graalvm.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.graalvm.tools</groupId>
-                <artifactId>profiler</artifactId>
-                <version>${graalvm.version}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.graalvm.tools</groupId>
-                <artifactId>chromeinspector</artifactId>
-                <version>${graalvm.version}</version>
-                <scope>runtime</scope>
-            </dependency>
-
-        </dependencies>
-    </dependencyManagement>
+  <scm>
+    <url>scm:git:https://github.com/nosqlbench/nosqlbench.git</url>
+    <!--        <tag>nosqlbench-2.0.102-SNAPSHOT</tag>-->
+    <tag>HEAD</tag>
+  </scm>
 
+  <dependencyManagement>
     <dependencies>
 
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>3.15.0</version>
-            <scope>test</scope>
-        </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <version>5.6.2</version>
+        <artifactId>junit-jupiter</artifactId>
+        <scope>test</scope>
+      </dependency>
 
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-launcher</artifactId>
-            <version>1.6.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <version>5.6.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.6.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>5.6.2</version>
-            <scope>test</scope>
-        </dependency>
+
+      <dependency>
+        <groupId>javax.activation</groupId>
+        <artifactId>activation</artifactId>
+        <version>${javax.activation.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.mpierce.metrics.reservoir</groupId>
+        <artifactId>hdrhistogram-metrics-reservoir</artifactId>
+        <version>${metrics.reservoir.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.hdrhistogram</groupId>
+        <artifactId>HdrHistogram</artifactId>
+        <version>${hdrhistogram.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.dropwizard.metrics</groupId>
+        <artifactId>metrics-graphite</artifactId>
+        <version>${metrics.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.dropwizard.metrics</groupId>
+        <artifactId>metrics-core</artifactId>
+        <version>${metrics.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-text</artifactId>
+        <version>${commons.text.version}</version>
+      </dependency>
+
+      <!--            <dependency>-->
+      <!--                <groupId>org.slf4j</groupId>-->
+      <!--                <artifactId>slf4j-api</artifactId>-->
+      <!--                <version>${slf4j.version}</version>-->
+      <!--            </dependency>-->
+
+      <dependency>
+        <groupId>org.openjdk.jmh</groupId>
+        <artifactId>jmh-core</artifactId>
+        <version>${jmh.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.openjdk.jmh</groupId>
+        <artifactId>jmh-generator-annprocess</artifactId>
+        <version>${jmh.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.yaml</groupId>
+        <artifactId>snakeyaml</artifactId>
+        <version>${snakeyaml.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.mitchtalmadge</groupId>
+        <artifactId>ascii-data</artifactId>
+        <version>${ascii.data.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.datastax.dse</groupId>
+        <artifactId>dse-java-driver-core</artifactId>
+        <version>${dse.driver.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.datastax.dse</groupId>
+        <artifactId>dse-java-driver-extras</artifactId>
+        <version>${dse.driver.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.datastax.dse</groupId>
+        <artifactId>dse-java-driver-mapping</artifactId>
+        <version>${dse.driver.version}</version>
+      </dependency>
+
+      <!-- For CQL compression option -->
+      <dependency>
+        <groupId>org.lz4</groupId>
+        <artifactId>lz4-java</artifactId>
+        <version>${lz4.version}</version>
+      </dependency>
+
+      <!-- For CQL compression option -->
+      <dependency>
+        <groupId>org.xerial.snappy</groupId>
+        <artifactId>snappy-java</artifactId>
+        <version>${snappy.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-handler</artifactId>
+        <version>${netty.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-transport-native-epoll</artifactId>
+        <version>${netty.version}</version>
+        <classifier>linux-x86_64</classifier>
+      </dependency>
+
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-transport-native-kqueue</artifactId>
+        <version>4.1.47.Final</version>
+        <classifier>linux-x86_64</classifier>
+      </dependency>
+
+      <dependency>
+        <groupId>com.github.docker-java</groupId>
+        <artifactId>docker-java-api</artifactId>
+        <version>${docker.java.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.github.docker-java</groupId>
+        <artifactId>docker-java-core</artifactId>
+        <version>${docker.java.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.github.docker-java</groupId>
+        <artifactId>docker-java-transport-okhttp</artifactId>
+        <version>${docker.java.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.github.docker-java</groupId>
+        <artifactId>docker-java</artifactId>
+        <version>${docker.java.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.github.oshi</groupId>
+        <artifactId>oshi-core</artifactId>
+        <version>5.2.2</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.vladsch.flexmark</groupId>
+        <artifactId>flexmark-ext-yaml-front-matter</artifactId>
+        <version>${flexmark.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.vladsch.flexmark</groupId>
+        <artifactId>flexmark-html2md-converter</artifactId>
+        <version>${flexmark.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.google.code.gson</groupId>
+        <artifactId>gson</artifactId>
+        <version>2.8.5</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.elega9t</groupId>
+        <artifactId>number-to-words</artifactId>
+        <version>${number.to.words.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.greenrobot</groupId>
+        <artifactId>essentials</artifactId>
+        <version>${greenrobot.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+        <version>${commons.lang.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.squareup</groupId>
+        <artifactId>javapoet</artifactId>
+        <version>${javapoet.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>joda-time</groupId>
+        <artifactId>joda-time</artifactId>
+        <version>${joda.time.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-math3</artifactId>
+        <version>${commons.math3.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-csv</artifactId>
+        <version>${commons.csv.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-codec</groupId>
+        <artifactId>commons-codec</artifactId>
+        <version>${commons.codec.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mvel</groupId>
+        <artifactId>mvel2</artifactId>
+        <version>${mvel2.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.antlr</groupId>
+        <artifactId>antlr4-runtime</artifactId>
+        <version>${antlr4.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-server</artifactId>
+        <version>${jetty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-servlets</artifactId>
+        <version>${jetty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-servlet</artifactId>
+        <version>${jetty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-rewrite</artifactId>
+        <version>${jetty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.glassfish.jersey.core</groupId>
+        <artifactId>jersey-server</artifactId>
+        <version>${jersey.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.glassfish.jersey.core</groupId>
+        <artifactId>jersey-common</artifactId>
+        <version>${jersey.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.glassfish.jersey.containers</groupId>
+        <artifactId>jersey-container-jetty-servlet</artifactId>
+        <version>${jersey.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.glassfish.jersey.inject</groupId>
+        <artifactId>jersey-hk2</artifactId>
+        <version>${jersey.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-compress</artifactId>
+        <version>${commons.compress.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>javax.ws.rs</groupId>
+        <artifactId>javax.ws.rs-api</artifactId>
+        <version>${javax.ws.rs.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.glassfish.jersey.media</groupId>
+        <artifactId>jersey-media-json-jackson</artifactId>
+        <version>${jersey.media.version}</version>
+      </dependency>
+
+
+      <dependency>
+        <groupId>com.fasterxml.jackson.jaxrs</groupId>
+        <artifactId>jackson-jaxrs-json-provider</artifactId>
+        <version>${jackson.jaxrs.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>javax.xml.bind</groupId>
+        <artifactId>jaxb-api</artifactId>
+        <version>${jaxb.api.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-core</artifactId>
+        <version>${jaxb.core.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-impl</artifactId>
+        <version>${jaxb.impl.version}</version>
+      </dependency>
+
+      <!-- graalvm -->
+      <dependency>
+        <groupId>org.graalvm.sdk</groupId>
+        <artifactId>graal-sdk</artifactId>
+        <version>${graalvm.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.graalvm.js</groupId>
+        <artifactId>js</artifactId>
+        <version>${graalvm.version}</version>
+        <scope>runtime</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.graalvm.js</groupId>
+        <artifactId>js-scriptengine</artifactId>
+        <version>${graalvm.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.graalvm.tools</groupId>
+        <artifactId>profiler</artifactId>
+        <version>${graalvm.version}</version>
+        <scope>runtime</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.graalvm.tools</groupId>
+        <artifactId>chromeinspector</artifactId>
+        <version>${graalvm.version}</version>
+        <scope>runtime</scope>
+      </dependency>
 
     </dependencies>
+  </dependencyManagement>
 
-    <build>
+  <dependencies>
+
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+      <version>2.14.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>2.14.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+      <version>2.14.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>3.15.0</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-launcher</artifactId>
+      <version>1.6.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>5.6.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>5.6.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <version>5.6.2</version>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <debug>true</debug>
+          <!--                    <release>${java.target.version}</release>-->
+          <source>11</source>
+          <target>11</target>
+          <!--                    <compilerArgs>-->
+          <!--                        &#45;&#45;enable-preview-->
+          <!--                    </compilerArgs>-->
+          <!--<compilerArgument>-Xdoclint:all</compilerArgument>-->
+          <!--                    <compilerArgument>-Xlint:all</compilerArgument>-->
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <!--                    <argLine>&#45;&#45;enable-preview</argLine>-->
+          <excludes>
+            <exclude>**/*Integrated*Test*.java</exclude>
+            <exclude>**/*IntegrationTest.java</exclude>
+            <exclude>**/*IntegrationTests.java</exclude>
+          </excludes>
+          <includes>
+            <include>**/*Test*.java</include>
+          </includes>
+          <useSystemClassLoader>false</useSystemClassLoader> <!-- fixes reflection tests -->
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>run-tests</id>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <!--                    <argLine>&#45;&#45;enable-preview</argLine>-->
+          <forkMode>always</forkMode>
+          <includes>
+            <include>**/*Integrated*Test*.java</include>
+            <include>**/*IntegrationTest.java</include>
+            <include>**/*IntegrationTests.java</include>
+          </includes>
+          <properties>
+          </properties>
+        </configuration>
+      </plugin>
+
+      <!-- TODO: make sure the IT settings above work for EB IT-->
+
+      <!-- Javadoc -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <doctitle>${javadoc.name}</doctitle>
+          <windowtitle>${javadoc.name}</windowtitle>
+          <isOffline>false</isOffline>
+          <detectJavaApiLink>false</detectJavaApiLink>
+          <detectLinks>false</detectLinks>
+          <detectOfflineLinks>false</detectOfflineLinks>
+          <!--                    <additionalparam>-Xdoclint:none</additionalparam>-->
+          <additionalOptions>-Xdoclint:none</additionalOptions>
+          <additionalJOption>-Xdoclint:none</additionalJOption>
+          <doclint>none</doclint>
+        </configuration>
+        <executions>
+          <execution>
+            <id>attach-javadoc</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+
+        </executions>
+      </plugin>
+
+      <!-- Sources -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- Distribution -->
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <serverId>ossrh</serverId>
+          <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+          <autoReleaseAfterClose>true</autoReleaseAfterClose>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-gpg-plugin</artifactId>
+      </plugin>
+    </plugins>
+
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>3.3.0</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>${release.plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-gpg-plugin</artifactId>
+          <version>${gpg.plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${surefire.plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <version>${failsafe.plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>${javadoc.plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>${source.plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.sonatype.plugins</groupId>
+          <artifactId>nexus-staging-maven-plugin</artifactId>
+          <version>${nexus.staging.plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.antlr</groupId>
+          <artifactId>antlr4-maven-plugin</artifactId>
+          <version>4.8</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>${exec.plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-enforcer-plugin</artifactId>
+          <version>${enforcer.plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>${clean.plugin.version}</version>
+        </plugin>
+        <!-- see http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>${resources.plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>${jar.plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>${install.plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>${deploy.plugin.version}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
+  </build>
+
+
+  <developers>
+    <developer>
+      <name>Jonathan Shook</name>
+      <email>jshook@gmail.com</email>
+      <organization>nosqlbench.io</organization>
+      <organizationUrl>http://nosqlbench.io/</organizationUrl>
+    </developer>
+    <developer>
+      <name>Sebastián Estévez</name>
+      <email>estevezsebastian@gmail.com</email>
+      <organization>nosqlbench.io</organization>
+      <organizationUrl>http://nosqlbench.io/</organizationUrl>
+    </developer>
+  </developers>
+
+  <distributionManagement>
+    <snapshotRepository>
+      <id>ossrh-snapshot</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+    </snapshotRepository>
+    <repository>
+      <id>ossrh-staging</id>
+      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2
+      </url>
+    </repository>
+  </distributionManagement>
+
+  <profiles>
+    <profile>
+      <id>release</id>
+      <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
+          <!-- Signing -->
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>1.6</version>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+
                 <configuration>
-                    <debug>true</debug>
-<!--                    <release>${java.target.version}</release>-->
-                    <source>11</source>
-                    <target>11</target>
-<!--                    <compilerArgs>-->
-<!--                        &#45;&#45;enable-preview-->
-<!--                    </compilerArgs>-->
-                    <!--<compilerArgument>-Xdoclint:all</compilerArgument>-->
-<!--                    <compilerArgument>-Xlint:all</compilerArgument>-->
+                  <gpgArguments>
+                    <arg>--pinentry-mode</arg>
+                    <arg>loopback</arg>
+                  </gpgArguments>
                 </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-<!--                    <argLine>&#45;&#45;enable-preview</argLine>-->
-                    <excludes>
-                        <exclude>**/*Integrated*Test*.java</exclude>
-                        <exclude>**/*IntegrationTest.java</exclude>
-                        <exclude>**/*IntegrationTests.java</exclude>
-                    </excludes>
-                    <includes>
-                        <include>**/*Test*.java</include>
-                    </includes>
-                    <useSystemClassLoader>false</useSystemClassLoader> <!-- fixes reflection tests -->
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>run-tests</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-<!--                    <argLine>&#45;&#45;enable-preview</argLine>-->
-                    <forkMode>always</forkMode>
-                    <includes>
-                        <include>**/*Integrated*Test*.java</include>
-                        <include>**/*IntegrationTest.java</include>
-                        <include>**/*IntegrationTests.java</include>
-                    </includes>
-                    <properties>
-                    </properties>
-                </configuration>
-            </plugin>
-
-            <!-- TODO: make sure the IT settings above work for EB IT-->
-
-            <!-- Javadoc -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <doctitle>${javadoc.name}</doctitle>
-                    <windowtitle>${javadoc.name}</windowtitle>
-                    <isOffline>false</isOffline>
-                    <detectJavaApiLink>false</detectJavaApiLink>
-                    <detectLinks>false</detectLinks>
-                    <detectOfflineLinks>false</detectOfflineLinks>
-                    <!--                    <additionalparam>-Xdoclint:none</additionalparam>-->
-                    <additionalOptions>-Xdoclint:none</additionalOptions>
-                    <additionalJOption>-Xdoclint:none</additionalJOption>
-                    <doclint>none</doclint>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-javadoc</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-
-                </executions>
-            </plugin>
-
-            <!-- Sources -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- Distribution -->
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <serverId>ossrh</serverId>
-                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-            </plugin>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
+      </build>
+    </profile>
 
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.3.0</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>${release.plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-gpg-plugin</artifactId>
-                    <version>${gpg.plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>${surefire.plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>${failsafe.plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>${javadoc.plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-source-plugin</artifactId>
-                    <version>${source.plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.sonatype.plugins</groupId>
-                    <artifactId>nexus-staging-maven-plugin</artifactId>
-                    <version>${nexus.staging.plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.antlr</groupId>
-                    <artifactId>antlr4-maven-plugin</artifactId>
-                    <version>4.8</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>exec-maven-plugin</artifactId>
-                    <version>${exec.plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>${enforcer.plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-clean-plugin</artifactId>
-                    <version>${clean.plugin.version}</version>
-                </plugin>
-                <!-- see http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>${resources.plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>${jar.plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-install-plugin</artifactId>
-                    <version>${install.plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>${deploy.plugin.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
-    </build>
-
-
-    <developers>
-        <developer>
-            <name>Jonathan Shook</name>
-            <email>jshook@gmail.com</email>
-            <organization>nosqlbench.io</organization>
-            <organizationUrl>http://nosqlbench.io/</organizationUrl>
-        </developer>
-        <developer>
-            <name>Sebastián Estévez</name>
-            <email>estevezsebastian@gmail.com</email>
-            <organization>nosqlbench.io</organization>
-            <organizationUrl>http://nosqlbench.io/</organizationUrl>
-        </developer>
-    </developers>
-
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh-snapshot</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-        <repository>
-            <id>ossrh-staging</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2
-            </url>
-        </repository>
-    </distributionManagement>
-
-    <profiles>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <!-- Signing -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.6</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-
-                                <configuration>
-                                    <gpgArguments>
-                                        <arg>--pinentry-mode</arg>
-                                        <arg>loopback</arg>
-                                    </gpgArguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
+  </profiles>
 </project>
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index a606f48b1..b1ff56ebb 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -1,100 +1,93 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
 
 
-    <parent>
-        <artifactId>mvn-defaults</artifactId>
-        <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
-        <relativePath>../mvn-defaults</relativePath>
-    </parent>
+  <parent>
+    <artifactId>mvn-defaults</artifactId>
+    <groupId>io.nosqlbench</groupId>
+    <version>3.12.156-SNAPSHOT</version>
+    <relativePath>../mvn-defaults</relativePath>
+  </parent>
 
-    <artifactId>nb-api</artifactId>
-    <packaging>jar</packaging>
-    <name>${project.artifactId}</name>
-    <description>
-        The top level API module for NoSQLBench. This module should have no internal
-        module dependencies other than the mvn-default module.
-        All modules within NoSQLBench can safely depend on this module with circular
-        dependencies. This module provides cross-cutting code infrastracture, such as
-        path utilities and ways of describing services used between modules.
-        It is also the transitive aggregation point for system-wide library dependencies
-        for logging and testing or similar needs.
-    </description>
+  <artifactId>nb-api</artifactId>
+  <packaging>jar</packaging>
+  <name>${project.artifactId}</name>
+  <description>
+    The top level API module for NoSQLBench. This module should have no internal
+    module dependencies other than the mvn-default module.
+    All modules within NoSQLBench can safely depend on this module with circular
+    dependencies. This module provides cross-cutting code infrastracture, such as
+    path utilities and ways of describing services used between modules.
+    It is also the transitive aggregation point for system-wide library dependencies
+    for logging and testing or similar needs.
+  </description>
 
-    <dependencies>
+  <dependencies>
 
-        <!-- logging -->
-        <!-- TODO: consolidate to Log4j 2 -->
+    <!-- logging -->
+    <!-- TODO: consolidate to Log4j 2 -->
 
-        <!-- The ONLY upstream module in project from nb-api -->
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>nb-annotations</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
-        </dependency>
+    <!-- The ONLY upstream module in project from nb-api -->
+    <dependency>
+      <groupId>io.nosqlbench</groupId>
+      <artifactId>nb-annotations</artifactId>
+      <version>3.12.156-SNAPSHOT</version>
+    </dependency>
 
-        <dependency>
-            <groupId>com.vladsch.flexmark</groupId>
-            <artifactId>flexmark-ext-yaml-front-matter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.vladsch.flexmark</groupId>
-            <artifactId>flexmark-html2md-converter</artifactId>
-        </dependency>
+    <dependency>
+      <groupId>com.vladsch.flexmark</groupId>
+      <artifactId>flexmark-ext-yaml-front-matter</artifactId>
+    </dependency>
 
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-        </dependency>
+    <dependency>
+      <groupId>com.vladsch.flexmark</groupId>
+      <artifactId>flexmark-html2md-converter</artifactId>
+    </dependency>
 
-      <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-core</artifactId>
-      </dependency>
+    <dependency>
+      <groupId>net.sf.jopt-simple</groupId>
+      <artifactId>jopt-simple</artifactId>
+      <version>5.0.3</version>
+    </dependency>
 
-      <dependency>
-        <groupId>net.sf.jopt-simple</groupId>
-        <artifactId>jopt-simple</artifactId>
-        <version>5.0.3</version>
-      </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+    </dependency>
 
-      <dependency>
-        <groupId>com.google.code.gson</groupId>
-        <artifactId>gson</artifactId>
-      </dependency>
+    <!-- perf testing -->
 
-      <!-- perf testing -->
+    <dependency>
+      <groupId>org.openjdk.jmh</groupId>
+      <artifactId>jmh-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.openjdk.jmh</groupId>
+      <artifactId>jmh-generator-annprocess</artifactId>
+    </dependency>
 
-      <dependency>
-        <groupId>org.openjdk.jmh</groupId>
-        <artifactId>jmh-core</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>org.openjdk.jmh</groupId>
-        <artifactId>jmh-generator-annprocess</artifactId>
-        </dependency>
+    <!-- TODO: Move this down to virtdata if it is the only module group using it -->
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-csv</artifactId>
+    </dependency>
 
-        <!-- TODO: Move this down to virtdata if it is the only module group using it -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-csv</artifactId>
-        </dependency>
+  </dependencies>
 
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <excludes>
-                    <exclude>docs-for-testing-only/**</exclude>
-                </excludes>
-                <includes>
-                    <include>**</include>
-                </includes>
-            </resource>
-        </resources>
-    </build>
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <excludes>
+          <exclude>docs-for-testing-only/**</exclude>
+        </excludes>
+        <includes>
+          <include>**</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
 
 </project>
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index d883e3ac0..f397d8bda 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -20,15 +20,6 @@
             <artifactId>antlr4-runtime</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-        </dependency>
-
     </dependencies>
 
     <build>

From 453070810e4ce5e2608d8308cbabfdef3b8486b1 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Tue, 17 Nov 2020 18:08:43 -0600
Subject: [PATCH 043/164] backfill missing default

---
 .../io/nosqlbench/engine/core/logging/SessionLogConfig.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/logging/SessionLogConfig.java b/engine-core/src/main/java/io/nosqlbench/engine/core/logging/SessionLogConfig.java
index d34221691..cc2cfc53f 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/logging/SessionLogConfig.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/logging/SessionLogConfig.java
@@ -29,7 +29,7 @@ public class SessionLogConfig implements ScenarioLogger {
     private String consolePattern = DEFAULT_CONSOLE_PATTERN;
     //    private final Scenario scenario;
     private Path loggerDir = Path.of("logs");
-    private NBLogLevel logLevel;
+    private NBLogLevel logLevel = NBLogLevel.INFO;
     private int maxLogfiles = 100;
     private Map<String, String> logLevelOverrides = new LinkedHashMap<>();
 

From d0592454e87ddb334be0727531f255ab00b33bdc Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Thu, 19 Nov 2020 16:31:48 -0600
Subject: [PATCH 044/164] typos, alignment, cruft

---
 driver-cqld4/pom.xml | 28 +++++-----------------------
 nb/pom.xml           |  2 +-
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/driver-cqld4/pom.xml b/driver-cqld4/pom.xml
index f6b1252f5..af7c64ddf 100644
--- a/driver-cqld4/pom.xml
+++ b/driver-cqld4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>3.12.155-SNAPSHOT</version>
+        <version>3.12.156-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.155-SNAPSHOT</version>
+            <version>3.12.156-SNAPSHOT</version>
         </dependency>
 
 
@@ -45,25 +45,6 @@
             <version>4.7.2</version>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>com.datastax.dse</groupId>-->
-<!--            <artifactId>dse-java-driver-core</artifactId>-->
-<!--            <version>2.4.0</version>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>com.datastax.dse</groupId>-->
-<!--            <artifactId>dse-java-driver-core</artifactId>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>com.datastax.dse</groupId>-->
-<!--            <artifactId>dse-java-driver-extras</artifactId>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.datastax.dse</groupId>-->
-<!--            <artifactId>dse-java-driver-mapping</artifactId>-->
-<!--        </dependency>-->
 
         <!-- For CQL compression option -->
         <dependency>
@@ -76,10 +57,11 @@
             <groupId>org.xerial.snappy</groupId>
             <artifactId>snappy-java</artifactId>
         </dependency>
+
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>virtdata-lib-basics</artifactId>
-        <version>3.12.155-SNAPSHOT</version>
+          <version>3.12.156-SNAPSHOT</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/nb/pom.xml b/nb/pom.xml
index b2cf78674..4fd7acc83 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -246,7 +246,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cqld4</artifactId>
-          <version>3.12.155-SNAPSHOT</version>
+          <version>3.12.156-SNAPSHOT</version>
         </dependency>
       </dependencies>
     </profile>

From 146686e0b5ad702b3be7c5fe15b862eb45d41b94 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Thu, 19 Nov 2020 16:31:53 -0600
Subject: [PATCH 045/164] simplify custom logging configuration

---
 .../java/io/nosqlbench/engine/cli/NBCLI.java  |  67 ++--
 .../nosqlbench/engine/cli/NBCLIArgsFile.java  |  42 ++-
 .../nosqlbench/engine/cli/NBCLIOptions.java   | 123 ++++----
 .../engine/core/logging/LoggerConfig.java     | 286 +++++++++++++-----
 .../engine/core/logging/ScenarioLogger.java   |  27 --
 .../engine/core/logging/SessionLogConfig.java | 204 -------------
 .../PolyglotMetricRegistryBindings.java       |   6 +-
 .../engine/core/script/Scenario.java          |  17 +-
 .../engine/core/script/ScenariosExecutor.java |  14 +-
 .../resources/ScenarioExecutorEndpoint.java   |   8 +-
 .../io/nosqlbench/nb/api/Environment.java     |  14 +-
 .../script/AsyncScriptIntegrationTests.java   |   9 +-
 .../core/script/ScriptIntegrationTests.java   |   9 +-
 13 files changed, 368 insertions(+), 458 deletions(-)
 delete mode 100644 engine-core/src/main/java/io/nosqlbench/engine/core/logging/ScenarioLogger.java
 delete mode 100644 engine-core/src/main/java/io/nosqlbench/engine/core/logging/SessionLogConfig.java

diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
index 2024aa140..84ca8c070 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
@@ -10,8 +10,6 @@ import io.nosqlbench.engine.api.metrics.ActivityMetrics;
 import io.nosqlbench.engine.core.*;
 import io.nosqlbench.engine.core.annotation.Annotators;
 import io.nosqlbench.engine.core.logging.LoggerConfig;
-import io.nosqlbench.engine.core.logging.SessionLogConfig;
-import io.nosqlbench.engine.core.logging.ScenarioLogger;
 import io.nosqlbench.engine.core.metrics.MetricReporters;
 import io.nosqlbench.engine.core.script.MetricsMapper;
 import io.nosqlbench.engine.core.script.Scenario;
@@ -45,8 +43,12 @@ import java.util.stream.Collectors;
 public class NBCLI {
 
     private static Logger logger;
+    private static LoggerConfig loggerConfig;
 
-    private static final String CHART_HDR_LOG_NAME = "hdrdata-for-chart.log";
+    static {
+        loggerConfig = new LoggerConfig();
+        LoggerConfig.setConfigurationFactory(loggerConfig);
+    }
 
     private final String commandName;
 
@@ -74,13 +76,30 @@ public class NBCLI {
         // Initial logging config covers only command line parsing
         // We don't want anything to go to console here unless it is a real problem
         // as some integrations will depend on a stable and parsable program output
-        LoggerConfig loggerConfig = new LoggerConfig(NBLogLevel.ERROR, NBLogLevel.ERROR);
+//        new LoggerConfig()
+//                .setConsoleLevel(NBLogLevel.INFO.ERROR)
+//                .setLogfileLevel(NBLogLevel.ERROR)
+//                .activate();
+//        logger = LogManager.getLogger("NBCLI");
 
-        ConfigurationFactory.setConfigurationFactory(loggerConfig);
-        logger = LogManager.getLogger("NBCLI");
+        loggerConfig.setConsoleLevel(NBLogLevel.ERROR);
 
         NBCLIOptions globalOptions = new NBCLIOptions(args, NBCLIOptions.Mode.ParseGlobalsOnly);
 
+        loggerConfig
+                .setConsoleLevel(globalOptions.getConsoleLogLevel())
+                .setConsolePattern(globalOptions.getConsoleLoggingPattern())
+                .setLogfileLevel(globalOptions.getScenarioLogLevel())
+                .getLoggerLevelOverrides(globalOptions.getLogLevelOverrides())
+                .setMaxLogs(globalOptions.getLogsMax())
+                .setLogsDirectory(globalOptions.getLogsDirectory())
+                .activate();
+        ConfigurationFactory.setConfigurationFactory(loggerConfig);
+
+        logger = LogManager.getLogger("NBCLI");
+        loggerConfig.purgeOldFiles(LogManager.getLogger("SCENARIO"));
+        logger.info("Configured scenario log at " + loggerConfig.getLogfileLocation());
+
         // Global only processing
         if (args.length == 0) {
             System.out.println(loadHelpFile("commandline.md"));
@@ -139,14 +158,10 @@ public class NBCLI {
         }
 
         NBCLIOptions options = new NBCLIOptions(args);
-        NBIO.addGlobalIncludes(options.wantsIncludes());
-
         String sessionName = new SessionNamer().format(options.getSessionName());
+        logger = LogManager.getLogger("NBCLI");
 
-        SessionLogConfig sessionLogConfig = new SessionLogConfig(sessionName);
-        sessionLogConfig.setConsolePattern(options.getConsoleLoggingPattern());
-        sessionLogConfig.setLevel(options.wantsConsoleLogLevel());
-        sessionLogConfig.start();
+        NBIO.addGlobalIncludes(options.wantsIncludes());
 
         ActivityMetrics.setHdrDigits(options.getHdrDigits());
 
@@ -280,27 +295,27 @@ public class NBCLI {
             if (options.getHistoLoggerConfigs().size() == 0) {
                 logger.info("Adding default histologger configs");
                 String pattern = ".*";
-                String file = CHART_HDR_LOG_NAME;
+                String file = options.getChartHdrFileName();
                 String interval = "1s";
                 options.setHistoLoggerConfigs(pattern, file, interval);
             }
         }
 
         for (
-                NBCLIOptions.LoggerConfig histoLogger : options.getHistoLoggerConfigs()) {
+                NBCLIOptions.LoggerConfigData histoLogger : options.getHistoLoggerConfigs()) {
             ActivityMetrics.addHistoLogger(sessionName, histoLogger.pattern, histoLogger.file, histoLogger.interval);
         }
         for (
-                NBCLIOptions.LoggerConfig statsLogger : options.getStatsLoggerConfigs()) {
+                NBCLIOptions.LoggerConfigData statsLogger : options.getStatsLoggerConfigs()) {
             ActivityMetrics.addStatsLogger(sessionName, statsLogger.pattern, statsLogger.file, statsLogger.interval);
         }
         for (
-                NBCLIOptions.LoggerConfig classicConfigs : options.getClassicHistoConfigs()) {
+                NBCLIOptions.LoggerConfigData classicConfigs : options.getClassicHistoConfigs()) {
             ActivityMetrics.addClassicHistos(sessionName, classicConfigs.pattern, classicConfigs.file, classicConfigs.interval);
         }
 
         // intentionally not shown for warn-only
-        logger.info("console logging level is " + options.wantsConsoleLogLevel());
+        logger.info("console logging level is " + options.getConsoleLogLevel());
 
         ScenariosExecutor executor = new ScenariosExecutor("executor-" + sessionName, 1);
 
@@ -331,13 +346,6 @@ public class NBCLI {
         }
 
 
-        NBLogLevel consoleLogLevel = options.wantsConsoleLogLevel();
-        NBLogLevel scenarioLogLevel = options.getScenarioLogLevel();
-        if (scenarioLogLevel.isGreaterOrEqualTo(consoleLogLevel)) {
-            logger.info("raising scenario logging level to accommodate console logging level");
-        }
-        NBLogLevel maxLevel = NBLogLevel.max(consoleLogLevel, scenarioLogLevel);
-
         // Execute Scenario!
         if (options.getCommands().size() == 0) {
             logger.info("No commands provided. Exiting before scenario.");
@@ -349,16 +357,7 @@ public class NBCLI {
         scriptParams.putAll(buffer.getCombinedParams());
         scenario.addScenarioScriptParams(scriptParams);
 
-        Path scenarioLogPath = SessionLogConfig.composeSessionLogName(options.getLogsDirectory(), scenario.getScenarioName());
-        logger.info("Configuring scenario log at " + scenarioLogPath.toString());
-        ScenarioLogger sl = new SessionLogConfig(scenario.getScenarioName())
-                .setLogDir(options.getLogsDirectory())
-                .setMaxLogs(options.getLogsMax())
-                .setLevel(maxLevel)
-                .setLogLevelOverrides(options.getLogLevelOverrides())
-                .start();
-
-        executor.execute(scenario, sl);
+        executor.execute(scenario);
 
         while (true) {
             Optional<ScenarioResult> pendingResult = executor.getPendingResult(scenario.getScenarioName());
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIArgsFile.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIArgsFile.java
index 0d597a14a..89eb8bb5f 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIArgsFile.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIArgsFile.java
@@ -4,7 +4,6 @@ import io.nosqlbench.nb.api.Environment;
 import io.nosqlbench.nb.api.errors.BasicError;
 import joptsimple.internal.Strings;
 import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -56,7 +55,8 @@ import java.util.stream.Collectors;
  * will cause an error to be thrown.
  */
 public class NBCLIArgsFile {
-    private final static Logger logger = LogManager.getLogger("ARGSFILE");
+    private Logger logger;
+//    = LogManager.getLogger("ARGSFILE");
 
     // Options which may contextualize other CLI options or commands.
     // These must be parsed first
@@ -176,10 +176,14 @@ public class NBCLIArgsFile {
         LinkedHashSet<String> extant = readArgsFile(this.argsPath, Selection.IgnoreIfMissing);
         LinkedHashSet<String> mergedPins = mergePins(this.argsToPin, this.argsToUnpin, extant);
         if (extant.equals(mergedPins)) {
-            logger.info("Pinning resulted in no changes to argsfile '" + this.argsPath.toString() + "'");
+            if (logger != null) {
+                logger.info("Pinning resulted in no changes to argsfile '" + this.argsPath.toString() + "'");
+            }
         } else {
-            logger.info("Writing updated argsfile '" + this.argsPath.toString() + "' with " +
-                    (this.argsToPin.size() + this.argsToUnpin.size()) + " changes");
+            if (logger != null) {
+                logger.info("Writing updated argsfile '" + this.argsPath.toString() + "' with " +
+                        (this.argsToPin.size() + this.argsToUnpin.size()) + " changes");
+            }
             writeArgsFile(mergedPins);
         }
 
@@ -212,19 +216,27 @@ public class NBCLIArgsFile {
 
         for (String toAdd : toPin) {
             if (merged.contains(toAdd)) {
-                logger.warn("Requested to pin argument again: '" + toAdd + "', ignoring");
+                if (logger != null) {
+                    logger.warn("Requested to pin argument again: '" + toAdd + "', ignoring");
+                }
             } else {
-                logger.info("Pinning option '" + toAdd + "' to '" + this.argsPath.toString() + "'");
+                if (logger != null) {
+                    logger.info("Pinning option '" + toAdd + "' to '" + this.argsPath.toString() + "'");
+                }
                 merged.add(toAdd);
             }
         }
 
         for (String toDel : toUnpin) {
             if (merged.contains(toDel)) {
-                logger.info("Unpinning '" + toDel + "' from '" + this.argsPath.toString() + "'");
+                if (logger != null) {
+                    logger.info("Unpinning '" + toDel + "' from '" + this.argsPath.toString() + "'");
+                }
                 merged.remove(toDel);
             } else {
-                logger.warn("Requested to unpin argument '" + toDel + "' which was not found in " + argsPath.toString());
+                if (logger != null) {
+                    logger.warn("Requested to unpin argument '" + toDel + "' which was not found in " + argsPath.toString());
+                }
             }
         }
 
@@ -244,7 +256,9 @@ public class NBCLIArgsFile {
                 .map(p -> {
                     String q = Environment.INSTANCE.interpolate(p).orElse(p);
                     if (!q.equals(p)) {
-                        logger.info("argsfile: '" + argsPath.toString() + "': loaded option '" + p + "' as '" + q + "'");
+                        if (logger != null) {
+                            logger.info("argsfile: '" + argsPath.toString() + "': loaded option '" + p + "' as '" + q + "'");
+                        }
                     }
                     return q;
                 })
@@ -360,7 +374,9 @@ public class NBCLIArgsFile {
                 case ErrorIfMissing:
                     throw new RuntimeException("A required argsfile was specified, but it does not exist: '" + argspath + "'");
                 case WarnIfMissing:
-                    logger.warn("An argsfile was specified, but it does not exist: '" + argspath + "'");
+                    if (logger != null) {
+                        logger.warn("An argsfile was specified, but it does not exist: '" + argspath + "'");
+                    }
                 case IgnoreIfMissing:
             }
             return false;
@@ -390,7 +406,9 @@ public class NBCLIArgsFile {
         }
 
         this.argsPath = selected;
-        logger.debug("argsfile path is now '" + this.argsPath.toString() + "'");
+        if (logger != null) {
+            logger.debug("argsfile path is now '" + this.argsPath.toString() + "'");
+        }
     }
 
     /**
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
index b94d9e913..75e8c59fc 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
@@ -24,7 +24,8 @@ import java.util.stream.Collectors;
  */
 public class NBCLIOptions {
 
-    private final static Logger logger = LogManager.getLogger("OPTIONS");
+//    private final static Logger logger = LogManager.getLogger("OPTIONS");
+
 
     private final static String NB_STATE_DIR = "--statedir";
     private final static String NB_STATEDIR_PATHS = "$NBSTATEDIR:$PWD/.nosqlbench:$HOME/.nosqlbench";
@@ -41,6 +42,8 @@ public class NBCLIOptions {
     private static final String ANNOTATORS_CONFIG = "--annotators";
     private static final String DEFAULT_ANNOTATORS = "all";
 
+    private final static String DEFAULT_CHART_HDR_LOG_NAME = "hdrdata-for-chart.log";
+
     // Discovery
     private static final String HELP = "--help";
     private static final String LIST_METRICS = "--list-metrics";
@@ -144,11 +147,17 @@ public class NBCLIOptions {
     private String statedirs = NB_STATEDIR_PATHS;
     private Path statepath;
     private List<String> statePathAccesses = new ArrayList<>();
+    private String hdrForChartFileName = DEFAULT_CHART_HDR_LOG_NAME;
 
     public String getAnnotatorsConfig() {
         return annotatorsConfig;
     }
 
+
+    public String getChartHdrFileName() {
+        return hdrForChartFileName;
+    }
+
     public enum Mode {
         ParseGlobalsOnly,
         ParseAllOptions
@@ -243,6 +252,18 @@ public class NBCLIOptions {
                     }
                     arglist = argsfile.process(arglist);
                     break;
+                case DASH_V_INFO:
+                    consoleLevel = NBLogLevel.INFO;
+                    arglist.removeFirst();
+                    break;
+                case DASH_VV_DEBUG:
+                    consoleLevel = NBLogLevel.DEBUG;
+                    arglist.removeFirst();
+                    break;
+                case DASH_VVV_TRACE:
+                    consoleLevel = NBLogLevel.TRACE;
+                    arglist.removeFirst();
+                    break;
                 case ANNOTATE_EVENTS:
                     arglist.removeFirst();
                     String toAnnotate = readWordOrThrow(arglist, "annotated events");
@@ -284,6 +305,31 @@ public class NBCLIOptions {
                     arglist.removeFirst();
                     dockerMetrics = true;
                     break;
+                case SESSION_NAME:
+                    arglist.removeFirst();
+                    sessionName = readWordOrThrow(arglist, "a session name");
+                    break;
+                case LOGS_DIR:
+                    arglist.removeFirst();
+                    logsDirectory = readWordOrThrow(arglist, "a log directory");
+                    break;
+                case LOGS_MAX:
+                    arglist.removeFirst();
+                    logsMax = Integer.parseInt(readWordOrThrow(arglist, "max logfiles to keep"));
+                    break;
+                case LOGS_LEVEL:
+                    arglist.removeFirst();
+                    String loglevel = readWordOrThrow(arglist, "a log level");
+                    this.logsLevel = NBLogLevel.valueOfName(loglevel);
+                    break;
+                case LOG_LEVEL_OVERRIDE:
+                    arglist.removeFirst();
+                    logLevelsOverrides = parseLogLevelOverrides(readWordOrThrow(arglist, "log levels in name:LEVEL,... format"));
+                    break;
+                case WITH_LOGGING_PATTERN:
+                    arglist.removeFirst();
+                    consoleLoggingPattern = readWordOrThrow(arglist, "logging pattern");
+                    break;
                 default:
                     nonincludes.addLast(arglist.removeFirst());
             }
@@ -313,7 +359,7 @@ public class NBCLIOptions {
                     selected = path;
                     break;
                 } else {
-                    logger.warn("possible state dir path is not a directory: '" + path.toString() + "'");
+                    System.err.println("ERROR: possible state dir path is not a directory: '" + path.toString() + "'");
                 }
             }
         }
@@ -378,31 +424,10 @@ public class NBCLIOptions {
                     Cmd cmd = Cmd.parseArg(arglist, canonicalizer);
                     wantsMetricsForActivity = cmd.getArg("driver");
                     break;
-                case SESSION_NAME:
-                    arglist.removeFirst();
-                    sessionName = readWordOrThrow(arglist, "a session name");
-                    break;
-                case LOGS_DIR:
-                    arglist.removeFirst();
-                    logsDirectory = readWordOrThrow(arglist, "a log directory");
-                    break;
                 case HDR_DIGITS:
                     arglist.removeFirst();
                     hdr_digits = Integer.parseInt(readWordOrThrow(arglist, "significant digits"));
                     break;
-                case LOGS_MAX:
-                    arglist.removeFirst();
-                    logsMax = Integer.parseInt(readWordOrThrow(arglist, "max logfiles to keep"));
-                    break;
-                case LOGS_LEVEL:
-                    arglist.removeFirst();
-                    String loglevel = readWordOrThrow(arglist, "a log level");
-                    this.logsLevel = NBLogLevel.valueOfName(loglevel);
-                    break;
-                case LOG_LEVEL_OVERRIDE:
-                    arglist.removeFirst();
-                    logLevelsOverrides = parseLogLevelOverrides(readWordOrThrow(arglist, "log levels in name:LEVEL,... format"));
-                    break;
                 case PROGRESS:
                     arglist.removeFirst();
                     progressSpec = readWordOrThrow(arglist, "a progress indicator, like 'log:1m' or 'screen:10s', or just 'log' or 'screen'");
@@ -417,7 +442,6 @@ public class NBCLIOptions {
                     arglist.removeFirst();
                     if (arglist.peekFirst() == null) {
                         wantsBasicHelp = true;
-                        logger.info("getting basic help");
                     } else {
                         wantsActivityHelp = true;
                         wantsActivityHelpFor = readWordOrThrow(arglist, "topic");
@@ -467,22 +491,6 @@ public class NBCLIOptions {
                     arglist.removeFirst();
                     wantsMarkerTypes = true;
                     break;
-                case DASH_V_INFO:
-                    consoleLevel = NBLogLevel.INFO;
-                    arglist.removeFirst();
-                    break;
-                case DASH_VV_DEBUG:
-                    consoleLevel = NBLogLevel.DEBUG;
-                    arglist.removeFirst();
-                    break;
-                case DASH_VVV_TRACE:
-                    consoleLevel = NBLogLevel.TRACE;
-                    arglist.removeFirst();
-                    break;
-                case WITH_LOGGING_PATTERN:
-                    arglist.removeFirst();
-                    consoleLoggingPattern = readWordOrThrow(arglist, "logging pattern");
-                    break;
                 case LIST_SCENARIOS:
                     arglist.removeFirst();
                     wantsScenariosList = true;
@@ -532,20 +540,23 @@ public class NBCLIOptions {
         return graaljs_compat;
     }
 
-    public List<LoggerConfig> getHistoLoggerConfigs() {
-        List<LoggerConfig> configs = histoLoggerConfigs.stream().map(LoggerConfig::new).collect(Collectors.toList());
+    public List<LoggerConfigData> getHistoLoggerConfigs() {
+        List<LoggerConfigData> configs =
+                histoLoggerConfigs.stream().map(LoggerConfigData::new).collect(Collectors.toList());
         checkLoggerConfigs(configs, LOG_HISTOGRAMS);
         return configs;
     }
 
-    public List<LoggerConfig> getStatsLoggerConfigs() {
-        List<LoggerConfig> configs = statsLoggerConfigs.stream().map(LoggerConfig::new).collect(Collectors.toList());
+    public List<LoggerConfigData> getStatsLoggerConfigs() {
+        List<LoggerConfigData> configs =
+                statsLoggerConfigs.stream().map(LoggerConfigData::new).collect(Collectors.toList());
         checkLoggerConfigs(configs, LOG_HISTOSTATS);
         return configs;
     }
 
-    public List<LoggerConfig> getClassicHistoConfigs() {
-        List<LoggerConfig> configs = classicHistoConfigs.stream().map(LoggerConfig::new).collect(Collectors.toList());
+    public List<LoggerConfigData> getClassicHistoConfigs() {
+        List<LoggerConfigData> configs =
+                classicHistoConfigs.stream().map(LoggerConfigData::new).collect(Collectors.toList());
         checkLoggerConfigs(configs, CLASSIC_HISTOGRAMS);
         return configs;
     }
@@ -622,7 +633,7 @@ public class NBCLIOptions {
         return sessionName;
     }
 
-    public NBLogLevel wantsConsoleLogLevel() {
+    public NBLogLevel getConsoleLogLevel() {
         return consoleLevel;
     }
 
@@ -646,11 +657,12 @@ public class NBCLIOptions {
     public String getProgressSpec() {
         ProgressSpec spec = parseProgressSpec(this.progressSpec);// sanity check
         if (spec.indicatorMode == IndicatorMode.console) {
-            if (NBLogLevel.INFO.isGreaterOrEqualTo(wantsConsoleLogLevel())) {
-                logger.warn("Console is already logging info or more, so progress data on console is suppressed.");
+            if (NBLogLevel.INFO.isGreaterOrEqualTo(getConsoleLogLevel())) {
+                System.err.println("Console is already logging info or more, so progress data on console is " +
+                        "suppressed.");
                 spec.indicatorMode = IndicatorMode.logonly;
             } else if (this.getCommands().stream().anyMatch(cmd -> cmd.getCmdType().equals(Cmd.CmdType.script))) {
-                logger.info("Command line includes script calls, so progress data on console is " +
+                System.err.println("Command line includes script calls, so progress data on console is " +
                         "suppressed.");
                 spec.indicatorMode = IndicatorMode.logonly;
             }
@@ -658,11 +670,12 @@ public class NBCLIOptions {
         return spec.toString();
     }
 
-    private void checkLoggerConfigs(List<LoggerConfig> configs, String configName) {
+    private void checkLoggerConfigs(List<LoggerConfigData> configs, String configName) {
         Set<String> files = new HashSet<>();
-        configs.stream().map(LoggerConfig::getFilename).forEach(s -> {
+        configs.stream().map(LoggerConfigData::getFilename).forEach(s -> {
             if (files.contains(s)) {
-                logger.warn(s + " is included in " + configName + " more than once. It will only be included " +
+                System.err.println(s + " is included in " + configName + " more than once. It will only be " +
+                        "included " +
                         "in the first matching config. Reorder your options if you need to control this.");
             }
             files.add(s);
@@ -754,12 +767,12 @@ public class NBCLIOptions {
         return docker_grafana_tag;
     }
 
-    public static class LoggerConfig {
+    public static class LoggerConfigData {
         public String file;
         public String pattern = ".*";
         public String interval = "30 seconds";
 
-        public LoggerConfig(String histoLoggerSpec) {
+        public LoggerConfigData(String histoLoggerSpec) {
             String[] words = histoLoggerSpec.split(":");
             switch (words.length) {
                 case 3:
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/logging/LoggerConfig.java b/engine-core/src/main/java/io/nosqlbench/engine/core/logging/LoggerConfig.java
index 6427ecdb2..882325897 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/logging/LoggerConfig.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/logging/LoggerConfig.java
@@ -2,136 +2,187 @@ package io.nosqlbench.engine.core.logging;
 
 import io.nosqlbench.nb.api.logging.NBLogLevel;
 import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.Filter;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.appender.ConsoleAppender;
 import org.apache.logging.log4j.core.appender.RollingFileAppender;
 import org.apache.logging.log4j.core.config.Configuration;
 import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.apache.logging.log4j.core.config.ConfigurationSource;
-import org.apache.logging.log4j.core.config.builder.api.AppenderComponentBuilder;
-import org.apache.logging.log4j.core.config.builder.api.ComponentBuilder;
-import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder;
-import org.apache.logging.log4j.core.config.builder.api.LayoutComponentBuilder;
+import org.apache.logging.log4j.core.config.builder.api.*;
 import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
 
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
 import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.stream.Collectors;
 
 //@Plugin(name = "CustomConfigurationFactory", category = ConfigurationFactory.CATEGORY)
 //@Order(50)
 // Can't use plugin injection, since we need a tailored instance before logging
 public class LoggerConfig extends ConfigurationFactory {
 
-    private static final String LOG_PATTERN = "%d{DEFAULT}{GMT} [%t] %-5level: %msg%n";
-    private static final String CONSOLE_PATTERN = "%7r %-5level [%t] %-12logger{0} %msg%n%throwable";
-    public static final Level ROOT_LOG_LEVEL = Level.ALL;
-    private final NBLogLevel consoleLevel;
-    private final NBLogLevel fileLevel;
+    /**
+     * ArgsFile
+     * Environment
+     * NBCLIOptions
+     */
+    private static final String DEFAULT_CONSOLE_PATTERN = "%7r %-5level [%t] %-12logger{0} %msg%n%throwable";
+    private String consolePattern = DEFAULT_CONSOLE_PATTERN;
+    private NBLogLevel consoleLevel = NBLogLevel.DEBUG;
 
-    public LoggerConfig(NBLogLevel consoleLevel, NBLogLevel fileLevel) {
-        this.consoleLevel = consoleLevel;
-        this.fileLevel = fileLevel;
+    private static final String DEFAULT_LOGFILE_PATTERN = "%d{DEFAULT}{GMT} [%t] %-5level: %msg%n";
+    private final String logfilePattern = DEFAULT_LOGFILE_PATTERN;
+    private NBLogLevel fileLevel = NBLogLevel.DEBUG;
+
+    public static final Level ROOT_LOG_LEVEL = Level.ALL;
+    private Map<String, String> logLevelOverrides = new LinkedHashMap<>();
+    private Path loggerDir = Path.of("logs");
+    private String sessionName;
+    private int maxLogfiles = 100;
+    private String logfileLocation;
+
+
+    public LoggerConfig() {
     }
 
+    public LoggerConfig setConsoleLevel(NBLogLevel level) {
+        this.consoleLevel = level;
+        return this;
+    }
+
+    public LoggerConfig setLogfileLevel(NBLogLevel level) {
+        this.fileLevel = level;
+        return this;
+    }
+
+    /**
+     * Ensure that what is shown in the logfile includes at a minimum,
+     * everything that is shown on console, but allow it to show more
+     * if configured to do so.
+     */
+    private NBLogLevel getEffectiveFileLevel() {
+        if (fileLevel.isGreaterOrEqualTo(consoleLevel)) {
+            return fileLevel;
+        } else {
+            return consoleLevel;
+        }
+    }
+
+    public LoggerConfig setMaxLogs(int maxLogfiles) {
+        this.maxLogfiles = maxLogfiles;
+        return this;
+    }
+
+
     Configuration createConfiguration(final String name, ConfigurationBuilder<BuiltConfiguration> builder) {
 
         Level internalLoggingStatusThreshold = Level.ERROR;
         Level builderThresholdLevel = Level.INFO;
 //        Level rootLoggingLevel = Level.INFO;
 
+        RootLoggerComponentBuilder rootBuilder = builder.newRootLogger(ROOT_LOG_LEVEL);
+
         builder.setConfigurationName(name);
 
         builder.setStatusLevel(internalLoggingStatusThreshold);
 
-//        builder.add(
-//                builder.newFilter(
-//                        "ThresholdFilter",
-//                        Filter.Result.ACCEPT,
-//                        Filter.Result.NEUTRAL
-//                ).addAttribute("level", builderThresholdLevel)
-//        );
+        builder.add(
+                builder.newFilter(
+                        "ThresholdFilter",
+                        Filter.Result.ACCEPT,
+                        Filter.Result.NEUTRAL
+                ).addAttribute("level", builderThresholdLevel)
+        );
 
         // CONSOLE appender
         AppenderComponentBuilder appenderBuilder =
-                builder.newAppender("Stdout", "CONSOLE")
+                builder.newAppender("console", "CONSOLE")
                         .addAttribute("target", ConsoleAppender.Target.SYSTEM_OUT);
 
         appenderBuilder.add(builder.newLayout("PatternLayout")
-                .addAttribute("pattern", CONSOLE_PATTERN));
+                .addAttribute("pattern", consolePattern));
 
 //        appenderBuilder.add(
 //                builder.newFilter("MarkerFilter", Filter.Result.DENY, Filter.Result.NEUTRAL)
-//                        .addAttribute("marker", "FLOW")
-//        );
+//                        .addAttribute("marker", "FLOW"));
+
         builder.add(appenderBuilder);
 
         // Log4J internal logging
         builder.add(builder.newLogger("org.apache.logging.log4j", Level.DEBUG)
-                .add(builder.newAppenderRef("Stdout"))
+                .add(builder.newAppenderRef("console"))
                 .addAttribute("additivity", false));
 
+        if (sessionName != null) {
 
-        // LOGFILE appender
+            if (!Files.exists(loggerDir)) {
+                try {
+                    Files.createDirectories(loggerDir);
+                } catch (Exception e) {
+                    throw new RuntimeException("Unable to create logger directory:" + loggerDir);
+                }
+            }
 
-        LayoutComponentBuilder logfileLayout = builder.newLayout("PatternLayout")
-                .addAttribute("pattern", LOG_PATTERN);
+            // LOGFILE appender
+            LayoutComponentBuilder logfileLayout = builder.newLayout("PatternLayout")
+                    .addAttribute("pattern", logfilePattern);
 
-        ComponentBuilder triggeringPolicy = builder.newComponent("Policies")
-                .addComponent(builder.newComponent("CronTriggeringPolicy").addAttribute("schedule", "0 0 0 * * ?"))
-                .addComponent(builder.newComponent("SizeBasedTriggeringPolicy").addAttribute("size", "100M"));
+            String filebase = getSessionName().replaceAll("\\s", "_");
+            String logfilePath = loggerDir.resolve(filebase + ".log").toString();
+            this.logfileLocation = logfilePath;
+            String archivePath = loggerDir.resolve(filebase + "-TIMESTAMP.log.gz").toString()
+                    .replaceAll("TIMESTAMP", "%d{MM-dd-yy}");
 
-        AppenderComponentBuilder logsAppenderBuilder =
-                builder.newAppender("LOGS_APPENDER", RollingFileAppender.PLUGIN_NAME)
-                        .addAttribute("fileName", "logs/irengine.log")
-                        .addAttribute("filePattern", "logs/irengine-%d{MM-dd-yy}.log.gz")
-                        .addAttribute("append", true)
-                        .add(logfileLayout)
-                        .addComponent(triggeringPolicy);
-        builder.add(logsAppenderBuilder);
+            ComponentBuilder triggeringPolicy = builder.newComponent("Policies")
+                    .addComponent(builder.newComponent("CronTriggeringPolicy").addAttribute("schedule", "0 0 0 * * ?"))
+                    .addComponent(builder.newComponent("SizeBasedTriggeringPolicy").addAttribute("size", "100M"));
 
-//        LoggerComponentBuilder payloadBuilder =
-//                builder.newLogger(PAYLOADS, Level.TRACE)
-//                        .addAttribute("additivity", false);
-//
-//
-//        if (consoleConfig.isPaylaodsEnabled()) {
-//            payloadBuilder = payloadBuilder.add(builder.newAppenderRef("Stdout").addAttribute("level",
-//                    consoleConfig.getLogLevel()));
-//        }
-//        if (fileConfig.isPaylaodsEnabled()) {
-//            payloadBuilder = payloadBuilder.add(builder.newAppenderRef("LOGS_APPENDER").addAttribute("level",
-//                    fileConfig.getLogLevel()));
-//        }
-//        builder.add(payloadBuilder);
+            AppenderComponentBuilder logsAppenderBuilder =
+                    builder.newAppender("SCENARIO_APPENDER", RollingFileAppender.PLUGIN_NAME)
+                            .addAttribute("fileName", logfilePath)
+                            .addAttribute("filePattern", archivePath)
+                            .addAttribute("append", false)
+                            .add(logfileLayout)
+                            .addComponent(triggeringPolicy);
+            builder.add(logsAppenderBuilder);
 
+            rootBuilder.add(
+                    builder.newAppenderRef("SCENARIO_APPENDER")
+                            .addAttribute("level", Level.valueOf(getEffectiveFileLevel().toString()))
+            );
+        }
 
-//        LoggerComponentBuilder stacktracesBuilder =
-//                builder.newLogger(STACKTRACES, Level.TRACE)
-//                        .addAttribute("additivity", false);
-//        if (consoleConfig.isStackTracesEnabled()) {
-//            stacktracesBuilder = payloadBuilder.add(builder.newAppenderRef("Stdout").addAttribute("level",
-//                    consoleConfig.getLogLevel()));
-//        }
-//        if (fileConfig.isStackTracesEnabled()) {
-//            stacktracesBuilder = payloadBuilder.add(builder.newAppenderRef("LOGS_APPENDER").addAttribute("level",
-//                    fileConfig.getLogLevel()));
-//        }
-//        builder.add(stacktracesBuilder);
-
-        // ROOT logging and appender
-        builder.add(
-                builder.newRootLogger(ROOT_LOG_LEVEL)
-                        .add(
-                                builder.newAppenderRef("Stdout")
-                                        .addAttribute("level", Level.valueOf(consoleLevel.toString()))
-                        )
-                        .add(
-                                builder.newAppenderRef("LOGS_APPENDER")
-                                        .addAttribute("level", Level.valueOf(fileLevel.toString()))
+        rootBuilder.add(
+                builder.newAppenderRef("console")
+                        .addAttribute("level",
+                                Level.valueOf(consoleLevel.toString())
                         )
         );
 
+        builder.add(rootBuilder);
 
-        return builder.build();
+        if (logLevelOverrides != null) {
+            logLevelOverrides.forEach((k, v) -> {
+                Level olevel = Level.valueOf(v);
+                builder.add(builder.newLogger(k, olevel)
+                        .add(builder.newAppenderRef("console"))
+                        .add(builder.newAppenderRef("SCENARIO_APPENDER"))
+                        .addAttribute("additivity", true));
+            });
+        }
+
+        BuiltConfiguration builtConfig = builder.build();
+        return builtConfig;
+    }
+
+    private String getSessionName() {
+        return sessionName;
     }
 
     @Override
@@ -149,4 +200,87 @@ public class LoggerConfig extends ConfigurationFactory {
     protected String[] getSupportedTypes() {
         return new String[]{"*"};
     }
+
+    public void activate() {
+        ConfigurationFactory.setConfigurationFactory(this);
+    }
+
+    public LoggerConfig setConsolePattern(String consoleLoggingPattern) {
+        this.consolePattern = consoleLoggingPattern;
+        return this;
+    }
+
+    public LoggerConfig getLoggerLevelOverrides(Map<String, String> logLevelOverrides) {
+        this.logLevelOverrides = logLevelOverrides;
+        return this;
+    }
+
+    public Map<String, String> getLogLevelOverrides() {
+        return logLevelOverrides;
+    }
+
+    public LoggerConfig setSessionName(String sessionName) {
+        this.sessionName = sessionName;
+        return this;
+    }
+
+    public LoggerConfig purgeOldFiles(Logger logger) {
+        if (maxLogfiles == 0) {
+            logger.debug("Not purging old files, since maxLogFiles is 0.");
+            return this;
+        }
+
+
+        File[] files = loggerDir.toFile().listFiles(new FileFilter() {
+            @Override
+            public boolean accept(File pathname) {
+                return pathname.getPath().endsWith(".log") || pathname.getPath().endsWith(".log.gz");
+            }
+        });
+
+        if (files == null) {
+            return this;
+        }
+
+        List<File> filesList = Arrays.asList(files);
+        int remove = filesList.size() - maxLogfiles;
+        if (remove <= 0) {
+            return this;
+        }
+
+        List<File> toDelete = filesList.stream()
+                .sorted(fileTimeComparator)
+                .limit(remove)
+                .collect(Collectors.toList());
+
+        for (File file : toDelete) {
+            logger.info("removing extra logfile: " + file.getPath());
+            if (!file.delete()) {
+                logger.warn("unable to delete: " + file);
+                try {
+                    Files.delete(file.toPath());
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+        return this;
+    }
+
+    private static final Comparator<File> fileTimeComparator = new Comparator<File>() {
+        @Override
+        public int compare(File o1, File o2) {
+            return Long.compare(o1.lastModified(), o2.lastModified());
+        }
+    };
+
+
+    public String getLogfileLocation() {
+        return logfileLocation;
+    }
+
+    public LoggerConfig setLogsDirectory(Path logsDirectory) {
+        this.loggerDir = logsDirectory;
+        return this;
+    }
 }
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/logging/ScenarioLogger.java b/engine-core/src/main/java/io/nosqlbench/engine/core/logging/ScenarioLogger.java
deleted file mode 100644
index 3cc0b6a9a..000000000
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/logging/ScenarioLogger.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.nosqlbench.engine.core.logging;
-
-import io.nosqlbench.nb.api.logging.NBLogLevel;
-import org.apache.logging.log4j.Logger;
-
-import java.nio.file.Path;
-import java.util.Map;
-
-public interface ScenarioLogger {
-
-    ScenarioLogger setLogDir(Path logDir);
-
-    Path getLogDir();
-
-    ScenarioLogger setMaxLogs(int maxLogfiles);
-
-    void purgeOldFiles(Logger logger);
-
-    ScenarioLogger setLevel(NBLogLevel levelname);
-
-    NBLogLevel getLevel();
-
-    ScenarioLogger start();
-
-    ScenarioLogger setLogLevelOverrides(Map<String, String> logLevelOverrides);
-
-}
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/logging/SessionLogConfig.java b/engine-core/src/main/java/io/nosqlbench/engine/core/logging/SessionLogConfig.java
deleted file mode 100644
index cc2cfc53f..000000000
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/logging/SessionLogConfig.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package io.nosqlbench.engine.core.logging;
-
-import io.nosqlbench.nb.api.logging.NBLogLevel;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.appender.ConsoleAppender;
-import org.apache.logging.log4j.core.config.Configurator;
-import org.apache.logging.log4j.core.config.builder.api.AppenderComponentBuilder;
-import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder;
-import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilderFactory;
-import org.apache.logging.log4j.core.config.builder.api.LayoutComponentBuilder;
-import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
-import org.apache.logging.log4j.spi.LoggerContext;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.*;
-import java.util.stream.Collectors;
-
-public class SessionLogConfig implements ScenarioLogger {
-
-    //    private static final String LOG_PATTERN = "%d{DEFAULT}{GMT} [%t] %-5level: %msg%n";
-    private static final String DEFAULT_CONSOLE_PATTERN = "%7r %-5level [%t] %-12logger{0} %msg%n%throwable";
-    private final String session;
-    private String consolePattern = DEFAULT_CONSOLE_PATTERN;
-    //    private final Scenario scenario;
-    private Path loggerDir = Path.of("logs");
-    private NBLogLevel logLevel = NBLogLevel.INFO;
-    private int maxLogfiles = 100;
-    private Map<String, String> logLevelOverrides = new LinkedHashMap<>();
-
-    public SessionLogConfig(String session) {
-        this.session = session;
-    }
-
-    public ScenarioLogger setConsolePattern(String consolePattern) {
-        this.consolePattern = consolePattern;
-        return this;
-    }
-
-    public String getConsolePattern() {
-        return consolePattern;
-    }
-
-    public void configure() {
-        ConfigurationBuilder<BuiltConfiguration> builder = ConfigurationBuilderFactory.newConfigurationBuilder();
-        builder.setStatusLevel(Level.WARN);
-
-        builder.setConfigurationName("ScenarioLogger");
-
-        // Append simple format to stdout
-
-        AppenderComponentBuilder appenderBuilder =
-                builder.newAppender("console", "CONSOLE")
-                        .addAttribute("target", ConsoleAppender.Target.SYSTEM_OUT);
-
-        appenderBuilder.add(builder.newLayout("PatternLayout")
-                .addAttribute("pattern", consolePattern));
-
-        builder.add(appenderBuilder);
-
-
-// create a rolling file appender
-
-        Path scenarioLog = composeSessionLogName(loggerDir, session);
-
-        LayoutComponentBuilder layoutBuilder = builder.newLayout("PatternLayout")
-//                .addAttribute("pattern", "%d [%t] %-5level: %msg%n");
-                .addAttribute("pattern", "%date %level [%thread] %logger{10} [%file:%line] %msg%n");
-
-        appenderBuilder = builder.newAppender("scenariolog", "File")
-                .addAttribute("fileName", scenarioLog.getFileName())
-                .addAttribute("append", false)
-                .add(layoutBuilder);
-        builder.add(appenderBuilder);
-
-        // Assemble the scenario logger instance
-        Level level = Level.valueOf(logLevel.toString());
-        builder.add(builder.newRootLogger(level)
-                .add(builder.newAppenderRef("console"))
-                .add(builder.newAppenderRef("scenariolog"))
-                .addAttribute("additivity", true));
-
-        logLevelOverrides.forEach((k, v) -> {
-            Level olevel = Level.valueOf(v);
-            builder.add(builder.newLogger(k, olevel)
-                    .add(builder.newAppenderRef("console"))
-                    .add(builder.newAppenderRef("scenariolog"))
-                    .addAttribute("additivity", true));
-        });
-
-        LoggerContext ctx = Configurator.initialize(builder.build());
-    }
-
-    public static Path composeSessionLogName(Path loggerDir, String session) {
-        String logfilePath = loggerDir.toString() + File.separator + ".log";
-        Path resolved = loggerDir.resolve(session.replaceAll("\\s", "_") + ".log");
-        return resolved;
-    }
-
-    @Override
-    public ScenarioLogger setLogDir(Path logDir) {
-        this.loggerDir = logDir;
-        return this;
-    }
-
-    @Override
-    public Path getLogDir() {
-        return this.loggerDir;
-    }
-
-    @Override
-    public ScenarioLogger setMaxLogs(int maxLogfiles) {
-        this.maxLogfiles = maxLogfiles;
-        return this;
-    }
-
-    @Override
-    public void purgeOldFiles(Logger logger) {
-        if (maxLogfiles == 0) {
-            logger.debug("Not purging old files, since maxLogFiles is 0.");
-            return;
-        }
-
-
-        File[] files = loggerDir.toFile().listFiles(new FileFilter() {
-            @Override
-            public boolean accept(File pathname) {
-                return pathname.getPath().endsWith(".log");
-            }
-        });
-        if (files == null) {
-            return;
-        }
-
-        List<File> filesList = Arrays.asList(files);
-        int remove = filesList.size() - maxLogfiles;
-        if (remove <= 0) {
-            return;
-        }
-
-        List<File> toDelete = filesList.stream()
-                .sorted(fileTimeComparator)
-                .limit(remove)
-                .collect(Collectors.toList());
-
-        for (File file : toDelete) {
-            logger.info("removing extra logfile: " + file.getPath());
-            if (!file.delete()) {
-                logger.warn("unable to delete: " + file);
-                try {
-                    Files.delete(file.toPath());
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }
-    }
-
-    private static final Comparator<File> fileTimeComparator = new Comparator<File>() {
-        @Override
-        public int compare(File o1, File o2) {
-            return Long.compare(o1.lastModified(), o2.lastModified());
-        }
-    };
-
-    @Override
-    public ScenarioLogger setLevel(NBLogLevel levelname) {
-        this.logLevel = levelname;
-        return this;
-    }
-
-    @Override
-    public NBLogLevel getLevel() {
-        return logLevel;
-    }
-
-    @Override
-    public ScenarioLogger start() {
-        if (!Files.exists(loggerDir)) {
-            try {
-                Files.createDirectories(loggerDir);
-            } catch (Exception e) {
-                throw new RuntimeException("Unable to create logger directory:" + loggerDir);
-            }
-        }
-
-        configure();
-        org.apache.logging.log4j.Logger logger = LogManager.getLogger("LOGGER");
-
-        purgeOldFiles(logger);
-        return this;
-    }
-
-    @Override
-    public ScenarioLogger setLogLevelOverrides(Map<String, String> logLevelOverrides) {
-        this.logLevelOverrides = logLevelOverrides;
-        return this;
-    }
-}
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/PolyglotMetricRegistryBindings.java b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/PolyglotMetricRegistryBindings.java
index 883f2b88f..33a9bdfc7 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/PolyglotMetricRegistryBindings.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/PolyglotMetricRegistryBindings.java
@@ -30,7 +30,7 @@ import java.util.ArrayList;
  */
 public class PolyglotMetricRegistryBindings implements ProxyObject, MetricRegistryListener {
 
-    private final static Logger logger = LogManager.getLogger(PolyglotMetricRegistryBindings.class);
+    private final static Logger logger = LogManager.getLogger("METRICS");
 
     private final MetricRegistry registry;
     MetricMap metrics = new MetricMap("ROOT",null);
@@ -75,8 +75,8 @@ public class PolyglotMetricRegistryBindings implements ProxyObject, MetricRegist
 
     @Override
     public void onGaugeAdded(String name, Gauge<?> gauge) {
-        metrics.add(name,gauge);
-        logger.info("gauge added: " + name +", " + gauge);
+        metrics.add(name, gauge);
+        logger.info("gauge added: " + name);
     }
 
     @Override
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
index 5df384fc9..9c2efee60 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
@@ -24,7 +24,6 @@ import io.nosqlbench.engine.core.PolyglotScenarioController;
 import io.nosqlbench.engine.core.ScenarioController;
 import io.nosqlbench.engine.core.ScenarioResult;
 import io.nosqlbench.engine.core.annotation.Annotators;
-import io.nosqlbench.engine.core.logging.ScenarioLogger;
 import io.nosqlbench.engine.core.metrics.NashornMetricRegistryBindings;
 import io.nosqlbench.engine.core.metrics.PolyglotMetricRegistryBindings;
 import io.nosqlbench.nb.api.Layer;
@@ -59,7 +58,7 @@ import java.util.stream.Collectors;
 
 public class Scenario implements Callable<ScenarioResult> {
 
-    private static final Logger logger = LogManager.getLogger("SCENARIO");
+    private Logger logger = LogManager.getLogger("SCENARIO");
 
     private State state = State.Scheduled;
 
@@ -79,7 +78,6 @@ public class Scenario implements Callable<ScenarioResult> {
     private boolean wantsGraaljsCompatMode;
     private ScenarioContext scriptEnv;
     private final String scenarioName;
-    private ScenarioLogger scenarioLogger;
     private ScriptParams scenarioScriptParams;
     private String scriptfile;
     private Engine engine = Engine.Graalvm;
@@ -110,6 +108,15 @@ public class Scenario implements Callable<ScenarioResult> {
         this.wantsCompiledScript = wantsCompiledScript;
     }
 
+    public Scenario setLogger(Logger logger) {
+        this.logger = logger;
+        return this;
+    }
+
+    public Logger getLogger() {
+        return logger;
+    }
+
     public Scenario(String name, Engine engine) {
         this.scenarioName = name;
         this.engine = engine;
@@ -353,10 +360,6 @@ public class Scenario implements Callable<ScenarioResult> {
         return "name:'" + this.getScenarioName() + "'";
     }
 
-    public void setScenarioLogger(ScenarioLogger scenarioLogger) {
-        this.scenarioLogger = scenarioLogger;
-    }
-
     public void addScenarioScriptParams(ScriptParams scenarioScriptParams) {
         this.scenarioScriptParams = scenarioScriptParams;
     }
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java
index 6a0c2927f..4617ed900 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java
@@ -21,20 +21,17 @@ import io.nosqlbench.engine.core.IndexedThreadFactory;
 import io.nosqlbench.engine.core.ScenarioController;
 import io.nosqlbench.engine.core.ScenarioResult;
 import io.nosqlbench.engine.core.ScenariosResults;
-import io.nosqlbench.engine.core.logging.SessionLogConfig;
-import io.nosqlbench.engine.core.logging.ScenarioLogger;
 import io.nosqlbench.nb.api.errors.BasicError;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.nio.file.Path;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
 public class ScenariosExecutor {
 
-    private final static Logger logger = LogManager.getLogger(ScenariosExecutor.class);
+    private final Logger logger = LogManager.getLogger("SCENARIOS");
     private final LinkedHashMap<String, SubmittedScenario> submitted = new LinkedHashMap<>();
 
     private final ExecutorService executor;
@@ -54,15 +51,6 @@ public class ScenariosExecutor {
     }
 
     public synchronized void execute(Scenario scenario) {
-        ScenarioLogger logs = new SessionLogConfig(scenario.getScenarioName())
-                .setLogDir(Path.of("logs"))
-                .setMaxLogs(0)
-                .start();
-        execute(scenario, logs);
-    }
-
-    public synchronized void execute(Scenario scenario, ScenarioLogger scenarioLogger) {
-        scenario.setScenarioLogger(scenarioLogger);
         if (submitted.get(scenario.getScenarioName()) != null) {
             throw new BasicError("Scenario " + scenario.getScenarioName() + " is already defined. Remove it first to reuse the name.");
         }
diff --git a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java
index d28f7fdae..d75cf7afe 100644
--- a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java
+++ b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java
@@ -6,8 +6,6 @@ import io.nosqlbench.engine.cli.Cmd;
 import io.nosqlbench.engine.cli.NBCLICommandParser;
 import io.nosqlbench.engine.cli.ScriptBuffer;
 import io.nosqlbench.engine.core.ScenarioResult;
-import io.nosqlbench.engine.core.logging.SessionLogConfig;
-import io.nosqlbench.engine.core.logging.ScenarioLogger;
 import io.nosqlbench.engine.core.script.Scenario;
 import io.nosqlbench.engine.core.script.ScenariosExecutor;
 import io.nosqlbench.engine.rest.services.WorkSpace;
@@ -115,11 +113,7 @@ public class ScenarioExecutorEndpoint implements WebServiceObject {
 
         scenario.addScriptText(buffer.getParsedScript());
 
-        ScenarioLogger logger = new SessionLogConfig(scenario.getScenarioName())
-                .setLogDir(workspace.getWorkspacePath().resolve("logs"))
-                .start();
-
-        executor.execute(scenario, logger);
+        executor.execute(scenario);
 
         return Response.created(UriBuilder.fromResource(ScenarioExecutorEndpoint.class).path(
                 "scenario/" + rq.getScenarioName()).build()).entity("started").build();
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/Environment.java b/nb-api/src/main/java/io/nosqlbench/nb/api/Environment.java
index 4d92c0c93..a817f2ca5 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/Environment.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/Environment.java
@@ -36,7 +36,7 @@ import java.util.regex.Pattern;
  * invalid in this API, except when provided as a default value.
  */
 public class Environment {
-    private final static Logger logger = LogManager.getLogger("ENVIRONMENT");
+    private Logger logger;
 
     // package private for testing
     Environment() {
@@ -66,7 +66,9 @@ public class Environment {
         }
         if (references.containsKey(propname)) {
             if (references.get(propname).equals(value)) {
-                logger.warn("changing already referenced property '" + propname + "' to same value");
+                if (logger != null) {
+                    logger.warn("changing already referenced property '" + propname + "' to same value");
+                }
             } else {
                 throw new BasicError("Changing already referenced property '" + propname + "' from \n" +
                         "'" + references.get(propname) + "' to '" + value + "' is not supported.\n" +
@@ -108,7 +110,9 @@ public class Environment {
         }
         if (envToProp.containsKey(name.toUpperCase())) {
             String propName = envToProp.get(name.toUpperCase());
-            logger.debug("redirecting env var '" + name + "' to property '" + propName + "'");
+            if (logger != null) {
+                logger.debug("redirecting env var '" + name + "' to property '" + propName + "'");
+            }
             value = System.getProperty(propName);
             if (value != null) {
                 return value;
@@ -173,7 +177,9 @@ public class Environment {
             }
             String value = peek(envvar);
             if (value == null) {
-                logger.debug("no value found for '" + envvar + "', returning Optional.empty() for '" + word + "'");
+                if (logger != null) {
+                    logger.debug("no value found for '" + envvar + "', returning Optional.empty() for '" + word + "'");
+                }
                 return Optional.empty();
             } else {
                 value = reference(envvar, value);
diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java b/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
index dddc9c0a3..c10ce239f 100644
--- a/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
+++ b/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
@@ -19,8 +19,6 @@ package io.nosqlbench.engine.core.script;
 
 import io.nosqlbench.engine.core.ScenarioResult;
 import io.nosqlbench.engine.core.ScenariosResults;
-import io.nosqlbench.engine.core.logging.SessionLogConfig;
-import io.nosqlbench.engine.core.logging.ScenarioLogger;
 import org.apache.commons.compress.utils.IOUtils;
 import org.assertj.core.data.Offset;
 import org.junit.BeforeClass;
@@ -30,7 +28,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.List;
@@ -69,11 +66,7 @@ public class AsyncScriptIntegrationTests {
         }
         s.addScriptText(script);
 //        s.addScriptText("load('classpath:scripts/async/" + scriptname + ".js');");
-        ScenarioLogger scenarioLogger = new SessionLogConfig(scenarioName)
-                .setMaxLogs(0)
-                .setLogDir(Path.of("logs/test"))
-                .start();
-        e.execute(s, scenarioLogger);
+        e.execute(s);
         ScenariosResults scenariosResults = e.awaitAllResults();
         ScenarioResult scenarioResult = scenariosResults.getOne();
         scenarioResult.reportToLog();
diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/ScriptIntegrationTests.java b/nb/src/test/java/io/nosqlbench/engine/core/script/ScriptIntegrationTests.java
index 5d210b544..da13c4bd8 100644
--- a/nb/src/test/java/io/nosqlbench/engine/core/script/ScriptIntegrationTests.java
+++ b/nb/src/test/java/io/nosqlbench/engine/core/script/ScriptIntegrationTests.java
@@ -19,8 +19,6 @@ package io.nosqlbench.engine.core.script;
 
 import io.nosqlbench.engine.core.ScenarioResult;
 import io.nosqlbench.engine.core.ScenariosResults;
-import io.nosqlbench.engine.core.logging.SessionLogConfig;
-import io.nosqlbench.engine.core.logging.ScenarioLogger;
 import org.apache.commons.compress.utils.IOUtils;
 import org.assertj.core.data.Offset;
 import org.junit.BeforeClass;
@@ -29,7 +27,6 @@ import org.junit.Test;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -64,11 +61,7 @@ public class ScriptIntegrationTests {
         }
         s.addScriptText(script);
 //        s.addScriptText("load('classpath:scripts/sync/" + scriptname + ".js');");
-        ScenarioLogger scenarioLogger = new SessionLogConfig(scenarioName)
-                .setMaxLogs(0)
-                .setLogDir(Path.of("logs/test"))
-                .start();
-        e.execute(s, scenarioLogger);
+        e.execute(s);
         ScenariosResults scenariosResults = e.awaitAllResults();
         ScenarioResult scenarioResult = scenariosResults.getOne();
         scenarioResult.reportToLog();

From 3f65a054636f30bf19f3f27889528954121a43d5 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Thu, 19 Nov 2020 16:31:58 -0600
Subject: [PATCH 046/164] console friendly metrics summary

---
 .../io/nosqlbench/engine/core/ScenarioResult.java | 15 ++++++++++++++-
 .../nosqlbench/engine/core/ScenariosResults.java  |  2 ++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioResult.java b/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioResult.java
index 61e491e01..c86330606 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioResult.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioResult.java
@@ -18,6 +18,7 @@
 
 package io.nosqlbench.engine.core;
 
+import com.codahale.metrics.ConsoleReporter;
 import com.codahale.metrics.MetricFilter;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
 import io.nosqlbench.engine.core.logging.Log4JMetricsReporter;
@@ -44,6 +45,7 @@ public class ScenarioResult {
     }
 
     public void reportToLog() {
+
         logger.info("-- BEGIN METRICS DETAIL --");
         Log4JMetricsReporter reporter = Log4JMetricsReporter.forRegistry(ActivityMetrics.getMetricRegistry())
                 .convertDurationsTo(TimeUnit.MICROSECONDS)
@@ -56,13 +58,23 @@ public class ScenarioResult {
 
     }
 
+    public void reportToConsole() {
+        ConsoleReporter consoleReporter = ConsoleReporter.forRegistry(ActivityMetrics.getMetricRegistry())
+                .convertDurationsTo(TimeUnit.MICROSECONDS)
+                .convertRatesTo(TimeUnit.SECONDS)
+                .filter(MetricFilter.ALL)
+                .outputTo(System.out)
+                .build();
+        consoleReporter.report();
+    }
+
 
     public Optional<Exception> getException() {
         return Optional.ofNullable(exception);
     }
 
     public void rethrowIfError() {
-        if (exception!=null) {
+        if (exception != null) {
             if (exception instanceof RuntimeException) {
                 throw ((RuntimeException) exception);
             } else {
@@ -74,4 +86,5 @@ public class ScenarioResult {
     public String getIOLog() {
         return this.iolog;
     }
+
 }
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenariosResults.java b/engine-core/src/main/java/io/nosqlbench/engine/core/ScenariosResults.java
index bcaa05a26..12e07e822 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenariosResults.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/ScenariosResults.java
@@ -67,9 +67,11 @@ public class ScenariosResults {
 
             if (oresult != null) {
                 oresult.reportToLog();
+                oresult.reportToConsole();
             } else {
                 logger.error(scenario.getScenarioName() + ": incomplete (missing result)");
             }
+
         }
     }
 

From 7e880b91921260be17a4eef1647612fa581970f0 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Thu, 19 Nov 2020 16:32:40 -0600
Subject: [PATCH 047/164] experimental grammar

---
 .../virtdata/lang/oldgrammars/Config.g4       | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/Config.g4

diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/Config.g4 b/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/Config.g4
new file mode 100644
index 000000000..a5bc42782
--- /dev/null
+++ b/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/Config.g4
@@ -0,0 +1,60 @@
+grammar Config;
+// https://www.youtube.com/watch?v=eW4WFgRtFeY
+
+config : OPEN_BRACE? assignments CLOSE_BRACE?;
+scope : OPEN_BRACE assignments CLOSE_BRACE;
+assignments : assignment? ( COMMA assignment )* ;
+assignment :
+  (ID OPEN_BRACE cval CLOSE_BRACE)
+  | (ID ASSIGN cval)
+  | ( ID ASSIGN? scope );
+
+ASSIGN : '=' | ':' ;
+OPEN_BRACE : '{';
+CLOSE_BRACE : '}';
+COMMA : ',';
+
+ID: IDPART ('.' IDPART)* ;
+IDPART:  ( ( [a-zA-Z] [0-9a-zA-Z_]* )
+ | ( [a-zA-Z] [0-9a-zA-Z_]* '-' [0-9a-zA-Z_]) )
+ ;
+
+NEWLINE   : '\r' '\n' | '\n' | '\r';
+
+cval : ( realNumber | wholeNumber | booleanValue | stringValue | hexValue);
+
+realNumber: FLOAT;
+wholeNumber: INTEGER;
+booleanValue: BOOLEAN;
+stringValue : SSTRING_LITERAL | DSTRING_LITERAL | RAW_SCOPE_LITERAL;
+hexValue : HEX_LITERAL;
+
+LONG : '-'? INT ('l'|'L') ;
+DOUBLE    :   ('-'? INT '.' '0'* INT EXP? | '-'? INT EXP | '-'? INT ) ('d'|'D') ;
+INTEGER : '-'? INT ;
+FLOAT
+    :    '-'? INT '.' INT EXP?   // 1.35, 1.35E-9, 0.3, -4.5
+    |   '-'? INT EXP            // 1e10 -3e4
+    |   '-'? INT    // -3, 45
+    ;
+BOOLEAN : 'true' | 'false';
+HEX_LITERAL: '0' ('x'|'X') HEX_CHAR+ ;
+fragment HEX_CHAR: [0123456789ABCDEFabcdef_];
+
+fragment INT :   '0' | [1-9] [0-9]* ; // no leading zeros
+fragment ZINT : [0-9]* ; // leading zeroes
+fragment EXP :   [Ee] [+\-]? INT ;
+
+SSTRING_LITERAL : '\'' (~('\'' | '\\' | '\r' | '\n') | '\\' ('\'' | '\\' | . ))* '\'';
+DSTRING_LITERAL :
+  '"'
+  (
+    ~('"' | '\\' | '\r' | '\n')
+    | '\\' ('"' | '\\' | .)
+  )*
+  '"';
+
+fragment RAW_SCOPE_LITERAL: ~('}' | '\r' | '\n')+;
+fragment RAW_BASIC_LITERAL : ~('"' | '\\' | '\r' | '\n')+;
+
+WS : [\u000C \t\n]+ -> channel(HIDDEN);

From 2752fa50b5adea8050b61e4b1439a79f8999c3c3 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Thu, 19 Nov 2020 16:51:38 -0600
Subject: [PATCH 048/164] bump major version to 4.0.0-SNAPSHOT

---
 docsys/pom.xml                 |  6 +++---
 driver-cql-shaded/pom.xml      |  6 +++---
 driver-cqld4/pom.xml           |  8 +++----
 driver-cqlverify/pom.xml       |  6 +++---
 driver-diag/pom.xml            |  6 +++---
 driver-dsegraph-shaded/pom.xml |  6 +++---
 driver-http/pom.xml            |  6 +++---
 driver-jmx/pom.xml             |  6 +++---
 driver-kafka/pom.xml           |  6 +++---
 driver-mongodb/pom.xml         |  6 +++---
 driver-stdout/pom.xml          |  6 +++---
 driver-tcp/pom.xml             |  8 +++----
 driver-web/pom.xml             |  6 +++---
 drivers-api/pom.xml            |  6 +++---
 engine-api/pom.xml             | 10 ++++-----
 engine-cli/pom.xml             |  6 +++---
 engine-clients/pom.xml         |  4 ++--
 engine-core/pom.xml            |  8 +++----
 engine-docker/pom.xml          |  4 ++--
 engine-docs/pom.xml            |  4 ++--
 engine-extensions/pom.xml      |  4 ++--
 engine-rest/pom.xml            |  4 ++--
 mvn-defaults/pom.xml           |  2 +-
 nb-annotations/pom.xml         |  2 +-
 nb-api/pom.xml                 |  4 ++--
 nb/pom.xml                     | 38 +++++++++++++++++-----------------
 pom.xml                        |  2 +-
 virtdata-api/pom.xml           |  6 +++---
 virtdata-lang/pom.xml          |  2 +-
 virtdata-lib-basics/pom.xml    |  4 ++--
 virtdata-lib-curves4/pom.xml   |  6 +++---
 virtdata-lib-random/pom.xml    |  6 +++---
 virtdata-lib-realer/pom.xml    |  4 ++--
 virtdata-realdata/pom.xml      |  4 ++--
 virtdata-userlibs/pom.xml      | 16 +++++++-------
 35 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/docsys/pom.xml b/docsys/pom.xml
index 4132f7f06..7eebb773c 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index 167c4fcd3..7db495c03 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-cqld4/pom.xml b/driver-cqld4/pom.xml
index af7c64ddf..a7ed99184 100644
--- a/driver-cqld4/pom.xml
+++ b/driver-cqld4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
 
@@ -61,7 +61,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>virtdata-lib-basics</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index 1eff45d60..fa0ca8512 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>3.12.156-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cql-shaded</artifactId>
-      <version>3.12.156-SNAPSHOT</version>
+      <version>4.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>3.12.156-SNAPSHOT</version>
+      <version>4.0.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index 8ade8e231..806dbf7b5 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index da730fc19..fdf041a23 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>3.12.156-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -25,13 +25,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>3.12.156-SNAPSHOT</version>
+      <version>4.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>3.12.156-SNAPSHOT</version>
+      <version>4.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index 4ddb3cf98..9664f160d 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index c299cd5bb..54280f347 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index f2bc01595..d30e3b1f3 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -44,13 +44,13 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-api</artifactId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>driver-stdout</artifactId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
       </dependency>
 
       <!--        <dependency>-->
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index 3623db877..0957359b1 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index 30f6c6571..7ef528d72 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index 2f8174793..cd329ff8d 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,19 +24,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index 54841c15d..5a20d1e09 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index 37325d0dc..e82e035bc 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index 3008fae5f..c1423d140 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,25 +23,25 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index dc9d16de6..451f496da 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index 0c0dc49c3..390edc0aa 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.156-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>3.12.156-SNAPSHOT</version>
+      <version>4.0.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index bc527f580..59d3a5640 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-clients</artifactId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index 47390810b..97db59a7d 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index e0ad07e69..9d15529d8 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.156-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>docsys</artifactId>
-      <version>3.12.156-SNAPSHOT</version>
+      <version>4.0.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index aef502cd0..3e628ac58 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index 5116df652..e96b5a2cd 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 97a3d13c5..01b800135 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>io.nosqlbench</groupId>
   <artifactId>mvn-defaults</artifactId>
-  <version>3.12.156-SNAPSHOT</version>
+  <version>4.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index e387a13d1..69e28547f 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index b1ff56ebb..30db12b50 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.156-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>nb-annotations</artifactId>
-      <version>3.12.156-SNAPSHOT</version>
+      <version>4.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/nb/pom.xml b/nb/pom.xml
index 4fd7acc83..a7fb4f804 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -26,31 +26,31 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-rest</artifactId>
-        <version>3.12.156-SNAPSHOT</version>
+      <version>4.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-cli</artifactId>
-        <version>3.12.156-SNAPSHOT</version>
+      <version>4.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-docs</artifactId>
-        <version>3.12.156-SNAPSHOT</version>
+      <version>4.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-core</artifactId>
-        <version>3.12.156-SNAPSHOT</version>
+      <version>4.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-extensions</artifactId>
-        <version>3.12.156-SNAPSHOT</version>
+      <version>4.0.0-SNAPSHOT</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -62,67 +62,67 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-web</artifactId>
-        <version>3.12.156-SNAPSHOT</version>
+      <version>4.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-kafka</artifactId>
-        <version>3.12.156-SNAPSHOT</version>
+      <version>4.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-stdout</artifactId>
-        <version>3.12.156-SNAPSHOT</version>
+      <version>4.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-diag</artifactId>
-        <version>3.12.156-SNAPSHOT</version>
+      <version>4.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-tcp</artifactId>
-        <version>3.12.156-SNAPSHOT</version>
+      <version>4.0.0-SNAPSHOT</version>
     </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-http</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-jmx</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-dsegraph-shaded</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cql-shaded</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cqlverify</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-mongodb</artifactId>
-        <version>3.12.156-SNAPSHOT</version>
+      <version>4.0.0-SNAPSHOT</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -246,7 +246,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cqld4</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
       </dependencies>
     </profile>
@@ -259,7 +259,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-mongodb</artifactId>
-            <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/pom.xml b/pom.xml
index 6d19cdf5f..6df766ae1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index 6f748d2e2..47d79cb23 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index f397d8bda..a55f473ff 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index 9419bfb18..70ee7b286 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index 5f6b65012..33701045b 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index a70bafebf..db6f7bd2f 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index 260e9232a..5b8949cb7 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index 49f712b1c..dd826699a 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+          <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index d754b267a..8ae260df5 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.156-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,36 +18,36 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-          <version>3.12.156-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

From 7e6aa1a2d86fe29240efbbaa54e0c34bff178e9f Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Thu, 19 Nov 2020 18:04:47 -0600
Subject: [PATCH 049/164] bump source and target to Java 15

---
 .github/workflows/build.yml                   |   2 +-
 .github/workflows/release.yml                 |   2 +-
 DOWNLOADS.md                                  |   3 +-
 .../cql/statements/core/CQLSessionCache.java  |   7 +-
 .../statements/core/CQLSessionCache.java      |   4 +-
 .../ebdrivers/dsegraph/GraphActivity.java     |   4 +-
 engine-api/pom.xml                            |   7 +
 .../{Evaluator.java => ExprEvaluator.java}    |  19 +-
 .../api/scripting/GraalJsEvaluator.java       |  53 ++++
 .../api/scripting/NashornEvaluator.java       | 159 ----------
 ...torTest.java => GraalJsEvaluatorTest.java} |  11 +-
 .../nosqlbench/engine/cli/NBCLIOptions.java   |   5 +-
 .../NashornMetricRegistryBindings.java        | 285 ------------------
 .../PolyglotMetricRegistryBindings.java       |   7 +-
 .../engine/core/script/MetricsMapper.java     |   8 +-
 .../engine/core/script/Scenario.java          |  19 +-
 .../src/test/resources/scripts/testlib.js     |  62 ----
 .../docs-for-nb/getting_started/index.md      |   3 +-
 .../optimizers/BobyqaOptimizerInstance.java   |  14 +-
 .../optimizers/MultivariateArrayScript.java   |  38 ---
 .../optimizers/MultivariateDynamicScript.java |  50 ---
 .../NashornMultivariateObjectScript.java      |  39 ---
 mvn-defaults/pom.xml                          |  15 +-
 nb/build-bin.sh                               |  18 +-
 .../bindings/funcref_conversion.md            |   3 +-
 25 files changed, 129 insertions(+), 708 deletions(-)
 rename engine-api/src/main/java/io/nosqlbench/engine/api/scripting/{Evaluator.java => ExprEvaluator.java} (77%)
 create mode 100644 engine-api/src/main/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluator.java
 delete mode 100644 engine-api/src/main/java/io/nosqlbench/engine/api/scripting/NashornEvaluator.java
 rename engine-api/src/test/java/io/nosqlbench/engine/api/scripting/{NashornEvaluatorTest.java => GraalJsEvaluatorTest.java} (79%)
 delete mode 100644 engine-core/src/main/java/io/nosqlbench/engine/core/metrics/NashornMetricRegistryBindings.java
 delete mode 100644 engine-core/src/test/resources/scripts/testlib.js
 delete mode 100644 engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/MultivariateArrayScript.java
 delete mode 100644 engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/MultivariateDynamicScript.java
 delete mode 100644 engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/NashornMultivariateObjectScript.java

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1adf10d25..f5a268014 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
     - uses: actions/setup-java@v1
       name: setup java
       with:
-        java-version: '14'
+        java-version: '15'
         java-package: jdk
         architecture: x64
         
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2228b2171..8757d8361 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
     - name: setup java
       uses: actions/setup-java@v1
       with:
-        java-version: '14'
+        java-version: '15'
         java-package: jdk
         architecture: x64
 
diff --git a/DOWNLOADS.md b/DOWNLOADS.md
index d3d12e8ae..b20cb9575 100644
--- a/DOWNLOADS.md
+++ b/DOWNLOADS.md
@@ -9,7 +9,8 @@ The latest release of NoSQLBench is always available from github releases.
   - (be sure to `chmod +x nb` once you download it)
 - download [the latest release of nb.jar](https://github.com/nosqlbench/nosqlbench/releases/latest/download/nb.jar), a
   single-jar application.
-  - This requires java 14 or later, make sure your `java -version` command says that you are on Java 14 or later.
+  - This requires java 15 or later, make sure your `java -version
+  ` command says that you are on Java 15 or later.
 
 ## Docker
 
diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java
index db84e375e..82787d3bb 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java
@@ -11,11 +11,12 @@ import io.nosqlbench.activitytype.cql.core.ProxyTranslator;
 import io.nosqlbench.engine.api.activityapi.core.Shutdownable;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
-import io.nosqlbench.engine.api.scripting.NashornEvaluator;
+import io.nosqlbench.engine.api.scripting.ExprEvaluator;
+import io.nosqlbench.engine.api.scripting.GraalJsEvaluator;
 import io.nosqlbench.engine.api.util.SSLKsFactory;
 import io.nosqlbench.nb.api.errors.BasicError;
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.net.ssl.SSLContext;
 import java.io.File;
@@ -129,7 +130,7 @@ public class CQLSessionCache implements Shutdownable {
         if (clusteropts.isPresent()) {
             try {
                 logger.info("applying cbopts:" + clusteropts.get());
-                NashornEvaluator<DseCluster.Builder> clusterEval = new NashornEvaluator<>(DseCluster.Builder.class);
+                ExprEvaluator<DseCluster.Builder> clusterEval = new GraalJsEvaluator<>(DseCluster.Builder.class);
                 clusterEval.put("builder", builder);
                 String importEnv =
                     "load(\"nashorn:mozilla_compat.js\");\n" +
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java
index 7026e7fa7..f3075c5d5 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java
@@ -19,7 +19,7 @@ import io.nosqlbench.activitytype.cqld4.core.ProxyTranslator;
 import io.nosqlbench.engine.api.activityapi.core.Shutdownable;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
-import io.nosqlbench.engine.api.scripting.NashornEvaluator;
+import io.nosqlbench.engine.api.scripting.GraalJsEvaluator;
 import io.nosqlbench.engine.api.util.SSLKsFactory;
 import org.apache.tinkerpop.gremlin.driver.Cluster;
 import org.graalvm.options.OptionMap;
@@ -170,7 +170,7 @@ public class CQLSessionCache implements Shutdownable {
         if (clusteropts.isPresent()) {
             try {
                 logger.info("applying cbopts:" + clusteropts.get());
-                NashornEvaluator<CqlSessionBuilder> clusterEval = new NashornEvaluator<>(CqlSessionBuilder.class);
+                GraalJsEvaluator<CqlSessionBuilder> clusterEval = new GraalJsEvaluator<>(CqlSessionBuilder.class);
                 clusterEval.put("builder", builder);
                 String importEnv =
                         "load(\"nashorn:mozilla_compat.js\");\n" +
diff --git a/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphActivity.java b/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphActivity.java
index 51150cd6f..cd30f281d 100644
--- a/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphActivity.java
+++ b/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphActivity.java
@@ -23,7 +23,7 @@ import io.nosqlbench.engine.api.activityimpl.ParameterMap;
 import io.nosqlbench.engine.api.activityimpl.SimpleActivity;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
 import io.nosqlbench.engine.api.metrics.ExceptionMeterMetrics;
-import io.nosqlbench.engine.api.scripting.NashornEvaluator;
+import io.nosqlbench.engine.api.scripting.GraalJsEvaluator;
 import io.nosqlbench.engine.api.templating.StrInterpolator;
 import io.nosqlbench.engine.api.util.TagFilter;
 import org.apache.logging.log4j.LogManager;
@@ -188,7 +188,7 @@ public class GraphActivity extends SimpleActivity implements ActivityDefObserver
         if (clusteropts.isPresent()) {
             try {
                 logger.info("applying cbopts:" + clusteropts.get());
-                NashornEvaluator<DseCluster.Builder> clusterEval = new NashornEvaluator<>(DseCluster.Builder.class);
+                GraalJsEvaluator<DseCluster.Builder> clusterEval = new GraalJsEvaluator<>(DseCluster.Builder.class);
                 clusterEval.put("builder", builder);
                 String importEnv =
                         "load(\"nashorn:mozilla_compat.js\");\n" +
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index c1423d140..4b9e0d05d 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -49,6 +49,13 @@
             <artifactId>graal-sdk</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.graalvm.js</groupId>
+            <artifactId>js</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/scripting/Evaluator.java b/engine-api/src/main/java/io/nosqlbench/engine/api/scripting/ExprEvaluator.java
similarity index 77%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/scripting/Evaluator.java
rename to engine-api/src/main/java/io/nosqlbench/engine/api/scripting/ExprEvaluator.java
index 90e831af6..b6330187f 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/scripting/Evaluator.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/scripting/ExprEvaluator.java
@@ -35,7 +35,7 @@ package io.nosqlbench.engine.api.scripting;
  *
  * @param <T> The return type that is needed by the caller
  */
-public interface Evaluator<T> {
+public interface ExprEvaluator<T> {
 
     /**
      * Evaluate the provided script, returning the value that it yields
@@ -45,17 +45,24 @@ public interface Evaluator<T> {
     T eval();
 
     /**
-     * @param scriptText Nashorn compatible script text
-     * @return this NahornEvaluator, for method chaining
+     * @param scriptText script text
+     * @return this ExprEvaluator<T>, for method chaining
      */
-    NashornEvaluator<T> script(String scriptText);
+    ExprEvaluator<T> script(String scriptText);
 
     /**
      * Set the variable environment of the evaluator
      *
      * @param varName the variable name to add to the environment
      * @param var     the object to bind to the varname
-     * @return this NashornEvaluator, for method chaining
+     * @return this ExprEvaluator<T>, for method chaining
      */
-    NashornEvaluator<T> put(String varName, Object var);
+    ExprEvaluator<T> put(String varName, Object var);
+
+    default ExprEvaluator<T> put(Object... vars) {
+        for (int i = 0; i < vars.length; i += 2) {
+            this.put(vars[i].toString(), vars[i + 1]);
+        }
+        return this;
+    }
 }
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluator.java b/engine-api/src/main/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluator.java
new file mode 100644
index 000000000..94f3e5e07
--- /dev/null
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluator.java
@@ -0,0 +1,53 @@
+package io.nosqlbench.engine.api.scripting;
+
+import org.graalvm.polyglot.*;
+
+public class GraalJsEvaluator<T> implements ExprEvaluator<T> {
+
+    private final Class<T> resultType;
+    private Context context;
+    private Source script;
+
+    public GraalJsEvaluator(Class<T> resultType) {
+        this.resultType = resultType;
+    }
+
+    private Context getContext() {
+        if (context == null) {
+            Context.Builder contextSettings = Context.newBuilder("js")
+                    .allowHostAccess(HostAccess.ALL)
+                    .allowNativeAccess(true)
+                    .allowCreateThread(true)
+                    .allowIO(true)
+                    .allowHostClassLookup(s -> true)
+                    .allowHostClassLoading(true)
+                    .allowCreateProcess(true)
+                    .allowAllAccess(true)
+                    .allowEnvironmentAccess(EnvironmentAccess.INHERIT)
+                    .allowPolyglotAccess(PolyglotAccess.ALL)
+                    .option("js.ecmascript-version", "2020")
+                    .option("js.nashorn-compat", "true");
+            context = contextSettings.build();
+        }
+        return context;
+    }
+
+    @Override
+    public T eval() {
+        Value result = getContext().eval(this.script);
+        T asType = result.as(resultType);
+        return asType;
+    }
+
+    @Override
+    public ExprEvaluator<T> script(String scriptText) {
+        this.script = Source.create("js", scriptText);
+        return this;
+    }
+
+    @Override
+    public ExprEvaluator<T> put(String varName, Object var) {
+        getContext().getBindings("js").putMember(varName, var);
+        return this;
+    }
+}
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/scripting/NashornEvaluator.java b/engine-api/src/main/java/io/nosqlbench/engine/api/scripting/NashornEvaluator.java
deleted file mode 100644
index 4a9572728..000000000
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/scripting/NashornEvaluator.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- *
- *    Copyright 2016 jshook
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * /
- */
-
-package io.nosqlbench.engine.api.scripting;
-
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
-
-import javax.script.*;
-
-/**
- * public void setBindings(Bindings bindings, int scope);
- *
- * @param <T> generic parameter for return types from this evaluator
- */
-public class NashornEvaluator<T> implements Evaluator<T> {
-    private final static Logger logger = LogManager.getLogger(NashornEvaluator.class);
-
-    private static final ScriptEngineManager engineManager = new ScriptEngineManager();
-    private final ScriptEngine scriptEngine;
-    private final SimpleBindings bindings = new SimpleBindings();
-    private String script = "";
-    private final Class<? extends T> resultType;
-    private CompiledScript compiled;
-
-    /**
-     * Create a new NashornEvaluator.
-     *
-     * @param resultType The required class of the result type, which must extend generic parameter type t.
-     * @param vars Optional pairs of names and values. vars[0] is a name, vars[1] is a value, ...
-     */
-    public NashornEvaluator(Class<? extends T> resultType, Object... vars) {
-        this.scriptEngine = engineManager.getEngineByName("nashorn");
-        this.scriptEngine.setBindings(bindings, ScriptContext.ENGINE_SCOPE);
-        this.resultType = resultType;
-        for (int i = 0; i < vars.length; i += 2) {
-            this.put(vars[i].toString(), vars[i + 1]);
-        }
-    }
-
-    /**
-     * Set the script that will be evaluated.
-     * @param scriptText Nashorn compatible script text
-     * @return this NashornEvaluator, for method chaining
-     */
-    @Override
-    public NashornEvaluator<T> script(String scriptText) {
-        this.script = scriptText;
-        try {
-            Object result = null;
-            if (scriptEngine instanceof Compilable) {
-                logger.info("Using direct script compilation");
-                Compilable compilableEngine = (Compilable) scriptEngine;
-                compiled = compilableEngine.compile(script);
-                logger.trace("Compiled script:" + script);
-            } else {
-                logger.trace("Did not compile script: " + script);
-            }
-        } catch (ScriptException e) {
-            throw new RuntimeException("Script compilation error for " + scriptText + ": ", e);
-        }
-        return this;
-    }
-
-
-    /**
-     * Evaluate the compiled script if it is compiled, or the raw script text otherwise.
-     * It is not an error to call this without setting the script to something other than the default of "",
-     * but it not very useful in most cases.
-     * @return The value produced by the script, compiled or not
-     */
-    @Override
-    public T eval() {
-        T result = null;
-        try {
-            Object evaled = null;
-            if (compiled != null) {
-                evaled = compiled.eval();
-            } else {
-                evaled = scriptEngine.eval(script);
-            }
-            result = convert(resultType, evaled);
-        } catch (ScriptException e) {
-            throw new RuntimeException("Script error while evaluating result for '" + script + "':", e);
-        } catch (Exception o) {
-            throw new RuntimeException("Non-Script error while evaluating result for '" + script + "':", o);
-        }
-        return result;
-    }
-
-    /**
-     * Put a varianble into the script environment
-     * @param varName the variable name to add to the environment
-     * @param var     the object to bind to the varname
-     * @return this NashornEvaluator, for method chaining
-     */
-    @Override
-    public NashornEvaluator<T> put(String varName, Object var) {
-        bindings.put(varName, var);
-        return this;
-    }
-
-    /**
-     * Convert some basic types from the script to the requested type. This makes it easier
-     * to deal with issues across the type systems, with the risk of unintended conversions.
-     * Be choosy about what you support here. Less is more.
-     * @param expectedType the wanted type to return
-     * @param result the result produced by the script
-     * @return the converted value
-     */
-    private T convert(Class<? extends T> expectedType, Object result) {
-        if (expectedType.isAssignableFrom(result.getClass())) {
-            return expectedType.cast(result);
-        }
-        String desiredClass = expectedType.getSimpleName();
-        Class<?> resultClass = result.getClass();
-
-        if (resultClass == Double.class) {
-            switch (desiredClass) {
-                case "Long":
-                    return expectedType.cast(((Double) result).longValue());
-                case "Integer":
-                    return expectedType.cast(((Double) result).intValue());
-                case "Float":
-                    return expectedType.cast(((Double) result).floatValue());
-                default:
-                    throw new RuntimeException("Incompatible result type requested for conversion from " + resultClass + " to " + desiredClass);
-            }
-        }
-
-        if (resultClass == Long.class) {
-            switch (desiredClass) {
-                case "Integer":
-                    return expectedType.cast(((Long) result).intValue());
-                default:
-                    throw new RuntimeException("Incompatible result type requested for conversion from " + resultClass + " to " + desiredClass);
-            }
-        }
-        throw new RuntimeException(
-                "Incompatible input type for conversion from evaluator:" + result.getClass() + ", " +
-                        "when type " + expectedType.getSimpleName() + " was needed.");
-
-    }
-
-}
diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/scripting/NashornEvaluatorTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluatorTest.java
similarity index 79%
rename from engine-api/src/test/java/io/nosqlbench/engine/api/scripting/NashornEvaluatorTest.java
rename to engine-api/src/test/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluatorTest.java
index f191b4f61..d8b5de7c6 100644
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/scripting/NashornEvaluatorTest.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluatorTest.java
@@ -23,19 +23,19 @@ import java.util.Date;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class NashornEvaluatorTest {
+public class GraalJsEvaluatorTest {
 
     @Test
     public void testBasicOperations() {
-        NashornEvaluator<Long> ne = new NashornEvaluator<>(Long.class);
-        ne.put("one",1L).put("two",2L);
+        GraalJsEvaluator<Long> ne = new GraalJsEvaluator<>(Long.class);
+        ne.put("one", 1L).put("two", 2L);
         Long sum = ne.script("one + two;").eval();
         assertThat(sum).isEqualTo(3L);
     }
 
     @Test
     public void testJavaReturnType() {
-        NashornEvaluator<Date> dateEval = new NashornEvaluator<>(Date.class);
+        GraalJsEvaluator<Date> dateEval = new GraalJsEvaluator<>(Date.class);
         dateEval.script("var d = new java.util.Date(234); d;");
         Date aDate = dateEval.eval();
         assertThat(aDate).isEqualTo(new Date(234));
@@ -43,7 +43,8 @@ public class NashornEvaluatorTest {
 
     @Test
     public void testOneLiner() {
-        String result = new NashornEvaluator<String>(String.class, "fname", "afirstname", "lname", "alastname")
+        String result = new GraalJsEvaluator<String>(String.class)
+                .put("fname", "afirstname", "lname", "alastname")
                 .script("fname + lname").eval();
         assertThat(result).isEqualTo("afirstnamealastname");
     }
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
index 75e8c59fc..c642f4cd2 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
@@ -403,9 +403,8 @@ public class NBCLIOptions {
                     arglist.removeFirst();
                     break;
                 case NASHORN_ENGINE:
-                    engine = Scenario.Engine.Nashorn;
-                    arglist.removeFirst();
-                    break;
+                    throw new RuntimeException("The nashorn engine has been deprecated in this major version of " +
+                            "NoSQLBench");
                 case COMPILE_SCRIPT:
                     arglist.removeFirst();
                     compileScript = true;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/NashornMetricRegistryBindings.java b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/NashornMetricRegistryBindings.java
deleted file mode 100644
index eb361ab8e..000000000
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/NashornMetricRegistryBindings.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- *
- *    Copyright 2016 jshook
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * /
- */
-
-package io.nosqlbench.engine.core.metrics;
-
-import com.codahale.metrics.*;
-import com.codahale.metrics.Timer;
-import io.nosqlbench.engine.core.script.ReadOnlyBindings;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-public class NashornMetricRegistryBindings extends ReadOnlyBindings implements MetricRegistryListener {
-
-    private final static Logger logger = LogManager.getLogger(NashornMetricRegistryBindings.class);
-
-    private final MetricRegistry registry;
-    private final MetricMap metricMap = new MetricMap("ROOT");
-    private final boolean failfast = true;
-
-    public NashornMetricRegistryBindings(MetricRegistry registry) {
-        this.registry = registry;
-        registry.addListener(this);
-    }
-
-    @Override
-    public int size() {
-        return metricMap.map.size();
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return metricMap.map.isEmpty();
-    }
-
-    @Override
-    public boolean containsKey(Object key) {
-        return metricMap.map.containsKey(key);
-    }
-
-    @Override
-    public boolean containsValue(Object value) {
-        return metricMap.map.containsValue(value);
-    }
-
-    @Override
-    public Object get(Object key) {
-        Object got = metricMap.map.get(key);
-        if (got==null) {
-            throw new RuntimeException("Attempted to get metrics node with name '" + key + "', but it was not found. Perhaps you were looking for one of its children: "
-                    + this.keySet().stream().collect(Collectors.joining(",","[","]")));
-        }
-        return got;
-    }
-
-    @Override
-    public Set<String> keySet() {
-        return metricMap.map.keySet();
-    }
-
-    @Override
-    public Collection<Object> values() {
-        return metricMap.map.values();
-    }
-
-    @Override
-    public Set<Entry<String, Object>> entrySet() {
-        return metricMap.map.entrySet();
-    }
-
-    @Override
-    public void onGaugeAdded(String name, Gauge<?> metric) {
-        MetricMap parent = findParentNodeOf(name);
-        parent.map.put(nodeNameOf(name), metric);
-    }
-
-    private String nodeNameOf(String name) {
-        String[] split = name.split("\\.");
-        return split[split.length - 1];
-    }
-
-    private synchronized void cleanEmptyMaps(MetricMap m) {
-        while (m.isEmpty() && m.parent != null) {
-            logger.debug("removing empty map:" + m.name);
-            MetricMap parent = m.parent;
-            m.parent = null;
-            parent.map.remove(m.name);
-            m = parent;
-        }
-    }
-
-    private synchronized MetricMap findParentNodeOf(String fullName) {
-        String[] names = fullName.split("\\.");
-        MetricMap m = metricMap;
-        for (int i = 0; i < names.length - 1; i++) {
-            String edge = names[i];
-            if (m.map.containsKey(edge)) {
-                Object o = m.map.get(edge);
-                if (o instanceof MetricMap) {
-                    m = (MetricMap) m.map.get(edge);
-                    logger.trace("traversing edge:" + edge + " while pathing to " + fullName);
-
-                } else {
-                    String error = "edge exists at level:" + i + ", while pathing to " + fullName;
-                    logger.error(error);
-                    if (failfast) {
-                        throw new RuntimeException(error);
-                    }
-                }
-            } else {
-                MetricMap newMap = new MetricMap(edge, m);
-                m.map.put(edge, newMap);
-                m = newMap;
-                logger.debug("adding edge:" + edge + " while pathing to " + fullName);
-            }
-        }
-        return m;
-    }
-
-    @Override
-    public void onGaugeRemoved(String name) {
-        MetricMap parent = findParentNodeOf(name);
-        parent.map.remove(nodeNameOf(name));
-        cleanEmptyMaps(parent);
-    }
-
-    @Override
-    public void onCounterAdded(String name, Counter metric) {
-        MetricMap parent = findParentNodeOf(name);
-        parent.map.put(nodeNameOf(name), metric);
-
-    }
-
-    @Override
-    public void onCounterRemoved(String name) {
-        MetricMap parent = findParentNodeOf(name);
-        parent.map.remove(nodeNameOf(name));
-        cleanEmptyMaps(parent);
-    }
-
-    @Override
-    public void onHistogramAdded(String name, Histogram metric) {
-        MetricMap parent = findParentNodeOf(name);
-        parent.map.put(nodeNameOf(name), metric);
-
-    }
-
-    @Override
-    public void onHistogramRemoved(String name) {
-        MetricMap parent = findParentNodeOf(name);
-        parent.map.remove(nodeNameOf(name));
-        cleanEmptyMaps(parent);
-
-    }
-
-    @Override
-    public void onMeterAdded(String name, Meter metric) {
-        MetricMap parent = findParentNodeOf(name);
-        parent.map.put(nodeNameOf(name), metric);
-
-    }
-
-    @Override
-    public void onMeterRemoved(String name) {
-        MetricMap parent = findParentNodeOf(name);
-        parent.map.remove(nodeNameOf(name));
-        cleanEmptyMaps(parent);
-
-    }
-
-    @Override
-    public void onTimerAdded(String name, Timer metric) {
-        MetricMap parent = findParentNodeOf(name);
-        parent.map.put(nodeNameOf(name), metric);
-
-    }
-
-    @Override
-    public void onTimerRemoved(String name) {
-        MetricMap parent = findParentNodeOf(name);
-        parent.map.remove(nodeNameOf(name));
-        cleanEmptyMaps(parent);
-
-    }
-
-    public Map<String, Metric> getMetrics() {
-        return getMetrics(new LinkedHashMap<String, Metric>(), "metrics", metricMap);
-    }
-
-    private Map<String, Metric> getMetrics(Map<String, Metric> totalMap, String prefix, MetricMap map) {
-        for (Entry<String, Object> mEntry : map.entrySet()) {
-            Object o = mEntry.getValue();
-            String name = prefix + "." + mEntry.getKey();
-            if (o instanceof Metric) {
-                totalMap.put(name, (Metric) o);
-            } else if (o instanceof MetricMap) {
-                getMetrics(totalMap, name, (MetricMap) o);
-            } else {
-                throw new RuntimeException("entry value must be either a Metric or a MetricMap");
-            }
-        }
-        return totalMap;
-    }
-
-    private class MetricMap extends ReadOnlyBindings {
-        Map<String, Object> map = new HashMap<String, Object>();
-        MetricMap parent = null;
-        public String name;
-
-        MetricMap(String name) {
-            this.name = name;
-        }
-
-        public MetricMap(String name, MetricMap parent) {
-            this.parent = parent;
-            this.name = name;
-        }
-
-        public int size() {
-            return map.size();
-        }
-
-        @Override
-        public boolean isEmpty() {
-            return map.isEmpty();
-        }
-
-        @Override
-        public boolean containsKey(Object key) {
-            boolean containsKey=map.containsKey(key);
-            if (containsKey==false) {
-                throw new RuntimeException("Attempted to get metrics node with name '" + key + "', but it was not found. Perhaps you " +
-                        "were looking for one of " + this.map.keySet().stream().collect(Collectors.joining(",","[","]")));
-            }
-            return true;
-        }
-
-        @Override
-        public boolean containsValue(Object value) {
-            return map.containsValue(value);
-        }
-
-        @Override
-        public Object get(Object key) {
-            Object got=map.get(key);
-            if (got==null) {
-                throw new RuntimeException("Attempted to get metrics node with name '" + key + "', but it was not found. Perhaps you " +
-                        "were looking for one of " + this.map.keySet().stream().collect(Collectors.joining(",","[","]")));
-            }
-            return got;
-        }
-
-        @Override
-        public Set<String> keySet() {
-            return map.keySet();
-        }
-
-        @Override
-        public Collection<Object> values() {
-            return map.values();
-        }
-
-        @Override
-        public Set<Entry<String, Object>> entrySet() {
-            return map.entrySet();
-        }
-
-    }
-}
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/PolyglotMetricRegistryBindings.java b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/PolyglotMetricRegistryBindings.java
index 33a9bdfc7..d4f78b648 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/PolyglotMetricRegistryBindings.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/PolyglotMetricRegistryBindings.java
@@ -24,6 +24,7 @@ import org.graalvm.polyglot.Value;
 import org.graalvm.polyglot.proxy.ProxyObject;
 
 import java.util.ArrayList;
+import java.util.Map;
 
 /**
  * A view of metrics objects as an object tree.
@@ -124,7 +125,7 @@ public class PolyglotMetricRegistryBindings implements ProxyObject, MetricRegist
 
     @Override
     public void onTimerAdded(String name, Timer timer) {
-        metrics.add(name,timer);
+        metrics.add(name, timer);
         logger.info("timer added: " + name);
     }
 
@@ -134,6 +135,10 @@ public class PolyglotMetricRegistryBindings implements ProxyObject, MetricRegist
         logger.info("timer removed: " + name);
     }
 
+    public Map<String, Metric> getMetrics() {
+        throw new RuntimeException("implement me");
+    }
+
 //    @Override
 //    public int size() {
 //        return metricMap.map.size();
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/MetricsMapper.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/MetricsMapper.java
index 361e67411..b70f7f390 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/MetricsMapper.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/MetricsMapper.java
@@ -19,13 +19,13 @@ import io.nosqlbench.engine.api.activityapi.core.Activity;
 import io.nosqlbench.engine.api.activityapi.core.ActivityType;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
-import io.nosqlbench.engine.core.metrics.NashornMetricRegistryBindings;
-import org.apache.logging.log4j.Logger;
+import io.nosqlbench.engine.core.metrics.PolyglotMetricRegistryBindings;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.lang.reflect.Method;
-import java.util.*;
 import java.util.Timer;
+import java.util.*;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -68,7 +68,7 @@ public class MetricsMapper {
             throw new RuntimeException("Activity type '" + activityDef.getActivityType() + "' does not exist in this runtime.");
         }
         Activity activity = activityType.get().getAssembledActivity(activityDef, new HashMap<>());
-        NashornMetricRegistryBindings nashornMetricRegistryBindings = new NashornMetricRegistryBindings(ActivityMetrics.getMetricRegistry());
+        PolyglotMetricRegistryBindings nashornMetricRegistryBindings = new PolyglotMetricRegistryBindings(ActivityMetrics.getMetricRegistry());
         activity.initActivity();
         activity.getInputDispenserDelegate().getInput(0);
         activity.getActionDispenserDelegate().getAction(0);
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
index 9c2efee60..53763f855 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
@@ -24,11 +24,9 @@ import io.nosqlbench.engine.core.PolyglotScenarioController;
 import io.nosqlbench.engine.core.ScenarioController;
 import io.nosqlbench.engine.core.ScenarioResult;
 import io.nosqlbench.engine.core.annotation.Annotators;
-import io.nosqlbench.engine.core.metrics.NashornMetricRegistryBindings;
 import io.nosqlbench.engine.core.metrics.PolyglotMetricRegistryBindings;
 import io.nosqlbench.nb.api.Layer;
 import io.nosqlbench.nb.api.annotations.Annotation;
-import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.graalvm.polyglot.Context;
@@ -87,8 +85,8 @@ public class Scenario implements Callable<ScenarioResult> {
     private long endedAtMillis = -1L;
 
     public enum Engine {
-        Nashorn,
-        Graalvm
+        Graalvm,
+        Nashorn
     }
 
     public Scenario(
@@ -153,12 +151,7 @@ public class Scenario implements Callable<ScenarioResult> {
 
         switch (engine) {
             case Nashorn:
-                NashornScriptEngineFactory f = new NashornScriptEngineFactory();
-                this.scriptEngine = f.getScriptEngine("--language=es6");
-
-                // engineManager.getEngineByName("nashorn");
-                // TODO: Figure out how to do this in engine bindings: --language=es-6
-                break;
+                throw new RuntimeException("The nashorn engine has been deprecated in this version of NoSQLBench.");
             case Graalvm:
                 Context.Builder contextSettings = Context.newBuilder("js")
                     .allowHostAccess(HostAccess.ALL)
@@ -201,7 +194,7 @@ public class Scenario implements Callable<ScenarioResult> {
             // https://github.com/graalvm/graaljs/blob/master/docs/user/JavaInterop.md
             if (wantsGraaljsCompatMode) {
                 scriptEngine.put("scenario", scenarioController);
-                scriptEngine.put("metrics", new NashornMetricRegistryBindings(metricRegistry));
+                scriptEngine.put("metrics", new PolyglotMetricRegistryBindings(metricRegistry));
                 scriptEngine.put("activities", new NashornActivityBindings(scenarioController));
             } else {
                 scriptEngine.put("scenario", new PolyglotScenarioController(scenarioController));
@@ -209,9 +202,7 @@ public class Scenario implements Callable<ScenarioResult> {
                 scriptEngine.put("activities", new NashornActivityBindings(scenarioController));
             }
         } else if (engine == Engine.Nashorn) {
-            scriptEngine.put("scenario", scenarioController);
-            scriptEngine.put("metrics", new NashornMetricRegistryBindings(metricRegistry));
-            scriptEngine.put("activities", new NashornActivityBindings(scenarioController));
+            throw new RuntimeException("The Nashorn engine has been deprecated in this version of NoSQLBench.");
         } else {
             throw new RuntimeException("Unsupported engine: " + engine);
         }
diff --git a/engine-core/src/test/resources/scripts/testlib.js b/engine-core/src/test/resources/scripts/testlib.js
deleted file mode 100644
index 7d18cefbe..000000000
--- a/engine-core/src/test/resources/scripts/testlib.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// This will be the basis for nashorn and timer-based events.
-
-var Platform = Java.type("javafx.application.Platform");
-var Timer    = Java.type("java.util.Timer");
-
-function setTimerRequest(handler, delay, interval, args) {
-    handler = handler || function() {};
-    delay = delay || 0;
-    interval = interval || 0;
-
-    var applyHandler = function() handler.apply(this, args);
-    var runLater = function() Platform.runLater(applyHandler);
-
-    var timer = new Timer("setTimerRequest", true);
-
-    if (interval > 0) {
-        timer.schedule(runLater, delay, interval);
-    } else {
-        timer.schedule(runLater, delay);
-    }
-
-    return timer;
-}
-
-function clearTimerRequest(timer) {
-    timer.cancel();
-}
-
-function setInterval() {
-    var args = Array.prototype.slice.call(arguments);
-    var handler = args.shift();
-    var ms = args.shift();
-
-    return setTimerRequest(handler, ms, ms, args);
-}
-
-function clearInterval(timer) {
-    clearTimerRequest(timer);
-}
-
-function setTimeout() {
-    var args = Array.prototype.slice.call(arguments);
-    var handler = args.shift();
-    var ms = args.shift();
-
-    return setTimerRequest(handler, ms, 0, args);
-}
-
-function clearTimeout(timer) {
-    clearTimerRequest(timer);
-}
-
-function setImmediate() {
-    var args = Array.prototype.slice.call(arguments);
-    var handler = args.shift();
-
-    return setTimerRequest(handler, 0, 0, args);
-}
-
-function clearImmediate(timer) {
-    clearTimerRequest(timer);
-}
\ No newline at end of file
diff --git a/engine-docs/src/main/resources/docs-for-nb/getting_started/index.md b/engine-docs/src/main/resources/docs-for-nb/getting_started/index.md
index 08060ce21..38b1b8bef 100644
--- a/engine-docs/src/main/resources/docs-for-nb/getting_started/index.md
+++ b/engine-docs/src/main/resources/docs-for-nb/getting_started/index.md
@@ -26,7 +26,8 @@ downloading and executing nb, you get an error, please consult the
 :::
 
 This documentation assumes you are using the Linux binary initiating NoSqlBench commands with `./nb`. If you are using
-the jar, just replace `./nb` with `java -jar nb.jar` when running commands. If you are using the jar version, Java 14 is
+the jar, just replace `./nb` with `java -jar nb.jar` when running
+ commands. If you are using the jar version, Java 15 is
 recommended, and will be required soon.
 
 ## Run a cluster
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerInstance.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerInstance.java
index 58366bdfc..138f2acc8 100644
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerInstance.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerInstance.java
@@ -18,7 +18,6 @@
 package io.nosqlbench.engine.extensions.optimizers;
 
 import com.codahale.metrics.MetricRegistry;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
 import org.apache.commons.math3.analysis.MultivariateFunction;
 import org.apache.commons.math3.optim.*;
 import org.apache.commons.math3.optim.nonlinear.scalar.GoalType;
@@ -96,19 +95,12 @@ public class BobyqaOptimizerInstance {
     }
 
     public BobyqaOptimizerInstance setObjectiveFunction(Object f) {
-        if (f instanceof ScriptObjectMirror) {
-            ScriptObjectMirror scriptObject = (ScriptObjectMirror) f;
-            if (!scriptObject.isFunction()) {
-                throw new RuntimeException("Unable to setFunction with a non-function object");
-            }
-            this.objectiveFunctionFromScript =
-                    new NashornMultivariateObjectScript(logger, params, scriptObject);
-        }
-
         if (f instanceof Function) {
 //            Function<Object[],Object> function = (Function<Object[],Object>)f;
             this.objectiveFunctionFromScript =
-                new PolyglotMultivariateObjectScript(logger, params, f);
+                    new PolyglotMultivariateObjectScript(logger, params, f);
+        } else {
+            throw new RuntimeException("The objective function must be recognizable as a polyglot Function");
         }
 
         return this;
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/MultivariateArrayScript.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/MultivariateArrayScript.java
deleted file mode 100644
index b8a1231a7..000000000
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/MultivariateArrayScript.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package io.nosqlbench.engine.extensions.optimizers;
-
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-import org.apache.commons.math3.analysis.MultivariateFunction;
-import org.apache.logging.log4j.Logger;
-
-import java.security.InvalidParameterException;
-import java.util.HashMap;
-import java.util.Map;
-
-public class MultivariateArrayScript implements MultivariateFunction {
-    private final ScriptObjectMirror script;
-    private final MVParams params;
-    private final Logger logger;
-
-    public MultivariateArrayScript(Logger logger, MVParams params, ScriptObjectMirror script) {
-        this.logger = logger;
-        this.script = script;
-        this.params = params;
-    }
-
-    @Override
-    public double value(double[] doubles) {
-        if (doubles.length != params.size()) {
-            throw new InvalidParameterException("Expected " + params.size() + " doubles, not " + doubles.length);
-        }
-
-        Map<Integer,Double> map = new HashMap<>();
-
-        for (int i = 0; i < doubles.length; i++) {
-            map.put(i,doubles[i]);
-        }
-
-        Object result = null;
-        result = this.script.call(script,doubles);
-        return Double.valueOf(result.toString());
-    }
-}
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/MultivariateDynamicScript.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/MultivariateDynamicScript.java
deleted file mode 100644
index 59bc90855..000000000
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/MultivariateDynamicScript.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package io.nosqlbench.engine.extensions.optimizers;
-
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-import org.apache.commons.math3.analysis.MultivariateFunction;
-import org.apache.logging.log4j.Logger;
-
-import java.security.InvalidParameterException;
-import java.util.Arrays;
-
-public class MultivariateDynamicScript implements MultivariateFunction {
-    private final ScriptObjectMirror script;
-    private final int varcount;
-    private final Logger logger;
-
-    public MultivariateDynamicScript(Logger logger, int varcount, ScriptObjectMirror script) {
-        this.logger = logger;
-        this.script = script;
-        this.varcount = varcount;
-    }
-
-    @Override
-    public double value(double[] doubles) {
-        logger.info("invoking function with " + Arrays.toString(doubles));
-        if (doubles.length != varcount) {
-            throw new InvalidParameterException("Expected " + varcount + " doubles, not " + doubles.length);
-        }
-        Object result = null;
-        if (doubles.length == 1) {
-            result = this.script.call(script,
-                    doubles[0]
-            );
-        } else if (doubles.length == 2) {
-            result = this.script.call(script,
-                    doubles[0], doubles[1]
-            );
-        } else if (doubles.length == 3) {
-            result = this.script.call(script,
-                    doubles[0], doubles[1], doubles[2]
-            );
-        } else if (doubles.length == 4) {
-            result = this.script.call(script,
-                    doubles[0], doubles[1], doubles[2], doubles[3]
-            );
-        } else if (doubles.length == 5) {
-            result = this.script.call(script,
-                    doubles[0], doubles[1], doubles[2], doubles[3], doubles[4]);
-        }
-        return Double.valueOf(result.toString());
-    }
-}
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/NashornMultivariateObjectScript.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/NashornMultivariateObjectScript.java
deleted file mode 100644
index a4d2940c5..000000000
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/NashornMultivariateObjectScript.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.nosqlbench.engine.extensions.optimizers;
-
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-import org.apache.commons.math3.analysis.MultivariateFunction;
-import org.apache.logging.log4j.Logger;
-
-import java.security.InvalidParameterException;
-import java.util.HashMap;
-import java.util.Map;
-
-public class NashornMultivariateObjectScript implements MultivariateFunction {
-    private final ScriptObjectMirror script;
-    private final MVParams params;
-    private final Logger logger;
-
-    public NashornMultivariateObjectScript(Logger logger, MVParams params, ScriptObjectMirror script) {
-        this.logger = logger;
-        this.script = script;
-        this.params = params;
-    }
-
-    @Override
-    public double value(double[] doubles) {
-        if (doubles.length != params.size()) {
-            throw new InvalidParameterException("Expected " + params.size() + " doubles, not " + doubles.length);
-        }
-
-        Map<String,Double> map = new HashMap<>();
-
-        for (int i = 0; i < doubles.length; i++) {
-            map.put(params.get(i).name, doubles[i]);
-        }
-
-        Object object = ScriptObjectMirror.wrap(map, null);
-        Object result = null;
-        result = this.script.call(script,object);
-        return Double.valueOf(result.toString());
-    }
-}
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 01b800135..42b5c62aa 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -71,7 +71,6 @@
     <resources.plugin.version>3.1.0</resources.plugin.version>
     <source.plugin.version>3.0.1</source.plugin.version>
     <surefire.plugin.version>3.0.0-M4</surefire.plugin.version>
-    <graalvm.version>20.1.0</graalvm.version>
   </properties>
 
   <name>${project.artifactId}</name>
@@ -417,29 +416,29 @@
       <dependency>
         <groupId>org.graalvm.sdk</groupId>
         <artifactId>graal-sdk</artifactId>
-        <version>${graalvm.version}</version>
+        <version>20.3.0</version>
       </dependency>
       <dependency>
         <groupId>org.graalvm.js</groupId>
         <artifactId>js</artifactId>
-        <version>${graalvm.version}</version>
+        <version>20.3.0</version>
         <scope>runtime</scope>
       </dependency>
       <dependency>
         <groupId>org.graalvm.js</groupId>
         <artifactId>js-scriptengine</artifactId>
-        <version>${graalvm.version}</version>
+        <version>20.3.0</version>
       </dependency>
       <dependency>
         <groupId>org.graalvm.tools</groupId>
         <artifactId>profiler</artifactId>
-        <version>${graalvm.version}</version>
+        <version>20.3.0</version>
         <scope>runtime</scope>
       </dependency>
       <dependency>
         <groupId>org.graalvm.tools</groupId>
         <artifactId>chromeinspector</artifactId>
-        <version>${graalvm.version}</version>
+        <version>20.3.0</version>
         <scope>runtime</scope>
       </dependency>
 
@@ -507,8 +506,8 @@
         <configuration>
           <debug>true</debug>
           <!--                    <release>${java.target.version}</release>-->
-          <source>11</source>
-          <target>11</target>
+          <source>15</source>
+          <target>15</target>
           <!--                    <compilerArgs>-->
           <!--                        &#45;&#45;enable-preview-->
           <!--                    </compilerArgs>-->
diff --git a/nb/build-bin.sh b/nb/build-bin.sh
index 7c254333a..cd8235572 100755
--- a/nb/build-bin.sh
+++ b/nb/build-bin.sh
@@ -37,19 +37,15 @@ then
   (cd cache && (
    if [ "$BUILD_OPENJ9" = "true" ]
    then
-    wget -c https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk14u-2020-04-27-07-27/OpenJDK14U-jre_x64_linux_openj9_linuxXL_2020-04-27-07-27.tar.gz
-    tar xf OpenJDK14U-jre_x64_linux_openj9_linuxXL_2020-04-27-07-27.tar.gz
-    mv jdk-14.0.1+7-jre jre
-    rm OpenJDK14U-jre_x64_linux_openj9_linuxXL_2020-04-27-07-27.tar.gz
+    wget -c wget -c https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2020-11-19-07-04/OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
+    tar -xf OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
+    mv jdk-15.0.1+9-jre jre
+    rm OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
    else
-    wget -c https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk14u-2020-04-27-07-27/OpenJDK14U-jre_x64_linux_hotspot_2020-04-27-07-27.tar.gz
-    tar xf OpenJDK14U-jre_x64_linux_hotspot_2020-04-27-07-27.tar.gz
-    mv jdk-14.0.1+7-jre jre
+    wget -c https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2020-11-19-07-04/OpenJDK15U-jre_x64_linux_hotspot_2020-11-19-07-04.tar.gz
+    tar xf OpenJDK15U-jre_x64_linux_hotspot_2020-11-19-07-04.tar.gz
+    mv jdk-15.0.1+9-jre jre
    fi
-   # wget -c https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.2%2B10/OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz
-   # tar xf OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz
-   # mv jdk-12.0.2+10-jre jre
-   # rm OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz
   ))
 fi
 
diff --git a/virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_conversion.md b/virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_conversion.md
index d2341aaca..687db1d7f 100644
--- a/virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_conversion.md
+++ b/virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_conversion.md
@@ -32,7 +32,8 @@ appropriate, to ensure that VirtData selects the right functions within the flow
 ## Format
 
 Apply the Java String.format method to an incoming object. @see
-[Java 14 String.format(...) javadoc](https://docs.oracle.com/en/java/javase/14/docs/api/java.base/java/util/Formatter.html#syntax) Note:
+[Java 15 String.format(...) javadoc](https://docs.oracle.com/en/java
+/javase/14/docs/api/java.base/java/util/Formatter.html#syntax) Note:
 This function can often be quite slow, so more direct methods are generally preferrable.
 
 - java.lang.Object -> Format(java.lang.String: format) -> java.lang.String

From 7b0e37ab3aafcd81d427a02e1b345d5eb98f3f98 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Fri, 20 Nov 2020 03:34:49 -0600
Subject: [PATCH 050/164] add metrics manifest to polyglot

---
 .../PolyglotMetricRegistryBindings.java       | 21 ++++++++++++++++---
 nb/src/test/resources/scripts/async/optimo.js |  2 +-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/PolyglotMetricRegistryBindings.java b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/PolyglotMetricRegistryBindings.java
index d4f78b648..9257554e8 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/PolyglotMetricRegistryBindings.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/PolyglotMetricRegistryBindings.java
@@ -18,13 +18,13 @@
 package io.nosqlbench.engine.core.metrics;
 
 import com.codahale.metrics.*;
+import com.codahale.metrics.Timer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.graalvm.polyglot.Value;
 import org.graalvm.polyglot.proxy.ProxyObject;
 
-import java.util.ArrayList;
-import java.util.Map;
+import java.util.*;
 
 /**
  * A view of metrics objects as an object tree.
@@ -136,7 +136,22 @@ public class PolyglotMetricRegistryBindings implements ProxyObject, MetricRegist
     }
 
     public Map<String, Metric> getMetrics() {
-        throw new RuntimeException("implement me");
+        return getMetrics(new LinkedHashMap<String, Metric>(), "metrics", metrics);
+    }
+
+    private Map<String, Metric> getMetrics(Map<String, Metric> totalMap, String prefix, MetricMap map) {
+        for (String key : map.getKeys()) {
+            Object o = map.get(key);
+            String name = prefix + "." + key;
+            if (o instanceof Metric) {
+                totalMap.put(name, (Metric) o);
+            } else if (o instanceof MetricMap) {
+                getMetrics(totalMap, name, (MetricMap) o);
+            } else {
+                throw new RuntimeException("entry value must be either a Metric or a MetricMap");
+            }
+        }
+        return totalMap;
     }
 
 //    @Override
diff --git a/nb/src/test/resources/scripts/async/optimo.js b/nb/src/test/resources/scripts/async/optimo.js
index 6a7675da8..bf4188ab7 100644
--- a/nb/src/test/resources/scripts/async/optimo.js
+++ b/nb/src/test/resources/scripts/async/optimo.js
@@ -22,5 +22,5 @@ optimo.setObjectiveFunction(
 var result = optimo.optimize();
 
 print("optimized result was " + result);
-print("map of result was " + result.getVarMap());
+print("map of result was " + result.getMap());
 

From a23808b36dc6f56f08f7560849e4255eae050e76 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Fri, 20 Nov 2020 14:56:17 -0600
Subject: [PATCH 051/164] update appimage build script for j15

---
 nb/build-bin.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nb/build-bin.sh b/nb/build-bin.sh
index cd8235572..3f8fce4d3 100755
--- a/nb/build-bin.sh
+++ b/nb/build-bin.sh
@@ -30,27 +30,27 @@ fi
 rsync -av appimage/skel/ "${APPDIR}/"
 cp target/nb.jar "${APPDIR}/usr/bin/nb.jar"
 
-if [ ! -d "cache/jre" ]
+if [ ! -d "cache/jre15" ]
 then
-  printf "getting jre once into cache/jre\n";
+  printf "getting jre once into cache/jre15\n";
   mkdir -p cache
   (cd cache && (
    if [ "$BUILD_OPENJ9" = "true" ]
    then
     wget -c wget -c https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2020-11-19-07-04/OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
     tar -xf OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
-    mv jdk-15.0.1+9-jre jre
+    mv jdk-15.0.1+9-jre jre15
     rm OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
    else
     wget -c https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2020-11-19-07-04/OpenJDK15U-jre_x64_linux_hotspot_2020-11-19-07-04.tar.gz
     tar xf OpenJDK15U-jre_x64_linux_hotspot_2020-11-19-07-04.tar.gz
-    mv jdk-15.0.1+9-jre jre
+    mv jdk-15.0.1+9-jre jre15
    fi
   ))
 fi
 
 mkdir -p "${APPDIR}/usr/bin/jre"
-rsync -av cache/jre/ "${APPDIR}/usr/bin/jre/"
+rsync -av cache/jre15/ "${APPDIR}/usr/bin/jre/"
 
 if [ ! -f "${APPDIR}/AppRun" ]
   then

From 2ab118f400383bd86ea58c3b6fc08645d98399a3 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Sun, 22 Nov 2020 02:55:20 -0600
Subject: [PATCH 052/164] package organization

---
 engine-api/pom.xml                            |  5 --
 .../api/activityapi/core/ActivityType.java    |  2 +-
 .../filters/ExperimentalResultFilterType.java |  2 +-
 .../filters/ResultValueFilterType.java        |  2 +-
 .../api/activityapi/input/InputType.java      |  2 +-
 .../api/activityapi/output/OutputType.java    |  2 +-
 .../engine/api/util/SimpleServiceLoader.java  |  2 +-
 .../java/io/nosqlbench/engine/cli/NBCLI.java  |  6 ++-
 .../ActivityExceptionHandler.java             |  2 +-
 .../{ => lifecycle}/ActivityExecutor.java     |  2 +-
 .../ActivityProgressIndicator.java            |  2 +-
 .../PolyglotScenarioController.java           |  2 +-
 .../{ => lifecycle}/ScenarioController.java   |  2 +-
 .../{ => lifecycle}/ScenarioErrorHandler.java |  2 +-
 .../core/{ => lifecycle}/ScenarioResult.java  |  2 +-
 .../{ => lifecycle}/ScenariosResults.java     |  2 +-
 .../core/{ => metadata}/MarkdownDocInfo.java  |  2 +-
 .../engine/core/metrics/MetricReporters.java  |  2 +-
 .../engine/core/script/Scenario.java          |  8 +--
 .../engine/core/script/ScenariosExecutor.java |  8 +--
 .../engine/core/ActivityExecutorTest.java     |  1 +
 .../core/script/ScenariosExecutorTest.java    |  2 +-
 .../resources/ScenarioExecutorEndpoint.java   |  2 +-
 .../rest/transfertypes/LiveScenarioView.java  |  2 +-
 .../engine/rest/transfertypes/ResultView.java |  2 +-
 nb-api/pom.xml                                |  5 ++
 .../java/io/nosqlbench/nb/api}/OnError.java   |  2 +-
 .../java/io/nosqlbench/nb/api/SystemId.java   | 36 +++++++++++++
 .../nb/api/annotations/Annotator.java         |  2 +-
 .../io/nosqlbench/nb/{ => api}/spi/Named.java |  2 +-
 .../nb/api/config/MutableConfigModelTest.java | 52 +++++++++++++++++++
 .../script/AsyncScriptIntegrationTests.java   |  4 +-
 .../core/script/ScriptIntegrationTests.java   |  4 +-
 .../script/SpeedCheckIntegrationTests.java    |  2 +-
 .../bindings/VirtDataFunctionLibrary.java     |  2 +-
 35 files changed, 136 insertions(+), 43 deletions(-)
 rename engine-core/src/main/java/io/nosqlbench/engine/core/{ => lifecycle}/ActivityExceptionHandler.java (95%)
 rename engine-core/src/main/java/io/nosqlbench/engine/core/{ => lifecycle}/ActivityExecutor.java (99%)
 rename engine-core/src/main/java/io/nosqlbench/engine/core/{ => lifecycle}/ActivityProgressIndicator.java (98%)
 rename engine-core/src/main/java/io/nosqlbench/engine/core/{ => lifecycle}/PolyglotScenarioController.java (99%)
 rename engine-core/src/main/java/io/nosqlbench/engine/core/{ => lifecycle}/ScenarioController.java (99%)
 rename engine-core/src/main/java/io/nosqlbench/engine/core/{ => lifecycle}/ScenarioErrorHandler.java (98%)
 rename engine-core/src/main/java/io/nosqlbench/engine/core/{ => lifecycle}/ScenarioResult.java (98%)
 rename engine-core/src/main/java/io/nosqlbench/engine/core/{ => lifecycle}/ScenariosResults.java (98%)
 rename engine-core/src/main/java/io/nosqlbench/engine/core/{ => metadata}/MarkdownDocInfo.java (97%)
 rename {engine-core/src/main/java/io/nosqlbench/engine/core/metrics => nb-api/src/main/java/io/nosqlbench/nb/api}/OnError.java (89%)
 create mode 100644 nb-api/src/main/java/io/nosqlbench/nb/api/SystemId.java
 rename nb-api/src/main/java/io/nosqlbench/nb/{ => api}/spi/Named.java (85%)
 create mode 100644 nb-api/src/test/java/io/nosqlbench/nb/api/config/MutableConfigModelTest.java

diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index 4b9e0d05d..cf11ea2f7 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -106,11 +106,6 @@
             <artifactId>netty-handler</artifactId>
         </dependency>
 
-        <dependency>
-          <groupId>com.github.oshi</groupId>
-          <artifactId>oshi-core</artifactId>
-        </dependency>
-
         <!-- test scope only -->
 
 
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityType.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityType.java
index e2909f482..b5206936d 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityType.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityType.java
@@ -25,7 +25,7 @@ import io.nosqlbench.engine.api.activityimpl.SimpleActivity;
 import io.nosqlbench.engine.api.activityimpl.action.CoreActionDispenser;
 import io.nosqlbench.engine.api.activityimpl.motor.CoreMotorDispenser;
 import io.nosqlbench.engine.api.util.SimpleServiceLoader;
-import io.nosqlbench.nb.spi.Named;
+import io.nosqlbench.nb.api.spi.Named;
 
 import java.util.Map;
 import java.util.Optional;
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ExperimentalResultFilterType.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ExperimentalResultFilterType.java
index 1dcd50d1c..7dc634892 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ExperimentalResultFilterType.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ExperimentalResultFilterType.java
@@ -20,7 +20,7 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.filters;
 import io.nosqlbench.engine.api.activityapi.core.Activity;
 import io.nosqlbench.engine.api.util.SimpleConfig;
 import io.nosqlbench.engine.api.util.SimpleServiceLoader;
-import io.nosqlbench.nb.spi.Named;
+import io.nosqlbench.nb.api.spi.Named;
 
 import java.util.function.IntPredicate;
 
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ResultValueFilterType.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ResultValueFilterType.java
index f0d930960..4f0f2e488 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ResultValueFilterType.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ResultValueFilterType.java
@@ -18,7 +18,7 @@
 package io.nosqlbench.engine.api.activityapi.cyclelog.filters;
 
 import io.nosqlbench.engine.api.util.SimpleServiceLoader;
-import io.nosqlbench.nb.spi.Named;
+import io.nosqlbench.nb.api.spi.Named;
 
 public interface ResultValueFilterType extends Named {
 
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/input/InputType.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/input/InputType.java
index 7d74f7cca..59ccd4423 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/input/InputType.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/input/InputType.java
@@ -19,7 +19,7 @@ package io.nosqlbench.engine.api.activityapi.input;
 
 import io.nosqlbench.engine.api.activityapi.core.Activity;
 import io.nosqlbench.engine.api.util.SimpleServiceLoader;
-import io.nosqlbench.nb.spi.Named;
+import io.nosqlbench.nb.api.spi.Named;
 
 public interface InputType extends Named {
 
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/output/OutputType.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/output/OutputType.java
index e8eabb2b3..04ead50f7 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/output/OutputType.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/output/OutputType.java
@@ -19,7 +19,7 @@ package io.nosqlbench.engine.api.activityapi.output;
 
 import io.nosqlbench.engine.api.activityapi.core.Activity;
 import io.nosqlbench.engine.api.util.SimpleServiceLoader;
-import io.nosqlbench.nb.spi.Named;
+import io.nosqlbench.nb.api.spi.Named;
 
 public interface OutputType extends Named {
 
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/util/SimpleServiceLoader.java b/engine-api/src/main/java/io/nosqlbench/engine/api/util/SimpleServiceLoader.java
index b662ebc3c..e8938e179 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/util/SimpleServiceLoader.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/util/SimpleServiceLoader.java
@@ -17,7 +17,7 @@
 
 package io.nosqlbench.engine.api.util;
 
-import io.nosqlbench.nb.spi.Named;
+import io.nosqlbench.nb.api.spi.Named;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
index 84ca8c070..44cfec7ff 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
@@ -7,9 +7,13 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.outputs.cyclelog.CycleLogIm
 import io.nosqlbench.engine.api.activityapi.input.InputType;
 import io.nosqlbench.engine.api.activityapi.output.OutputType;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
-import io.nosqlbench.engine.core.*;
 import io.nosqlbench.engine.core.annotation.Annotators;
+import io.nosqlbench.engine.core.lifecycle.ScenarioErrorHandler;
+import io.nosqlbench.engine.core.lifecycle.ScenarioResult;
+import io.nosqlbench.engine.core.lifecycle.ScenariosResults;
+import io.nosqlbench.engine.core.lifecycle.ShutdownManager;
 import io.nosqlbench.engine.core.logging.LoggerConfig;
+import io.nosqlbench.engine.core.metadata.MarkdownDocInfo;
 import io.nosqlbench.engine.core.metrics.MetricReporters;
 import io.nosqlbench.engine.core.script.MetricsMapper;
 import io.nosqlbench.engine.core.script.Scenario;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/ActivityExceptionHandler.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExceptionHandler.java
similarity index 95%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/ActivityExceptionHandler.java
rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExceptionHandler.java
index e29107c02..565c859f5 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/ActivityExceptionHandler.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExceptionHandler.java
@@ -15,7 +15,7 @@
  * /
  */
 
-package io.nosqlbench.engine.core;
+package io.nosqlbench.engine.core.lifecycle;
 
 public class ActivityExceptionHandler implements Thread.UncaughtExceptionHandler {
 
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/ActivityExecutor.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java
similarity index 99%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/ActivityExecutor.java
rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java
index 6b0a55a88..b344f97d1 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/ActivityExecutor.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java
@@ -12,7 +12,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package io.nosqlbench.engine.core;
+package io.nosqlbench.engine.core.lifecycle;
 
 import io.nosqlbench.engine.api.activityapi.core.*;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/ActivityProgressIndicator.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityProgressIndicator.java
similarity index 98%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/ActivityProgressIndicator.java
rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityProgressIndicator.java
index 85a26fcd3..a94dee4b9 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/ActivityProgressIndicator.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityProgressIndicator.java
@@ -15,7 +15,7 @@
  * /
  */
 
-package io.nosqlbench.engine.core;
+package io.nosqlbench.engine.core.lifecycle;
 
 import io.nosqlbench.engine.api.activityapi.core.RunState;
 import io.nosqlbench.engine.api.activityimpl.ProgressAndStateMeter;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/PolyglotScenarioController.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/PolyglotScenarioController.java
similarity index 99%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/PolyglotScenarioController.java
rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/PolyglotScenarioController.java
index cd9b0fca4..ce6a6e990 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/PolyglotScenarioController.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/PolyglotScenarioController.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.engine.core;
+package io.nosqlbench.engine.core.lifecycle;
 
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import org.apache.logging.log4j.LogManager;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioController.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java
similarity index 99%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioController.java
rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java
index 9566333a3..26f0a9540 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioController.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java
@@ -12,7 +12,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package io.nosqlbench.engine.core;
+package io.nosqlbench.engine.core.lifecycle;
 
 import io.nosqlbench.engine.api.activityapi.core.Activity;
 import io.nosqlbench.engine.api.activityapi.core.ActivityType;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioErrorHandler.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioErrorHandler.java
similarity index 98%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioErrorHandler.java
rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioErrorHandler.java
index b149f4dff..8e4c30694 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioErrorHandler.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioErrorHandler.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.engine.core;
+package io.nosqlbench.engine.core.lifecycle;
 
 import io.nosqlbench.nb.api.errors.BasicError;
 import org.graalvm.polyglot.PolyglotException;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioResult.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioResult.java
similarity index 98%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioResult.java
rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioResult.java
index c86330606..57f6c43d2 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioResult.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioResult.java
@@ -16,7 +16,7 @@
  *
  */
 
-package io.nosqlbench.engine.core;
+package io.nosqlbench.engine.core.lifecycle;
 
 import com.codahale.metrics.ConsoleReporter;
 import com.codahale.metrics.MetricFilter;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenariosResults.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenariosResults.java
similarity index 98%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/ScenariosResults.java
rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenariosResults.java
index 12e07e822..daa937ceb 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenariosResults.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenariosResults.java
@@ -15,7 +15,7 @@
  * /
  */
 
-package io.nosqlbench.engine.core;
+package io.nosqlbench.engine.core.lifecycle;
 
 import io.nosqlbench.engine.core.script.Scenario;
 import io.nosqlbench.engine.core.script.ScenariosExecutor;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/MarkdownDocInfo.java b/engine-core/src/main/java/io/nosqlbench/engine/core/metadata/MarkdownDocInfo.java
similarity index 97%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/MarkdownDocInfo.java
rename to engine-core/src/main/java/io/nosqlbench/engine/core/metadata/MarkdownDocInfo.java
index 4fa7d545e..e7083f695 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/MarkdownDocInfo.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/metadata/MarkdownDocInfo.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.engine.core;
+package io.nosqlbench.engine.core.metadata;
 
 import io.nosqlbench.engine.api.activityapi.core.ActivityType;
 import io.nosqlbench.nb.api.content.Content;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricReporters.java b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricReporters.java
index 42528db07..7d56a0a05 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricReporters.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricReporters.java
@@ -22,7 +22,7 @@ import com.codahale.metrics.graphite.Graphite;
 import com.codahale.metrics.graphite.GraphiteReporter;
 import io.nosqlbench.engine.api.activityapi.core.Shutdownable;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
-import io.nosqlbench.engine.core.ShutdownManager;
+import io.nosqlbench.engine.core.lifecycle.ShutdownManager;
 import io.nosqlbench.engine.core.logging.Log4JMetricsReporter;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
index 53763f855..a02afe9d6 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
@@ -19,10 +19,10 @@ import com.oracle.truffle.js.scriptengine.GraalJSScriptEngine;
 import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
 import io.nosqlbench.engine.api.scripting.ScriptEnvBuffer;
-import io.nosqlbench.engine.core.ActivityProgressIndicator;
-import io.nosqlbench.engine.core.PolyglotScenarioController;
-import io.nosqlbench.engine.core.ScenarioController;
-import io.nosqlbench.engine.core.ScenarioResult;
+import io.nosqlbench.engine.core.lifecycle.ActivityProgressIndicator;
+import io.nosqlbench.engine.core.lifecycle.PolyglotScenarioController;
+import io.nosqlbench.engine.core.lifecycle.ScenarioController;
+import io.nosqlbench.engine.core.lifecycle.ScenarioResult;
 import io.nosqlbench.engine.core.annotation.Annotators;
 import io.nosqlbench.engine.core.metrics.PolyglotMetricRegistryBindings;
 import io.nosqlbench.nb.api.Layer;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java
index 4617ed900..411c3aea3 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java
@@ -17,10 +17,10 @@
 
 package io.nosqlbench.engine.core.script;
 
-import io.nosqlbench.engine.core.IndexedThreadFactory;
-import io.nosqlbench.engine.core.ScenarioController;
-import io.nosqlbench.engine.core.ScenarioResult;
-import io.nosqlbench.engine.core.ScenariosResults;
+import io.nosqlbench.engine.core.lifecycle.IndexedThreadFactory;
+import io.nosqlbench.engine.core.lifecycle.ScenarioController;
+import io.nosqlbench.engine.core.lifecycle.ScenarioResult;
+import io.nosqlbench.engine.core.lifecycle.ScenariosResults;
 import io.nosqlbench.nb.api.errors.BasicError;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java
index f0c2c33ed..a0669beb4 100644
--- a/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java
+++ b/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java
@@ -12,6 +12,7 @@ import io.nosqlbench.engine.api.activityimpl.input.CoreInputDispenser;
 import io.nosqlbench.engine.api.activityimpl.input.AtomicInput;
 import io.nosqlbench.engine.api.activityimpl.motor.CoreMotor;
 import io.nosqlbench.engine.api.activityimpl.motor.CoreMotorDispenser;
+import io.nosqlbench.engine.core.lifecycle.ActivityExecutor;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.junit.Test;
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScenariosExecutorTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScenariosExecutorTest.java
index 636d20ec1..c25404c3a 100644
--- a/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScenariosExecutorTest.java
+++ b/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScenariosExecutorTest.java
@@ -17,7 +17,7 @@
 
 package io.nosqlbench.engine.core.script;
 
-import io.nosqlbench.engine.core.ScenariosResults;
+import io.nosqlbench.engine.core.lifecycle.ScenariosResults;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java
index d75cf7afe..ccf36ce0a 100644
--- a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java
+++ b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java
@@ -5,7 +5,7 @@ import io.nosqlbench.engine.cli.BasicScriptBuffer;
 import io.nosqlbench.engine.cli.Cmd;
 import io.nosqlbench.engine.cli.NBCLICommandParser;
 import io.nosqlbench.engine.cli.ScriptBuffer;
-import io.nosqlbench.engine.core.ScenarioResult;
+import io.nosqlbench.engine.core.lifecycle.ScenarioResult;
 import io.nosqlbench.engine.core.script.Scenario;
 import io.nosqlbench.engine.core.script.ScenariosExecutor;
 import io.nosqlbench.engine.rest.services.WorkSpace;
diff --git a/engine-rest/src/main/java/io/nosqlbench/engine/rest/transfertypes/LiveScenarioView.java b/engine-rest/src/main/java/io/nosqlbench/engine/rest/transfertypes/LiveScenarioView.java
index b7ad12e11..1c7968a77 100644
--- a/engine-rest/src/main/java/io/nosqlbench/engine/rest/transfertypes/LiveScenarioView.java
+++ b/engine-rest/src/main/java/io/nosqlbench/engine/rest/transfertypes/LiveScenarioView.java
@@ -3,7 +3,7 @@ package io.nosqlbench.engine.rest.transfertypes;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
 import io.nosqlbench.engine.api.activityapi.core.ProgressMeter;
-import io.nosqlbench.engine.core.ScenarioResult;
+import io.nosqlbench.engine.core.lifecycle.ScenarioResult;
 import io.nosqlbench.engine.core.script.Scenario;
 
 import java.util.ArrayList;
diff --git a/engine-rest/src/main/java/io/nosqlbench/engine/rest/transfertypes/ResultView.java b/engine-rest/src/main/java/io/nosqlbench/engine/rest/transfertypes/ResultView.java
index 2b86e3e2d..046789880 100644
--- a/engine-rest/src/main/java/io/nosqlbench/engine/rest/transfertypes/ResultView.java
+++ b/engine-rest/src/main/java/io/nosqlbench/engine/rest/transfertypes/ResultView.java
@@ -1,6 +1,6 @@
 package io.nosqlbench.engine.rest.transfertypes;
 
-import io.nosqlbench.engine.core.ScenarioResult;
+import io.nosqlbench.engine.core.lifecycle.ScenarioResult;
 
 public class ResultView {
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 30db12b50..43ec01752 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -57,6 +57,11 @@
       <artifactId>gson</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>com.github.oshi</groupId>
+      <artifactId>oshi-core</artifactId>
+    </dependency>
+    
     <!-- perf testing -->
 
     <dependency>
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/OnError.java b/nb-api/src/main/java/io/nosqlbench/nb/api/OnError.java
similarity index 89%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/metrics/OnError.java
rename to nb-api/src/main/java/io/nosqlbench/nb/api/OnError.java
index 4f36af5ba..9090e4c60 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/OnError.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/OnError.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.engine.core.metrics;
+package io.nosqlbench.nb.api;
 
 public enum OnError {
     Warn,
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/SystemId.java b/nb-api/src/main/java/io/nosqlbench/nb/api/SystemId.java
new file mode 100644
index 000000000..cef0ada5d
--- /dev/null
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/SystemId.java
@@ -0,0 +1,36 @@
+package io.nosqlbench.nb.api;
+
+import oshi.SystemInfo;
+import oshi.hardware.HardwareAbstractionLayer;
+import oshi.hardware.NetworkIF;
+
+import java.util.*;
+
+public class SystemId {
+    public static String getNodeId() {
+        SystemInfo sysinfo = new SystemInfo();
+        HardwareAbstractionLayer hal = sysinfo.getHardware();
+        List<NetworkIF> interfaces = hal.getNetworkIFs();
+        Optional<String> first = interfaces.stream()
+                .filter(i -> !i.getName().startsWith("docker" ))
+                .filter(i -> !i.getName().equals("lo" ))
+                .sorted((o1, o2) -> {
+                    if (o1.getName().startsWith("e" ) && o2.getName().startsWith("e" )) {
+                        return 0;
+                    }
+                    if (o1.getName().startsWith("e" )) {
+                        return -1;
+                    }
+                    if (o2.getName().startsWith("e" )) {
+                        return 1;
+                    }
+                    return 0;
+                })
+                .flatMap(iface -> Arrays.stream(iface.getIPv4addr().clone()))
+                .filter(addr -> !(addr.startsWith("127." )))
+                .findFirst();
+        String systemID = first.orElse("UNKNOWN_SYSTEM_ID" );
+        return systemID;
+    }
+
+}
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotator.java b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotator.java
index fde190951..2b0d7fe0d 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotator.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotator.java
@@ -1,6 +1,6 @@
 package io.nosqlbench.nb.api.annotations;
 
-import io.nosqlbench.nb.spi.Named;
+import io.nosqlbench.nb.api.spi.Named;
 
 /**
  * An implementation of this type is responsible for taking annotation details and
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/spi/Named.java b/nb-api/src/main/java/io/nosqlbench/nb/api/spi/Named.java
similarity index 85%
rename from nb-api/src/main/java/io/nosqlbench/nb/spi/Named.java
rename to nb-api/src/main/java/io/nosqlbench/nb/api/spi/Named.java
index ffe8279a4..06592302c 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/spi/Named.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/spi/Named.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.nb.spi;
+package io.nosqlbench.nb.api.spi;
 
 public interface Named {
     /**
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/config/MutableConfigModelTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/config/MutableConfigModelTest.java
new file mode 100644
index 000000000..9346bc34a
--- /dev/null
+++ b/nb-api/src/test/java/io/nosqlbench/nb/api/config/MutableConfigModelTest.java
@@ -0,0 +1,52 @@
+package io.nosqlbench.nb.api.config;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class MutableConfigModelTest {
+
+    @Test
+    void optional() {
+    }
+
+    @Test
+    void testOptional() {
+    }
+
+    @Test
+    void required() {
+    }
+
+    @Test
+    void testRequired() {
+    }
+
+    @Test
+    void defaultto() {
+    }
+
+    @Test
+    void testDefaultto() {
+    }
+
+    @Test
+    void asReadOnly() {
+    }
+
+    @Test
+    void getElements() {
+    }
+
+    @Test
+    void getOf() {
+    }
+
+    @Test
+    void assertValidConfig() {
+    }
+
+    @Test
+    void apply() {
+    }
+}
\ No newline at end of file
diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java b/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
index c10ce239f..5662373dd 100644
--- a/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
+++ b/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
@@ -17,8 +17,8 @@
 
 package io.nosqlbench.engine.core.script;
 
-import io.nosqlbench.engine.core.ScenarioResult;
-import io.nosqlbench.engine.core.ScenariosResults;
+import io.nosqlbench.engine.core.lifecycle.ScenarioResult;
+import io.nosqlbench.engine.core.lifecycle.ScenariosResults;
 import org.apache.commons.compress.utils.IOUtils;
 import org.assertj.core.data.Offset;
 import org.junit.BeforeClass;
diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/ScriptIntegrationTests.java b/nb/src/test/java/io/nosqlbench/engine/core/script/ScriptIntegrationTests.java
index da13c4bd8..f31f2cb55 100644
--- a/nb/src/test/java/io/nosqlbench/engine/core/script/ScriptIntegrationTests.java
+++ b/nb/src/test/java/io/nosqlbench/engine/core/script/ScriptIntegrationTests.java
@@ -17,8 +17,8 @@
 
 package io.nosqlbench.engine.core.script;
 
-import io.nosqlbench.engine.core.ScenarioResult;
-import io.nosqlbench.engine.core.ScenariosResults;
+import io.nosqlbench.engine.core.lifecycle.ScenarioResult;
+import io.nosqlbench.engine.core.lifecycle.ScenariosResults;
 import org.apache.commons.compress.utils.IOUtils;
 import org.assertj.core.data.Offset;
 import org.junit.BeforeClass;
diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/SpeedCheckIntegrationTests.java b/nb/src/test/java/io/nosqlbench/engine/core/script/SpeedCheckIntegrationTests.java
index 370ee3210..f244523c3 100644
--- a/nb/src/test/java/io/nosqlbench/engine/core/script/SpeedCheckIntegrationTests.java
+++ b/nb/src/test/java/io/nosqlbench/engine/core/script/SpeedCheckIntegrationTests.java
@@ -14,7 +14,7 @@
 */
 package io.nosqlbench.engine.core.script;
 
-import io.nosqlbench.engine.core.ScenarioResult;
+import io.nosqlbench.engine.core.lifecycle.ScenarioResult;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionLibrary.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionLibrary.java
index dc7126e3a..982ad4e9e 100644
--- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionLibrary.java
+++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionLibrary.java
@@ -1,6 +1,6 @@
 package io.nosqlbench.virtdata.core.bindings;
 
-import io.nosqlbench.nb.spi.Named;
+import io.nosqlbench.nb.api.spi.Named;
 import io.nosqlbench.virtdata.lang.ast.Expression;
 import io.nosqlbench.virtdata.lang.ast.FunctionCall;
 import io.nosqlbench.virtdata.lang.parser.VirtDataDSL;

From cfa92eabcca8215672f5b380b475de506cb2e9cb Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Sun, 22 Nov 2020 02:55:46 -0600
Subject: [PATCH 053/164] package organization

---
 .../{ => lifecycle}/IndexedThreadFactory.java |  6 +--
 .../core/{ => lifecycle}/ShutdownManager.java |  8 +--
 .../core/script/NashornActivityBindings.java  |  4 +-
 .../engine/core/script/ScenarioContext.java   |  4 +-
 .../nb/api/config/MutableConfigModel.java     | 51 ++++++++++++++-----
 .../io/nosqlbench/nb/api/config/Synonyms.java | 10 ++--
 6 files changed, 56 insertions(+), 27 deletions(-)
 rename engine-core/src/main/java/io/nosqlbench/engine/core/{ => lifecycle}/IndexedThreadFactory.java (93%)
 rename engine-core/src/main/java/io/nosqlbench/engine/core/{ => lifecycle}/ShutdownManager.java (87%)

diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/IndexedThreadFactory.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/IndexedThreadFactory.java
similarity index 93%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/IndexedThreadFactory.java
rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/IndexedThreadFactory.java
index 1591536fa..e510db5c7 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/IndexedThreadFactory.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/IndexedThreadFactory.java
@@ -16,7 +16,7 @@
  *
  */
 
-package io.nosqlbench.engine.core;
+package io.nosqlbench.engine.core.lifecycle;
 
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -29,7 +29,7 @@ public class IndexedThreadFactory implements ThreadFactory {
 
     private final Thread.UncaughtExceptionHandler uncaughtExceptionHandler;
     private String name = Thread.currentThread().getName() + "-factory";
-    private AtomicInteger threadIndexer = new AtomicInteger(0);
+    private final AtomicInteger threadIndexer = new AtomicInteger(0);
 
     public IndexedThreadFactory(String name, Thread.UncaughtExceptionHandler exceptionHandler) {
         this.name = name;
@@ -38,7 +38,7 @@ public class IndexedThreadFactory implements ThreadFactory {
 
     public class IndexedThread extends Thread {
 
-        private int threadIndex;
+        private final int threadIndex;
         private String metricName = "default-name-" + Thread.currentThread().getName();
 
         public IndexedThread(int threadIndex, Runnable r) {
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/ShutdownManager.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ShutdownManager.java
similarity index 87%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/ShutdownManager.java
rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ShutdownManager.java
index 2dcbd5c8c..7ca48ff6e 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/ShutdownManager.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ShutdownManager.java
@@ -12,7 +12,7 @@
 *   See the License for the specific language governing permissions and
 *   limitations under the License.
 */
-package io.nosqlbench.engine.core;
+package io.nosqlbench.engine.core.lifecycle;
 
 import io.nosqlbench.engine.api.activityapi.core.Shutdownable;
 
@@ -22,8 +22,10 @@ import java.util.LinkedList;
  * A simple callback handler for shutting down things gracefully.
  */
 public class ShutdownManager {
-    private ShutdownManager() {}
-    private static ShutdownManager instance = new ShutdownManager();
+    private ShutdownManager() {
+    }
+
+    private static final ShutdownManager instance = new ShutdownManager();
 
     private final LinkedList<Shutdownable> managedInstances = new LinkedList<>();
 
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/NashornActivityBindings.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/NashornActivityBindings.java
index c38200f35..784b01e5e 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/NashornActivityBindings.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/NashornActivityBindings.java
@@ -15,7 +15,7 @@
 package io.nosqlbench.engine.core.script;
 
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import io.nosqlbench.engine.core.ScenarioController;
+import io.nosqlbench.engine.core.lifecycle.ScenarioController;
 import org.graalvm.polyglot.Value;
 import org.graalvm.polyglot.proxy.ProxyObject;
 
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
 public class NashornActivityBindings implements Bindings, ProxyObject {
 
     private final ScenarioController scenario;
-    private Map<String,Bindings> elementMap = new HashMap<String,Bindings>();
+    private final Map<String, Bindings> elementMap = new HashMap<String, Bindings>();
 
     public NashornActivityBindings(ScenarioController scenarioController) {
         this.scenario = scenarioController;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenarioContext.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenarioContext.java
index d7489c5df..1a87a683f 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenarioContext.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenarioContext.java
@@ -14,12 +14,12 @@
 */
 package io.nosqlbench.engine.core.script;
 
-import io.nosqlbench.engine.core.ScenarioController;
+import io.nosqlbench.engine.core.lifecycle.ScenarioController;
 import io.nosqlbench.engine.api.scripting.ScriptEnvBuffer;
 
 public class ScenarioContext extends ScriptEnvBuffer {
 
-    private ScenarioController sc;
+    private final ScenarioController sc;
 
     public ScenarioContext(ScenarioController sc) {
         this.sc = sc;
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/MutableConfigModel.java b/nb-api/src/main/java/io/nosqlbench/nb/api/config/MutableConfigModel.java
index 16f3ed183..7cfd029fd 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/config/MutableConfigModel.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/config/MutableConfigModel.java
@@ -73,12 +73,7 @@ public class MutableConfigModel implements ConfigModel {
                                 "while configuring a " + getOf().getSimpleName());
             }
             Object value = config.get(configkey);
-            if (!element.getType().isAssignableFrom(value.getClass())) {
-                throw new RuntimeException("Unable to assign provided configuration\n" +
-                        "of type '" + value.getClass().getSimpleName() + " to config\n" +
-                        "parameter of type '" + element.getType().getSimpleName() + "'\n" +
-                        "while configuring a " + getOf().getSimpleName());
-            }
+            Object testValue = convertValueTo(ofType.getSimpleName(), configkey, value, element.getType());
         }
         for (ConfigElement element : elements.values()) {
             if (element.isRequired() && element.getDefaultValue() == null) {
@@ -91,6 +86,42 @@ public class MutableConfigModel implements ConfigModel {
         }
     }
 
+    private Object convertValueTo(String configName, String paramName, Object value, Class<?> type) {
+        try {
+            if (type.isAssignableFrom(value.getClass())) {
+                return type.cast(value);
+            } else if (Number.class.isAssignableFrom(type)
+                    && Number.class.isAssignableFrom(value.getClass())) {
+                Number number = (Number) value;
+                if (type.equals(Float.class)) {
+                    return number.floatValue();
+                } else if (type.equals(Integer.class)) {
+                    return number.intValue();
+                } else if (type.equals(Double.class)) {
+                    return number.doubleValue();
+                } else if (type.equals(Long.class)) {
+                    return number.longValue();
+                } else if (type.equals(Byte.class)) {
+                    return number.byteValue();
+                } else if (type.equals(Short.class)) {
+                    return number.shortValue();
+                } else {
+                    throw new RuntimeException("Number type " + type.getSimpleName() + " could " +
+                            " not be converted from " + value.getClass().getSimpleName());
+                }
+            }
+
+        } catch (Exception e) {
+            throw e;
+        }
+
+        throw new RuntimeException(
+                "While configuring " + paramName + " for " + configName + ", " +
+                        "Unable to convert " + value.getClass() + " to " +
+                        type.getCanonicalName()
+        );
+    }
+
     @Override
     public ConfigReader apply(Map<String, ?> config) {
         assertValidConfig(config);
@@ -104,12 +135,8 @@ public class MutableConfigModel implements ConfigModel {
                 cval = v.getDefaultValue();
             }
             if (cval != null) {
-                if (type.isAssignableFrom(cval.getClass())) {
-                    validConfig.put(name, cval);
-                } else {
-                    throw new RuntimeException("Unable to assign a " + cval.getClass().getSimpleName() +
-                            " to a " + type.getSimpleName());
-                }
+                cval = convertValueTo(ofType.getSimpleName(), k, cval, type);
+                validConfig.put(name, cval);
             }
         });
 
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/Synonyms.java b/nb-api/src/main/java/io/nosqlbench/nb/api/config/Synonyms.java
index ff7891f8e..2a76a2857 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/config/Synonyms.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/config/Synonyms.java
@@ -18,11 +18,11 @@ public class Synonyms {
      * Each entry in this list is a list of synonyms in configuration.
      */
     public final static Map<String, Set<String>> PARAM_SYNONYMS = new HashMap<>() {{
-        put("hosts",Set.of("host"));
-        put("workload",Set.of("yaml"));
-        put("driver",Set.of("type"));
-        put("cyclerate", Set.of("targetrate", "rate"));
-        put("parameterized", Set.of("parametrized")); // mispelling safety net
+        put("hosts", Set.of("host" ));
+        put("workload", Set.of("yaml" ));
+        put("driver", Set.of("type" ));
+        put("rate", Set.of("targetrate", "cyclerate" ));
+        put("parameterized", Set.of("parametrized" )); // mispelling safety net
     }};
 
     /**

From 3d2ff55f1c0c383dd2f9a560f106578f94bdbeba Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Sun, 22 Nov 2020 02:55:51 -0600
Subject: [PATCH 054/164] auto create apikey

---
 .../clients/grafana/GrafanaClientConfig.java  |  28 ++++-
 .../grafana}/GrafanaKeyFileReader.java        |  10 +-
 .../grafana}/GrafanaMetricsAnnotator.java     | 116 +++++++++++-------
 .../grafana/transfer/GrafanaAnnotation.java   |  17 ++-
 .../nb/api/config/ConfigReader.java           |  10 +-
 5 files changed, 122 insertions(+), 59 deletions(-)
 rename {engine-core/src/main/java/io/nosqlbench/engine/core/metrics => engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana}/GrafanaKeyFileReader.java (84%)
 rename {engine-core/src/main/java/io/nosqlbench/engine/core/metrics => engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana}/GrafanaMetricsAnnotator.java (63%)

diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClientConfig.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClientConfig.java
index 1c8893bb4..60053eddf 100644
--- a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClientConfig.java
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClientConfig.java
@@ -21,17 +21,28 @@ public class GrafanaClientConfig {
     @JsonProperty("baseuri")
     private URI baseUrl;
 
-    @JsonProperty("timeoutms")
+    @JsonProperty("timeoutms" )
     private int timeoutms;
 
     private final List<Authenticator> authenticators = new ArrayList<>();
-    //    private LinkedHashMap<String,String> headers = new LinkedHashMap<>();
     private final List<Supplier<Map<String, String>>> headerSources = new ArrayList<>();
 
     public GrafanaClientConfig() {
     }
 
-    public void basicAuth(String username, String pw) {
+    private GrafanaClientConfig(URI baseUrl, int timeoutms, List<Authenticator> authenticators,
+                                List<Supplier<Map<String, String>>> headerSources) {
+        this.baseUrl = baseUrl;
+        this.timeoutms = timeoutms;
+        this.authenticators.addAll(authenticators);
+        this.headerSources.addAll(headerSources);
+    }
+
+    public GrafanaClientConfig copy() {
+        return new GrafanaClientConfig(baseUrl, timeoutms, authenticators, headerSources);
+    }
+
+    public GrafanaClientConfig basicAuth(String username, String pw) {
         Objects.requireNonNull(username);
         String authPw = pw != null ? pw : "";
 
@@ -44,9 +55,9 @@ public class GrafanaClientConfig {
 
         addAuthenticator(basicAuth);
         addHeader("Authorization", encodeBasicAuth(username, authPw));
+        return this;
     }
 
-
     public GrafanaClientConfig addAuthenticator(Authenticator authenticator) {
         authenticators.add(authenticator);
         return this;
@@ -87,7 +98,9 @@ public class GrafanaClientConfig {
 
     public HttpClient newClient() {
         HttpClient.Builder cb = HttpClient.newBuilder();
-        cb.connectTimeout(Duration.ofMillis(timeoutms));
+        if (timeoutms > 0) {
+            cb.connectTimeout(Duration.ofMillis(timeoutms));
+        }
         for (Authenticator authenticator : authenticators) {
             cb.authenticator(authenticator);
         }
@@ -106,8 +119,11 @@ public class GrafanaClientConfig {
     public HttpRequest.Builder newRequest(String path) {
         URI requestUri = makeUri(path);
         HttpRequest.Builder rqb = HttpRequest.newBuilder(requestUri);
-        rqb.timeout(Duration.ofMillis(timeoutms));
+        if (timeoutms > 0) {
+            rqb.timeout(Duration.ofMillis(timeoutms));
+        }
         getHeaders().forEach(rqb::setHeader);
+
         return rqb;
     }
 
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/GrafanaKeyFileReader.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaKeyFileReader.java
similarity index 84%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/metrics/GrafanaKeyFileReader.java
rename to engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaKeyFileReader.java
index 1c3dc1eba..5cfe6acca 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/GrafanaKeyFileReader.java
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaKeyFileReader.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.engine.core.metrics;
+package io.nosqlbench.engine.clients.grafana;
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
@@ -10,15 +10,18 @@ import java.nio.file.Path;
 import java.util.function.Supplier;
 
 public class GrafanaKeyFileReader implements Supplier<String> {
-    private final static Logger logger = LogManager.getLogger("ANNOTATORS");
+    private final static Logger logger = LogManager.getLogger("ANNOTATORS" );
 
     private final Path keyfilePath;
 
+    public GrafanaKeyFileReader(Path path) {
+        this.keyfilePath = path;
+    }
+
     public GrafanaKeyFileReader(String sourcePath) {
         this.keyfilePath = Path.of(sourcePath);
     }
 
-
     @Override
     public String get() {
         if (!Files.exists(keyfilePath)) {
@@ -27,6 +30,7 @@ public class GrafanaKeyFileReader implements Supplier<String> {
         } else {
             try {
                 String apikey = Files.readString(keyfilePath, StandardCharsets.UTF_8);
+                apikey = apikey.trim();
                 return apikey;
             } catch (IOException e) {
                 throw new RuntimeException(e);
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/GrafanaMetricsAnnotator.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaMetricsAnnotator.java
similarity index 63%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/metrics/GrafanaMetricsAnnotator.java
rename to engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaMetricsAnnotator.java
index 00471adee..25d50aac6 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/GrafanaMetricsAnnotator.java
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaMetricsAnnotator.java
@@ -1,26 +1,29 @@
-package io.nosqlbench.engine.core.metrics;
+package io.nosqlbench.engine.clients.grafana;
 
-import io.nosqlbench.engine.clients.grafana.GrafanaClient;
-import io.nosqlbench.engine.clients.grafana.GrafanaClientConfig;
 import io.nosqlbench.engine.clients.grafana.transfer.GrafanaAnnotation;
 import io.nosqlbench.nb.annotations.Service;
+import io.nosqlbench.nb.api.Environment;
+import io.nosqlbench.nb.api.OnError;
+import io.nosqlbench.nb.api.SystemId;
 import io.nosqlbench.nb.api.annotations.Annotation;
 import io.nosqlbench.nb.api.annotations.Annotator;
 import io.nosqlbench.nb.api.config.*;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-@Service(value = Annotator.class, selector = "grafana")
+@Service(value = Annotator.class, selector = "grafana" )
 public class GrafanaMetricsAnnotator implements Annotator, ConfigAware {
 
-    private final static Logger logger = LogManager.getLogger("ANNOTATORS");
-    private final static Logger annotationsLog = LogManager.getLogger("ANNOTATIONS");
+    private final static Logger logger = LogManager.getLogger("ANNOTATORS" );
+    private final static Logger annotationsLog = LogManager.getLogger("ANNOTATIONS" );
     private OnError onError = OnError.Warn;
 
     private GrafanaClient client;
@@ -38,43 +41,43 @@ public class GrafanaMetricsAnnotator implements Annotator, ConfigAware {
             ga.setTimeEnd(annotation.getEnd());
 
             annotation.getLabels().forEach((k, v) -> {
-                ga.getTags().put(k, v);
+                ga.getTags().add(k + ":" + v);
             });
-            ga.getTags().put("layer", annotation.getLayer().toString());
+            ga.getTags().add("layer:" + annotation.getLayer().toString());
 
             Map<String, String> labels = annotation.getLabels();
 
-            Optional.ofNullable(labels.get("alertId"))
+            Optional.ofNullable(labels.get("alertId" ))
                     .map(Integer::parseInt).ifPresent(ga::setAlertId);
 
-            ga.setData(annotation.toString());
+            ga.setText(annotation.toString());
 
             annotation.getSession();
 
 
             // Target
-            Optional.ofNullable(labels.get("type"))
+            Optional.ofNullable(labels.get("type" ))
                     .ifPresent(ga::setType);
 
-            Optional.ofNullable(labels.get("id")).map(Integer::valueOf)
+            Optional.ofNullable(labels.get("id" )).map(Integer::valueOf)
                     .ifPresent(ga::setId);
 
-            Optional.ofNullable(labels.get("alertId")).map(Integer::valueOf)
+            Optional.ofNullable(labels.get("alertId" )).map(Integer::valueOf)
                     .ifPresent(ga::setAlertId);
 
-            Optional.ofNullable(labels.get("dashboardId")).map(Integer::valueOf)
+            Optional.ofNullable(labels.get("dashboardId" )).map(Integer::valueOf)
                     .ifPresent(ga::setDashboardId);
 
-            Optional.ofNullable(labels.get("panelId")).map(Integer::valueOf)
+            Optional.ofNullable(labels.get("panelId" )).map(Integer::valueOf)
                     .ifPresent(ga::setPanelId);
 
-            Optional.ofNullable(labels.get("userId")).map(Integer::valueOf)
+            Optional.ofNullable(labels.get("userId" )).map(Integer::valueOf)
                     .ifPresent(ga::setUserId);
 
-            Optional.ofNullable(labels.get("userName"))
+            Optional.ofNullable(labels.get("userName" ))
                     .ifPresent(ga::setUserName);
 
-            Optional.ofNullable(labels.get("metric"))
+            Optional.ofNullable(labels.get("metric" ))
                     .ifPresent(ga::setMetric);
 
             // Details
@@ -107,60 +110,81 @@ public class GrafanaMetricsAnnotator implements Annotator, ConfigAware {
         GrafanaClientConfig gc = new GrafanaClientConfig();
         gc.setBaseUri(cfg.param("baseurl", String.class));
 
-        if (cfg.containsKey("tags")) {
+        if (cfg.containsKey("tags" )) {
             this.tags = ParamsParser.parse(cfg.param("tags", String.class), false);
         }
 
-        if (cfg.containsKey("apikeyfile")) {
-            String apikeyfile = cfg.paramEnv("apikeyfile", String.class);
-            AuthWrapper authHeaderSupplier = new AuthWrapper(
-                    "Authorization",
-                    new GrafanaKeyFileReader(apikeyfile),
-                    s -> "Bearer " + s + ";"
-            );
-            gc.addHeaderSource(authHeaderSupplier);
-        }
-
-        if (cfg.containsKey("apikey")) {
-            gc.addHeaderSource(() -> Map.of("Authorization", "Bearer " + cfg.param("apikey", String.class)));
-        }
-
-        if (cfg.containsKey("username")) {
-            if (cfg.containsKey("password")) {
+        if (cfg.containsKey("username" )) {
+            if (cfg.containsKey("password" )) {
                 gc.basicAuth(
                         cfg.param("username", String.class),
                         cfg.param("password", String.class)
                 );
             } else {
-                gc.basicAuth(cfg.param("username", String.class), "");
+                gc.basicAuth(cfg.param("username", String.class), "" );
             }
         }
 
-        this.onError = OnError.valueOfName(cfg.get("onerror").toString());
+        Path keyfilePath = null;
+        if (cfg.containsKey("apikeyfile" )) {
+            String apikeyfile = cfg.paramEnv("apikeyfile", String.class);
+            keyfilePath = Path.of(apikeyfile);
+        } else if (cfg.containsKey("apikey" )) {
+            gc.addHeaderSource(() -> Map.of("Authorization", "Bearer " + cfg.param("apikey", String.class)));
+        } else {
+            Optional<String> apikeyLocation = Environment.INSTANCE.interpolate("$NBSTATEDIR/grafana_apikey" );
+            keyfilePath = apikeyLocation.map(Path::of).orElseThrow();
+        }
+
+        if (!Files.exists(keyfilePath)) {
+            logger.info("Auto-configuring grafana apikey." );
+            GrafanaClientConfig apiClientConf = gc.copy().basicAuth("admin", "admin" );
+            GrafanaClient apiClient = new GrafanaClient(apiClientConf);
+            try {
+                String nodeId = SystemId.getNodeId();
+
+                String keyName = "nosqlbench-" + nodeId + "-" + System.currentTimeMillis();
+                ApiToken apiToken = apiClient.createApiToken(keyName, "Admin", Long.MAX_VALUE);
+                Files.writeString(keyfilePath, apiToken.getKey());
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        AuthWrapper authHeaderSupplier = new AuthWrapper(
+                "Authorization",
+                new GrafanaKeyFileReader(keyfilePath),
+                s -> "Bearer " + s
+        );
+        gc.addHeaderSource(authHeaderSupplier);
+
+        this.onError = OnError.valueOfName(cfg.get("onerror" ).toString());
 
         this.client = new GrafanaClient(gc);
+
+
     }
 
     @Override
     public ConfigModel getConfigModel() {
         return new MutableConfigModel(this)
                 .required("baseurl", String.class,
-                        "The base url of the grafana node, like http://localhost:3000/")
-                .defaultto("apikeyfile", "$NBSTATEDIR/grafana_key",
-                        "The file that contains the api key, supersedes apikey")
+                        "The base url of the grafana node, like http://localhost:3000/" )
+                .defaultto("apikeyfile", "$NBSTATEDIR/grafana_apikey",
+                        "The file that contains the api key, supersedes apikey" )
                 .optional("apikey", String.class,
-                        "The api key to use, supersedes basic username and password")
+                        "The api key to use, supersedes basic username and password" )
                 .optional("username", String.class,
-                        "The username to use for basic auth")
+                        "The username to use for basic auth" )
                 .optional("password", String.class,
-                        "The password to use for basic auth")
+                        "The password to use for basic auth" )
                 .defaultto("tags", "source:nosqlbench",
-                        "The tags that identify the annotations, in k:v,... form")
+                        "The tags that identify the annotations, in k:v,... form" )
 //                .defaultto("onerror", OnError.Warn)
                 .defaultto("onerror", "warn",
-                        "What to do when an error occurs while posting an annotation")
+                        "What to do when an error occurs while posting an annotation" )
                 .defaultto("timeoutms", 5000,
-                        "connect and transport timeout for the HTTP client")
+                        "connect and transport timeout for the HTTP client" )
                 .asReadOnly();
     }
 
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GrafanaAnnotation.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GrafanaAnnotation.java
index b492a3a76..058abdca9 100644
--- a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GrafanaAnnotation.java
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GrafanaAnnotation.java
@@ -17,7 +17,8 @@ public class GrafanaAnnotation {
     private String text;
     private String metric;
     private String type;
-    private Map<String, String> tags = new LinkedHashMap<>();
+    private final List<String> tags = new ArrayList<>();
+    //    private Map<String, String> tags = new LinkedHashMap<>();
     private Object data;
 
     public Integer getId() {
@@ -124,12 +125,22 @@ public class GrafanaAnnotation {
         this.type = type;
     }
 
-    public Map<String, String> getTags() {
+    public List<String> getTags() {
         return tags;
     }
 
+    public void addTag(String tag) {
+        this.tags.add(tag);
+    }
+
+    public void setTags(List<String> tags) {
+        tags.forEach(this::addTag);
+    }
+
     public void setTags(Map<String, String> tags) {
-        this.tags = tags;
+        tags.forEach((k, v) -> {
+            this.addTag(k + ":" + v);
+        });
     }
 
     public Object getData() {
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigReader.java b/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigReader.java
index 5457fa8d4..c26c2a80e 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigReader.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigReader.java
@@ -31,10 +31,18 @@ public class ConfigReader extends LinkedHashMap<String, Object> {
         Object o = get(name);
         ConfigElement<?> elem = configModel.getElements().get(name);
         if (elem == null) {
-            throw new RuntimeException("Invalid config element named '" + name + "'");
+            throw new RuntimeException("Invalid config element named '" + name + "'" );
         }
         Class<T> type = (Class<T>) elem.getType();
         T typeCastedValue = type.cast(o);
         return typeCastedValue;
     }
+
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(this.configModel.getOf().getSimpleName()).append(":" );
+        sb.append(this.configModel.toString());
+        return sb.toString();
+
+    }
 }

From 40897879ec702e96966277ef41e18d4e5c50c912 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Wed, 2 Dec 2020 14:18:26 -0600
Subject: [PATCH 055/164] core activity impl now handles alias defaults

---
 .../activitytype/cql/core/CqlActivityType.java    |  5 -----
 .../activitytype/stdout/StdoutActivityType.java   |  5 -----
 .../engine/api/activityimpl/SimpleActivity.java   | 15 +++++++++++++++
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivityType.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivityType.java
index 7572aad8e..2b5421bd5 100644
--- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivityType.java
+++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivityType.java
@@ -34,11 +34,6 @@ public class CqlActivityType implements ActivityType<CqlActivity> {
             throw new RuntimeException("Currently, the cql activity type requires yaml/workload activity parameter.");
         }
 
-        // allow shortcut: yaml parameter provide the default alias name
-        if (activityDef.getAlias().equals(ActivityDef.DEFAULT_ALIAS)) {
-            activityDef.getParams().set("alias",yaml.get());
-        }
-
         return new CqlActivity(activityDef);
     }
 
diff --git a/driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivityType.java b/driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivityType.java
index 6de74b7cd..0399bacf2 100644
--- a/driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivityType.java
+++ b/driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivityType.java
@@ -27,11 +27,6 @@ public class StdoutActivityType implements ActivityType<StdoutActivity> {
                 ".");
         }
 
-        // allow shortcut: yaml parameter provide the default alias name
-        if (activityDef.getAlias().equals(ActivityDef.DEFAULT_ALIAS)) {
-            activityDef.getParams().set("alias",yaml.get());
-        }
-
         return new StdoutActivity(activityDef);
     }
 
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java
index 884a7f569..09e00fbf0 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java
@@ -27,6 +27,7 @@ import java.io.InputStream;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -52,9 +53,23 @@ public class SimpleActivity implements Activity, ProgressCapable {
     private ActivityInstrumentation activityInstrumentation;
     private PrintWriter console;
     private long startedAtMillis;
+    private int nameEnumerator = 0;
 
     public SimpleActivity(ActivityDef activityDef) {
         this.activityDef = activityDef;
+        if (activityDef.getAlias().equals(ActivityDef.DEFAULT_ALIAS)) {
+            Optional<String> workloadOpt = activityDef.getParams().getOptionalString(
+                    "workload",
+                    "yaml"
+            );
+            if (workloadOpt.isPresent()) {
+                activityDef.getParams().set("alias", workloadOpt.get());
+            } else {
+                activityDef.getParams().set("alias",
+                        activityDef.getActivityType().toUpperCase(Locale.ROOT)
+                                + String.valueOf(nameEnumerator++));
+            }
+        }
     }
 
     public SimpleActivity(String activityDefString) {

From 7a403252cc67a2da96da97f803f4979a496c4e98 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Wed, 2 Dec 2020 14:18:33 -0600
Subject: [PATCH 056/164] cqld4 api updates

---
 .../nosqlbench/activitytype/cqld4/core/CqlActivityType.java | 6 ------
 .../nosqlbench/activitytype/cqld4/core/CqlAsyncAction.java  | 6 +++---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlActivityType.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlActivityType.java
index 28d117e52..290be30b8 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlActivityType.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlActivityType.java
@@ -3,7 +3,6 @@ package io.nosqlbench.activitytype.cqld4.core;
 
 import com.datastax.oss.driver.api.core.data.TupleValue;
 import com.datastax.oss.driver.api.core.type.UserDefinedType;
-import io.nosqlbench.activitytype.cqld4.codecsupport.UDTJavaType;
 import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
 import io.nosqlbench.engine.api.activityapi.core.ActivityType;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
@@ -35,11 +34,6 @@ public class CqlActivityType implements ActivityType<CqlActivity> {
             throw new RuntimeException("Currently, the cql activity type requires yaml/workload activity parameter.");
         }
 
-        // allow shortcut: yaml parameter provide the default alias name
-        if (activityDef.getAlias().equals(ActivityDef.DEFAULT_ALIAS)) {
-            activityDef.getParams().set("alias",yaml.get());
-        }
-
         return new CqlActivity(activityDef);
     }
 
diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlAsyncAction.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlAsyncAction.java
index f00f6f2f2..06dbf2f1c 100644
--- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlAsyncAction.java
+++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlAsyncAction.java
@@ -79,7 +79,7 @@ public class CqlAsyncAction extends BaseAsyncAction<CqlOpData, CqlActivity> {
 
     @Override
     public void startOpCycle(TrackedOp<CqlOpData> opc) {
-        CqlOpData cqlop = opc.getData();
+        CqlOpData cqlop = opc.getOpData();
         long cycle = opc.getCycle();
 
         // bind timer covers all statement selection and binding, skipping, transforming logic
@@ -123,7 +123,7 @@ public class CqlAsyncAction extends BaseAsyncAction<CqlOpData, CqlActivity> {
 
 
     public void onSuccess(StartedOp<CqlOpData> sop, AsyncResultSet resultSet) {
-        CqlOpData cqlop = sop.getData();
+        CqlOpData cqlop = sop.getOpData();
 
         HashedCQLErrorHandler.resetThreadStatusCode();
         if (cqlop.skipped) {
@@ -218,7 +218,7 @@ public class CqlAsyncAction extends BaseAsyncAction<CqlOpData, CqlActivity> {
 
     public void onFailure(StartedOp<CqlOpData> startedOp) {
 
-        CqlOpData cqlop = startedOp.getData();
+        CqlOpData cqlop = startedOp.getOpData();
         long serviceTime = startedOp.getCurrentServiceTimeNanos();
 
         // Even if this is retryable, we expose error events

From ff6492763d8e8791c05f34ec4de2d62060fd655c Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Wed, 2 Dec 2020 14:18:39 -0600
Subject: [PATCH 057/164] docs updates

---
 devdocs/devguide/hybrid_ratelimiter.md | 244 +++++++++++++++++++++++++
 1 file changed, 244 insertions(+)
 create mode 100644 devdocs/devguide/hybrid_ratelimiter.md

diff --git a/devdocs/devguide/hybrid_ratelimiter.md b/devdocs/devguide/hybrid_ratelimiter.md
new file mode 100644
index 000000000..1da432cb6
--- /dev/null
+++ b/devdocs/devguide/hybrid_ratelimiter.md
@@ -0,0 +1,244 @@
+## RateLimiter Design
+
+The nosqlbench rate limiter is a hybrid design, combining ideas from
+well-known algorithms with a heavy dose of mechanical sympathy. The
+resulting implementation provides the following:
+
+1. A basic design that can be explained in one page (this page!)
+2. High throughput, compared to other rate limiters tested.
+3. Graceful degradation with increasing concurrency.
+4. Clearly defined behavioral semantics.
+5. Efficient burst capability, for tunable catch-up rates.
+6. Efficient calculation of wait time.
+
+## Parameters
+
+**rate** - In simplest terms, users simply need to configure the *rate*.
+For example, `rate=12000` specifies an op rate of 12000 ops/second.
+
+**burst rate** - Additionally, users may specify a burst rate which can be
+used to recover unused time when a client is able to go faster than the
+strict limit. The burst rate is multiplied by the _op rate_ to arrive at
+the maximum rate when wait time is available to recover. For
+example, `rate=12000,1.1`
+specifies that a client may operate at 12000 ops/s _when it is caught up_,
+while allowing it to go at a rate of up to 13200 ops/s _when it is behind
+schedule_.
+
+## Design Principles
+
+The core design of the rate limiter is based on
+the [token bucket](https://en.wikipedia.org/wiki/Token_bucket) algorithm
+as established in the telecom industry for rate metering. Additional
+refinements have been added to allow for flexible and reliable use on
+non-realtime systems.
+
+The unit of scheduling used in this design is the token, corresponding
+directly to a nanosecond of time. The scheduling time that is made
+available to callers is stored in a pool of tokens which is set to a
+configured size. The size of the token pool determines how many grants are
+allowed to be dispatched before the next one is forced to wait for
+available tokens.
+
+At some regular frequency, a filler thread adds tokens (nanoseconds of
+time to be distributed to waiting ops) to the pool. The callers which are
+waiting for these tokens consume a number of tokens serially. If the pool
+does not contain the requested number of tokens, then the caller is
+blocked using basic synchronization primitives. When the pool is filled
+any blocked callers are unblocked.
+
+The hybrid rate limiter tracks and accumulates both the passage of system
+time and the usage rate of this time as a measurement of progress. The
+delta between these two reference points in time captures a very simple
+and empirical value of imposed wait time.
+
+That is, the time which was allocated but which was not used always
+represents a slow down which is imposed by external factors. This
+manifests as slower response when considering the target rate to be
+equivalent to user load.
+
+## Design Details
+
+In fact, there are three pools. The _active_ pool, the _bursting_ pool,
+and the
+_waiting_ pool. The active pool has a limited size based on the number of
+operations that are allowed to be granted concurrently.
+
+The bursting pool is sized according to the relative burst rate and the
+size of the active pool. For example, with an op rate of 1000 ops/s and a
+burst rate of 1.1, the active pool can be sized to 1E9 nanos (one second
+of nanos), and the burst pool can be sized to 1E8 (1/10 of that), thus
+yielding a combined pool size of 1E9 + 1E8, or 1100000000 ns.
+
+The waiting pool is where all extra tokens are held in reserve. It is
+unlimited except by the size of a long value. The size of the waiting pool
+is a direct measure of wait time in nanoseconds.
+
+Within the pools, tokens (time) are neither created nor destroyed. They
+are added by the filler based on the passage of time, and consumed by
+callers when they become available. In between these operations, the net
+sum of tokens is preserved. In short, when time deltas are observed in the
+system clock, this time is accumulated into the available scheduling time
+of the token pools. In this way, the token pool acts as a metered
+dispenser of scheduling time to waiting (or not) consumers.
+
+The filler thread adds tokens to the pool according to the system
+real-time clock, at some estimated but unreliable interval. The frequency
+of filling is set high enough to give a reliable perception of time
+passing smoothly, but low enough to avoid wasting too much thread time in
+calling overhead. (It is set to 1K/s by default). Each time filling
+occurs, the real-time clock is check-pointed, and the time delta is fed
+into the pool filling logic as explained below.
+
+## Visual Explanation
+
+The diagram below explains the moving parts of the hybrid rate limiter.
+The arrows represent the flow of tokens (ns) as a form of scheduling
+currency.
+
+The top box shows an active token filler thread which polls the system
+clock and accumulates new time into the token pool.
+
+The bottom boxes represent concurrent readers of the token pool. These are
+typically independent threads which do a blocking read for tokens once
+they are ready to execute the rate-limited task.
+
+![Hybrid Ratelimiter Schematic](hybrid_ratelimiter.png)
+
+In the middle, the passive component in this diagram is the token pool
+itself. When the token filler adds tokens, it never blocks. However, the
+token filler can cause any readers of the token pool to unblock so that
+they can acquire newly available tokens.
+
+When time is added to the token pool, the following steps are taken:
+
+1) New tokens (based on measured time elapsed since the last fill) are
+   added to the active pool until it is full.
+2) Any extra tokens are added to the waiting pool.
+3) If the waiting pool has any tokens, and there is room in the bursting
+   pool, some tokens are moved from the waiting pool to the bursting pool
+   according to how many will fit.
+
+When a caller asks for a number of tokens, the combined total from the
+active and burst pools is available to that caller. If the number of
+tokens needed is not yet available, then the caller will block until
+tokens are added.
+
+## Bursting Logic
+
+Tokens in the waiting pool represent time that has not been claimed by a
+caller. Tokens accumulate in the waiting pool as a side-effect of
+continuous filling outpacing continuous draining, thus creating a backlog
+of operations.
+
+The pool sizes determine both the maximum instantaneously available
+operations as well as the rate at which unclaimed time can be back-filled
+back into the active or burst pools.
+
+### Normalizing for Jitter
+
+Since it is not possible to schedule the filler thread to trigger on a
+strict and reliable schedule (as in a real-time system), the method of
+moving tokens from the waiting pool to the bursting pool must account for
+differences in timing. Thus, tokens which are activated for bursting are
+scaled according to the amount of time added in the last fill, relative to
+the maximum active pool. This means that a full pool fill will allow a
+full burst pool fill, presuming wait time is positive by that amount. It
+also means that the same effect can be achieved by ten consecutive fills
+of a tenth the time each. In effect, bursting is normalized to the passage
+of time along with the burst rate, with a maximum cap imposed when
+operations are unclaimed by callers.
+
+## Mechanical Trade-offs
+
+In this implementation, it is relatively easy to explain how accuracy and
+performance trade-off. They are competing concerns. Consider these two
+extremes of an isochronous configuration:
+
+### Slow Isochronous
+
+For example, the rate limiter could be configured for strict isochronous
+behavior by setting the active pool size to *one* op of nanos and the
+burst rate to 1.0, thus disabling bursting. If the op rate requested is 1
+op/s, this configuration will work relatively well, although *any* caller
+which doesn't show up (or isn't already waiting) when the tokens become
+available will incur a waittime penalty. The odds of this are relatively
+low for a high-velocity client.
+
+### Fast Isochronous
+
+However, if the op rate for this type of configuration is set to 1E8
+operations per second, then the filler thread will be adding 100 ops worth
+of time when there is only *one* op worth of active pool space. This is
+due to the fact that filling can only occur at a maximal frequency which
+has been set to 1K fills/s on average. That will create artificial wait
+time, since the token consumers and producers would not have enough pool
+space to hold the tokens needed during fill. It is not possible on most
+systems to fill the pool at arbitrarily high fill frequencies. Thus, it is
+important for users to understand the limits of the machinery when using
+high rates. In most scenarios, these limits will not be onerous.
+
+### Boundary Rules
+
+Taking these effects into account, the default configuration makes some
+reasonable trade-offs according to the rules below. These rules should
+work well for most rates below 50M ops/s. The net effect of these rules is
+to increase work bulking within the token pools as rates go higher.
+
+Trying to go above 50M ops/s while also forcing isochronous behavior will
+result in artificial wait-time. For this reason, the pool size itself is
+not user-configurable at this time.
+
+- The pool size will always be at least as big as two ops. This rule
+  ensures that there is adequate buffer space for tokens when callers are
+  accessing the token pools near the rate of the filler thread. If this
+  were not ensured, then artificial wait time would be injected due to
+  overflow error.
+- The pool size will always be at least as big as 1E6 nanos, or 1/1000 of
+  a second. This rule ensures that the filler thread has a reasonably
+  attainable update frequency which will prevent underflow in the active
+  or burst pools.
+- The number of ops that can fit in the pool will determine how many ops
+  can be dispatched between fills. For example, an op rate of 1E6 will
+  mean that up to 1000 ops worth of tokens may be present between fills,
+  and up to 1000 ops may be allowed to start at any time before the next
+  fill.
+
+  .1 ops/s : .2 seconds worth 1 ops/s : 2 seconds worth 100 ops/s : 2
+  seconds worth
+
+In practical terms, this means that rates slower than 1K ops/S will have
+their strictness controlled by the burst rate in general, and rates faster
+than 1K ops/S will automatically include some op bulking between fills.
+
+## History
+
+A CAS-oriented method which compensated for RTC calling overhead was used
+previously. This method afforded very high performance, but it was
+difficult to reason about.
+
+This implementation replaces that previous version. Basic synchronization
+primitives (implicit locking via synchronized methods) performed
+surprisingly well -- well enough to discard the complexity of the previous
+implementation.
+
+Further, this version is much easier to study and reason about.
+
+## New Challenges
+
+While the current implementation works well for most basic cases, high CPU
+contention has shown that it can become an artificial bottleneck. Based on
+observations on higher end systems with many cores running many threads
+and high target rates, it appears that the rate limiter becomes a resource
+blocker or forces too much thread management.
+
+Strategies for handling this should be considered:
+
+1) Make callers able to pseudo-randomly (or not randomly) act as a token
+   filler, such that active consumers can do some work stealing from the
+   original token filler thread.
+2) Analyze the timing and history of a high-contention scenario for
+   weaknesses in the parameter adjustment rules above.
+3) Add internal micro-batching at the consumer interface, such that
+   contention cost is lower in general.
+4) Partition the rate limiter into multiple slices.

From 0b03da159c107abb94ee5714ed5f10332de6cccd Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Wed, 2 Dec 2020 14:18:59 -0600
Subject: [PATCH 058/164] misc code cleanups

---
 .../activitytype/http/HttpAction.java         | 114 +-----------------
 mvn-defaults/pom.xml                          |   5 +-
 2 files changed, 8 insertions(+), 111 deletions(-)

diff --git a/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpAction.java b/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpAction.java
index b97425c47..9c7464551 100644
--- a/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpAction.java
+++ b/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpAction.java
@@ -7,11 +7,10 @@ import io.nosqlbench.engine.api.activityapi.core.SyncAction;
 import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.nb.api.errors.BasicError;
-import io.nosqlbench.virtdata.core.templates.StringBindings;
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
-import java.io.*;
+import java.io.FileNotFoundException;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
@@ -28,14 +27,11 @@ public class HttpAction implements SyncAction {
     private final HttpActivity httpActivity;
     private final int slot;
     private final int maxTries = 1;
-    private boolean showstmts;
 
     private OpSequence<ReadyHttpOp> sequencer;
     private HttpClient client;
 
     private final HttpResponse.BodyHandler<String> bodyreader = HttpResponse.BodyHandlers.ofString();
-    private final long timeoutMillis=30000L;
-
 
     public HttpAction(ActivityDef activityDef, int slot, HttpActivity httpActivity) {
         this.slot = slot;
@@ -54,25 +50,15 @@ public class HttpAction implements SyncAction {
 
     @Override
     public int runCycle(long cycleValue) {
-        StringBindings stringBindings;
-        String statement = null;
-        InputStream result = null;
+
+        // The request to be used must be constructed from the template each time.
+        HttpOp httpOp = null;
 
         // The bind timer captures all the time involved in preparing the
         // operation for execution, including data generation as well as
         // op construction
-
-        // The request to be used must be constructed from the template each time.
-        HttpOp httpOp=null;
-
-        // A specifier for what makes a response ok. If this is provided, then it is
-        // either a list of valid http status codes, or if non-numeric, a regex for the body
-        // which must match.
-        // If not provided, then status code 200 is the only thing required to be matched.
-        String ok;
-
         try (Timer.Context bindTime = httpActivity.bindTimer.time()) {
-            ReadyHttpOp readHTTPOperation = httpActivity.getSequencer().get(cycleValue);
+            ReadyHttpOp readHTTPOperation = sequencer.get(cycleValue);
             httpOp = readHTTPOperation.apply(cycleValue);
         } catch (Exception e) {
             if (httpActivity.isDiagnosticMode()) {
@@ -135,98 +121,10 @@ public class HttpAction implements SyncAction {
                 }
             }
 
-
-//            if (ok == null) {
-//                if (response.statusCode() != 200) {
-//                    throw new ResponseError("Result had status code " +
-//                            response.statusCode() + ", but 'ok' was not set for this statement," +
-//                            "so it is considered an error.");
-//                }
-//            } else {
-//                String[] oks = ok.split(",");
-//                for (String ok_condition : oks) {
-//                    if (ok_condition.charAt(0)>='0' && ok_condition.charAt(0)<='9') {
-//                        int matching_status = Integer.parseInt(ok_condition);
-//                    } else {
-//                        Pattern successRegex = Pattern.compile(ok);
-//                    }
-//                }
-////                Matcher matcher = successRegex.matcher(String.valueOf(response.statusCode()));
-////                if (!matcher.matches()) {
-////                    throw new BasicError("status code " + response.statusCode() + " did not match " + success);
-////                }
-//            }
         }
         return 0;
     }
 
-//                String body = future.body();
-
-
-//            String[] splitStatement = statement.split("\\?");
-//            String path, query;
-//
-//            path = splitStatement[0];
-//            query = "";
-//
-//            if (splitStatement.length >= 2) {
-//                query = splitStatement[1];
-//            }
-//
-//            URI uri = new URI(
-//                "http",
-//                null,
-//                host,
-//                httpActivity.getPort(),
-//                path,
-//                query,
-//                null);
-//
-//                statement = uri.toString();
-//
-//            showstmts = httpActivity.getShowstmts();
-
-//            if (showstmts) {
-//                logger.info("STMT(cycle=" + cycleValue + "):\n" + statement);
-//            }
-//        } catch (URISyntaxException e) {
-//            e.printStackTrace();
-//        }
-//
-//        long nanoStartTime=System.nanoTime();
-//
-
-//                Timer.Context resultTime = httpActivity.resultTimer.time();
-//                try {
-//                    StringBuilder res = new StringBuilder();
-//
-//                    BufferedReader rd = new BufferedReader(new InputStreamReader(result));
-//                    String line;
-//                    while ((line = rd.readLine()) != null) {
-//                        res.append(line);
-//                    }
-//                    rd.close();
-//
-//                } catch (Exception e) {
-//                    long resultNanos = resultTime.stop();
-//                    resultTime = null;
-//                } finally {
-//                    if (resultTime != null) {
-//                        resultTime.stop();
-//                    }
-//
-//                }
-//
-//            }
-//            long resultNanos = System.nanoTime() - nanoStartTime;
-//            httpActivity.resultSuccessTimer.update(resultNanos, TimeUnit.NANOSECONDS);
-
-
-//        protected HttpActivity getHttpActivity () {
-//            return httpActivity;
-//        }
-//    }
-
     private HttpRequest.BodyPublisher bodySourceFrom(Map<String, String> cmdMap) {
         if (cmdMap.containsKey("body")) {
             String body = cmdMap.remove("body");
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 42b5c62aa..3147e41cc 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -13,10 +13,9 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <javadoc.name>nosqlbench</javadoc.name>
 
-    <java.target.version>11</java.target.version>
+<!--    <java.target.version>11</java.target.version>-->
 
     <!-- properties for package versions -->
-    <antlr4.version>4.8</antlr4.version>
     <ascii.data.version>1.2.0</ascii.data.version>
     <commons.codec.version>1.14</commons.codec.version>
     <commons.compress.version>1.20</commons.compress.version>
@@ -325,7 +324,7 @@
       <dependency>
         <groupId>org.antlr</groupId>
         <artifactId>antlr4-runtime</artifactId>
-        <version>${antlr4.version}</version>
+        <version>4.8</version>
       </dependency>
 
       <dependency>

From 5c8c5d9c9c58cfe701236988708969b2c4d27194 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Wed, 2 Dec 2020 14:19:07 -0600
Subject: [PATCH 059/164] promote rate to the preferred name for cyclerate

---
 .../java/io/nosqlbench/nb/api/config/SynonymsTest.java     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/config/SynonymsTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/config/SynonymsTest.java
index d2d6db5d9..c3e922b0a 100644
--- a/nb-api/src/test/java/io/nosqlbench/nb/api/config/SynonymsTest.java
+++ b/nb-api/src/test/java/io/nosqlbench/nb/api/config/SynonymsTest.java
@@ -1,6 +1,5 @@
 package io.nosqlbench.nb.api.config;
 
-import io.nosqlbench.nb.api.config.Synonyms;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -13,10 +12,10 @@ public class SynonymsTest {
         StringBuilder sb = new StringBuilder();
         String result = Synonyms.canonicalize(before, Synonyms.PARAM_SYNONYMS,
             (s, s2) -> sb.append("replaced ").append(s).append(" with ").append(s2).append("\n"));
-        assertThat(result).isEqualTo("test workload ayamlfoo driver btype typea cyclerate");
+        assertThat(result).isEqualTo("test workload ayamlfoo driver btype typea rate");
         assertThat(sb.toString()).isEqualTo("replaced type with driver\n" +
-            "replaced targetrate with cyclerate\n" +
-            "replaced yaml with workload\n");
+                "replaced targetrate with rate\n" +
+                "replaced yaml with workload\n");
     }
 
 }

From 1e409332a8e152b3dc039dccf17b8951cd1d3b99 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Wed, 2 Dec 2020 14:19:12 -0600
Subject: [PATCH 060/164] set default hdr_digits to 3 to avoid memory hammer

---
 .../java/io/nosqlbench/engine/cli/NBCLIOptions.java    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
index c642f4cd2..64cae718b 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
@@ -4,10 +4,8 @@ import io.nosqlbench.engine.api.metrics.IndicatorMode;
 import io.nosqlbench.engine.api.util.Unit;
 import io.nosqlbench.engine.core.script.Scenario;
 import io.nosqlbench.nb.api.Environment;
-import io.nosqlbench.nb.api.logging.NBLogLevel;
 import io.nosqlbench.nb.api.errors.BasicError;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
+import io.nosqlbench.nb.api.logging.NBLogLevel;
 
 import java.io.File;
 import java.io.IOException;
@@ -136,7 +134,7 @@ public class NBCLIOptions {
     private final List<String> wantsToIncludePaths = new ArrayList<>();
     private Scenario.Engine engine = Scenario.Engine.Graalvm;
     private boolean graaljs_compat = false;
-    private int hdr_digits = 4;
+    private int hdr_digits = 3;
     private String docker_grafana_tag = "7.2.2";
     private boolean showStackTraces = false;
     private boolean compileScript = false;
@@ -146,8 +144,8 @@ public class NBCLIOptions {
     private String annotatorsConfig = "";
     private String statedirs = NB_STATEDIR_PATHS;
     private Path statepath;
-    private List<String> statePathAccesses = new ArrayList<>();
-    private String hdrForChartFileName = DEFAULT_CHART_HDR_LOG_NAME;
+    private final List<String> statePathAccesses = new ArrayList<>();
+    private final String hdrForChartFileName = DEFAULT_CHART_HDR_LOG_NAME;
 
     public String getAnnotatorsConfig() {
         return annotatorsConfig;

From 0af587d28cc4b7faccff650f94ae84e1bdfc7938 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Wed, 2 Dec 2020 14:40:20 -0600
Subject: [PATCH 061/164] encapsulate update logic into token pool

---
 .../ratelimits/HybridRateLimiter.java         | 21 ++++++------
 .../activityapi/ratelimits/TokenFiller.java   | 10 +++---
 .../api/activityapi/ratelimits/TokenPool.java | 34 +++++++++++--------
 .../activityapi/ratelimits/TokenPoolTest.java | 21 +++++++-----
 mvn-defaults/pom.xml                          |  2 +-
 5 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java
index b97cf281c..e9daf2f81 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java
@@ -80,7 +80,7 @@ public class HybridRateLimiter implements Startable, RateLimiter {
 
     private final static Logger logger = LogManager.getLogger(HybridRateLimiter.class);
 
-    private volatile TokenFiller filler;
+    //private volatile TokenFiller filler;
     private volatile long starttime;
 
     // rate controls
@@ -150,8 +150,9 @@ public class HybridRateLimiter implements Startable, RateLimiter {
         }
 
         this.rateSpec = updatingRateSpec;
-        this.filler = (this.filler == null) ? new TokenFiller(rateSpec, activityDef) : filler.apply(rateSpec);
-        this.tokens = this.filler.getTokenPool();
+        this.tokens = (this.tokens == null) ? new TokenPool(rateSpec, activityDef) : this.tokens.apply(rateSpec);
+//        this.filler = (this.filler == null) ? new TokenFiller(rateSpec, activityDef) : filler.apply(rateSpec);
+//        this.tokens = this.filler.getTokenPool();
 
         if (this.state == State.Idle && updatingRateSpec.isAutoStart()) {
             this.start();
@@ -177,7 +178,7 @@ public class HybridRateLimiter implements Startable, RateLimiter {
             case Idle:
                 long nanos = getNanoClockTime();
                 this.starttime = nanos;
-                this.filler.start();
+                this.tokens.start();
                 state = State.Started;
                 break;
         }
@@ -191,7 +192,7 @@ public class HybridRateLimiter implements Startable, RateLimiter {
             case Started:
                 long accumulatedWaitSinceLastStart = cumulativeWaitTimeNanos.get();
                 cumulativeWaitTimeNanos.set(0L);
-                return this.filler.restart() + accumulatedWaitSinceLastStart;
+                return this.tokens.restart() + accumulatedWaitSinceLastStart;
             default:
                 return 0L;
         }
@@ -215,14 +216,14 @@ public class HybridRateLimiter implements Startable, RateLimiter {
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder(HybridRateLimiter.class.getSimpleName());
-        if (this.getRateSpec()!=null) {
+        if (this.getRateSpec() != null) {
             sb.append(" spec=").append(this.getRateSpec().toString());
         }
-        if (this.state!=null) {
+        if (this.state != null) {
             sb.append(" state=").append(this.state);
         }
-        if (this.filler !=null) {
-            sb.append(" filler=").append(this.filler.toString());
+        if (this.tokens != null) {
+            sb.append(" tokens=").append(this.tokens.toString());
         }
         return sb.toString();
     }
@@ -245,7 +246,7 @@ public class HybridRateLimiter implements Startable, RateLimiter {
 
         @Override
         public Long getValue() {
-            TokenPool pool = rl.filler.getTokenPool();
+            TokenPool pool = rl.tokens;
             if (pool==null) {
                 return 0L;
             }
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenFiller.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenFiller.java
index 359996db3..9ca7570a5 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenFiller.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenFiller.java
@@ -48,18 +48,16 @@ public class TokenFiller implements Runnable {
      * in the JVM.
      *
      * @param rateSpec A {@link RateSpec}
-     * @param def An {@link ActivityDef}
+     * @param def      An {@link ActivityDef}
      */
-    public TokenFiller(RateSpec rateSpec, ActivityDef def) {
+    public TokenFiller(RateSpec rateSpec, TokenPool tokenPool, ActivityDef def) {
         this.rateSpec = rateSpec;
-        this.tokenPool= new TokenPool(rateSpec);
-        this.tokenPool.refill(rateSpec.getNanosPerOp());
+        this.tokenPool = tokenPool;
         this.timer = ActivityMetrics.timer(def, "tokenfiller");
     }
 
     public TokenFiller apply(RateSpec rateSpec) {
         this.rateSpec = rateSpec;
-        this.tokenPool.apply(rateSpec);
         return this;
     }
 
@@ -99,6 +97,8 @@ public class TokenFiller implements Runnable {
     }
 
     public TokenFiller start() {
+        this.tokenPool.refill(rateSpec.getNanosPerOp());
+
         thread = new Thread(this);
         thread.setName(this.toString());
         thread.setPriority(Thread.MAX_PRIORITY);
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPool.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPool.java
index 1a37ab2ae..b76986e65 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPool.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPool.java
@@ -17,8 +17,9 @@
 
 package io.nosqlbench.engine.api.activityapi.ratelimits;
 
-import org.apache.logging.log4j.Logger;
+import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import static io.nosqlbench.engine.api.util.Colors.*;
 
@@ -57,10 +58,12 @@ public class TokenPool {
     private volatile long waitingPool;
     private RateSpec rateSpec;
     private long nanosPerOp;
-//    private long debugTrigger=0L;
+    //    private long debugTrigger=0L;
 //    private long debugRate=1000000000;
     private long blocks = 0L;
 
+    private TokenFiller filler;
+    private final ActivityDef activityDef;
 
     /**
      * This constructor tries to pick reasonable defaults for the token pool for
@@ -69,16 +72,11 @@ public class TokenPool {
      *
      * @param rateSpec a {@link RateSpec}
      */
-    public TokenPool(RateSpec rateSpec) {
+    public TokenPool(RateSpec rateSpec, ActivityDef activityDef) {
+        this.activityDef = activityDef;
         apply(rateSpec);
         logger.debug("initialized token pool: " + this.toString() + " for rate:" + rateSpec.toString());
-    }
-
-    public TokenPool(long poolsize, double burstRatio) {
-        this.maxActivePool = poolsize;
-        this.burstRatio = burstRatio;
-        this.maxOverActivePool = (long) (maxActivePool * burstRatio);
-        this.burstPoolSize = maxOverActivePool - maxActivePool;
+//        filler.start();
     }
 
     /**
@@ -87,15 +85,17 @@ public class TokenPool {
      *
      * @param rateSpec The rate specifier.
      */
-    public synchronized void apply(RateSpec rateSpec) {
-        this.rateSpec=rateSpec;
+    public synchronized TokenPool apply(RateSpec rateSpec) {
+        this.rateSpec = rateSpec;
         this.maxActivePool = Math.max((long) 1E6, (long) ((double) rateSpec.getNanosPerOp() * MIN_CONCURRENT_OPS));
         this.maxOverActivePool = (long) (maxActivePool * rateSpec.getBurstRatio());
         this.burstRatio = rateSpec.getBurstRatio();
 
         this.burstPoolSize = maxOverActivePool - maxActivePool;
         this.nanosPerOp = rateSpec.getNanosPerOp();
+        this.filler = (this.filler == null) ? new TokenFiller(rateSpec, this, activityDef) : filler.apply(rateSpec);
         notifyAll();
+        return this;
     }
 
 
@@ -243,10 +243,14 @@ public class TokenPool {
     }
 
     public synchronized long restart() {
-        long wait=activePool+waitingPool;
-        activePool=0L;
-        waitingPool=0L;
+        long wait = activePool + waitingPool;
+        activePool = 0L;
+        waitingPool = 0L;
+        filler.restart();
         return wait;
+    }
 
+    public void start() {
+        filler.start();
     }
 }
diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPoolTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPoolTest.java
index 09def25dc..167347c00 100644
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPoolTest.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPoolTest.java
@@ -17,30 +17,33 @@
 
 package io.nosqlbench.engine.api.activityapi.ratelimits;
 
-import org.junit.Ignore;
+import io.nosqlbench.engine.api.activityimpl.ActivityDef;
+import io.nosqlbench.engine.api.activityimpl.ParameterMap;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TokenPoolTest {
 
+    ActivityDef def = new ActivityDef(ParameterMap.parseOrException("alias=testing"));
+
     @Test
     public void testBackfillFullRate() {
-        TokenPool p = new TokenPool(100, 1.1);
-        assertThat(p.refill(100L)).isEqualTo(100L);
+        TokenPool p = new TokenPool(new RateSpec(10000000, 1.1), def);
+        assertThat(p.refill(1000000L)).isEqualTo(1000000L);
         assertThat(p.getWaitPool()).isEqualTo(0L);
-        assertThat(p.refill(100L)).isEqualTo(200);
+        assertThat(p.refill(100L)).isEqualTo(1000100);
         assertThat(p.getWaitPool()).isEqualTo(90L);
-        assertThat(p.refill(10L)).isEqualTo(210L);
-        assertThat(p.getWaitPool()).isEqualTo(100L);
+        assertThat(p.refill(10L)).isEqualTo(1000110L);
+        assertThat(p.getWaitPool()).isEqualTo(99L);
 
-        assertThat(p.refill(10)).isEqualTo(220L);
+        assertThat(p.refill(10)).isEqualTo(1000120L);
         assertThat(p.takeUpTo(100)).isEqualTo(100L);
 
     }
     @Test
     public void testTakeRanges() {
-        TokenPool p = new TokenPool(100, 10);
+        TokenPool p = new TokenPool(new RateSpec(100, 10), def);
         p.refill(100);
         assertThat(p.takeUpTo(99)).isEqualTo(99L);
         assertThat(p.takeUpTo(10)).isEqualTo(1L);
@@ -51,7 +54,7 @@ public class TokenPoolTest {
     public void testChangedParameters() {
 
         RateSpec s1 = new RateSpec(1000L, 1.10D);
-        TokenPool p = new TokenPool(s1);
+        TokenPool p = new TokenPool(s1, def);
         long r = p.refill(10000000);
         assertThat(r).isEqualTo(10000000L);
         assertThat(p.getWaitTime()).isEqualTo(10000000L);
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 3147e41cc..85c263709 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -37,7 +37,7 @@
     <jaxb.impl.version>2.4.0-b180830.0438</jaxb.impl.version>
     <jersey.media.version>2.29</jersey.media.version>
     <jersey.version>2.27</jersey.version>
-    <jetty.version>9.4.25.v20191220</jetty.version>
+    <jetty.version>9.4.35.v20201120</jetty.version>
     <jmh.version>1.22</jmh.version>
     <joda.time.version>2.9.9</joda.time.version>
     <junit.jupiter.version>5.3.2</junit.jupiter.version>

From 106dc3bafcd5060d21f8ffc7f9d3a81ac10961fb Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Wed, 2 Dec 2020 15:39:42 -0600
Subject: [PATCH 062/164] encapsulate update logic into token pool

---
 .../ratelimits/HybridRateLimiter.java         |   8 +-
 .../ratelimits/ThreadDrivenTokenPool.java     | 269 ++++++++++++++++++
 .../activityapi/ratelimits/TokenFiller.java   |   6 +-
 .../api/activityapi/ratelimits/TokenPool.java | 255 +----------------
 .../activityapi/ratelimits/TokenPoolTest.java |   6 +-
 5 files changed, 292 insertions(+), 252 deletions(-)
 create mode 100644 engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/ThreadDrivenTokenPool.java

diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java
index e9daf2f81..dec645a92 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java
@@ -21,8 +21,9 @@ import com.codahale.metrics.Gauge;
 import io.nosqlbench.engine.api.activityapi.core.Startable;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
-import org.apache.logging.log4j.Logger;
+import io.nosqlbench.nb.annotations.Service;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -76,6 +77,7 @@ import java.util.concurrent.atomic.AtomicLong;
  * overall workload is not saturating resources.
  * </p>
  */
+@Service(value = RateLimiter.class, selector = "hybrid")
 public class HybridRateLimiter implements Startable, RateLimiter {
 
     private final static Logger logger = LogManager.getLogger(HybridRateLimiter.class);
@@ -94,7 +96,7 @@ public class HybridRateLimiter implements Startable, RateLimiter {
     private Gauge<Long> delayGauge;
     private Gauge<Double> avgRateGauge;
     private Gauge<Double> burstRateGauge;
-    private TokenPool tokens;
+    private ThreadDrivenTokenPool tokens;
     // diagnostics
 
     // TODO Doc rate limiter scenarios, including when you want to reset the waittime, and when you don't
@@ -150,7 +152,7 @@ public class HybridRateLimiter implements Startable, RateLimiter {
         }
 
         this.rateSpec = updatingRateSpec;
-        this.tokens = (this.tokens == null) ? new TokenPool(rateSpec, activityDef) : this.tokens.apply(rateSpec);
+        this.tokens = (this.tokens == null) ? new ThreadDrivenTokenPool(rateSpec, activityDef) : this.tokens.apply(rateSpec);
 //        this.filler = (this.filler == null) ? new TokenFiller(rateSpec, activityDef) : filler.apply(rateSpec);
 //        this.tokens = this.filler.getTokenPool();
 
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/ThreadDrivenTokenPool.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/ThreadDrivenTokenPool.java
new file mode 100644
index 000000000..2605d1126
--- /dev/null
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/ThreadDrivenTokenPool.java
@@ -0,0 +1,269 @@
+/*
+ *
+ *    Copyright 2016 jshook
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ * /
+ */
+
+package io.nosqlbench.engine.api.activityapi.ratelimits;
+
+import io.nosqlbench.engine.api.activityimpl.ActivityDef;
+import io.nosqlbench.nb.annotations.Service;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import static io.nosqlbench.engine.api.util.Colors.*;
+
+/**
+ * <h2>Synopsis</h2>
+ *
+ * This TokenPool represents a finite quantity which can be
+ * replenished with regular refills. Extra tokens that do not fit
+ * within the active token pool are saved in a waiting token pool and
+ * used to backfill when allowed according to the backfill rate.
+ *
+ * A detailed explanation for how this works will be included
+ * at @link "http://docs.nosqlbench.io/" under dev notes.
+ *
+ * <p>This is the basis for the token-based rate limiters in
+ * NB. This mechanism is easily adaptable to bursting
+ * capability as well as a degree of stricter timing at speed.
+ * Various methods for doing this in a lock free way were
+ * investigated, but the intrinsic locks provided by synchronized
+ * method won out for now. This may be revisited when EB is
+ * retrofitted for J11.
+ * </p>
+ */
+@Service(value = TokenPool.class, selector = "threaded")
+public class ThreadDrivenTokenPool implements TokenPool {
+
+    private final static Logger logger = LogManager.getLogger(ThreadDrivenTokenPool.class);
+
+    public static final double MIN_CONCURRENT_OPS = 2;
+
+    private long maxActivePool;
+    private long burstPoolSize;
+    private long maxOverActivePool;
+    private double burstRatio;
+    // TODO Consider removing volatile after investigating 
+    private volatile long activePool;
+    private volatile long waitingPool;
+    private RateSpec rateSpec;
+    private long nanosPerOp;
+    //    private long debugTrigger=0L;
+//    private long debugRate=1000000000;
+    private long blocks = 0L;
+
+    private TokenFiller filler;
+    private final ActivityDef activityDef;
+
+    /**
+     * This constructor tries to pick reasonable defaults for the token pool for
+     * a given rate spec. The active pool must be large enough to contain one
+     * op worth of time, and the burst ratio
+     *
+     * @param rateSpec a {@link RateSpec}
+     */
+    public ThreadDrivenTokenPool(RateSpec rateSpec, ActivityDef activityDef) {
+        this.activityDef = activityDef;
+        apply(rateSpec);
+        logger.debug("initialized token pool: " + this.toString() + " for rate:" + rateSpec.toString());
+//        filler.start();
+    }
+
+    /**
+     * Change the settings of this token pool, and wake any blocked callers
+     * just in case it allows them to proceed.
+     *
+     * @param rateSpec The rate specifier.
+     */
+    @Override
+    public synchronized TokenPool apply(RateSpec rateSpec) {
+        this.rateSpec = rateSpec;
+        this.maxActivePool = Math.max((long) 1E6, (long) ((double) rateSpec.getNanosPerOp() * MIN_CONCURRENT_OPS));
+        this.maxOverActivePool = (long) (maxActivePool * rateSpec.getBurstRatio());
+        this.burstRatio = rateSpec.getBurstRatio();
+
+        this.burstPoolSize = maxOverActivePool - maxActivePool;
+        this.nanosPerOp = rateSpec.getNanosPerOp();
+        this.filler = (this.filler == null) ? new TokenFiller(rateSpec, this, activityDef) : filler.apply(rateSpec);
+        notifyAll();
+        return this;
+    }
+
+
+    @Override
+    public double getBurstRatio() {
+        return burstRatio;
+    }
+
+    /**
+     * Take tokens up to amt tokens form the pool and report
+     * the amount of token removed.
+     *
+     * @param amt tokens requested
+     * @return actual number of tokens removed, greater to or equal to zero
+     */
+    @Override
+    public synchronized long takeUpTo(long amt) {
+        long take = Math.min(amt, activePool);
+        activePool -= take;
+        return take;
+    }
+
+    /**
+     * wait for the given number of tokens to be available, and then remove
+     * them from the pool.
+     *
+     * @return the total number of tokens untaken, including wait tokens
+     */
+    @Override
+    public synchronized long blockAndTake() {
+        while (activePool < nanosPerOp) {
+            blocks++;
+            //System.out.println(ANSI_BrightRed +  "waiting for " + amt + "/" + activePool + " of max " + maxActivePool + ANSI_Reset);
+            try {
+                wait(maxActivePool / 1000000, (int) maxActivePool % 1000000);
+            } catch (InterruptedException ignored) {
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+            //System.out.println("waited for " + amt + "/" + activePool + " tokens");
+        }
+        //System.out.println(ANSI_BrightYellow + "taking " + amt + "/" + activePool + ANSI_Reset);
+
+        activePool -= nanosPerOp;
+        return waitingPool + activePool;
+    }
+
+    @Override
+    public synchronized long blockAndTake(long tokens) {
+        while (activePool < tokens) {
+            //System.out.println(ANSI_BrightRed +  "waiting for " + amt + "/" + activePool + " of max " + maxActivePool + ANSI_Reset);
+            try {
+                wait(maxActivePool / 1000000, (int) maxActivePool % 1000000);
+            } catch (InterruptedException ignored) {
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+            //System.out.println("waited for " + amt + "/" + activePool + " tokens");
+        }
+        //System.out.println(ANSI_BrightYellow + "taking " + amt + "/" + activePool + ANSI_Reset);
+
+        activePool -= tokens;
+        return waitingPool + activePool;
+    }
+
+    @Override
+    public long getWaitTime() {
+        return activePool + waitingPool;
+    }
+
+    @Override
+    public long getWaitPool() {
+        return waitingPool;
+    }
+
+    @Override
+    public long getActivePool() {
+        return activePool;
+    }
+
+    /**
+     * Add the given number of new tokens to the pool, forcing any amount
+     * that would spill over the current pool size into the wait token pool, but
+     * moving up to the configured burst tokens back from the wait token pool
+     * otherwise.
+     *
+     * The amount of backfilling that occurs is controlled by the backfill ratio,
+     * based on the number of tokens submitted. This causes normalizes the
+     * backfilling rate to the fill rate, so that it is not sensitive to refill
+     * scheduling.
+     *
+     * @param newTokens The number of new tokens to add to the token pools
+     * @return the total number of tokens in all pools
+     */
+    public synchronized long refill(long newTokens) {
+        boolean debugthis = false;
+//        long debugAt = System.nanoTime();
+//        if (debugAt>debugTrigger+debugRate) {
+//            debugTrigger=debugAt;
+//            debugthis=true;
+//        }
+
+        long needed = Math.max(maxActivePool - activePool, 0L);
+        long allocatedToActivePool = Math.min(newTokens, needed);
+        activePool += allocatedToActivePool;
+
+
+        // overflow logic
+        long allocatedToOverflowPool = newTokens - allocatedToActivePool;
+        waitingPool += allocatedToOverflowPool;
+
+        // backfill logic
+        double refillFactor = Math.min((double) newTokens / maxActivePool, 1.0D);
+        long burstFillAllowed = (long) (refillFactor * burstPoolSize);
+
+        burstFillAllowed = Math.min(maxOverActivePool - activePool, burstFillAllowed);
+        long burstFill = Math.min(burstFillAllowed, waitingPool);
+
+        waitingPool -= burstFill;
+        activePool += burstFill;
+
+        if (debugthis) {
+            System.out.print(this);
+            System.out.print(ANSI_BrightBlue + " adding=" + allocatedToActivePool);
+            if (allocatedToOverflowPool > 0) {
+                System.out.print(ANSI_Red + " OVERFLOW:" + allocatedToOverflowPool + ANSI_Reset);
+            }
+            if (burstFill > 0) {
+                System.out.print(ANSI_BrightGreen + " BACKFILL:" + burstFill + ANSI_Reset);
+            }
+            System.out.println();
+        }
+        //System.out.println(this);
+        notifyAll();
+
+        return activePool + waitingPool;
+    }
+
+    @Override
+    public String toString() {
+        return "Tokens: active=" + activePool + "/" + maxActivePool
+                + String.format(
+                " (%3.1f%%)A (%3.1f%%)B ",
+                (((double) activePool / (double) maxActivePool) * 100.0),
+                (((double) activePool / (double) maxOverActivePool) * 100.0)) + " waiting=" + waitingPool +
+                " blocks=" + blocks +
+                " rateSpec:" + ((rateSpec != null) ? rateSpec.toString() : "NULL");
+    }
+
+    @Override
+    public RateSpec getRateSpec() {
+        return rateSpec;
+    }
+
+    @Override
+    public synchronized long restart() {
+        long wait = activePool + waitingPool;
+        activePool = 0L;
+        waitingPool = 0L;
+        filler.restart();
+        return wait;
+    }
+
+    @Override
+    public void start() {
+        filler.start();
+    }
+}
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenFiller.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenFiller.java
index 9ca7570a5..695da698b 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenFiller.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenFiller.java
@@ -35,7 +35,7 @@ public class TokenFiller implements Runnable {
 //    (false);
     private final long interval = (long) 1E6;
 
-    private final TokenPool tokenPool;
+    private final ThreadDrivenTokenPool tokenPool;
     private volatile boolean running = true;
     private RateSpec rateSpec;
     private Thread thread;
@@ -43,14 +43,14 @@ public class TokenFiller implements Runnable {
     private final Timer timer;
 
     /**
-     * A token filler adds tokens to a {@link TokenPool} at some rate.
+     * A token filler adds tokens to a {@link ThreadDrivenTokenPool} at some rate.
      * By default, this rate is at least every millisecond +- scheduling jitter
      * in the JVM.
      *
      * @param rateSpec A {@link RateSpec}
      * @param def      An {@link ActivityDef}
      */
-    public TokenFiller(RateSpec rateSpec, TokenPool tokenPool, ActivityDef def) {
+    public TokenFiller(RateSpec rateSpec, ThreadDrivenTokenPool tokenPool, ActivityDef def) {
         this.rateSpec = rateSpec;
         this.tokenPool = tokenPool;
         this.timer = ActivityMetrics.timer(def, "tokenfiller");
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPool.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPool.java
index b76986e65..a2f02ac5d 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPool.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPool.java
@@ -1,256 +1,25 @@
-/*
- *
- *    Copyright 2016 jshook
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * /
- */
-
 package io.nosqlbench.engine.api.activityapi.ratelimits;
 
-import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+public interface TokenPool {
+    TokenPool apply(RateSpec rateSpec);
 
-import static io.nosqlbench.engine.api.util.Colors.*;
+    double getBurstRatio();
 
-/**
- * <h2>Synopsis</h2>
- *
- * This TokenPool represents a finite quantity which can be
- * replenished with regular refills. Extra tokens that do not fit
- * within the active token pool are saved in a waiting token pool and
- * used to backfill when allowed according to the backfill rate.
- *
- * A detailed explanation for how this works will be included
- * at @link "http://docs.nosqlbench.io/" under dev notes.
- *
- * <p>This is the basis for the token-based rate limiters in
- * NB. This mechanism is easily adaptable to bursting
- * capability as well as a degree of stricter timing at speed.
- * Various methods for doing this in a lock free way were
- * investigated, but the intrinsic locks provided by synchronized
- * method won out for now. This may be revisited when EB is
- * retrofitted for J11.
- * </p>
- */
-public class TokenPool {
+    long takeUpTo(long amt);
 
-    private final static Logger logger = LogManager.getLogger(TokenPool.class);
+    long blockAndTake();
 
-    public static final double MIN_CONCURRENT_OPS = 2;
+    long blockAndTake(long tokens);
 
-    private long maxActivePool;
-    private long burstPoolSize;
-    private long maxOverActivePool;
-    private double burstRatio;
-    // TODO Consider removing volatile after investigating 
-    private volatile long activePool;
-    private volatile long waitingPool;
-    private RateSpec rateSpec;
-    private long nanosPerOp;
-    //    private long debugTrigger=0L;
-//    private long debugRate=1000000000;
-    private long blocks = 0L;
+    long getWaitTime();
 
-    private TokenFiller filler;
-    private final ActivityDef activityDef;
+    long getWaitPool();
 
-    /**
-     * This constructor tries to pick reasonable defaults for the token pool for
-     * a given rate spec. The active pool must be large enough to contain one
-     * op worth of time, and the burst ratio
-     *
-     * @param rateSpec a {@link RateSpec}
-     */
-    public TokenPool(RateSpec rateSpec, ActivityDef activityDef) {
-        this.activityDef = activityDef;
-        apply(rateSpec);
-        logger.debug("initialized token pool: " + this.toString() + " for rate:" + rateSpec.toString());
-//        filler.start();
-    }
+    long getActivePool();
 
-    /**
-     * Change the settings of this token pool, and wake any blocked callers
-     * just in case it allows them to proceed.
-     *
-     * @param rateSpec The rate specifier.
-     */
-    public synchronized TokenPool apply(RateSpec rateSpec) {
-        this.rateSpec = rateSpec;
-        this.maxActivePool = Math.max((long) 1E6, (long) ((double) rateSpec.getNanosPerOp() * MIN_CONCURRENT_OPS));
-        this.maxOverActivePool = (long) (maxActivePool * rateSpec.getBurstRatio());
-        this.burstRatio = rateSpec.getBurstRatio();
+    RateSpec getRateSpec();
 
-        this.burstPoolSize = maxOverActivePool - maxActivePool;
-        this.nanosPerOp = rateSpec.getNanosPerOp();
-        this.filler = (this.filler == null) ? new TokenFiller(rateSpec, this, activityDef) : filler.apply(rateSpec);
-        notifyAll();
-        return this;
-    }
+    long restart();
 
-
-    public double getBurstRatio() {
-        return burstRatio;
-    }
-
-    /**
-     * Take tokens up to amt tokens form the pool and report
-     * the amount of token removed.
-     *
-     * @param amt tokens requested
-     * @return actual number of tokens removed, greater to or equal to zero
-     */
-    public synchronized long takeUpTo(long amt) {
-        long take = Math.min(amt, activePool);
-        activePool -= take;
-        return take;
-    }
-
-    /**
-     * wait for the given number of tokens to be available, and then remove
-     * them from the pool.
-     *
-     * @return the total number of tokens untaken, including wait tokens
-     */
-    public synchronized long blockAndTake() {
-        while (activePool < nanosPerOp) {
-            blocks++;
-            //System.out.println(ANSI_BrightRed +  "waiting for " + amt + "/" + activePool + " of max " + maxActivePool + ANSI_Reset);
-            try {
-                wait(maxActivePool / 1000000, (int) maxActivePool % 1000000);
-            } catch (InterruptedException ignored) {
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-            //System.out.println("waited for " + amt + "/" + activePool + " tokens");
-        }
-        //System.out.println(ANSI_BrightYellow + "taking " + amt + "/" + activePool + ANSI_Reset);
-
-        activePool -= nanosPerOp;
-        return waitingPool + activePool;
-    }
-
-    public synchronized long blockAndTake(long tokens) {
-        while (activePool < tokens) {
-            //System.out.println(ANSI_BrightRed +  "waiting for " + amt + "/" + activePool + " of max " + maxActivePool + ANSI_Reset);
-            try {
-                wait(maxActivePool / 1000000, (int) maxActivePool % 1000000);
-            } catch (InterruptedException ignored) {
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-            //System.out.println("waited for " + amt + "/" + activePool + " tokens");
-        }
-        //System.out.println(ANSI_BrightYellow + "taking " + amt + "/" + activePool + ANSI_Reset);
-
-        activePool -= tokens;
-        return waitingPool + activePool;
-    }
-
-    public long getWaitTime() {
-        return activePool + waitingPool;
-    }
-
-    public long getWaitPool() {
-        return waitingPool;
-    }
-
-    public long getActivePool() {
-        return activePool;
-    }
-
-    /**
-     * Add the given number of new tokens to the pool, forcing any amount
-     * that would spill over the current pool size into the wait token pool, but
-     * moving up to the configured burst tokens back from the wait token pool
-     * otherwise.
-     *
-     * The amount of backfilling that occurs is controlled by the backfill ratio,
-     * based on the number of tokens submitted. This causes normalizes the
-     * backfilling rate to the fill rate, so that it is not sensitive to refill
-     * scheduling.
-     *
-     * @param newTokens The number of new tokens to add to the token pools
-     * @return the total number of tokens in all pools
-     */
-    public synchronized long refill(long newTokens) {
-        boolean debugthis=false;
-//        long debugAt = System.nanoTime();
-//        if (debugAt>debugTrigger+debugRate) {
-//            debugTrigger=debugAt;
-//            debugthis=true;
-//        }
-
-        long needed = Math.max(maxActivePool - activePool, 0L);
-        long allocatedToActivePool = Math.min(newTokens, needed);
-        activePool += allocatedToActivePool;
-
-
-        // overflow logic
-        long allocatedToOverflowPool = newTokens - allocatedToActivePool;
-        waitingPool += allocatedToOverflowPool;
-
-        // backfill logic
-        double refillFactor = Math.min((double) newTokens / maxActivePool, 1.0D);
-        long burstFillAllowed =(long) (refillFactor* burstPoolSize);
-
-        burstFillAllowed = Math.min(maxOverActivePool - activePool, burstFillAllowed);
-        long burstFill = Math.min(burstFillAllowed, waitingPool);
-
-        waitingPool -= burstFill;
-        activePool += burstFill;
-
-        if (debugthis) {
-            System.out.print(this);
-            System.out.print(ANSI_BrightBlue + " adding=" + allocatedToActivePool);
-            if (allocatedToOverflowPool>0) {
-                System.out.print(ANSI_Red + " OVERFLOW:" + allocatedToOverflowPool + ANSI_Reset);
-            }
-            if (burstFill>0) {
-                System.out.print(ANSI_BrightGreen + " BACKFILL:" + burstFill + ANSI_Reset);
-            }
-            System.out.println();
-        }
-        //System.out.println(this);
-        notifyAll();
-
-        return activePool+waitingPool;
-    }
-
-    @Override
-    public String toString() {
-        return "Tokens: active=" + activePool +"/" + maxActivePool
-                + String.format(
-                        " (%3.1f%%)A (%3.1f%%)B ",
-                (((double)activePool/(double)maxActivePool)*100.0),
-                (((double)activePool/(double)maxOverActivePool)*100.0)) + " waiting=" + waitingPool +
-                " blocks=" + blocks +
-                " rateSpec:"+ ((rateSpec!=null) ? rateSpec.toString() : "NULL");
-    }
-
-    public RateSpec getRateSpec() {
-        return rateSpec;
-    }
-
-    public synchronized long restart() {
-        long wait = activePool + waitingPool;
-        activePool = 0L;
-        waitingPool = 0L;
-        filler.restart();
-        return wait;
-    }
-
-    public void start() {
-        filler.start();
-    }
+    void start();
 }
diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPoolTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPoolTest.java
index 167347c00..86dc50afc 100644
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPoolTest.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPoolTest.java
@@ -29,7 +29,7 @@ public class TokenPoolTest {
 
     @Test
     public void testBackfillFullRate() {
-        TokenPool p = new TokenPool(new RateSpec(10000000, 1.1), def);
+        ThreadDrivenTokenPool p = new ThreadDrivenTokenPool(new RateSpec(10000000, 1.1), def);
         assertThat(p.refill(1000000L)).isEqualTo(1000000L);
         assertThat(p.getWaitPool()).isEqualTo(0L);
         assertThat(p.refill(100L)).isEqualTo(1000100);
@@ -43,7 +43,7 @@ public class TokenPoolTest {
     }
     @Test
     public void testTakeRanges() {
-        TokenPool p = new TokenPool(new RateSpec(100, 10), def);
+        ThreadDrivenTokenPool p = new ThreadDrivenTokenPool(new RateSpec(100, 10), def);
         p.refill(100);
         assertThat(p.takeUpTo(99)).isEqualTo(99L);
         assertThat(p.takeUpTo(10)).isEqualTo(1L);
@@ -54,7 +54,7 @@ public class TokenPoolTest {
     public void testChangedParameters() {
 
         RateSpec s1 = new RateSpec(1000L, 1.10D);
-        TokenPool p = new TokenPool(s1, def);
+        ThreadDrivenTokenPool p = new ThreadDrivenTokenPool(s1, def);
         long r = p.refill(10000000);
         assertThat(r).isEqualTo(10000000L);
         assertThat(p.getWaitTime()).isEqualTo(10000000L);

From 06a092a2570266ad571ad9a7f675a8b54b837689 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Fri, 4 Dec 2020 10:21:39 -0600
Subject: [PATCH 063/164] update actions for release, since github made a
 breaking change

---
 .github/workflows/release.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8757d8361..5a665b13e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,8 +27,10 @@ jobs:
 
     - name: capture tty for gpg
       run: |
-       echo "::set-env name=TTY::"$(tty)
-       echo "::set-env name=GPG_TTY::"$(tty)
+        echo "TTY="$(tty) >> $GITHUB_ENV
+        echo "GPG_TTY="$(tty) >> $GITHUB_ENV
+        # echo "::set-env name=TTY::"$(tty)
+        # echo "::set-env name=GPG_TTY::"$(tty)
 
     - name: initialize gpg
       run: |
@@ -70,9 +72,12 @@ jobs:
         NEXT_MINOR_VERSION=$(( MINOR_VERSION+1))
         NEXT_SNAPSHOT="${BASE_VERSION}.${NEXT_MINOR_VERSION}-SNAPSHOT"
         RELEASE_TAGNAME="nosqlbench-${RELEASE_VERSION}"
-        echo "::set-env name=NEXT_SNAPSHOT::${NEXT_SNAPSHOT}"
-        echo "::set-env name=RELEASE_VERSION::${RELEASE_VERSION}"
-        echo "::set-env name=RELEASE_TAGNAME::${RELEASE_TAGNAME}"
+        echo "NEXT_SNAPSHOT=${NEXT_SNAPSHOT} >> $GITHUB_ENV
+        echo "RELEASE_VERSION=${RELEASE_VERSION} >> $GITHUB_ENV
+        echo "RELEASE_TAGNAME=${RELEASE_TAGNAME} >> $GITHUB_ENV
+        # echo "::set-env name=NEXT_SNAPSHOT::${NEXT_SNAPSHOT}"
+        # echo "::set-env name=RELEASE_VERSION::${RELEASE_VERSION}"
+        # echo "::set-env name=RELEASE_TAGNAME::${RELEASE_TAGNAME}"
 
     - name: prepare release summary
       id: prepare_summary

From b6493d0bdb1a78a71bfb343295cd63cc48792b61 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Fri, 4 Dec 2020 10:24:37 -0600
Subject: [PATCH 064/164] update docs for hybrid ratelimiter

---
 devdocs/devguide/hybrid_ratelimiter.png |  Bin 0 -> 70586 bytes
 devdocs/devguide/hybrid_ratelimiter.svg | 2186 +++++++++++++++++++++++
 2 files changed, 2186 insertions(+)
 create mode 100644 devdocs/devguide/hybrid_ratelimiter.png
 create mode 100644 devdocs/devguide/hybrid_ratelimiter.svg

diff --git a/devdocs/devguide/hybrid_ratelimiter.png b/devdocs/devguide/hybrid_ratelimiter.png
new file mode 100644
index 0000000000000000000000000000000000000000..68107623c56eacd22a22156d1718796241823485
GIT binary patch
literal 70586
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
XqeG51Ilc0A68|`?Tq9H3Z8-REvUAAP

literal 0
HcmV?d00001

diff --git a/devdocs/devguide/hybrid_ratelimiter.svg b/devdocs/devguide/hybrid_ratelimiter.svg
new file mode 100644
index 000000000..f3b9e05fc
--- /dev/null
+++ b/devdocs/devguide/hybrid_ratelimiter.svg
@@ -0,0 +1,2186 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+    width="297mm"
+    height="210mm"
+    viewBox="0 0 297 210"
+    version="1.1"
+    id="svg8"
+    inkscape:version="1.1-dev (1:1.0+devel+202008182239+0d2e79aadc)"
+    sodipodi:docname="hybrid_ratelimiter.svg"
+    inkscape:export-filename="/home/jshook/IdeaProjects/nosqlbench/devdocs/hybrid_ratelimiter.png"
+    inkscape:export-xdpi="96"
+    inkscape:export-ydpi="96"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:svg="http://www.w3.org/2000/svg"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:cc="http://creativecommons.org/ns#"
+    xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+      id="defs2">
+    <marker
+        inkscape:stockid="Arrow1Lend"
+        orient="auto"
+        refY="0.0"
+        refX="0.0"
+        id="marker2159"
+        style="overflow:visible;"
+        inkscape:isstock="true">
+      <path
+          id="path2157"
+          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+          style="fill-rule:evenodd;stroke:#ededed;stroke-width:1pt;stroke-opacity:1;fill:#ededed;fill-opacity:1"
+          transform="scale(0.8) rotate(180) translate(12.5,0)"/>
+    </marker>
+    <marker
+        inkscape:isstock="true"
+        style="overflow:visible;"
+        id="marker2131"
+        refX="0.0"
+        refY="0.0"
+        orient="auto"
+        inkscape:stockid="Arrow1Lend">
+      <path
+          transform="scale(0.8) rotate(180) translate(12.5,0)"
+          style="fill-rule:evenodd;stroke:#ededed;stroke-width:1pt;stroke-opacity:1;fill:#ededed;fill-opacity:1"
+          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+          id="path2129"/>
+    </marker>
+    <marker
+        inkscape:stockid="Arrow1Lend"
+        orient="auto"
+        refY="0.0"
+        refX="0.0"
+        id="marker2087"
+        style="overflow:visible;"
+        inkscape:isstock="true">
+      <path
+          id="path2085"
+          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+          style="fill-rule:evenodd;stroke:#969696;stroke-width:1pt;stroke-opacity:1;fill:#969696;fill-opacity:1"
+          transform="scale(0.8) rotate(180) translate(12.5,0)"/>
+    </marker>
+    <marker
+        inkscape:isstock="true"
+        style="overflow:visible;"
+        id="marker2083"
+        refX="0.0"
+        refY="0.0"
+        orient="auto"
+        inkscape:stockid="Arrow1Lend">
+      <path
+          transform="scale(0.8) rotate(180) translate(12.5,0)"
+          style="fill-rule:evenodd;stroke:#969696;stroke-width:1pt;stroke-opacity:1;fill:#969696;fill-opacity:1"
+          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+          id="path2081"/>
+    </marker>
+    <marker
+        inkscape:stockid="Arrow1Lend"
+        orient="auto"
+        refY="0.0"
+        refX="0.0"
+        id="marker1640"
+        style="overflow:visible;"
+        inkscape:isstock="true">
+      <path
+          id="path1638"
+          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+          style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+          transform="scale(0.8) rotate(180) translate(12.5,0)"/>
+    </marker>
+    <marker
+        inkscape:stockid="Arrow1Lend"
+        orient="auto"
+        refY="0.0"
+        refX="0.0"
+        id="marker1501"
+        style="overflow:visible;"
+        inkscape:isstock="true">
+      <path
+          id="path1499"
+          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+          style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+          transform="scale(0.8) rotate(180) translate(12.5,0)"/>
+    </marker>
+    <marker
+        inkscape:isstock="true"
+        style="overflow:visible;"
+        id="marker1475"
+        refX="0.0"
+        refY="0.0"
+        orient="auto"
+        inkscape:stockid="Arrow1Lend"
+        inkscape:collect="always">
+      <path
+          transform="scale(0.8) rotate(180) translate(12.5,0)"
+          style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+          id="path1473"/>
+    </marker>
+    <marker
+        inkscape:isstock="true"
+        style="overflow:visible;"
+        id="marker1467"
+        refX="0.0"
+        refY="0.0"
+        orient="auto"
+        inkscape:stockid="Arrow1Lend">
+      <path
+          transform="scale(0.8) rotate(180) translate(12.5,0)"
+          style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+          id="path1465"/>
+    </marker>
+    <marker
+        inkscape:stockid="Arrow1Lend"
+        orient="auto"
+        refY="0.0"
+        refX="0.0"
+        id="marker1435"
+        style="overflow:visible;"
+        inkscape:isstock="true"
+        inkscape:collect="always">
+      <path
+          id="path1433"
+          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+          style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+          transform="scale(0.8) rotate(180) translate(12.5,0)"/>
+    </marker>
+    <marker
+        inkscape:stockid="Arrow1Lend"
+        orient="auto"
+        refY="0.0"
+        refX="0.0"
+        id="marker1431"
+        style="overflow:visible;"
+        inkscape:isstock="true"
+        inkscape:collect="always">
+      <path
+          id="path1171"
+          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+          style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+          transform="scale(0.8) rotate(180) translate(12.5,0)"/>
+    </marker>
+    <marker
+        inkscape:stockid="Arrow1Lend"
+        orient="auto"
+        refY="0.0"
+        refX="0.0"
+        id="marker4804"
+        style="overflow:visible;"
+        inkscape:isstock="true">
+      <path
+          id="path4802"
+          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+          style="fill-rule:evenodd;stroke:#7d7d7d;stroke-width:1pt;stroke-opacity:1;fill:#7d7d7d;fill-opacity:1"
+          transform="scale(0.8) rotate(180) translate(12.5,0)"/>
+    </marker>
+    <marker
+        inkscape:stockid="Arrow1Lend"
+        orient="auto"
+        refY="0.0"
+        refX="0.0"
+        id="Arrow1Lend"
+        style="overflow:visible;"
+        inkscape:isstock="true">
+      <path
+          id="path4529"
+          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+          style="fill-rule:evenodd;stroke:#7d7d7d;stroke-width:1pt;stroke-opacity:1;fill:#7d7d7d;fill-opacity:1"
+          transform="scale(0.8) rotate(180) translate(12.5,0)"/>
+    </marker>
+    <marker
+        inkscape:stockid="Arrow1Lend"
+        orient="auto"
+        refY="0"
+        refX="0"
+        id="marker1431-1"
+        style="overflow:visible"
+        inkscape:isstock="true">
+      <path
+          inkscape:connector-curvature="0"
+          id="path1171-0"
+          d="M 0,0 5,-5 -12.5,0 5,5 Z"
+          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+          transform="matrix(-0.8,0,0,-0.8,-10,0)"/>
+    </marker>
+    <marker
+        inkscape:stockid="Arrow1Lend"
+        orient="auto"
+        refY="0"
+        refX="0"
+        id="marker1435-1"
+        style="overflow:visible"
+        inkscape:isstock="true">
+      <path
+          inkscape:connector-curvature="0"
+          id="path1433-3"
+          d="M 0,0 5,-5 -12.5,0 5,5 Z"
+          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+          transform="matrix(-0.8,0,0,-0.8,-10,0)"/>
+    </marker>
+    <marker
+        inkscape:isstock="true"
+        style="overflow:visible"
+        id="marker1475-7"
+        refX="0"
+        refY="0"
+        orient="auto"
+        inkscape:stockid="Arrow1Lend">
+      <path
+          inkscape:connector-curvature="0"
+          transform="matrix(-0.8,0,0,-0.8,-10,0)"
+          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+          d="M 0,0 5,-5 -12.5,0 5,5 Z"
+          id="path1473-2"/>
+    </marker>
+    <marker
+        inkscape:stockid="Arrow1Lend"
+        orient="auto"
+        refY="0"
+        refX="0"
+        id="marker1640-5"
+        style="overflow:visible"
+        inkscape:isstock="true">
+      <path
+          inkscape:connector-curvature="0"
+          id="path1638-1"
+          d="M 0,0 5,-5 -12.5,0 5,5 Z"
+          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+          transform="matrix(-0.8,0,0,-0.8,-10,0)"/>
+    </marker>
+  </defs>
+  <sodipodi:namedview
+      id="base"
+      pagecolor="#ffffff"
+      bordercolor="#666666"
+      borderopacity="1.0"
+      inkscape:pageopacity="0.0"
+      inkscape:pageshadow="2"
+      inkscape:zoom="1.6411848"
+      inkscape:cx="269.62229"
+      inkscape:cy="433.22361"
+      inkscape:document-units="mm"
+      inkscape:current-layer="g1199"
+      showgrid="true"
+      inkscape:window-width="3554"
+      inkscape:window-height="2007"
+      inkscape:window-x="286"
+      inkscape:window-y="2160"
+      inkscape:window-maximized="1"
+      inkscape:snap-intersection-paths="true"
+      inkscape:snap-bbox="true"
+      inkscape:bbox-paths="true"
+      inkscape:bbox-nodes="true"
+      inkscape:snap-bbox-edge-midpoints="true"
+      inkscape:snap-bbox-midpoints="true">
+    <inkscape:grid
+        type="xygrid"
+        id="grid815"
+        dotted="false"/>
+  </sodipodi:namedview>
+  <metadata
+      id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+          rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+            rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+      inkscape:label="Layer 1"
+      inkscape:groupmode="layer"
+      id="layer1"
+      transform="translate(0,-87)"
+      style="display:none">
+    <path
+        style="fill:none;stroke:#7d7d7d;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow1Lend);marker-end:url(#marker4804)"
+        d="M 50.799999,178.46667 H 186.26667"
+        id="path4524"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cc"/>
+    <path
+        style="fill:none;stroke:#7d7d7d;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="M 67.733332,174.23333 V 182.7"
+        id="path4978"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cc"/>
+    <path
+        style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#7d7d7d;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        d="M 101.6,174.23333 V 182.7"
+        id="path4980"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cc"/>
+    <path
+        style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#7d7d7d;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        d="M 135.46666,174.23333 V 182.7"
+        id="path4982"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cc"/>
+    <path
+        style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#7d7d7d;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        d="M 169.33333,174.23333 V 182.7"
+        id="path4984"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cc"/>
+    <g
+        aria-label="{"
+        transform="matrix(0,-2.509412,-2.509412,0,409.26608,1096.1585)"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:OpenSymbol;-inkscape-font-specification:OpenSymbol;letter-spacing:6.77553px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+        id="flowRoot4986">
+      <path
+          d="m 363.16948,136.10071 h -0.0703 q -0.85627,0 -1.30358,-0.5815 -0.42174,-0.51759 -0.42174,-1.38664 l 0.0128,-3.85961 q 0,-0.81793 -0.79876,-0.82432 v -0.21087 l 0.23643,-0.0128 q 0.56233,-0.0958 0.56233,-0.82432 l -0.0128,-3.8596 q 0,-0.88183 0.46647,-1.40582 0.46009,-0.53038 1.32914,-0.53038 v 0.21088 l -0.29395,0.0192 -0.23643,0.0639 q -0.73486,0.28116 -0.75403,1.46332 l -0.0511,3.6743 q -0.0192,0.90739 -0.8371,1.30996 0.81793,0.3898 0.8371,1.32275 l 0.0511,3.66151 q 0.0256,1.5464 1.25246,1.55918 0.0192,0 0.0319,0 z"
+          style="font-size:13.0869px;line-height:1.25;letter-spacing:10.082px;word-spacing:8.54225px"
+          id="path4994"
+          inkscape:connector-curvature="0"/>
+    </g>
+    <path
+        inkscape:connector-curvature="0"
+        id="path4994-6"
+        d="m 71.904189,167.87727 c 0,0 2.63e-4,0.006 2.63e-4,0.006 h -0.03926 l -0.0079,0.38558 c -0.0398,0.61143 -0.211087,0.91691 -0.513628,0.91691 l -2.404205,-0.0208 c -0.36621,0 -0.658025,0.25387 -0.875631,0.76107 -0.220261,0.50027 -0.330447,1.22275 -0.330447,2.16768 0.100316,-10e-4 0.143416,-0.47962 0.143416,-0.47962 l 0.03977,-0.38557 c 0.116761,-0.79903 0.420617,-1.2091 0.911551,-1.22994 l 2.288752,-0.0833 c 0.345684,-0.0191 0.725624,-0.47362 0.849977,-1.15067 0.124403,0.6769 0.504082,1.13152 0.849719,1.15067 l 2.288753,0.0833 c 0.490932,0.0208 0.794789,0.43091 0.91155,1.22994 l 0.03977,0.38557 c 0,0 0.0431,0.47815 0.143416,0.47962 0,-0.94493 -0.110186,-1.66741 -0.330446,-2.16768 -0.217607,-0.5072 -0.509422,-0.76107 -0.875632,-0.76107 l -2.404205,0.0208 c -0.30254,0 -0.473823,-0.30548 -0.513628,-0.91691 l -0.008,-0.38558 h -0.03925 c 4e-6,-1.2e-4 2.63e-4,-0.006 2.63e-4,-0.006 l -0.06234,0.004 z"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.0869px;line-height:1.25;font-family:OpenSymbol;-inkscape-font-specification:OpenSymbol;letter-spacing:10.082px;word-spacing:8.54225px;fill:#ae8fe2;fill-opacity:1;stroke:none;stroke-width:1.00795"/>
+    <flowRoot
+        xml:space="preserve"
+        id="flowRoot6447"
+        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:10px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+        transform="matrix(0.26458333,0,0,0.26458333,-17.226329,158.0725)"><flowRegion
+         id="flowRegion6449"
+         style="letter-spacing:10px"><rect
+           id="rect6451"
+           width="224"
+           height="80"
+           x="272"
+           y="105.70079"
+           style="letter-spacing:10px" /></flowRegion>
+      <flowPara
+          id="flowPara6453"
+          style="font-size:16px;text-align:center;letter-spacing:0px;text-anchor:middle">window</flowPara></flowRoot>
+    <flowRoot
+        xml:space="preserve"
+        id="flowRoot6447-8"
+        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:10px;word-spacing:0px;opacity:1;vector-effect:none;fill:#ae8fe2;fill-opacity:1;stroke:none;stroke-width:4.7422;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        transform="matrix(0.26458333,0,0,0.26458333,-21.84749,128.83581)"><flowRegion
+         id="flowRegion6449-5"
+         style="letter-spacing:10px;vector-effect:none;fill:#ae8fe2;fill-opacity:1;stroke:none;stroke-width:4.7422;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><rect
+           id="rect6451-5"
+           width="224"
+           height="80"
+           x="272"
+           y="105.70079"
+           style="letter-spacing:10px;vector-effect:none;fill:#ae8fe2;fill-opacity:1;stroke:none;stroke-width:4.74219561;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></flowRegion>
+      <flowPara
+          id="flowPara6453-0"
+          style="font-size:21.3333px;text-align:center;letter-spacing:0px;text-anchor:middle;vector-effect:none;fill:#ae8fe2;fill-opacity:1;stroke:none;stroke-width:4.7422;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1">ops ...</flowPara></flowRoot>
+    <g
+        aria-label="{"
+        transform="matrix(0,-2.509426,-3.1367641,0,494.24825,1111.4453)"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:OpenSymbol;-inkscape-font-specification:OpenSymbol;letter-spacing:6.77553px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+        id="flowRoot4986-8">
+      <path
+          d="m 363.16948,136.10071 h -0.0703 q -0.85627,0 -1.30358,-0.5815 -0.42174,-0.51759 -0.42174,-1.38664 l 0.0128,-3.85961 q 0,-0.81793 -0.79876,-0.82432 v -0.21087 l 0.23643,-0.0128 q 0.56233,-0.0958 0.56233,-0.82432 l -0.0128,-3.8596 q 0,-0.88183 0.46647,-1.40582 0.46009,-0.53038 1.32914,-0.53038 v 0.21088 l -0.29395,0.0192 -0.23643,0.0639 q -0.73486,0.28116 -0.75403,1.46332 l -0.0511,3.6743 q -0.0192,0.90739 -0.8371,1.30996 0.81793,0.3898 0.8371,1.32275 l 0.0511,3.66151 q 0.0256,1.5464 1.25246,1.55918 0.0192,0 0.0319,0 z"
+          style="font-size:13.0869px;line-height:1.25;letter-spacing:10.082px;word-spacing:8.54225px"
+          id="path4994-2"
+          inkscape:connector-curvature="0"/>
+    </g>
+    <flowRoot
+        xml:space="preserve"
+        id="flowRoot6447-3"
+        style="font-style:normal;font-weight:normal;font-size:40px;line-height:0.5;font-family:sans-serif;letter-spacing:10px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+        transform="matrix(0.26458333,0,0,0.26458333,-31.568495,171.82043)"><flowRegion
+         id="flowRegion6449-0"
+         style="line-height:0.5;letter-spacing:10px"><rect
+           id="rect6451-7"
+           width="242.06213"
+           height="36.3475"
+           x="334.10321"
+           y="127.86569"
+           style="line-height:0.5;letter-spacing:10px" /></flowRegion>
+      <flowPara
+          style="font-size:16px;line-height:0.5;text-align:center;letter-spacing:0px;text-anchor:middle"
+          id="flowPara6539">window * burst ratio</flowPara></flowRoot>
+    <g
+        aria-label="{"
+        transform="matrix(0,-2.5093559,-0.62735364,0,186.98327,1096.1381)"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:OpenSymbol;-inkscape-font-specification:OpenSymbol;letter-spacing:6.77553px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+        id="flowRoot4986-1">
+      <path
+          d="m 363.16948,136.10071 h -0.0703 q -0.85627,0 -1.30358,-0.5815 -0.42174,-0.51759 -0.42174,-1.38664 l 0.0128,-3.85961 q 0,-0.81793 -0.79876,-0.82432 v -0.21087 l 0.23643,-0.0128 q 0.56233,-0.0958 0.56233,-0.82432 l -0.0128,-3.8596 q 0,-0.88183 0.46647,-1.40582 0.46009,-0.53038 1.32914,-0.53038 v 0.21088 l -0.29395,0.0192 -0.23643,0.0639 q -0.73486,0.28116 -0.75403,1.46332 l -0.0511,3.6743 q -0.0192,0.90739 -0.8371,1.30996 0.81793,0.3898 0.8371,1.32275 l 0.0511,3.66151 q 0.0256,1.5464 1.25246,1.55918 0.0192,0 0.0319,0 z"
+          style="font-size:13.0869px;line-height:1.25;letter-spacing:10.082px;word-spacing:8.54225px"
+          id="path4994-9"
+          inkscape:connector-curvature="0"/>
+    </g>
+    <g
+        id="use6977"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:OpenSymbol;-inkscape-font-specification:OpenSymbol;letter-spacing:6.77553px;word-spacing:0px;fill:#ae8fe2;fill-opacity:1;stroke:none"
+        transform="matrix(0,1.6309665,0.62292356,0,-0.1735206,-420.22365)"
+        aria-label="{">
+      <path
+          inkscape:connector-curvature="0"
+          id="path1769"
+          transform="matrix(0,0.21087279,0.21087279,0,297.01851,65.343312)"
+          d="m 303.29688,301.44141 c 0,0 0.002,0.0172 0.002,0.0176 H 303 l -0.0605,1.1211 c -0.30302,1.7778 -1.60696,2.66601 -3.91015,2.66601 l -18.30274,-0.0605 c -2.78789,0 -5.00942,0.73816 -6.66601,2.21289 -1.6768,1.45457 -2.51563,3.55525 -2.51563,6.30273 0.76369,-0.004 1.0918,-1.39453 1.0918,-1.39453 l 0.30273,-1.12109 c 0.88888,-2.32325 3.20208,-3.51557 6.93946,-3.57617 l 17.42382,-0.24219 c 2.63163,-0.0557 5.52404,-1.37711 6.47071,-3.34571 0.94706,1.96816 3.83748,3.29003 6.46875,3.34571 l 17.42383,0.24219 c 3.73737,0.0606 6.05057,1.25292 6.93945,3.57617 l 0.30273,1.12109 c 0,0 0.32812,1.39026 1.0918,1.39453 0,-2.74748 -0.83883,-4.84816 -2.51562,-6.30273 -1.6566,-1.47473 -3.87813,-2.21289 -6.66602,-2.21289 l -18.30274,0.0605 c -2.30318,0 -3.60712,-0.88821 -3.91015,-2.66601 l -0.0606,-1.1211 h -0.29883 c 3e-5,-3.5e-4 0.002,-0.0176 0.002,-0.0176 l -0.47461,0.0117 z"
+          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.0869px;line-height:1.25;font-family:OpenSymbol;-inkscape-font-specification:OpenSymbol;letter-spacing:10.082px;word-spacing:8.54225px;fill:#ae8fe2;fill-opacity:1;stroke:none;stroke-width:4.7422"/>
+    </g>
+    <g
+        id="use6983"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:OpenSymbol;-inkscape-font-specification:OpenSymbol;letter-spacing:6.77553px;word-spacing:0px;fill:#ae8fe2;fill-opacity:1;stroke:none"
+        transform="matrix(0,1.6309665,0.62292356,0,8.2931456,-420.22365)"
+        aria-label="{">
+      <path
+          inkscape:connector-curvature="0"
+          id="path1773"
+          transform="matrix(0,0.21087279,0.21087279,0,297.01851,65.343312)"
+          d="m 303.29688,301.44141 c 0,0 0.002,0.0172 0.002,0.0176 H 303 l -0.0605,1.1211 c -0.30302,1.7778 -1.60696,2.66601 -3.91015,2.66601 l -18.30274,-0.0605 c -2.78789,0 -5.00942,0.73816 -6.66601,2.21289 -1.6768,1.45457 -2.51563,3.55525 -2.51563,6.30273 0.76369,-0.004 1.0918,-1.39453 1.0918,-1.39453 l 0.30273,-1.12109 c 0.88888,-2.32325 3.20208,-3.51557 6.93946,-3.57617 l 17.42382,-0.24219 c 2.63163,-0.0557 5.52404,-1.37711 6.47071,-3.34571 0.94706,1.96816 3.83748,3.29003 6.46875,3.34571 l 17.42383,0.24219 c 3.73737,0.0606 6.05057,1.25292 6.93945,3.57617 l 0.30273,1.12109 c 0,0 0.32812,1.39026 1.0918,1.39453 0,-2.74748 -0.83883,-4.84816 -2.51562,-6.30273 -1.6566,-1.47473 -3.87813,-2.21289 -6.66602,-2.21289 l -18.30274,0.0605 c -2.30318,0 -3.60712,-0.88821 -3.91015,-2.66601 l -0.0606,-1.1211 h -0.29883 c 3e-5,-3.5e-4 0.002,-0.0176 0.002,-0.0176 l -0.47461,0.0117 z"
+          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.0869px;line-height:1.25;font-family:OpenSymbol;-inkscape-font-specification:OpenSymbol;letter-spacing:10.082px;word-spacing:8.54225px;fill:#ae8fe2;fill-opacity:1;stroke:none;stroke-width:4.7422"/>
+    </g>
+    <flowRoot
+        xml:space="preserve"
+        id="flowRoot6447-9"
+        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:10px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+        transform="matrix(0.26458333,0,0,0.26458333,-17.226329,149.60583)"><flowRegion
+         id="flowRegion6449-7"
+         style="letter-spacing:10px"><rect
+           id="rect6451-6"
+           width="224"
+           height="80"
+           x="272"
+           y="105.70079"
+           style="letter-spacing:10px" /></flowRegion>
+      <flowPara
+          id="flowPara6453-2"
+          style="font-size:10.6667px;text-align:center;letter-spacing:0px;text-anchor:middle">16</flowPara></flowRoot>
+    <flowRoot
+        xml:space="preserve"
+        id="flowRoot6447-9-7"
+        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:10px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+        transform="matrix(0.26458333,0,0,0.26458333,3.9403381,149.60583)"><flowRegion
+         id="flowRegion6449-7-1"
+         style="letter-spacing:10px"><rect
+           id="rect6451-6-5"
+           width="224"
+           height="80"
+           x="272"
+           y="105.70079"
+           style="letter-spacing:10px" /></flowRegion>
+      <flowPara
+          id="flowPara6453-2-8"
+          style="font-size:10.6667px;text-align:center;letter-spacing:0px;text-anchor:middle">4</flowPara></flowRoot>
+    <flowRoot
+        xml:space="preserve"
+        id="flowRoot6447-9-8"
+        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:10px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+        transform="matrix(0.26458333,0,0,0.26458333,-12.992995,164.4225)"><flowRegion
+         id="flowRegion6449-7-4"
+         style="letter-spacing:10px"><rect
+           id="rect6451-6-56"
+           width="224"
+           height="80"
+           x="272"
+           y="105.70079"
+           style="letter-spacing:10px" /></flowRegion>
+      <flowPara
+          id="flowPara6453-2-5"
+          style="font-size:10.6667px;text-align:center;letter-spacing:0px;text-anchor:middle">20</flowPara></flowRoot>
+  </g>
+  <g
+      inkscape:groupmode="layer"
+      id="layer3"
+      inkscape:label="braces"
+      style="display:none">
+    <path
+        style="display:inline;fill:none;stroke:#ededed;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+        d="M 101.6,74.533333 V 104.16667"
+        id="path2056-0"
+        inkscape:connector-curvature="0"/>
+    <path
+        style="display:inline;fill:none;stroke:#ededed;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+        d="M 67.733337,74.533333 V 104.16667"
+        id="path2056-4"
+        inkscape:connector-curvature="0"/>
+    <path
+        style="fill:none;stroke:#ededed;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+        d="M 110.06667,74.533333 V 104.16667"
+        id="path2056"
+        inkscape:connector-curvature="0"/>
+    <path
+        sodipodi:nodetypes="ccccccccccccccccccccc"
+        inkscape:connector-curvature="0"
+        id="path4994-6-0"
+        d="m 105.83333,91.443669 -0.10942,-0.38556 c -0.0398,-0.611433 -0.21108,-0.916913 -0.51363,-0.916913 l -2.4042,0.02088 c -0.36621,0 -0.65803,-0.253876 -0.87563,-0.761074 -0.22026,-0.50027 -0.33045,-1.22274 -0.33045,-2.167673 0.10032,0.0014 0.14342,0.479619 0.14342,0.479619 l 0.0397,0.385576 c 0.11676,0.799027 0.42061,1.209085 0.91155,1.229929 l 2.28875,0.08334 c 0.34568,0.01924 0.72562,0.473633 0.84998,1.150679 0.1244,-0.6769 0.50408,-1.131532 0.84972,-1.150679 l 2.28875,-0.08334 c 0.49094,-0.02088 0.79479,-0.430902 0.91155,-1.229929 l 0.0397,-0.385576 c 0,0 0.0431,-0.478151 0.14342,-0.479619 0,0.944933 -0.11019,1.667403 -0.33045,2.167669 -0.21761,0.507198 -0.50942,0.761074 -0.87563,0.761074 l -2.40421,-0.02088 c -0.30254,0 -0.47382,0.30548 -0.51363,0.916913 -0.10942,0.38556 -0.10942,0.38556 -0.10942,0.38556 z"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.0869px;line-height:1.25;font-family:OpenSymbol;-inkscape-font-specification:OpenSymbol;letter-spacing:10.082px;word-spacing:8.54225px;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
+    <path
+        sodipodi:nodetypes="cccccccccccccccccccccccccc"
+        inkscape:connector-curvature="0"
+        id="path4994-6-0-4-0"
+        d="m 84.66671,91.466666 -0.109422,-0.387697 c -0.03981,-0.614826 -0.211084,-0.921986 -0.513626,-0.921986 l -1.318321,0.01142 -13.785928,0.0098 c -0.36621,0 -0.658025,-0.255279 -0.875631,-0.765298 -0.22026,-0.503039 -0.330448,-1.229504 -0.330448,-2.179673 0.100315,0.0014 0.143415,0.482277 0.143415,0.482277 l 0.03974,0.387713 c 0.116761,0.803447 0.420616,1.215788 0.911549,1.236746 l 13.888567,0.04338 1.100229,0.04028 c 0.345685,0.01941 0.725625,0.476259 0.849979,1.157057 0.124404,-0.680651 0.504082,-1.137811 0.849718,-1.157057 l 1.096705,-0.04012 13.892054,-0.04355 c 0.49093,-0.02104 0.79478,-0.433299 0.91155,-1.236746 l 0.0397,-0.387713 c 0,0 0.0431,-0.480793 0.14342,-0.482277 0,0.950169 -0.11019,1.676634 -0.33045,2.179673 -0.2176,0.510019 -0.50942,0.765298 -0.87563,0.765298 l -13.7631,-0.0098 -1.341102,-0.01142 c -0.302541,0 -0.473827,0.30716 -0.513632,0.921986 l -0.109422,0.387697 z"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.0869px;line-height:1.25;font-family:OpenSymbol;-inkscape-font-specification:OpenSymbol;letter-spacing:10.082px;word-spacing:8.54225px;display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
+    <path
+        sodipodi:nodetypes="ccccccccccccscccscccc"
+        inkscape:connector-curvature="0"
+        id="path4994-6-0-0"
+        d="m 114.30004,91.443669 -0.10942,-0.38556 c -0.0398,-0.611433 -0.21109,-0.916913 -0.51363,-0.916913 l -2.4042,0.02088 c -0.36621,0 -0.65803,-0.253876 -0.87563,-0.761074 -0.22026,-0.500266 -0.33045,-1.222736 -0.33045,-2.167669 0.10031,0.0014 0.14341,0.479619 0.14341,0.479619 l 0.0397,0.385576 c 0.11676,0.799027 0.42061,1.209085 0.91155,1.229929 l 2.28875,0.08334 c 0.34568,0.01924 0.72562,0.473633 0.84998,1.150679 0.1244,-0.6769 0.50408,-1.131532 0.84971,-1.150679 0,0 1.5263,-0.04501 2.28876,-0.08334 1.02037,-0.05121 14.26874,-0.418154 14.26874,-0.418154 l 1.64269,0.89159 -1.66189,0.849203 c 0,0 -13.46931,-0.440515 -14.3609,-0.48902 -0.80025,-0.04355 -2.40421,-0.02088 -2.40421,-0.02088 -0.30254,0 -0.47382,0.30548 -0.51363,0.916913 L 114.3,91.443669 Z"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.0869px;line-height:1.25;font-family:OpenSymbol;-inkscape-font-specification:OpenSymbol;letter-spacing:10.082px;word-spacing:8.54225px;display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
+    <path
+        d="m 131.01288,90.188575 q -0.0482,-0.05595 -0.12433,-0.186487 -0.10412,0.186487 -0.19581,0.268851 -0.11499,0.09946 -0.29371,0.09946 -0.2098,0 -0.3481,-0.156957 -0.14609,-0.164729 -0.14609,-0.436687 0,-0.261081 0.14609,-0.438241 0.13053,-0.156961 0.35121,-0.156961 0.11344,0 0.19736,0.04662 0.0979,0.05129 0.16473,0.139865 0.0622,0.07926 0.12432,0.186483 0.10412,-0.186483 0.19581,-0.268847 0.11501,-0.09946 0.29372,-0.09946 0.2098,0 0.34811,0.156958 0.14608,0.164729 0.14608,0.436686 0,0.261082 -0.14608,0.438242 -0.13054,0.156957 -0.35122,0.156957 -0.11344,0 -0.19737,-0.04662 -0.0839,-0.04196 -0.16472,-0.139864 z m -0.63094,-0.02176 q 0.25642,0 0.41026,-0.372972 -0.19736,-0.407159 -0.41026,-0.407159 -0.15541,0 -0.23466,0.111893 -0.0855,0.119661 -0.0855,0.278174 0,0.174053 0.0855,0.281281 0.087,0.108783 0.23466,0.108783 z m 1.01324,-0.777021 q -0.23156,0 -0.41028,0.372971 0.19581,0.40716 0.41028,0.40716 0.1554,0 0.23466,-0.111893 0.0855,-0.119662 0.0855,-0.278174 0,-0.174054 -0.0855,-0.281281 -0.087,-0.108783 -0.23466,-0.108783 z"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:OpenSymbol;letter-spacing:0px;word-spacing:0px;vector-effect:none;fill:#050023;fill-opacity:1;stroke:none;stroke-width:0.72471;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        id="path1109"
+        inkscape:connector-curvature="0"/>
+    <text
+        id="text1114"
+        y="93.535225"
+        x="80.366043"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:OpenSymbol;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+        xml:space="preserve"><tspan
+         style="font-size:2.82222px;stroke-width:0.264583"
+         y="93.535225"
+         x="80.366043"
+         id="tspan1112"
+         sodipodi:role="line">active</tspan></text>
+    <text
+        id="text1118"
+        y="93.233032"
+        x="102.11585"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:OpenSymbol;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+        xml:space="preserve"><tspan
+         style="font-size:2.82222px;stroke-width:0.264583"
+         y="93.233032"
+         x="102.11585"
+         id="tspan1116"
+         sodipodi:role="line">burst</tspan></text>
+    <text
+        id="text1122"
+        y="93.195877"
+        x="111.30794"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:OpenSymbol;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+        xml:space="preserve"><tspan
+         style="font-size:2.82222px;stroke-width:0.264583"
+         y="93.195877"
+         x="111.30794"
+         id="tspan1120"
+         sodipodi:role="line">wait</tspan></text>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1431);marker-end:url(#marker1435)"
+        d="m 67.733333,78.766667 h 6.330709 c 1.0669,0.04027 2.110809,0.928831 2.135958,2.126243 v 4.223757"
+        id="path1166"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccc"/>
+    <path
+        style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker1475)"
+        d="m 74.083333,78.766667 c 2.116667,0 3.006299,0.06907 4.313132,0.04208 2.036868,-0.04208 21.782585,-0.238843 35.903535,-0.04208 1.21139,0.02829 2.06952,1.009 2.11667,2.116663 v 4.233339"
+        id="path1437"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="csccc"/>
+    <path
+        style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker1501)"
+        d="m 112.18333,89.35 v -6.352517 c 0,-2.11415 -4.23333,-2.11415 -4.23333,-0.0943 v 4.33015"
+        id="path1477"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccc"/>
+    <path
+        inkscape:connector-curvature="0"
+        id="path1507"
+        style="font-style:normal;font-weight:normal;font-size:medium;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.108927"
+        d="m 58.538652,77.608182 -1.021989,2.044587 h 2.04647 z m -1.704976,2.349641 1.420813,-2.710985 h 0.570818 l 1.418321,2.710985 z"/>
+    <path
+        inkscape:connector-curvature="0"
+        id="path1509"
+        style="font-style:normal;font-weight:normal;font-size:medium;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.0619049"
+        d="m 60.270397,79.646308 v -0.235239 h 0.178286 v -0.420953 l 0.126286,-0.02724 q 0.151048,-0.03219 0.242668,-0.116382 0.0941,-0.08419 0.118857,-0.27981 0.02971,-0.235238 0.141143,-0.416001 0.111429,-0.183238 0.289715,-0.287239 0.180762,-0.104 0.413525,-0.104 0.230286,0 0.408573,0.104 0.180761,0.104001 0.29219,0.287239 0.113906,0.180763 0.143621,0.416001 0.02476,0.19562 0.116378,0.27981 0.0941,0.08419 0.245144,0.116382 l 0.126287,0.02724 v 0.420953 h 0.178288 v 0.235239 h -0.869147 v -0.09905 h -1.285145 v 0.09905 z m 1.51048,-0.443239 q 0.133715,0 0.252572,-0.04952 0.118857,-0.052 0.208001,-0.141143 0.08914,-0.08914 0.138667,-0.208001 0.052,-0.118857 0.052,-0.252572 0,-0.133715 -0.052,-0.252572 -0.04952,-0.118857 -0.138667,-0.208 -0.08914,-0.08914 -0.208001,-0.138667 -0.118857,-0.052 -0.252572,-0.052 -0.133715,0 -0.252572,0.052 -0.118857,0.04952 -0.208,0.138667 -0.08914,0.08914 -0.141144,0.208 -0.04952,0.118857 -0.04952,0.252572 0,0.133715 0.04952,0.252572 0.052,0.118857 0.141144,0.208001 0.08914,0.08914 0.208,0.141143 0.118857,0.04952 0.252572,0.04952 z m 0,-0.542287 q -0.04705,0 -0.07924,-0.03219 -0.03219,-0.03219 -0.03219,-0.07924 l -0.24019,-0.141141 0.052,-0.08667 0.240192,0.136191 0.0074,-0.0025 v -0.49524 h 0.104 v 0.49524 q 0.02476,0.01485 0.03962,0.03962 0.01733,0.02476 0.01733,0.05695 0,0.04457 -0.03219,0.07676 -0.03219,0.03219 -0.07676,0.03219 z m 0.282286,-0.552192 q -0.01733,0 -0.03219,-0.01238 -0.01238,-0.01486 -0.01238,-0.02971 0,-0.01733 0.01238,-0.02971 0.01486,-0.01238 0.02971,-0.01238 0.01982,0 0.02971,0.01486 0.01238,0.01486 0.01238,0.02724 0,0.01733 -0.01238,0.02971 -0.01237,0.01238 -0.02724,0.01238 z m -0.564573,0 q -0.01486,0 -0.02971,-0.01238 -0.01238,-0.01238 -0.01238,-0.02971 0,-0.01733 0.01238,-0.02971 0.01238,-0.01238 0.02971,-0.01238 0.01733,0 0.02971,0.01238 0.01238,0.01238 0.01238,0.02971 0,0.02476 -0.01733,0.03467 -0.01733,0.0074 -0.02476,0.0074 z m 0.770099,0.205524 q -0.01734,0 -0.02971,-0.01238 -0.01238,-0.01238 -0.01238,-0.02971 0,-0.01733 0.0099,-0.02971 0.01238,-0.01486 0.03219,-0.01486 0.01486,0 0.02724,0.01238 0.01238,0.01238 0.01238,0.03219 0,0.02229 -0.01733,0.03219 -0.01486,0.0099 -0.0223,0.0099 z m -0.975623,0 q -0.01981,0 -0.03219,-0.01238 -0.0099,-0.01486 -0.0099,-0.02971 0,-0.01981 0.01238,-0.03219 0.01486,-0.01238 0.02971,-0.01238 0.01486,0 0.02724,0.01238 0.01486,0.01238 0.01486,0.03219 0,0.01981 -0.01238,0.03219 -0.01238,0.0099 -0.02971,0.0099 z m 0.487811,0.27981 q 0.01734,0 0.02971,-0.01238 0.01238,-0.01238 0.01238,-0.02971 0,-0.01734 -0.01238,-0.02971 -0.01238,-0.01238 -0.02971,-0.01238 -0.01734,0 -0.02971,0.01238 -0.01238,0.01238 -0.01238,0.02971 0,0.01733 0.01238,0.02971 0.01238,0.01238 0.02971,0.01238 z m 0.562097,0 q -0.01734,0 -0.02971,-0.01238 -0.0099,-0.01238 -0.0099,-0.02971 0,-0.01734 0.0099,-0.02971 0.01238,-0.01238 0.02971,-0.01238 0.01734,0 0.02971,0.01238 0.01238,0.01238 0.01238,0.02971 0,0.01733 -0.01238,0.02971 -0.01238,0.01238 -0.02971,0.01238 z m -1.124194,0 q -0.01981,0 -0.03219,-0.01238 -0.0099,-0.01238 -0.0099,-0.02971 0,-0.01734 0.0099,-0.02971 0.01238,-0.01238 0.03219,-0.01238 0.01733,0 0.02724,0.01238 0.01238,0.01238 0.01238,0.02971 0,0.01733 -0.01238,0.02971 -0.0099,0.01238 -0.02724,0.01238 z m 0.07429,0.282287 q -0.01486,0 -0.02971,-0.01238 -0.01238,-0.01238 -0.01238,-0.02971 0,-0.02229 0.01733,-0.03219 0.01733,-0.01238 0.02476,-0.01238 0.01486,0 0.02724,0.01238 0.01486,0.01238 0.01486,0.03219 0,0.01486 -0.01238,0.02971 -0.0099,0.01238 -0.02971,0.01238 z m 0.975623,0 q -0.01982,0 -0.03219,-0.01238 -0.0099,-0.01486 -0.0099,-0.02971 0,-0.01733 0.01238,-0.02971 0.01238,-0.01238 0.02971,-0.01238 0.03962,0 0.03962,0.03962 0,0.01981 -0.01238,0.03219 -0.01238,0.01238 -0.02724,0.01238 z m -0.205526,0.205524 q -0.01733,0 -0.03219,-0.0099 -0.01238,-0.01238 -0.01238,-0.03219 0,-0.01733 0.01238,-0.02971 0.01238,-0.01238 0.03219,-0.01238 0.01486,0 0.02724,0.01238 0.01238,0.0099 0.01238,0.02971 0,0.01486 -0.01238,0.02971 -0.0099,0.01238 -0.02724,0.01238 z m -0.564573,0 q -0.01733,0 -0.02971,-0.01238 -0.01238,-0.01486 -0.01238,-0.02971 0,-0.01981 0.01238,-0.02971 0.01486,-0.01238 0.02971,-0.01238 0.02476,0 0.03219,0.01486 0.0099,0.01486 0.0099,0.02724 0,0.01981 -0.01238,0.03219 -0.01238,0.0099 -0.02971,0.0099 z m 0.282287,0.07429 q -0.01734,0 -0.02971,-0.0099 -0.01238,-0.01238 -0.01238,-0.03219 0,-0.01733 0.01238,-0.02724 0.01238,-0.01238 0.02971,-0.01238 0.01734,0 0.02971,0.01238 0.01238,0.0099 0.01238,0.02724 0,0.01981 -0.01238,0.03219 -0.01238,0.0099 -0.02971,0.0099 z"/>
+    <text
+        xml:space="preserve"
+        style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+        x="77.238121"
+        y="83.363823"
+        id="text1532"><tspan
+         sodipodi:role="line"
+         id="tspan1530"
+         x="77.238121"
+         y="83.363823"
+         style="font-size:2.82222px;stroke-width:0.264583">1</tspan></text>
+    <text
+        xml:space="preserve"
+        style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+        x="117.45479"
+        y="85.480492"
+        id="text1532-0"><tspan
+         sodipodi:role="line"
+         id="tspan1530-9"
+         x="117.45479"
+         y="85.480492"
+         style="font-size:2.82222px;stroke-width:0.264583">2</tspan></text>
+    <text
+        xml:space="preserve"
+        style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+        x="109.41487"
+        y="84.546974"
+        id="text1532-0-7"><tspan
+         sodipodi:role="line"
+         id="tspan1530-9-5"
+         x="109.41487"
+         y="84.546974"
+         style="font-size:2.82222px;stroke-width:0.264583">3</tspan></text>
+    <text
+        id="text1114-3"
+        y="78.380775"
+        x="68.256477"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:OpenSymbol;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+        xml:space="preserve"><tspan
+         style="font-size:2.82222px;stroke-width:0.264583"
+         y="78.380775"
+         x="68.256477"
+         id="tspan1112-8"
+         sodipodi:role="line">refill</tspan></text>
+    <text
+        id="text1114-7"
+        y="87.520348"
+        x="68.574081"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:OpenSymbol;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;display:inline;opacity:1;vector-effect:none;fill:#806aff;fill-opacity:1;stroke:none;stroke-width:0.816494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:OpenSymbol;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;vector-effect:none;fill:#806aff;fill-opacity:1;stroke:none;stroke-width:0.816494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         y="87.520348"
+         x="68.574081"
+         id="tspan1112-4"
+         sodipodi:role="line">op</tspan></text>
+    <path
+        inkscape:connector-curvature="0"
+        id="path4994-6-8"
+        d="m 69.81873,85.110602 c 0,0 1.31e-4,0.003 1.31e-4,0.003 h -0.01963 l -0.0039,0.194119 c -0.0199,0.307822 -0.105543,0.461614 -0.256811,0.461614 l -1.202093,-0.01047 c -0.183104,0 -0.32901,0.127809 -0.437811,0.383158 -0.110131,0.251859 -0.165223,0.615589 -0.165223,1.09131 0.05016,-5.03e-4 0.07171,-0.241462 0.07171,-0.241462 l 0.01989,-0.194114 c 0.05838,-0.402269 0.210306,-0.608718 0.455771,-0.619209 l 1.144367,-0.04194 c 0.17284,-0.0096 0.362809,-0.238442 0.424984,-0.579301 0.0622,0.340784 0.252039,0.56966 0.424857,0.579301 l 1.144366,0.04194 c 0.245464,0.01047 0.397391,0.21694 0.455771,0.619209 l 0.01989,0.194114 c 0,0 0.02155,0.240722 0.07171,0.241462 0,-0.475721 -0.05509,-0.839451 -0.165222,-1.09131 -0.108803,-0.255349 -0.254709,-0.383158 -0.437813,-0.383158 l -1.202091,0.01047 c -0.151269,0 -0.23691,-0.153792 -0.256812,-0.461614 l -0.004,-0.194119 h -0.01963 c 2e-6,-6.1e-5 1.31e-4,-0.003 1.31e-4,-0.003 l -0.03117,0.002 z"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.0869px;line-height:1.25;font-family:OpenSymbol;-inkscape-font-specification:OpenSymbol;letter-spacing:10.082px;word-spacing:8.54225px;display:inline;opacity:1;vector-effect:none;fill:#806aff;fill-opacity:1;stroke:none;stroke-width:0.816494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
+    <path
+        inkscape:connector-curvature="0"
+        id="path4994-6-8-8"
+        d="m 74.052065,85.110602 c 0,0 1.31e-4,0.003 1.31e-4,0.003 h -0.01963 l -0.0039,0.194119 c -0.0199,0.307822 -0.105543,0.461614 -0.256811,0.461614 l -1.202093,-0.01047 c -0.183104,0 -0.32901,0.127809 -0.437811,0.383158 -0.110131,0.251859 -0.165223,0.615589 -0.165223,1.09131 0.05016,-5.03e-4 0.07171,-0.241462 0.07171,-0.241462 l 0.01989,-0.194114 c 0.05838,-0.402269 0.210306,-0.608718 0.455771,-0.619209 l 1.144367,-0.04194 c 0.17284,-0.0096 0.362809,-0.238442 0.424984,-0.579301 0.0622,0.340784 0.252039,0.56966 0.424857,0.579301 l 1.144366,0.04194 c 0.245464,0.01047 0.397391,0.21694 0.455771,0.619209 l 0.01989,0.194114 c 0,0 0.02155,0.240722 0.07171,0.241462 0,-0.475721 -0.05509,-0.839451 -0.165222,-1.09131 -0.108802,-0.255349 -0.254708,-0.383158 -0.437812,-0.383158 l -1.202091,0.01047 c -0.151269,0 -0.23691,-0.153793 -0.256812,-0.461615 l -0.004,-0.194119 h -0.01963 c 2e-6,-6.1e-5 1.31e-4,-0.003 1.31e-4,-0.003 l -0.03117,0.002 z"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.0869px;line-height:1.25;font-family:OpenSymbol;-inkscape-font-specification:OpenSymbol;letter-spacing:10.082px;word-spacing:8.54225px;display:inline;opacity:1;vector-effect:none;fill:#806aff;fill-opacity:1;stroke:none;stroke-width:0.816494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
+    <text
+        id="text1114-7-3"
+        y="87.520348"
+        x="72.807419"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:OpenSymbol;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;display:inline;opacity:1;vector-effect:none;fill:#806aff;fill-opacity:1;stroke:none;stroke-width:0.816494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:OpenSymbol;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;vector-effect:none;fill:#806aff;fill-opacity:1;stroke:none;stroke-width:0.816494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         y="87.520348"
+         x="72.807419"
+         id="tspan1112-4-7"
+         sodipodi:role="line">op</tspan></text>
+    <text
+        id="text1114-7-3-3"
+        y="101.96121"
+        x="68.433533"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:OpenSymbol;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;display:inline;opacity:1;vector-effect:none;fill:#806aff;fill-opacity:1;stroke:none;stroke-width:0.816494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:OpenSymbol;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;vector-effect:none;fill:#806aff;fill-opacity:1;stroke:none;stroke-width:0.816494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         y="101.96121"
+         x="68.433533"
+         id="tspan1112-4-7-8"
+         sodipodi:role="line">op</tspan></text>
+    <flowRoot
+        xml:space="preserve"
+        id="flowRoot1875"
+        style="font-style:normal;font-weight:normal;font-size:10.6667px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+        transform="scale(0.26458333)"><flowRegion
+         id="flowRegion1877"
+         style="font-size:10.6667px"><rect
+           id="rect1879"
+           width="200"
+           height="40"
+           x="304"
+           y="257.70078"
+           style="font-size:10.66666698px" /></flowRegion>
+      <flowPara
+          id="flowPara1881"/></flowRoot>
+    <text
+        xml:space="preserve"
+        style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+        x="141.81667"
+        y="110.51666"
+        id="text1897"/>
+    <text
+        id="text1114-0"
+        y="97.761757"
+        x="70.888428"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:OpenSymbol;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;vector-effect:none;fill:#dadada;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        xml:space="preserve"><tspan
+         style="font-style:italic;font-weight:bold;font-size:2.82222px;vector-effect:none;fill:#dadada;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         y="97.761757"
+         x="70.888428"
+         id="tspan1112-9"
+         sodipodi:role="line">available to consumers</tspan></text>
+    <g
+        id="g1956"
+        transform="translate(0,-2.559597)">
+      <path
+          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.0869px;line-height:1.25;font-family:OpenSymbol;-inkscape-font-specification:OpenSymbol;letter-spacing:10.082px;word-spacing:8.54225px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.714701"
+          d="m 84.666564,98.702477 -0.109422,-0.19385 c -0.03981,-0.30741 -0.211084,-0.46099 -0.513626,-0.46099 l -9.784987,0.0057 -5.319262,0.005 c -0.36621,0 -0.658025,-0.12764 -0.875631,-0.382645 -0.22026,-0.25152 -0.330448,-0.614755 -0.330448,-1.08984 0.100315,5e-4 0.143415,0.24114 0.143415,0.24114 l 0.03974,0.193855 c 0.116761,0.401725 0.420616,0.607895 0.911549,0.618375 l 5.421901,0.0217 9.566895,0.02015 c 0.345685,0.0097 0.725625,0.238125 0.849979,0.578525 0.124404,-0.340325 0.504082,-0.568905 0.849718,-0.578525 l 1.096705,-0.02005 22.35871,-0.02175 c 0.49093,-0.0105 0.79479,-0.21665 0.91155,-0.618375 l 0.0397,-0.193855 c 0,0 0.0431,-0.240395 0.14342,-0.24114 0,0.475085 -0.11018,0.83832 -0.33044,1.08984 -0.21761,0.255005 -0.50942,0.382645 -0.87563,0.382645 l -22.229766,-0.005 -1.341102,-0.0057 c -0.302541,0 -0.473827,0.15358 -0.513632,0.46099 l -0.109422,0.19385 z"
+          id="path4994-6-0-4"
+          inkscape:connector-curvature="0"
+          sodipodi:nodetypes="cccccccccccccccccccccccccc"/>
+      <path
+          sodipodi:nodetypes="ccsc"
+          inkscape:connector-curvature="0"
+          id="path1616"
+          d="m 84.674306,98.542354 -0.0076,1.833906 c 0,0 0,2.11667 -2.116667,2.11667 H 63.5"
+          style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker1640)"/>
+    </g>
+    <path
+        sodipodi:nodetypes="ccccccccsscssc"
+        inkscape:connector-curvature="0"
+        id="path4994-6-0-4-4"
+        d="m 116.5919,95.49374 -5.31926,0.005 c -0.36621,0 -0.65803,-0.12764 -0.87563,-0.382645 -0.22026,-0.25152 -0.33045,-0.614755 -0.33045,-1.08984 0.10031,5e-4 0.14341,0.24114 0.14341,0.24114 l 0.0397,0.193855 c 0.11676,0.401725 0.42062,0.607895 0.91155,0.618375 l 5.4219,0.0217 c 2.93565,0.0045 9.63606,0.08367 13.81362,0.09876 0.65243,0.0024 0.12011,-0.218605 0.80418,-0.201947 0.74349,0.0181 1.46534,0.200354 2.04745,0.330975 -0.51415,0.110172 -1.32169,0.36346 -2.02005,0.362679 -0.66603,-7.44e-4 -0.16383,-0.155869 -0.82576,-0.15706 -4.20173,-0.0076 -9.95511,0.0051 -13.81066,-0.04099 z"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.0869px;line-height:1.25;font-family:OpenSymbol;-inkscape-font-specification:OpenSymbol;letter-spacing:10.082px;word-spacing:8.54225px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.714701"/>
+    <text
+        id="text1114-0-7"
+        y="97.906219"
+        x="110.96845"
+        style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:2.82222px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:OpenSymbol;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;display:inline;opacity:1;vector-effect:none;fill:#dadada;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        xml:space="preserve"><tspan
+         style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:2.82222px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:OpenSymbol;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;vector-effect:none;fill:#dadada;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         y="97.906219"
+         x="110.96845"
+         id="tspan1112-9-1"
+         sodipodi:role="line">unused time</tspan></text>
+  </g>
+  <g
+      inkscape:groupmode="layer"
+      id="layer2"
+      inkscape:label="buckets2"
+      style="display:none">
+    <path
+        style="opacity:1;vector-effect:none;fill:#fef7cf;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        d="m 61.383333,146.5 v -25.4 h 31.75 l -10e-7,25.4 z"
+        id="path1110"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="ccccc"/>
+    <path
+        style="opacity:1;vector-effect:none;fill:#d6fee4;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        d="M 78.316667,95.699999 V 102.05 H 105.83333 V 121.1 H 93.133333 l -10e-7,25.4 H 150.28333 V 95.699999 Z"
+        id="path1093"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="ccccccccc"/>
+    <path
+        style="fill:#d6fef1;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+        d="m 46.566666,95.7 h 31.750001 v 6.35 H 105.83333 V 121.1 H 61.383333 v 25.4 H 46.566667 Z"
+        id="path1051"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="ccccccccc"/>
+    <path
+        inkscape:connector-curvature="0"
+        id="path1005"
+        d="m 69.85,108.4 v 8.46667 h 31.74999 V 108.4"
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        sodipodi:nodetypes="cccc"/>
+    <path
+        inkscape:connector-curvature="0"
+        id="path1007"
+        d="m 74.083333,133.8 v 8.46667 H 88.9 V 133.8"
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        sodipodi:nodetypes="cccc"/>
+    <path
+        sodipodi:nodetypes="cccc"
+        inkscape:connector-curvature="0"
+        id="path1009"
+        d="m 95.25,125.33333 v 16.93334 h 50.8 v -16.93334"
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+    <g
+        id="g1076"
+        transform="translate(2.1166677)">
+      <path
+          sodipodi:nodetypes="cccc"
+          style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+          d="m 88.899999,125.33333 v 4.23333 L 84.666666,127.45 Z"
+          id="path1013"
+          inkscape:connector-curvature="0"/>
+      <path
+          sodipodi:nodetypes="ccccc"
+          style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+          d="m 84.666666,127.45 h -8.466667 v 2.11666 0 0"
+          id="path1015"
+          inkscape:connector-curvature="0"/>
+      <path
+          style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+          d="M 78.316665,129.56666 H 74.083332 L 76.199999,133.8 Z"
+          id="path1017"
+          inkscape:connector-curvature="0"
+          sodipodi:nodetypes="cccc"/>
+    </g>
+    <path
+        inkscape:connector-curvature="0"
+        id="path1019"
+        d="m 74.083333,108.4 -2.116666,-4.23333 H 76.2 Z"
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        sodipodi:nodetypes="cccc"/>
+    <path
+        sodipodi:nodetypes="cccccc"
+        inkscape:connector-curvature="0"
+        id="path1021"
+        d="m 74.083334,104.16667 v -4.23334 l -21.166669,3e-6 -4.233332,2.116667 v -4.233333 l 4.233332,2.116666"
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+    <path
+        sodipodi:nodetypes="ccc"
+        inkscape:connector-curvature="0"
+        id="path1025"
+        d="m 82.55,99.933333 h 27.51666 V 121.1"
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+    <path
+        inkscape:connector-curvature="0"
+        id="path1027"
+        d="m 112.18333,121.1 h -4.23334 l 2.11667,4.23333 z"
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+    <path
+        inkscape:connector-curvature="0"
+        id="path1038"
+        d="M 69.85,135.91667 V 140.15 l -4.233333,-2.11667 z"
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+    <path
+        inkscape:connector-curvature="0"
+        id="path1040"
+        d="M 65.616667,110.51667 V 114.75 l -4.233333,-2.11667 z"
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+    <path
+        sodipodi:nodetypes="cccccccc"
+        inkscape:connector-curvature="0"
+        id="path1042"
+        d="M 61.383333,112.63333 H 57.15 v 25.4 h -4.233333 v -2.11666 l -4.233333,2.11666 4.233333,2.11667 v -2.11667"
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+    <path
+        sodipodi:nodetypes="cc"
+        inkscape:connector-curvature="0"
+        id="path1044"
+        d="M 65.616667,138.03333 H 57.15"
+        style="fill:none;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.264583, 0.264583;stroke-dashoffset:0;stroke-opacity:1"/>
+    <path
+        sodipodi:nodetypes="cc"
+        inkscape:connector-curvature="0"
+        id="path1044-3"
+        d="m 82.55,99.933333 -8.466667,-2e-6"
+        style="fill:none;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.264583, 0.264583;stroke-dashoffset:0;stroke-opacity:1"/>
+  </g>
+  <g
+      inkscape:label="betterbuckets"
+      id="g1164"
+      inkscape:groupmode="layer"
+      style="display:none">
+    <rect
+        style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        id="rect1670"
+        width="116.41666"
+        height="97.366669"
+        x="59.266666"
+        y="2.5666666"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="opacity:1;vector-effect:none;fill:#fff6f4;fill-opacity:1;stroke:#dcdcdc;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        d="M 127,80.883333 H 84.666666 V 47.016667 H 127 Z"
+        id="path1536"
+        inkscape:connector-curvature="0"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="opacity:1;vector-effect:none;fill:#f7f4ff;fill-opacity:1;stroke:#dcdcdc;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        d="M 105.83333,19.5 V 47.016667 H 127 v 33.866666 h 42.33333 V 19.5 Z"
+        id="path1534"
+        inkscape:connector-curvature="0"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="fill:#f4fff7;fill-opacity:1;stroke:#dcdcdc;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="M 105.83333,47.016667 H 84.666667 V 80.883333 H 63.5 L 63.500003,19.5 h 42.333327 z"
+        id="path1519"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="ccccccc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        sodipodi:nodetypes="ccccc"
+        inkscape:connector-curvature="0"
+        id="path1126"
+        d="m 116.41667,176.13333 v -25.4 h 31.75 v 25.4 z"
+        style="opacity:1;vector-effect:none;fill:#fef7cf;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
+    <path
+        sodipodi:nodetypes="ccccccccc"
+        inkscape:connector-curvature="0"
+        id="path1128"
+        d="m 133.35,125.33333 v 6.35 h 27.51666 v 19.05 h -12.69999 v 25.4 h 57.14999 v -50.8 z"
+        style="opacity:1;vector-effect:none;fill:#d6fee4;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
+    <path
+        sodipodi:nodetypes="ccccccccc"
+        inkscape:connector-curvature="0"
+        id="path1130"
+        d="m 101.6,125.33333 h 31.75 v 6.35 h 27.51666 v 19.05 h -44.44999 v 25.4 H 101.6 Z"
+        style="fill:#d6fef1;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
+    <path
+        sodipodi:nodetypes="cccc"
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="M 124.88333,138.03333 V 146.5 h 31.74999 v -8.46667"
+        id="path1132"
+        inkscape:connector-curvature="0"/>
+    <path
+        sodipodi:nodetypes="cccc"
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="M 129.11667,163.43333 V 171.9 h 14.81666 v -8.46667"
+        id="path1134"
+        inkscape:connector-curvature="0"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="M 150.28333,154.96666 V 171.9 h 50.8 v -16.93334"
+        id="path1136"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccc"/>
+    <g
+        transform="translate(57.150002,29.633337)"
+        id="g1144">
+      <path
+          inkscape:connector-curvature="0"
+          id="path1138"
+          d="m 88.899999,125.33333 v 4.23333 L 84.666666,127.45 Z"
+          style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+          sodipodi:nodetypes="cccc"/>
+      <path
+          inkscape:connector-curvature="0"
+          id="path1140"
+          d="m 84.666666,127.45 h -8.466667 v 2.11666 0 0"
+          style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+          sodipodi:nodetypes="ccccc"/>
+      <path
+          sodipodi:nodetypes="cccc"
+          inkscape:connector-curvature="0"
+          id="path1142"
+          d="M 78.316665,129.56666 H 74.083332 L 76.199999,133.8 Z"
+          style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+    </g>
+    <path
+        sodipodi:nodetypes="cccc"
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="M 129.11667,138.03333 127,133.8 h 4.23333 z"
+        id="path1146"
+        inkscape:connector-curvature="0"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 129.11667,133.8 v -4.23334 l -21.16667,10e-6 -4.23333,2.11666 V 127.45 l 4.23333,2.11667"
+        id="path1148"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccccc"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 137.58333,129.56667 h 27.51666 v 21.16666"
+        id="path1150"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="ccc"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 167.21666,150.73333 h -4.23334 l 2.11667,4.23333 z"
+        id="path1152"
+        inkscape:connector-curvature="0"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 124.88333,165.55 v 4.23333 L 120.65,167.66666 Z"
+        id="path1154"
+        inkscape:connector-curvature="0"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 120.65,140.15 v 4.23333 l -4.23333,-2.11667 z"
+        id="path1156"
+        inkscape:connector-curvature="0"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 116.41667,142.26666 h -4.23334 v 25.4 H 107.95 V 165.55 l -4.23333,2.11666 4.23333,2.11667 v -2.11667"
+        id="path1158"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccccccc"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.264583, 0.264583;stroke-dashoffset:0;stroke-opacity:1"
+        d="m 120.65,167.66666 h -8.46667"
+        id="path1160"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cc"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+        d="M 67.733332,32.2 V 42.783333 H 101.6 V 32.2"
+        id="path1167"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        d="M 88.900001,51.25 88.9,61.833333 h 12.7 V 51.25"
+        id="path1176"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 105.83333,53.366667 4.23334,-2.116666 v 4.233333 z"
+        id="path1188"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 122.76666,51.249999 v 4.233333 l -4.23333,-2.116667 4.23333,-2.116666"
+        id="path1190"
+        inkscape:connector-curvature="0"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 118.53333,53.366665 -8.46666,2e-6"
+        id="path1192"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        d="M 131.23333,23.733333 V 76.65 h 33.86666 V 23.733333"
+        id="path1194"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 71.966667,44.900001 h 8.466666 L 76.2,53.366667 Z"
+        id="path1266"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 91.016667,63.950001 h 8.466666 L 95.25,72.416667 Z"
+        id="path1268"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="display:inline;fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 71.966664,6.8 h 8.466666 l -4.233333,8.466666 z"
+        id="path1266-6"
+        inkscape:connector-curvature="0"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="display:inline;fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 71.966664,23.733333 h 8.466666 l -4.233333,8.466666 z"
+        id="path1266-6-2"
+        inkscape:connector-curvature="0"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 76.199996,15.266666 v 8.466667"
+        id="path1330"
+        inkscape:connector-curvature="0"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="M 76.2,53.366667 V 76.65 H 95.250001 L 95.25,72.416667"
+        id="path1332"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="M 80.433333,85.116667 H 71.966667 L 76.2,93.583334 Z"
+        id="path1336"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="display:inline;fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 127,34.316667 -4.23334,-2.116666 v 4.233333 z"
+        id="path1188-9"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="display:inline;fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 110.06667,32.200001 v 4.233333 L 114.3,34.316667 110.06667,32.200001"
+        id="path1190-1"
+        inkscape:connector-curvature="0"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="display:inline;fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 114.3,34.316667 h 8.46667"
+        id="path1192-2"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <flowRoot
+        xml:space="preserve"
+        id="flowRoot1359"
+        style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        transform="matrix(0.26458333,0,0,0.26458333,-3.4088254e-8,2.0460518)"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><flowRegion
+         id="flowRegion1361"
+         style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><rect
+           id="rect1363"
+           width="128"
+           height="32"
+           x="256"
+           y="121.70079"
+           style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></flowRegion>
+      <flowPara
+          id="flowPara1365"
+          style="font-size:18.6667px;text-align:center;text-anchor:middle">active pool</flowPara></flowRoot>
+    <flowRoot
+        xml:space="preserve"
+        id="flowRoot1367"
+        style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+        transform="matrix(0.26458333,0,0,0.26458333,8.3844208,-2.3366917)"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><flowRegion
+         id="flowRegion1369"
+         style="text-align:center;text-anchor:middle"><rect
+           id="rect1371"
+           width="112.31086"
+           height="48.831589"
+           x="472"
+           y="177.70079"
+           style="text-align:center;text-anchor:middle" /></flowRegion>
+      <flowPara
+          id="flowPara1373"
+          style="font-size:18.6667px">waiting</flowPara>
+      <flowPara
+          style="font-size:18.6667px"
+          id="flowPara1700">pool</flowPara></flowRoot>
+    <flowRoot
+        transform="matrix(0.26458333,0,0,0.26458333,5.3596998,18.746883)"
+        xml:space="preserve"
+        id="flowRoot1359-6"
+        style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><flowRegion
+         id="flowRegion1361-0"
+         style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><rect
+           id="rect1363-6"
+           width="72"
+           height="48.000004"
+           x="304"
+           y="121.70078"
+           style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></flowRegion>
+      <flowPara
+          id="flowPara1365-2"
+          style="font-size:16px;text-align:center;text-anchor:middle">burst</flowPara>
+      <flowPara
+          style="font-size:16px;text-align:center;text-anchor:middle"
+          id="flowPara1521">pool</flowPara></flowRoot>
+    <flowRoot
+        transform="matrix(0.26458333,0,0,0.26458333,24.917761,5.9263119)"
+        xml:space="preserve"
+        id="flowRoot1359-6-6"
+        style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><flowRegion
+         id="flowRegion1361-0-1"
+         style="font-size:13.3333px;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><rect
+           id="rect1363-6-8"
+           width="96.924362"
+           height="39.349098"
+           x="304"
+           y="121.70078"
+           style="font-size:13.33333397px;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></flowRegion>
+      <flowPara
+          id="flowPara1365-2-7"
+          style="font-size:16px;text-align:center;text-anchor:middle">overflow</flowPara></flowRoot>
+    <flowRoot
+        xml:space="preserve"
+        id="flowRoot1359-3"
+        style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        transform="matrix(0.26458333,0,0,0.26458333,15.741519,-23.500341)"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><flowRegion
+         id="flowRegion1361-7"
+         style="text-align:start;text-anchor:start;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><rect
+           id="rect1363-5"
+           width="88"
+           height="24.000006"
+           x="248"
+           y="121.96767"
+           style="text-align:start;text-anchor:start;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           ry="9.8712544e-06" /></flowRegion>
+      <flowPara
+          id="flowPara1365-9"
+          style="font-size:18.6667px;text-align:start;text-anchor:start">refill</flowPara></flowRoot>
+    <flowRoot
+        xml:space="preserve"
+        id="flowRoot1359-3-2"
+        style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        transform="matrix(0.26458333,0,0,0.26458333,16.358086,53.684792)"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><flowRegion
+         id="flowRegion1361-7-2"
+         style="text-align:start;text-anchor:start;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><rect
+           id="rect1363-5-8"
+           width="88"
+           height="24.000006"
+           x="248"
+           y="121.96767"
+           style="text-align:start;text-anchor:start;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           ry="9.8712544e-06" /></flowRegion>
+      <flowPara
+          id="flowPara1365-9-9"
+          style="font-size:18.6667px;text-align:start;text-anchor:start">consume</flowPara></flowRoot>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 76.199999,76.65 v 8.466666"
+        id="path1532"
+        inkscape:connector-curvature="0"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <flowRoot
+        transform="matrix(0.26458333,0,0,0.26458333,22.205187,24.631874)"
+        xml:space="preserve"
+        id="flowRoot1359-6-6-7"
+        style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><flowRegion
+         id="flowRegion1361-0-1-3"
+         style="font-size:13.3333px;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><rect
+           id="rect1363-6-8-6"
+           width="96.924362"
+           height="39.349098"
+           x="304"
+           y="121.70078"
+           style="font-size:13.33333397px;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></flowRegion>
+      <flowPara
+          id="flowPara1365-2-7-1"
+          style="font-size:16px;text-align:center;text-anchor:middle">backfill</flowPara></flowRoot>
+    <text
+        xml:space="preserve"
+        style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+        x="92.522484"
+        y="14.705019"
+        id="text1674"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><tspan
+         sodipodi:role="line"
+         id="tspan1672"
+         x="92.522484"
+         y="14.705019"
+         style="stroke-width:0.264583">1</tspan></text>
+    <text
+        xml:space="preserve"
+        style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+        x="127.06158"
+        y="43.465328"
+        id="text1678"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><tspan
+         sodipodi:role="line"
+         id="tspan1676"
+         x="127.06158"
+         y="43.465328"
+         style="stroke-width:0.264583">2</tspan></text>
+    <text
+        xml:space="preserve"
+        style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+        x="123.05116"
+        y="61.939545"
+        id="text1682"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><tspan
+         sodipodi:role="line"
+         id="tspan1680"
+         x="123.05116"
+         y="61.939545"
+         style="stroke-width:0.264583">3</tspan></text>
+    <text
+        xml:space="preserve"
+        style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+        x="104.15981"
+        y="92.254868"
+        id="text1698"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><tspan
+         sodipodi:role="line"
+         id="tspan1696"
+         x="104.15981"
+         y="92.254868"
+         style="stroke-width:0.264583">4</tspan></text>
+  </g>
+  <g
+      inkscape:label="betterbuckets copy"
+      id="g1199"
+      inkscape:groupmode="layer"
+      style="display:inline">
+    <rect
+        style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        id="rect1042-0"
+        width="123.03124"
+        height="210.29375"
+        x="55.562504"
+        y="0.050000001"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <rect
+        style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        id="rect1042-6"
+        width="116.41701"
+        height="26.458334"
+        x="59.266666"
+        y="2.6458333"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <rect
+        style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+        id="rect2113"
+        width="37.041668"
+        height="2.6458333"
+        x="63.5"
+        y="1.3229166"
+        rx="0"
+        ry="0"/>
+    <g
+        id="g1936"
+        transform="translate(-6.6145833,-9.2604157)"/>
+    <rect
+        style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        id="rect1042"
+        width="116.41666"
+        height="94.720833"
+        x="59.266666"
+        y="34.395832"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="opacity:1;vector-effect:none;fill:#ffded6;fill-opacity:1;stroke:#dcdcdc;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        d="M 127,110.06667 H 84.666666 V 76.2 H 127 Z"
+        id="path1045"
+        inkscape:connector-curvature="0"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="opacity:1;vector-effect:none;fill:#e4d6ff;fill-opacity:1;stroke:#dcdcdc;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        d="M 105.83333,48.683333 V 76.2 H 127 v 33.86667 h 42.33333 V 48.683333 Z"
+        id="path1047"
+        inkscape:connector-curvature="0"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="fill:#ccffde;fill-opacity:1;stroke:#dcdcdc;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="M 105.83333,76.2 H 84.666667 v 33.86667 H 63.5 l 3e-6,-61.383337 h 42.333327 z"
+        id="path1049"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="ccccccc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+        d="M 67.733332,61.383333 V 71.966666 H 101.6 V 61.383333"
+        id="path1088"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        d="M 88.900001,80.433333 88.9,91.016666 h 12.7 V 80.433333"
+        id="path1090"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 105.83333,82.55 4.23334,-2.116666 v 4.233333 z"
+        id="path1092"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 122.76666,80.433332 v 4.233333 l -4.23333,-2.116667 4.23333,-2.116666"
+        id="path1094"
+        inkscape:connector-curvature="0"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 118.53333,82.549998 -8.46666,2e-6"
+        id="path1096"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        d="m 131.23333,52.916666 v 52.916664 h 33.86666 V 52.916666"
+        id="path1098"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 71.966667,74.083334 h 8.466666 L 76.2,82.55 Z"
+        id="path1100"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 91.016667,93.133334 h 8.466666 L 95.25,101.6 Z"
+        id="path1102"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="display:inline;fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="M 72.495834,53.048958 H 80.9625 l -4.233333,8.466666 z"
+        id="path1106"
+        inkscape:connector-curvature="0"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 76.2,82.55 v 23.28333 H 95.250001 L 95.25,101.6"
+        id="path1111"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="M 80.433333,114.3 H 71.966667 L 76.2,122.76667 Z"
+        id="path1113"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="display:inline;fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 127,63.5 -4.23334,-2.116666 v 4.233333 z"
+        id="path1115"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cccc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="display:inline;fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 110.06667,61.383334 v 4.233333 L 114.3,63.5 110.06667,61.383334"
+        id="path1117"
+        inkscape:connector-curvature="0"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="display:inline;fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 114.3,63.5 h 8.46667"
+        id="path1119"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="cc"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <flowRoot
+        xml:space="preserve"
+        id="flowRoot1127"
+        style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        transform="matrix(0.26458333,0,0,0.26458333,-3.4088269e-8,31.229385)"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><flowRegion
+         id="flowRegion1123"
+         style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><rect
+           id="rect1121"
+           width="128"
+           height="32"
+           x="256"
+           y="121.70079"
+           style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></flowRegion>
+      <flowPara
+          id="flowPara1125"
+          style="font-size:18.6667px;text-align:center;text-anchor:middle">active pool</flowPara></flowRoot>
+    <flowRoot
+        xml:space="preserve"
+        id="flowRoot1137"
+        style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+        transform="matrix(0.26458333,0,0,0.26458333,8.3844208,26.846641)"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><flowRegion
+         id="flowRegion1131"
+         style="text-align:center;text-anchor:middle"><rect
+           id="rect1129"
+           width="112.31086"
+           height="48.831589"
+           x="472"
+           y="177.70079"
+           style="text-align:center;text-anchor:middle" /></flowRegion>
+      <flowPara
+          id="flowPara1133"
+          style="font-size:18.6667px">waiting</flowPara>
+      <flowPara
+          style="font-size:18.6667px"
+          id="flowPara1135">pool</flowPara></flowRoot>
+    <flowRoot
+        transform="matrix(0.26458333,0,0,0.26458333,5.3596998,47.930216)"
+        xml:space="preserve"
+        id="flowRoot1147"
+        style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><flowRegion
+         id="flowRegion1141"
+         style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><rect
+           id="rect1139"
+           width="72"
+           height="48.000004"
+           x="304"
+           y="121.70078"
+           style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></flowRegion>
+      <flowPara
+          id="flowPara1143"
+          style="font-size:16px;text-align:center;text-anchor:middle">burst</flowPara>
+      <flowPara
+          style="font-size:16px;text-align:center;text-anchor:middle"
+          id="flowPara1145">pool</flowPara></flowRoot>
+    <flowRoot
+        transform="matrix(0.26458333,0,0,0.26458333,24.917761,35.109645)"
+        xml:space="preserve"
+        id="flowRoot1155"
+        style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><flowRegion
+         id="flowRegion1151"
+         style="font-size:13.3333px;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><rect
+           id="rect1149"
+           width="96.924362"
+           height="39.349098"
+           x="304"
+           y="121.70078"
+           style="font-size:13.33333397px;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></flowRegion>
+      <flowPara
+          id="flowPara1153"
+          style="font-size:16px;text-align:center;text-anchor:middle">overflow</flowPara></flowRoot>
+    <flowRoot
+        xml:space="preserve"
+        id="flowRoot1163"
+        style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        transform="matrix(0.26458333,0,0,0.26458333,15.741519,7.4336055)"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><flowRegion
+         id="flowRegion1159"
+         style="text-align:start;text-anchor:start;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><rect
+           id="rect1157"
+           width="88"
+           height="24.000006"
+           x="248"
+           y="121.96767"
+           style="text-align:start;text-anchor:start;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           ry="9.8712544e-06" /></flowRegion>
+      <flowPara
+          id="flowPara1161"
+          style="font-size:18.6667px;text-align:start;text-anchor:start">refill</flowPara></flowRoot>
+    <flowRoot
+        xml:space="preserve"
+        id="flowRoot1171"
+        style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        transform="matrix(0.26458333,0,0,0.26458333,16.358086,82.868125)"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><flowRegion
+         id="flowRegion1167"
+         style="text-align:start;text-anchor:start;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><rect
+           id="rect1165"
+           width="88"
+           height="24.000006"
+           x="248"
+           y="121.96767"
+           style="text-align:start;text-anchor:start;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           ry="9.8712544e-06" /></flowRegion>
+      <flowPara
+          id="flowPara1169"
+          style="font-size:18.6667px;text-align:start;text-anchor:start">consume</flowPara></flowRoot>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="M 76.199999,105.83333 V 114.3"
+        id="path1173"
+        inkscape:connector-curvature="0"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <flowRoot
+        transform="matrix(0.26458333,0,0,0.26458333,22.205187,53.815207)"
+        xml:space="preserve"
+        id="flowRoot1181"
+        style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><flowRegion
+         id="flowRegion1177"
+         style="font-size:13.3333px;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><rect
+           id="rect1175"
+           width="96.924362"
+           height="39.349098"
+           x="304"
+           y="121.70078"
+           style="font-size:13.33333397px;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></flowRegion>
+      <flowPara
+          id="flowPara1179"
+          style="font-size:16px;text-align:center;text-anchor:middle">backfill</flowPara></flowRoot>
+    <text
+        xml:space="preserve"
+        style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+        x="92.522484"
+        y="44.915668"
+        id="text1185"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><tspan
+         sodipodi:role="line"
+         id="tspan1183"
+         x="92.522484"
+         y="44.915668"
+         style="stroke-width:0.264583">1</tspan></text>
+    <text
+        xml:space="preserve"
+        style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+        x="127.06158"
+        y="72.648659"
+        id="text1189"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><tspan
+         sodipodi:role="line"
+         id="tspan1187"
+         x="127.06158"
+         y="72.648659"
+         style="stroke-width:0.264583">2</tspan></text>
+    <text
+        xml:space="preserve"
+        style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+        x="123.05116"
+        y="91.122879"
+        id="text1193"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><tspan
+         sodipodi:role="line"
+         id="tspan1191"
+         x="123.05116"
+         y="91.122879"
+         style="stroke-width:0.264583">3</tspan></text>
+    <text
+        xml:space="preserve"
+        style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+        x="104.15981"
+        y="121.4382"
+        id="text1197"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><tspan
+         sodipodi:role="line"
+         id="tspan1195"
+         x="104.15981"
+         y="121.4382"
+         style="stroke-width:0.264583">4</tspan></text>
+    <g
+        id="g1529"
+        transform="translate(-0.18229109,35.79792)">
+      <path
+          style="fill:#ffffff;fill-opacity:0.999567;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+          d="m 59.531249,103.1875 h 34.395834 v 48.94792 H 59.53125 Z"
+          id="path1220"
+          sodipodi:nodetypes="ccccc"/>
+      <path
+          style="display:inline;fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+          d="m 72.760417,105.83333 h 7.9375 l -3.96875,7.9375 z"
+          id="path1100-6"
+          inkscape:connector-curvature="0"
+          sodipodi:nodetypes="cccc"
+          inkscape:export-xdpi="174.39999"
+          inkscape:export-ydpi="174.39999"/>
+      <g
+          id="g1507">
+        <path
+            style="display:inline;fill:none;stroke:#000000;stroke-width:0.499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+            d="m 64.029167,117.73959 -3e-6,6.61458 h 24.606253 l 3e-6,-6.61458"
+            id="path1088-7"
+            inkscape:connector-curvature="0"
+            sodipodi:nodetypes="cccc"
+            inkscape:export-xdpi="174.39999"
+            inkscape:export-ydpi="174.39999"/>
+        <flowRoot
+            transform="matrix(0.26458333,0,0,0.26458333,-17.368629,86.298887)"
+            xml:space="preserve"
+            id="flowRoot1147-5"
+            style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+            inkscape:export-xdpi="174.39999"
+            inkscape:export-ydpi="174.39999"><flowRegion
+             id="flowRegion1141-3"
+             style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><rect
+               id="rect1139-5"
+               width="100.74287"
+               height="22.44486"
+               x="304"
+               y="121.70078"
+               style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></flowRegion>
+          <flowPara
+              style="font-size:16px;text-align:center;text-anchor:middle"
+              id="flowPara1145-2">microbatch</flowPara></flowRoot>
+      </g>
+      <g
+          id="g1500"
+          transform="translate(-0.6096664,1.9846287)">
+        <g
+            id="g1491"
+            transform="matrix(1.0810282,0,0,1.0810282,-5.4668683,-10.344173)">
+          <path
+              style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+              d="m 83.867105,139.88628 c -1.36777,2.93715 -4.345822,4.9731 -7.799396,4.9731 -4.749074,0 -8.598959,-3.84989 -8.598958,-8.59896 4e-6,-4.74907 3.849888,-8.59895 8.598958,-8.59895 3.681674,0 6.822939,2.31377 8.04901,5.56654"
+              id="path1457"/>
+          <path
+              style="fill:#000000;fill-opacity:0.999567;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+              d="m 85.090119,134.8609 -0.302241,-3.83346 -2.767046,1.52881 z"
+              id="path1461"
+              sodipodi:nodetypes="cccc"/>
+        </g>
+        <flowRoot
+            transform="matrix(0.26458333,0,0,0.26458333,-16.81238,102.4441)"
+            xml:space="preserve"
+            id="flowRoot1147-5-9"
+            style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+            inkscape:export-xdpi="174.39999"
+            inkscape:export-ydpi="174.39999"><flowRegion
+             id="flowRegion1141-3-2"
+             style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><rect
+               id="rect1139-5-0"
+               width="100.74287"
+               height="22.44486"
+               x="304"
+               y="121.70078"
+               style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></flowRegion>
+          <flowPara
+              style="font-size:16px;text-align:center;text-anchor:middle"
+              id="flowPara1145-2-2">iteration</flowPara></flowRoot>
+      </g>
+      <path
+          style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+          d="m 76.729166,105.83333 v -3.96875"
+          id="path1510"/>
+    </g>
+    <g
+        id="g1529-3"
+        transform="translate(40.745833,35.79792)"
+        style="display:inline">
+      <path
+          style="fill:#ffffff;fill-opacity:0.999567;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+          d="m 59.531249,103.1875 h 34.395834 v 48.94792 H 59.53125 Z"
+          id="path1220-7"
+          sodipodi:nodetypes="ccccc"/>
+      <path
+          style="display:inline;fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+          d="m 72.760417,105.83333 h 7.9375 l -3.96875,7.9375 z"
+          id="path1100-6-5"
+          inkscape:connector-curvature="0"
+          sodipodi:nodetypes="cccc"
+          inkscape:export-xdpi="174.39999"
+          inkscape:export-ydpi="174.39999"/>
+      <g
+          id="g1507-9">
+        <path
+            style="display:inline;fill:none;stroke:#000000;stroke-width:0.499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+            d="m 64.029167,117.73959 -3e-6,6.61458 h 24.606253 l 3e-6,-6.61458"
+            id="path1088-7-2"
+            inkscape:connector-curvature="0"
+            sodipodi:nodetypes="cccc"
+            inkscape:export-xdpi="174.39999"
+            inkscape:export-ydpi="174.39999"/>
+        <flowRoot
+            transform="matrix(0.26458333,0,0,0.26458333,-17.368629,86.298887)"
+            xml:space="preserve"
+            id="flowRoot1147-5-2"
+            style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+            inkscape:export-xdpi="174.39999"
+            inkscape:export-ydpi="174.39999"><flowRegion
+             id="flowRegion1141-3-8"
+             style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><rect
+               id="rect1139-5-9"
+               width="100.74287"
+               height="22.44486"
+               x="304"
+               y="121.70078"
+               style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></flowRegion>
+          <flowPara
+              style="font-size:16px;text-align:center;text-anchor:middle"
+              id="flowPara1145-2-7">microbatch</flowPara></flowRoot>
+      </g>
+      <g
+          id="g1500-3"
+          transform="translate(-0.6096664,1.9846287)">
+        <g
+            id="g1491-6"
+            transform="matrix(1.0810282,0,0,1.0810282,-5.4668683,-10.344173)">
+          <path
+              style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+              d="m 83.867105,139.88628 c -1.36777,2.93715 -4.345822,4.9731 -7.799396,4.9731 -4.749074,0 -8.598959,-3.84989 -8.598958,-8.59896 4e-6,-4.74907 3.849888,-8.59895 8.598958,-8.59895 3.681674,0 6.822939,2.31377 8.04901,5.56654"
+              id="path1457-1"/>
+          <path
+              style="fill:#000000;fill-opacity:0.999567;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+              d="m 85.090119,134.8609 -0.302241,-3.83346 -2.767046,1.52881 z"
+              id="path1461-2"
+              sodipodi:nodetypes="cccc"/>
+        </g>
+        <flowRoot
+            transform="matrix(0.26458333,0,0,0.26458333,-16.81238,102.4441)"
+            xml:space="preserve"
+            id="flowRoot1147-5-9-9"
+            style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+            inkscape:export-xdpi="174.39999"
+            inkscape:export-ydpi="174.39999"><flowRegion
+             id="flowRegion1141-3-2-3"
+             style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><rect
+               id="rect1139-5-0-1"
+               width="100.74287"
+               height="22.44486"
+               x="304"
+               y="121.70078"
+               style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></flowRegion>
+          <flowPara
+              style="font-size:16px;text-align:center;text-anchor:middle"
+              id="flowPara1145-2-2-9">iteration</flowPara></flowRoot>
+      </g>
+      <path
+          style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+          d="m 76.729166,105.83333 v -3.96875"
+          id="path1510-4"/>
+    </g>
+    <g
+        aria-label="{"
+        transform="matrix(0,-2.509426,-3.136764,0,478.02635,1119.7745)"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:OpenSymbol;-inkscape-font-specification:OpenSymbol;letter-spacing:6.77553px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+        id="flowRoot4986-8-6">
+      <g
+          id="g1529-7"
+          transform="matrix(0,-0.31879989,-0.39849751,0,431.96197,126.3571)"
+          style="display:inline">
+        <path
+            style="fill:#ffffff;fill-opacity:0.999567;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+            d="m 59.531249,103.1875 h 34.395834 v 48.94792 H 59.53125 Z"
+            id="path1220-8"
+            sodipodi:nodetypes="ccccc"/>
+        <path
+            style="display:inline;fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+            d="m 72.760417,105.83333 h 7.9375 l -3.96875,7.9375 z"
+            id="path1100-6-4"
+            inkscape:connector-curvature="0"
+            sodipodi:nodetypes="cccc"
+            inkscape:export-xdpi="174.39999"
+            inkscape:export-ydpi="174.39999"/>
+        <g
+            id="g1507-5">
+          <path
+              style="display:inline;fill:none;stroke:#000000;stroke-width:0.499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+              d="m 64.029167,117.73959 -3e-6,6.61458 h 24.606253 l 3e-6,-6.61458"
+              id="path1088-7-0"
+              inkscape:connector-curvature="0"
+              sodipodi:nodetypes="cccc"
+              inkscape:export-xdpi="174.39999"
+              inkscape:export-ydpi="174.39999"/>
+          <flowRoot
+              transform="matrix(0.26458333,0,0,0.26458333,-17.368629,86.298887)"
+              xml:space="preserve"
+              id="flowRoot1147-5-3"
+              style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+              inkscape:export-xdpi="174.39999"
+              inkscape:export-ydpi="174.39999"><flowRegion
+               id="flowRegion1141-3-6"
+               style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><rect
+                 id="rect1139-5-1"
+                 width="100.74287"
+                 height="22.44486"
+                 x="304"
+                 y="121.70078"
+                 style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></flowRegion>
+            <flowPara
+                style="font-size:16px;text-align:center;text-anchor:middle"
+                id="flowPara1145-2-0">microbatch</flowPara></flowRoot>
+        </g>
+        <g
+            id="g1500-6"
+            transform="translate(-0.6096664,1.9846287)">
+          <g
+              id="g1491-3"
+              transform="matrix(1.0810282,0,0,1.0810282,-5.4668683,-10.344173)">
+            <path
+                style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+                d="m 83.867105,139.88628 c -1.36777,2.93715 -4.345822,4.9731 -7.799396,4.9731 -4.749074,0 -8.598959,-3.84989 -8.598958,-8.59896 4e-6,-4.74907 3.849888,-8.59895 8.598958,-8.59895 3.681674,0 6.822939,2.31377 8.04901,5.56654"
+                id="path1457-2"/>
+            <path
+                style="fill:#000000;fill-opacity:0.999567;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+                d="m 85.090119,134.8609 -0.302241,-3.83346 -2.767046,1.52881 z"
+                id="path1461-0"
+                sodipodi:nodetypes="cccc"/>
+          </g>
+          <flowRoot
+              transform="matrix(0.26458333,0,0,0.26458333,-16.81238,102.4441)"
+              xml:space="preserve"
+              id="flowRoot1147-5-9-6"
+              style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+              inkscape:export-xdpi="174.39999"
+              inkscape:export-ydpi="174.39999"><flowRegion
+               id="flowRegion1141-3-2-1"
+               style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><rect
+                 id="rect1139-5-0-5"
+                 width="100.74287"
+                 height="22.44486"
+                 x="304"
+                 y="121.70078"
+                 style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></flowRegion>
+            <flowPara
+                style="font-size:16px;text-align:center;text-anchor:middle"
+                id="flowPara1145-2-2-5">iteration</flowPara></flowRoot>
+        </g>
+        <path
+            style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+            d="m 76.729166,105.83333 v -3.96875"
+            id="path1510-47"/>
+      </g>
+    </g>
+    <path
+        d="m 59.972248,193.95458 v 0.17641 c 0,1.43249 0.60801,2.52291 1.82403,3.27124 1.082374,0.70555 2.532225,1.05832 4.349555,1.05832 l 48.442797,-0.0321 c 1.71043,0 2.57233,0.66814 2.58569,2.00443 h 0.66145 l 0.0401,-0.5933 c 0.20034,-0.94075 1.06224,-1.41113 2.5857,-1.41113 l 48.87176,0.0321 c 1.84406,0 3.31397,-0.39019 4.40973,-1.17057 1.10912,-0.76971 1.66367,-1.8815 1.66367,-3.33538 h -0.66148 l -0.0602,0.73765 -0.20044,0.5933 c -0.58795,1.22939 -2.11798,1.86011 -4.59009,1.89218 l -48.29052,0.12823 c -1.89751,0.0321 -3.26719,0.73235 -4.10903,2.10064 -0.81514,-1.36835 -2.19819,-2.06857 -4.14916,-2.10064 l -47.821397,-0.12823 c -3.23379,-0.0428 -4.864048,-1.09045 -4.890775,-3.14295 v -0.08 z"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.0869px;line-height:1.25;font-family:OpenSymbol;-inkscape-font-specification:OpenSymbol;letter-spacing:10.082px;word-spacing:8.54225px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.80562"
+        id="path4994-2-5"
+        inkscape:connector-curvature="0"
+        sodipodi:nodetypes="csccccccccccccccccccccc"/>
+    <flowRoot
+        transform="matrix(0.26458333,0,0,0.26458333,-10.018783,170.22091)"
+        xml:space="preserve"
+        id="flowRoot1147-5-3-6"
+        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:OpenSymbol;letter-spacing:0px;word-spacing:0px;display:inline;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"><flowRegion
+         id="flowRegion1141-3-6-9"
+         style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><rect
+           id="rect1139-5-1-3"
+           width="356.64523"
+           height="27.130173"
+           x="304"
+           y="121.70078"
+           style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></flowRegion>
+      <flowPara
+          style="font-size:18.6667px;text-align:center;text-anchor:middle"
+          id="flowPara1145-2-0-7">individual consumers (threads)</flowPara></flowRoot>
+    <g
+        id="g1529-4"
+        transform="translate(-35.281578,-95.285575)"
+        style="display:inline">
+      <g
+          id="g1500-8-8"
+          transform="translate(85.33962,-25.796614)"
+          style="display:inline">
+        <g
+            id="g1491-68-9"
+            transform="matrix(1.0810282,0,0,1.0810282,-5.4668683,-10.344173)">
+          <path
+              style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+              d="m 83.867105,139.88628 c -1.36777,2.93715 -4.345822,4.9731 -7.799396,4.9731 -4.749074,0 -8.598959,-3.84989 -8.598958,-8.59896 4e-6,-4.74907 3.849888,-8.59895 8.598958,-8.59895 3.681674,0 6.822939,2.31377 8.04901,5.56654"
+              id="path1457-8-2"/>
+          <path
+              style="fill:#000000;fill-opacity:0.999567;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+              d="m 85.090119,134.8609 -0.302241,-3.83346 -2.767046,1.52881 z"
+              id="path1461-4-6"
+              sodipodi:nodetypes="cccc"/>
+        </g>
+        <flowRoot
+            transform="matrix(0.26458333,0,0,0.26458333,-16.760187,101.12118)"
+            xml:space="preserve"
+            id="flowRoot1147-5-9-3-6"
+            style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+            inkscape:export-xdpi="174.39999"
+            inkscape:export-ydpi="174.39999"><flowRegion
+             id="flowRegion1141-3-2-14-4"
+             style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><rect
+               id="rect1139-5-0-9-9"
+               width="100.34711"
+               height="43.74239"
+               x="304"
+               y="121.70078"
+               style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></flowRegion>
+          <flowPara
+              style="font-size:16px;text-align:center;text-anchor:middle"
+              id="flowPara1145-2-2-2-5">iteration</flowPara>
+          <flowPara
+              style="font-size:16px;text-align:center;text-anchor:middle"
+              id="flowPara1428">/time</flowPara>
+          <flowPara
+              style="font-size:16px;text-align:center;text-anchor:middle"
+              id="flowPara1422"/>
+          <flowPara
+              style="font-size:16px;text-align:center;text-anchor:middle"
+              id="flowPara1424"/>
+          <flowPara
+              style="font-size:16px;text-align:center;text-anchor:middle"
+              id="flowPara1426"/></flowRoot>
+      </g>
+    </g>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.25, 0.5;stroke-dashoffset:0;stroke-opacity:1"
+        d="M 127,120.38542 101.86458,91.281249"
+        id="path1974"
+        sodipodi:nodetypes="cc"/>
+    <g
+        id="g1972"
+        transform="translate(117.73958,58.208334)">
+      <path
+          style="display:inline;fill:#feffcc;fill-opacity:1;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+          d="M 19.84375,67.46875 15.875,71.4375 v 5.291666 l 33.07292,-1e-6 v -9.260417 z"
+          id="path1930"
+          sodipodi:nodetypes="cccccc"
+          transform="translate(-6.6145833,-9.2604156)"/>
+      <path
+          style="display:inline;fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+          d="m 15.875,71.437499 h 3.96875 v -3.96875 z"
+          id="path1932"
+          transform="translate(-6.6145833,-9.2604156)"/>
+      <flowRoot
+          transform="matrix(0.26458333,0,0,0.26458333,-70.576587,27.168906)"
+          xml:space="preserve"
+          id="flowRoot1147-0"
+          style="font-style:normal;font-weight:normal;font-size:10.6667px;line-height:1.25;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+          inkscape:export-xdpi="174.39999"
+          inkscape:export-ydpi="174.39999"><flowRegion
+           id="flowRegion1141-4"
+           style="text-align:end;text-anchor:end;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><rect
+             id="rect1139-8"
+             width="118.38902"
+             height="30.964956"
+             x="304"
+             y="121.70078"
+             style="vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;text-anchor:end;text-align:end" /></flowRegion>
+        <flowPara
+            style="font-size:10.6667px;text-align:end;text-anchor:end"
+            id="flowPara1145-1">burst pool is sized according to burst rate</flowPara></flowRoot>
+    </g>
+    <text
+        xml:space="preserve"
+        style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+        x="30.427082"
+        y="34.395832"
+        id="text1978"><tspan
+         sodipodi:role="line"
+         id="tspan1976"
+         style="stroke-width:0.264583" /></text>
+    <g
+        id="g2074"
+        transform="matrix(0.86478602,0,0,0.86478602,22.001849,2.146522)">
+      <path
+          style="color:#000000;fill:none;stroke-width:0.25"
+          d="m 170.5218,11.29551 -7.80305,4.532323 9.0238,0.02358 -9.0238,0.02358 7.80305,4.532323 -7.82663,-4.491476 4.49147,7.826632 -4.53232,-7.803049 -0.0236,9.0238 -0.0236,-9.0238 -4.53232,7.803049 4.49148,-7.826632 -7.82663,4.491476 7.80304,-4.532323 -9.0238,-0.02358 9.0238,-0.02358 -7.80304,-4.532323 7.82663,4.491476 -4.49148,-7.8266314 4.53232,7.8030484 0.0236,-9.0238 0.0236,9.0238 4.53232,-7.8030484 -4.49147,7.8266314 z"
+          id="path2058"/>
+      <path
+          id="path2060"
+          style="color:#000000;fill:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none"
+          d="m 162.59134,6.7544064 -0.004,1.4789795 a 7.6729163,7.6729163 0 0 1 0.21652,-0.017053 7.6729163,7.6729163 0 0 1 0.0408,0.00103 l -0.004,-1.4629598 z m -4.32222,1.1580688 -0.21704,0.1250571 0.76119,1.3260173 a 7.6729163,7.6729163 0 0 1 0.22015,-0.1348755 z m 8.89455,0 -0.71314,1.2273153 a 7.6729163,7.6729163 0 0 1 0.22428,0.1266073 l 0.70538,-1.2288655 z m -12.27522,3.2892058 -0.12506,0.217041 1.33429,0.775146 a 7.6729163,7.6729163 0 0 1 0.13539,-0.220658 z m 15.65589,0 -1.19476,0.685229 a 7.6729163,7.6729163 0 0 1 0.12919,0.223242 l 1.19063,-0.69143 z m -15.40113,4.535123 -1.5384,0.0041 v 0.250114 l 1.53479,0.0036 a 7.6729163,7.6729163 0 0 1 -0.008,-0.10542 7.6729163,7.6729163 0 0 1 0.0119,-0.152446 z m 15.32982,5.17e-4 a 7.6729163,7.6729163 0 0 1 0.004,0.151929 7.6729163,7.6729163 0 0 1 -0.008,0.10542 l 1.35858,-0.0036 v -0.250114 z m -14.39654,3.813204 -1.3131,0.762744 0.12506,0.216524 1.32292,-0.759643 a 7.6729163,7.6729163 0 0 1 -0.13488,-0.219625 z m 13.40952,0.07545 a 7.6729163,7.6729163 0 0 1 -0.13436,0.219108 l 1.19269,0.684712 0.12506,-0.216524 z m -10.69289,2.776574 -0.74104,1.291394 0.21704,0.125057 0.74414,-1.281575 a 7.6729163,7.6729163 0 0 1 -0.22014,-0.134876 z m 7.89151,0.0801 a 7.6729163,7.6729163 0 0 1 -0.21911,0.134358 l 0.69815,1.201994 0.21652,-0.125057 z m -4.09691,1.062467 0.004,1.431954 h 0.25011 l 0.004,-1.418001 a 7.6729163,7.6729163 0 0 1 -0.0408,0.0031 7.6729163,7.6729163 0 0 1 -0.21652,-0.01705 z"/>
+      <circle
+          style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+          id="path2012"
+          cx="162.71875"
+          cy="15.875"
+          r="10.583333"/>
+      <circle
+          style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+          id="path2012-2"
+          cx="162.71875"
+          cy="15.875"
+          r="9.7895832"/>
+      <path
+          style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+          d="M 162.71875,8.9958333 V 15.875 h 6.35"
+          id="path2026"
+          sodipodi:nodetypes="ccc"/>
+    </g>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="M 140.22916,15.875 H 150.8125"
+        id="path2107"/>
+    <text
+        xml:space="preserve"
+        style="font-style:normal;font-weight:normal;font-size:4.23333px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+        x="64.367897"
+        y="4.2439156"
+        id="text2111"><tspan
+         sodipodi:role="line"
+         id="tspan2109"
+         style="font-size:4.23333px;stroke-width:0.264583"
+         x="64.367897"
+         y="4.2439156">token filler thread</tspan></text>
+    <path
+        id="path1209"
+        style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.17009px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="M 95.625248,10.129208 89.958333,21.62495 h 11.906257 l -5.668972,-11.4999 z m -0.11067,1.573867 4.762502,9.525 h -9.525002 z"
+        sodipodi:nodetypes="ccccccccc"/>
+    <path
+        style="display:inline;fill:#ffffff;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-variation-settings:normal;opacity:1;vector-effect:none;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stop-color:#000000;stop-opacity:1"
+        d="m 72.495837,22.621875 h 8.46666 l -4.23333,8.46666 z"
+        id="path1104-7-2-6-4"
+        inkscape:connector-curvature="0"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="M 76.729167,41.010417 76.596875,52.916668"
+        id="path1108"
+        inkscape:connector-curvature="0"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"
+        sodipodi:nodetypes="cc"/>
+    <path
+        style="display:inline;fill:#ffffff;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+        d="M 72.495834,33.205208 H 80.9625 l -4.233333,8.466666 z"
+        id="path1104"
+        inkscape:connector-curvature="0"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+        d="m 148.03438,11.64167 v 8.46666 L 139.56772,15.875 Z"
+        id="path1104-7-2"
+        inkscape:connector-curvature="0"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="display:inline;fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 103.18749,16.007291 h 10.58334"
+        id="path2107-1"/>
+    <path
+        style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+        d="m 110.99271,11.64167 v 8.46666 L 102.52605,15.875 Z"
+        id="path1104-7-2-6"
+        inkscape:connector-curvature="0"
+        inkscape:export-xdpi="174.39999"
+        inkscape:export-ydpi="174.39999"/>
+    <path
+        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="m 88.635416,15.875 c 0,0 -7.9375,0 -9.260417,0 -1.322917,0 -2.645833,0 -2.645833,1.322916 0,1.322917 0,5.291667 0,5.291667"
+        id="path1386"/>
+    <rect
+        style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+        id="rect2113-0"
+        width="22.489584"
+        height="2.6458321"
+        x="152.13542"
+        y="33.072918"
+        rx="0"
+        ry="0"/>
+    <text
+        xml:space="preserve"
+        style="font-style:normal;font-weight:normal;font-size:4.23333px;line-height:1.25;font-family:sans-serif;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+        x="153.14851"
+        y="35.496498"
+        id="text2111-9"><tspan
+         sodipodi:role="line"
+         id="tspan2109-3"
+         style="font-size:4.23333px;stroke-width:0.264583"
+         x="153.14851"
+         y="35.496498">token pool</tspan></text>
+  </g>
+</svg>

From 4e33f5fb3e3c961a19f50e1eeebfd9ce5e781cf3 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Fri, 4 Dec 2020 10:25:26 -0600
Subject: [PATCH 065/164] release notes

---
 RELEASENOTES.md | 71 +++++++++++++++++++++++++++++--------------------
 1 file changed, 42 insertions(+), 29 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ba35d0396..05a0589db 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,29 +1,42 @@
-- 1e958a7e (HEAD -> main) simplify logger naming for core systems
-- 1382d33d argsfiles and statedirs
-- b5901679 environment and sys prop support
-- fd74ccba move common topics to resources base
-- 6a8dfef1 qualify grafana docker with tag
-- 2830d070 simple workload improvements
-- b9607d07 make argsfiles use double dash
-- a9b0dc9d argsfile support
-- f702736f (HEAD -> main) flatten maps in OpTemplates to allow map consumers
-- 4a9fa81b pull Named service up
-- 574a89e7 pull ConfigAware api up
-- 71195d0a http release fixes
-- 3fa89ebc partial work for --args
-- 262df571 improved error messages
-- 453b1b2c extract ratio from optemplate before construction
-- dcf458c4 annotation progress
-- 7017b6cd add SplitLongs function
-- 0758670f add nb clients module
-- 1dbf36c4 add grafana annotation client
-- 120d9761 remove warning for speculative defaults
-- c78f1e92 typos and minor fixes
-- f3f1b8f4 add annotations design sketch
-- 394580d6 more idea sketches
-- 9e5972f5 comment cleanup
-- 06edfcc9 fix NPE when binding has undefined value
-- 510746b7 improve mismatched scenario name feedback
-- 735b32e1 add illustrative test for EpochMillisToJavaLocalDate
-- 2390f253 Initial Migration of DSE Graph
-- 2275573c Update Readme
+- 3d2ff55f (origin/nb4-rc1, main) auto create apikey
+- cfa92eab package organization
+- 2ab118f4 package organization
+- a23808b3 update appimage build script for j15
+- 7b0e37ab add metrics manifest to polyglot
+- 7e6aa1a2 bump source and target to Java 15
+- 2752fa50 bump major version to 4.0.0-SNAPSHOT
+- 7e880b91 experimental grammar
+- 3f65a054 console friendly metrics summary
+- 146686e0 simplify custom logging configuration
+- d0592454 typos, alignment, cruft
+- 45307081 backfill missing default
+- b7c24642 centralize log4j2 and slf4j stub config
+- 2215fc94 typos, alignment, cruft
+- 0ef26c82 update logger deps for dsegraph
+- 975ea40d merge fixups
+- ae419a26 logging annotator module
+- 6c0632fb grafana annotator module
+- 317ffab4 api for annotations
+- c2cec235 allow configurable delimiter in params parser
+- a09efbe9 consolidate to log4j2
+- 6a523dc4 remove slf4j
+- 67eefbbe fix activity run state bug
+- a88d0376 docker-metrics improvements
+- 667fbdba add log4j2 programmatic configuration
+- 60fa0529 add default log4j configs
+- a3e0739a add FixedValues for double
+- fa85704b add SPI impl selector field 'selector'
+- 4996d206 config API improvements
+- e0498ff2 docs updates
+- e9d2b489 environment API improvements
+- 897a8389 generalize log level to NB
+- a97db87f include JSON support in project API
+- 2c09b8ae typos, culling, and alignment
+- a3a51381 update inactive coords
+- 83136139 generalize op source
+- 089a29d8 grafana api tokens
+- e6e70f71 support DoubleToIntFunction in function matrix
+- 52b029f8 typos, culling, and alignment
+- 4d65dc62 update inactive coords
+- 55edec53 add ToByteBuffer binding function
+- 93e10e6a config model improvements

From 33cac5cf902433637b09373d0ace0c943861d7ff Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Fri, 4 Dec 2020 10:30:42 -0600
Subject: [PATCH 066/164] fix release workflow

---
 .github/workflows/release.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5a665b13e..4e14a60fb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -72,9 +72,9 @@ jobs:
         NEXT_MINOR_VERSION=$(( MINOR_VERSION+1))
         NEXT_SNAPSHOT="${BASE_VERSION}.${NEXT_MINOR_VERSION}-SNAPSHOT"
         RELEASE_TAGNAME="nosqlbench-${RELEASE_VERSION}"
-        echo "NEXT_SNAPSHOT=${NEXT_SNAPSHOT} >> $GITHUB_ENV
-        echo "RELEASE_VERSION=${RELEASE_VERSION} >> $GITHUB_ENV
-        echo "RELEASE_TAGNAME=${RELEASE_TAGNAME} >> $GITHUB_ENV
+        echo "NEXT_SNAPSHOT=${NEXT_SNAPSHOT}" >> $GITHUB_ENV
+        echo "RELEASE_VERSION=${RELEASE_VERSION}" >> $GITHUB_ENV
+        echo "RELEASE_TAGNAME=${RELEASE_TAGNAME}" >> $GITHUB_ENV
         # echo "::set-env name=NEXT_SNAPSHOT::${NEXT_SNAPSHOT}"
         # echo "::set-env name=RELEASE_VERSION::${RELEASE_VERSION}"
         # echo "::set-env name=RELEASE_TAGNAME::${RELEASE_TAGNAME}"

From 159ff1f59e0a0cd1381763446c260d457cc5f97e Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Fri, 4 Dec 2020 10:31:55 -0600
Subject: [PATCH 067/164] release notes

---
 RELEASENOTES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 05a0589db..7d95cb174 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,4 +1,4 @@
-- 3d2ff55f (origin/nb4-rc1, main) auto create apikey
+- 3d2ff55f (main) auto create apikey
 - cfa92eab package organization
 - 2ab118f4 package organization
 - a23808b3 update appimage build script for j15

From 480ca626d7e5ee83bc04cf8defd07dfcbbc8c6b7 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Fri, 4 Dec 2020 10:50:12 -0600
Subject: [PATCH 068/164] actions debugging

---
 .github/workflows/release.yml                                   | 1 +
 .../engine/api/activityapi/ratelimits/HybridRateLimiter.java    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4e14a60fb..7db3a4543 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -110,6 +110,7 @@ jobs:
         pwd
         ls -l
         mkdir -p itlogs/nb
+        ls -l nb
         cp -R nb/logs itlogs/nb
 
     - name: upload integration test logs
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java
index dec645a92..e72b533e3 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java
@@ -96,7 +96,7 @@ public class HybridRateLimiter implements Startable, RateLimiter {
     private Gauge<Long> delayGauge;
     private Gauge<Double> avgRateGauge;
     private Gauge<Double> burstRateGauge;
-    private ThreadDrivenTokenPool tokens;
+    private TokenPool tokens;
     // diagnostics
 
     // TODO Doc rate limiter scenarios, including when you want to reset the waittime, and when you don't

From 87826dd072657865d858b994384f8e2e6913da88 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Fri, 4 Dec 2020 10:56:54 -0600
Subject: [PATCH 069/164] release debugging

---
 .github/workflows/release.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7db3a4543..2fd623d33 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -108,9 +108,8 @@ jobs:
     - name: bundle integration test logs
       run: |
         pwd
-        ls -l
+        find nb
         mkdir -p itlogs/nb
-        ls -l nb
         cp -R nb/logs itlogs/nb
 
     - name: upload integration test logs

From 53090a8c764c075059f933aee31a5a5fea4a09cc Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Fri, 4 Dec 2020 13:06:05 -0600
Subject: [PATCH 070/164] release debugging

---
 RELEASENOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 7d95cb174..0ebb717d5 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,3 +1,4 @@
+ 
 - 3d2ff55f (main) auto create apikey
 - cfa92eab package organization
 - 2ab118f4 package organization

From 1e457e3eb56c6b4d3d7b0b580cc92b169640ce51 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Fri, 4 Dec 2020 13:31:26 -0600
Subject: [PATCH 071/164] prerelease support

---
 .github/workflows/release.yml | 11 ++++++++++-
 scripts/release-perform.sh    |  7 ++++++-
 scripts/release-prepare.sh    |  8 +++++++-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2fd623d33..5e51ee217 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -93,6 +93,7 @@ jobs:
       run: scripts/release-prepare.sh
       env:
        RELEASE_BRANCH_NAME: "main"
+       PRERELEASE_BRANCH_PATTERN: "-rc"
        GIT_RELEASE_BOT_NAME: "nb-droid"
        GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }}
        ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }}
@@ -167,6 +168,14 @@ jobs:
         name: guidebook
         path: guidebook
 
+    - name: select release type from branch name
+      run: |
+       current_branch=$(git rev-parse --abbrev-ref HEAD)
+       if [[ ${current_branch} == *"-rc"* ]]
+        then echo "PRERELEASE=true" >> $GITHUB_ENV
+        else echo "PRERELEASE=false" >> $GITHUB_ENV
+       fi
+
     - name: create release
       id: create_release
       uses: actions/create-release@v1
@@ -176,7 +185,7 @@ jobs:
         tag_name: ${{ env.RELEASE_TAGNAME }}
         release_name: Release ${{ env.RELEASE_TAGNAME }}
         draft: false
-        prerelease: false
+        prerelease: ${{ env.PRERELEASE }}
         body: ${{ steps.prepare_summary.outputs.release_summary }}
 
     - name: upload nb.jar
diff --git a/scripts/release-perform.sh b/scripts/release-perform.sh
index 131d8e446..2ae4aae49 100755
--- a/scripts/release-perform.sh
+++ b/scripts/release-perform.sh
@@ -19,10 +19,15 @@ if [[ "${last_release_commit_hash}" = "${GITHUB_SHA}" ]]; then
      exit 0
 fi
 
+PRERELEASE_BRANCH_PATTERN=${PRERELEASE_BRANCH_PATTERN:?PRERELEASE_BRANCH_PATTERN must be provided}
 # Filter the branch to execute the release on
 readonly local current_branch=$(git rev-parse --abbrev-ref HEAD)
 echo "Current branch: ${branch}"
-if [[ -n "$RELEASE_BRANCH_NAME" && ! "${current_branch}" = "$RELEASE_BRANCH_NAME" ]]; then
+if [[ -n "$RELEASE_BRANCH_NAME" && "${current_branch}" = "$RELEASE_BRANCH_NAME" ]]; then
+    echo "Building for release branch $RELEASE_BRANCH_NAME"
+elif [[ -n "${current_branch}" && "${current_branch}" == *"${PRERELEASE_BRANCH_PATTERN}"* ]]; then
+    echo "Building prerelease for branch $RELEASE_BRANCH_NAME"
+else
      echo "Skipping for ${current_branch} branch"
      exit 0
 fi
diff --git a/scripts/release-prepare.sh b/scripts/release-prepare.sh
index 033b461a1..ea84d7ea8 100755
--- a/scripts/release-prepare.sh
+++ b/scripts/release-prepare.sh
@@ -6,12 +6,18 @@ GIT_RELEASE_BOT_NAME=${GIT_RELEASE_BOT_NAME:?GIT_RELEASE_BOT_NAME must be provid
 GITHUB_SHA=${GITHUB_SHA:?GITHUB_SHA must be provided}
 GITHUB_REF=${GITHUB_REF:?GITHUB_REF must be provided}
 RELEASE_BRANCH_NAME=${RELEASE_BRANCH_NAME:?RELEASE_BRANCH_NAME must be provided}
+PRERELEASE_BRANCH_PATTERN=${PRERELEASE_BRANCH_PATTERN:?PRERELEASE_BRANCH_PATTERN must be provided}
+
 #git rev-parse --abbrev-ref HEAD
 
 # Filter the branch to execute the release on
 readonly local current_branch=$(git rev-parse --abbrev-ref HEAD)
 echo "Current branch: ${current_branch}"
-if [[ -n "$RELEASE_BRANCH_NAME" && ! "${current_branch}" = "$RELEASE_BRANCH_NAME" ]]; then
+if [[ -n "$RELEASE_BRANCH_NAME" && "${current_branch}" = "$RELEASE_BRANCH_NAME" ]]; then
+    echo "Building for release branch $RELEASE_BRANCH_NAME"
+elif [[ -n "${current_branch}" && "${current_branch}" == *"${PRERELEASE_BRANCH_PATTERN}"* ]]; then
+    echo "Building prerelease for branch $RELEASE_BRANCH_NAME"
+else 
      echo "Skipping for ${current_branch} branch"
      exit 0
 fi

From a9fd4556adc1591de0ab268355deace19ae8ad44 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Fri, 4 Dec 2020 13:31:50 -0600
Subject: [PATCH 072/164] release notes

---
 RELEASENOTES.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 0ebb717d5..7d95cb174 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,4 +1,3 @@
- 
 - 3d2ff55f (main) auto create apikey
 - cfa92eab package organization
 - 2ab118f4 package organization

From 31ebdb0d926932024222a63381be41b2ed79eb6f Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Fri, 4 Dec 2020 14:19:05 -0600
Subject: [PATCH 073/164] test fixes for annotation builder

---
 .../nb/api/annotations/AnnotationBuilder.java |  6 ++++-
 .../nb/api/annotations/MutableAnnotation.java | 26 ++++++++++++++-----
 .../annotations/AnnotationBuilderTest.java    |  2 +-
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilder.java b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilder.java
index 4bc83d516..90c43b068 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilder.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilder.java
@@ -2,7 +2,9 @@ package io.nosqlbench.nb.api.annotations;
 
 import io.nosqlbench.nb.api.Layer;
 
+import java.time.ZoneId;
 import java.util.LinkedHashMap;
+import java.util.TimeZone;
 
 public class AnnotationBuilder implements BuilderFacets.All {
     private String session;
@@ -11,6 +13,7 @@ public class AnnotationBuilder implements BuilderFacets.All {
     private final LinkedHashMap<String, String> labels = new LinkedHashMap<>();
     private final LinkedHashMap<String, String> details = new LinkedHashMap<>();
     private Layer layer;
+    private TimeZone timezone = TimeZone.getTimeZone(ZoneId.of("GMT"));
 
     @Override
     public AnnotationBuilder layer(Layer layer) {
@@ -50,6 +53,7 @@ public class AnnotationBuilder implements BuilderFacets.All {
         return this;
     }
 
+
     @Override
     public AnnotationBuilder label(String name, String value) {
         this.labels.put(name, value);
@@ -64,7 +68,7 @@ public class AnnotationBuilder implements BuilderFacets.All {
 
     @Override
     public Annotation build() {
-        return new MutableAnnotation(session, layer, start, end, labels, details).asReadOnly();
+        return new MutableAnnotation(timezone, session, layer, start, end, labels, details).asReadOnly();
 
     }
 
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/MutableAnnotation.java b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/MutableAnnotation.java
index eea57e7f9..8bcefc917 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/MutableAnnotation.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/MutableAnnotation.java
@@ -2,9 +2,10 @@ package io.nosqlbench.nb.api.annotations;
 
 import io.nosqlbench.nb.api.Layer;
 
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.*;
 
 public class MutableAnnotation implements Annotation {
 
@@ -14,9 +15,16 @@ public class MutableAnnotation implements Annotation {
     private long end = 0L;
     private Map<String, String> labels = new LinkedHashMap<>();
     private Map<String, String> details = new LinkedHashMap<>();
+    private ZoneId zoneid = ZoneId.of("GMT");
 
-    public MutableAnnotation(String session, Layer layer, long start, long end, LinkedHashMap<String, String> labels,
-                             LinkedHashMap<String, String> details) {
+    public MutableAnnotation(
+            TimeZone timezone,
+            String session,
+            Layer layer,
+            long start,
+            long end,
+            LinkedHashMap<String, String> labels,
+            LinkedHashMap<String, String> details) {
         this.session = session;
         this.layer = layer;
         this.start = start;
@@ -85,9 +93,13 @@ public class MutableAnnotation implements Annotation {
         StringBuilder sb = new StringBuilder();
         sb.append("session: ").append(getSession()).append("\n");
 
-        sb.append("[").append(new Date(getStart()));
+        ZonedDateTime startTime = ZonedDateTime.ofInstant(Instant.ofEpochMilli(getStart()), zoneid);
+        ZonedDateTime endTime = ZonedDateTime.ofInstant(Instant.ofEpochMilli(getStart()), zoneid);
+
+
+        sb.append("[").append(startTime);
         if (getStart() != getEnd()) {
-            sb.append(" - ").append(new Date(getEnd()));
+            sb.append(" - ").append(endTime);
         }
         sb.append("]\n");
         sb.append("details:\n");
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java
index adfa377ef..fd4dc8549 100644
--- a/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java
+++ b/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java
@@ -25,7 +25,7 @@ public class AnnotationBuilderTest {
 
         String represented = an1.toString();
         assertThat(represented).isEqualTo("session: test-session\n" +
-                "[Sun Sep 13 07:26:40 CDT 2020]\n" +
+                "[2020-09-13T12:26:40Z[GMT]]\n" +
                 "details:\n" +
                 " detailk1: detailv1\n" +
                 " detailk2: \n" +

From cdaaaa03f655a32fa4341205747594285b5da8e3 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Fri, 4 Dec 2020 14:19:53 -0600
Subject: [PATCH 074/164] release debugging

---
 RELEASENOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 7d95cb174..dc5b172e3 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,3 +1,4 @@
+
 - 3d2ff55f (main) auto create apikey
 - cfa92eab package organization
 - 2ab118f4 package organization

From 6a097552610905c65a700a5a47a05502f4dc31ca Mon Sep 17 00:00:00 2001
From: nb-droid <nosqlbenchdroid@gmail.com>
Date: Sat, 5 Dec 2020 07:38:20 +0000
Subject: [PATCH 075/164] [maven-release-plugin] prepare release
 nosqlbench-4.0.0

---
 docsys/pom.xml                 |  6 ++---
 driver-cql-shaded/pom.xml      |  6 ++---
 driver-cqlverify/pom.xml       |  6 ++---
 driver-diag/pom.xml            |  6 ++---
 driver-dsegraph-shaded/pom.xml | 13 ++++-------
 driver-http/pom.xml            |  6 ++---
 driver-jmx/pom.xml             |  6 ++---
 driver-kafka/pom.xml           |  6 ++---
 driver-mongodb/pom.xml         |  6 ++---
 driver-stdout/pom.xml          |  6 ++---
 driver-tcp/pom.xml             |  8 +++----
 driver-web/pom.xml             |  6 ++---
 drivers-api/pom.xml            |  6 ++---
 engine-api/pom.xml             | 10 ++++----
 engine-cli/pom.xml             |  6 ++---
 engine-clients/pom.xml         |  4 ++--
 engine-core/pom.xml            |  8 +++----
 engine-docker/pom.xml          |  4 ++--
 engine-docs/pom.xml            |  4 ++--
 engine-extensions/pom.xml      |  4 ++--
 engine-rest/pom.xml            |  4 ++--
 mvn-defaults/pom.xml           |  8 +++----
 nb-annotations/pom.xml         |  2 +-
 nb-api/pom.xml                 |  8 +++----
 nb/pom.xml                     | 42 ++++++++++++++++------------------
 pom.xml                        |  4 ++--
 virtdata-api/pom.xml           |  6 ++---
 virtdata-lang/pom.xml          |  2 +-
 virtdata-lib-basics/pom.xml    |  4 ++--
 virtdata-lib-curves4/pom.xml   |  6 ++---
 virtdata-lib-random/pom.xml    |  6 ++---
 virtdata-lib-realer/pom.xml    |  4 ++--
 virtdata-realdata/pom.xml      |  4 ++--
 virtdata-userlibs/pom.xml      | 16 ++++++-------
 34 files changed, 117 insertions(+), 126 deletions(-)

diff --git a/docsys/pom.xml b/docsys/pom.xml
index 7eebb773c..7e5dc9d44 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index 7db495c03..38df9e73d 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index fa0ca8512..fa57e1002 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cql-shaded</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
   </dependencies>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index 806dbf7b5..031bdae02 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index fdf041a23..b0db08b39 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -1,12 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -25,13 +23,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
@@ -237,8 +235,7 @@
             </includes>
           </artifactSet>
           <transformers combine.children="append">
-            <transformer
-                implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+            <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
               <mainClass>io.nosqlbench.engine.cli.NBCLI</mainClass>
             </transformer>
           </transformers>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index 9664f160d..1ea3ab509 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index 54280f347..6dfb9b86e 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index d30e3b1f3..84fbd6592 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -44,13 +44,13 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-api</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>driver-stdout</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
       </dependency>
 
       <!--        <dependency>-->
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index 0957359b1..2599ce8e5 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index 7ef528d72..d72700f7a 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index cd329ff8d..df32a3d6d 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,19 +24,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index 5a20d1e09..07ee184ee 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index e82e035bc..ab177f941 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index cf11ea2f7..1e719e348 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,25 +23,25 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index 451f496da..04a00cfb7 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index 390edc0aa..c46f59d84 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index 59d3a5640..20f31ccef 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-clients</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index 97db59a7d..fad6e5465 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index 9d15529d8..31279c6da 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>docsys</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index 3e628ac58..07ddf66d3 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index e96b5a2cd..9e392b334 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 85c263709..9c60a3987 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -1,11 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>io.nosqlbench</groupId>
   <artifactId>mvn-defaults</artifactId>
-  <version>4.0.0-SNAPSHOT</version>
+  <version>4.0.0</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -94,7 +92,7 @@
   <scm>
     <url>scm:git:https://github.com/nosqlbench/nosqlbench.git</url>
     <!--        <tag>nosqlbench-2.0.102-SNAPSHOT</tag>-->
-    <tag>HEAD</tag>
+    <tag>nosqlbench-4.0.0</tag>
   </scm>
 
   <dependencyManagement>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index 69e28547f..3fd356bf5 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 43ec01752..a963ad059 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -1,13 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
 
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -33,7 +31,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>nb-annotations</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
diff --git a/nb/pom.xml b/nb/pom.xml
index a7fb4f804..b1d2c81f3 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -1,13 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
 
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -26,31 +24,31 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-rest</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-cli</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-docs</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-core</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-extensions</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -62,67 +60,67 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-web</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-kafka</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-stdout</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-diag</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-tcp</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-http</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-jmx</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-dsegraph-shaded</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cql-shaded</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cqlverify</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-mongodb</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -259,7 +257,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-mongodb</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
       </dependencies>
     </profile>
@@ -313,7 +311,7 @@
             <artifactId>maven-enforcer-plugin</artifactId>
             <configuration>
               <rules>
-                <dependencyConvergence/>
+                <dependencyConvergence />
               </rules>
             </configuration>
           </plugin>
diff --git a/pom.xml b/pom.xml
index 6df766ae1..1c1e9e9ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
@@ -145,7 +145,7 @@
             scm:git:https://github.com/nosqlbench/nosqlbench.git
         </developerConnection>
         <url>scm:git:git@github.com:nosqlbench/nosqlbench.git</url>
-        <tag>HEAD</tag>
+        <tag>nosqlbench-4.0.0</tag>
     </scm>
 
     <distributionManagement>
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index 47d79cb23..3bcd6e425 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index a55f473ff..15e90d5c2 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index 70ee7b286..fd5746fea 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index 33701045b..a9b946651 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index db6f7bd2f..8bf958b91 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index 5b8949cb7..83ff35ac9 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index dd826699a..f37e1e38e 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index 8ae260df5..a6011ff1d 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,36 +18,36 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
     </dependencies>

From 647674d5fe8296f2c36ab2567a36d2ec736f4daf Mon Sep 17 00:00:00 2001
From: nb-droid <nosqlbenchdroid@gmail.com>
Date: Sat, 5 Dec 2020 07:38:26 +0000
Subject: [PATCH 076/164] [maven-release-plugin] prepare for next development
 iteration

---
 docsys/pom.xml                 |  6 +++---
 driver-cql-shaded/pom.xml      |  6 +++---
 driver-cqlverify/pom.xml       |  6 +++---
 driver-diag/pom.xml            |  6 +++---
 driver-dsegraph-shaded/pom.xml |  6 +++---
 driver-http/pom.xml            |  6 +++---
 driver-jmx/pom.xml             |  6 +++---
 driver-kafka/pom.xml           |  6 +++---
 driver-mongodb/pom.xml         |  6 +++---
 driver-stdout/pom.xml          |  6 +++---
 driver-tcp/pom.xml             |  8 ++++----
 driver-web/pom.xml             |  6 +++---
 drivers-api/pom.xml            |  6 +++---
 engine-api/pom.xml             | 10 +++++-----
 engine-cli/pom.xml             |  6 +++---
 engine-clients/pom.xml         |  4 ++--
 engine-core/pom.xml            |  8 ++++----
 engine-docker/pom.xml          |  4 ++--
 engine-docs/pom.xml            |  4 ++--
 engine-extensions/pom.xml      |  4 ++--
 engine-rest/pom.xml            |  4 ++--
 mvn-defaults/pom.xml           |  4 ++--
 nb-annotations/pom.xml         |  2 +-
 nb-api/pom.xml                 |  4 ++--
 nb/pom.xml                     | 36 +++++++++++++++++-----------------
 pom.xml                        |  4 ++--
 virtdata-api/pom.xml           |  6 +++---
 virtdata-lang/pom.xml          |  2 +-
 virtdata-lib-basics/pom.xml    |  4 ++--
 virtdata-lib-curves4/pom.xml   |  6 +++---
 virtdata-lib-random/pom.xml    |  6 +++---
 virtdata-lib-realer/pom.xml    |  4 ++--
 virtdata-realdata/pom.xml      |  4 ++--
 virtdata-userlibs/pom.xml      | 16 +++++++--------
 34 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/docsys/pom.xml b/docsys/pom.xml
index 7e5dc9d44..cf517242a 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index 38df9e73d..0d0cce552 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index fa57e1002..6ab08544e 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.0.0</version>
+    <version>4.0.1-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cql-shaded</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index 031bdae02..b11049d44 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index b0db08b39..2bad65e0e 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.0.0</version>
+    <version>4.0.1-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -23,13 +23,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index 1ea3ab509..f336d7900 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index 6dfb9b86e..1d94240ff 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index 84fbd6592..e44edcb54 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -44,13 +44,13 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-api</artifactId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>driver-stdout</artifactId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
       </dependency>
 
       <!--        <dependency>-->
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index 2599ce8e5..b71dbe3f5 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index d72700f7a..fbdba5650 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index df32a3d6d..604bdd10d 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,19 +24,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index 07ee184ee..c5ae29e21 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index ab177f941..17de21e56 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index 1e719e348..378732418 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,25 +23,25 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index 04a00cfb7..aa81fa9f0 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index c46f59d84..7d0943820 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.0.0</version>
+    <version>4.0.1-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index 20f31ccef..6af74b22b 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-clients</artifactId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index fad6e5465..178702733 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index 31279c6da..2d86bf2d3 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.0.0</version>
+    <version>4.0.1-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>docsys</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index 07ddf66d3..4bd7deb56 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index 9e392b334..5be95850c 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 9c60a3987..d46a7c4f6 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>io.nosqlbench</groupId>
   <artifactId>mvn-defaults</artifactId>
-  <version>4.0.0</version>
+  <version>4.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -92,7 +92,7 @@
   <scm>
     <url>scm:git:https://github.com/nosqlbench/nosqlbench.git</url>
     <!--        <tag>nosqlbench-2.0.102-SNAPSHOT</tag>-->
-    <tag>nosqlbench-4.0.0</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencyManagement>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index 3fd356bf5..8cc915f9e 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index a963ad059..9eb392cbc 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.0.0</version>
+    <version>4.0.1-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>nb-annotations</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/nb/pom.xml b/nb/pom.xml
index b1d2c81f3..6830ad4b4 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,31 +24,31 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-rest</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-cli</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-docs</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-core</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-extensions</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.1-SNAPSHOT</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -60,67 +60,67 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-web</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-kafka</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-stdout</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-diag</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-tcp</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.1-SNAPSHOT</version>
     </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-http</artifactId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-jmx</artifactId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-dsegraph-shaded</artifactId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cql-shaded</artifactId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cqlverify</artifactId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-mongodb</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.1-SNAPSHOT</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -257,7 +257,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-mongodb</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/pom.xml b/pom.xml
index 1c1e9e9ce..f1fe1927d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
@@ -145,7 +145,7 @@
             scm:git:https://github.com/nosqlbench/nosqlbench.git
         </developerConnection>
         <url>scm:git:git@github.com:nosqlbench/nosqlbench.git</url>
-        <tag>nosqlbench-4.0.0</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index 3bcd6e425..ea8949990 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index 15e90d5c2..6313e02dd 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index fd5746fea..1b826c0f7 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index a9b946651..42346d9be 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index 8bf958b91..edc0089b4 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index 83ff35ac9..3e80ada57 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index f37e1e38e..7dc21a0bb 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.0.0</version>
+          <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index a6011ff1d..4d205c4a9 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,36 +18,36 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>4.0.0</version>
+            <version>4.0.1-SNAPSHOT</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>4.0.0</version>
+            <version>4.0.1-SNAPSHOT</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

From 608d1f727f42118f10b6a54b05cdedc11416a298 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@users.noreply.github.com>
Date: Sat, 5 Dec 2020 17:54:58 -0600
Subject: [PATCH 077/164] Update DOWNLOADS.md

Add redirect support with curl examples
---
 DOWNLOADS.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/DOWNLOADS.md b/DOWNLOADS.md
index d3d12e8ae..49b5d970f 100644
--- a/DOWNLOADS.md
+++ b/DOWNLOADS.md
@@ -6,10 +6,12 @@ The latest release of NoSQLBench is always available from github releases.
 
 - download [the latest release of nb](https://github.com/nosqlbench/nosqlbench/releases/latest/download/nb), a linux
   binary
+  - To download it with curl, use `curl -L -O https://github.com/nosqlbench/nosqlbench/releases/latest/download/nb`.
   - (be sure to `chmod +x nb` once you download it)
 - download [the latest release of nb.jar](https://github.com/nosqlbench/nosqlbench/releases/latest/download/nb.jar), a
   single-jar application.
   - This requires java 14 or later, make sure your `java -version` command says that you are on Java 14 or later.
+  - To download it with curl, use `curl -L -O https://github.com/nosqlbench/nosqlbench/releases/latest/download/nb.jar`.
 
 ## Docker
 

From 7a72639a946ca1f79a35fa6c36a9ac835c85c2f0 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Sat, 5 Dec 2020 22:22:31 -0600
Subject: [PATCH 078/164] log annotators config to debug

---
 engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
index 44cfec7ff..ec030e94e 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
@@ -271,6 +271,7 @@ public class NBCLI {
             System.exit(0);
         }
 
+        logger.debug("initializing annotators with config:'" + annotatorsConfig + "'");
         Annotators.init(annotatorsConfig);
         Annotators.recordAnnotation(
                 Annotation.newBuilder()

From 8a0b326f22944c0bffb2a7f3c10e5d397aa57c81 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 6 Dec 2020 04:39:17 +0000
Subject: [PATCH 079/164] Bump jetty.version in /mvn-defaults

Bumps `jetty.version` from 9.4.25.v20191220 to 9.4.35.v20201120.

Updates `jetty-server` from 9.4.25.v20191220 to 9.4.35.v20201120
- [Release notes](https://github.com/eclipse/jetty.project/releases)
- [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.25.v20191220...jetty-9.4.35.v20201120)

Updates `jetty-servlets` from 9.4.25.v20191220 to 9.4.35.v20201120
- [Release notes](https://github.com/eclipse/jetty.project/releases)
- [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.25.v20191220...jetty-9.4.35.v20201120)

Updates `jetty-servlet` from 9.4.25.v20191220 to 9.4.35.v20201120
- [Release notes](https://github.com/eclipse/jetty.project/releases)
- [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.25.v20191220...jetty-9.4.35.v20201120)

Updates `jetty-rewrite` from 9.4.25.v20191220 to 9.4.35.v20201120
- [Release notes](https://github.com/eclipse/jetty.project/releases)
- [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.25.v20191220...jetty-9.4.35.v20201120)

Signed-off-by: dependabot[bot] <support@github.com>
---
 mvn-defaults/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 42b5c62aa..57b9009be 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -38,7 +38,7 @@
     <jaxb.impl.version>2.4.0-b180830.0438</jaxb.impl.version>
     <jersey.media.version>2.29</jersey.media.version>
     <jersey.version>2.27</jersey.version>
-    <jetty.version>9.4.25.v20191220</jetty.version>
+    <jetty.version>9.4.35.v20201120</jetty.version>
     <jmh.version>1.22</jmh.version>
     <joda.time.version>2.9.9</joda.time.version>
     <junit.jupiter.version>5.3.2</junit.jupiter.version>

From e4f325c43bf39948af925da5caaf94ced5a05112 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Sat, 5 Dec 2020 22:40:04 -0600
Subject: [PATCH 080/164] disable test which is present in feature branch

---
 .../annotations/AnnotationBuilderTest.java    | 70 +++++++++----------
 1 file changed, 33 insertions(+), 37 deletions(-)

diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java
index adfa377ef..1a7430f03 100644
--- a/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java
+++ b/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java
@@ -1,45 +1,41 @@
 package io.nosqlbench.nb.api.annotations;
 
-import io.nosqlbench.nb.api.Layer;
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class AnnotationBuilderTest {
 
     private static final long time = 1600000000000L;
 
-    @Test
-    public void testBasicAnnotation() {
-
-        Annotation an1 = Annotation.newBuilder()
-                .session("test-session")
-                .at(time)
-                .layer(Layer.Scenario)
-                .label("labelka", "labelvb")
-                .label("labelkc", "labelvd")
-                .detail("detailk1", "detailv1")
-                .detail("detailk2", "detailv21\ndetailv22")
-                .detail("detailk3", "v1\nv2\nv3\n")
-                .build();
-
-        String represented = an1.toString();
-        assertThat(represented).isEqualTo("session: test-session\n" +
-                "[Sun Sep 13 07:26:40 CDT 2020]\n" +
-                "details:\n" +
-                " detailk1: detailv1\n" +
-                " detailk2: \n" +
-                "  detailv21\n" +
-                "  detailv22\n" +
-                " detailk3: \n" +
-                "  v1\n" +
-                "  v2\n" +
-                "  v3\n" +
-                "labels:\n" +
-                " layer: Scenario\n" +
-                " labelka: labelvb\n" +
-                " labelkc: labelvd\n");
-
-    }
+    // Disabled until the feature is properly merged into main
+//    @Test
+//    public void testBasicAnnotation() {
+//
+//        Annotation an1 = Annotation.newBuilder()
+//                .session("test-session")
+//                .at(time)
+//                .layer(Layer.Scenario)
+//                .label("labelka", "labelvb")
+//                .label("labelkc", "labelvd")
+//                .detail("detailk1", "detailv1")
+//                .detail("detailk2", "detailv21\ndetailv22")
+//                .detail("detailk3", "v1\nv2\nv3\n")
+//                .build();
+//
+//        String represented = an1.toString();
+//        assertThat(represented).isEqualTo("session: test-session\n" +
+//                "[Sun Sep 13 07:26:40 CDT 2020]\n" +
+//                "details:\n" +
+//                " detailk1: detailv1\n" +
+//                " detailk2: \n" +
+//                "  detailv21\n" +
+//                "  detailv22\n" +
+//                " detailk3: \n" +
+//                "  v1\n" +
+//                "  v2\n" +
+//                "  v3\n" +
+//                "labels:\n" +
+//                " layer: Scenario\n" +
+//                " labelka: labelvb\n" +
+//                " labelkc: labelvd\n");
+//
+//    }
 
 }
\ No newline at end of file

From 6248b0e2ab186a31cabacba952368578f3a95456 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Sun, 6 Dec 2020 16:10:39 -0600
Subject: [PATCH 081/164] fix #232 and #235 logfile dir and config

---
 .../main/java/io/nosqlbench/engine/cli/NBCLI.java  |  4 +++-
 .../engine/core/logging/LoggerConfig.java          | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
index ec030e94e..3aa8c720d 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
@@ -89,8 +89,10 @@ public class NBCLI {
         loggerConfig.setConsoleLevel(NBLogLevel.ERROR);
 
         NBCLIOptions globalOptions = new NBCLIOptions(args, NBCLIOptions.Mode.ParseGlobalsOnly);
+        String sessionName = new SessionNamer().format(globalOptions.getSessionName());
 
         loggerConfig
+                .setSessionName(sessionName)
                 .setConsoleLevel(globalOptions.getConsoleLogLevel())
                 .setConsolePattern(globalOptions.getConsoleLoggingPattern())
                 .setLogfileLevel(globalOptions.getScenarioLogLevel())
@@ -103,6 +105,7 @@ public class NBCLI {
         logger = LogManager.getLogger("NBCLI");
         loggerConfig.purgeOldFiles(LogManager.getLogger("SCENARIO"));
         logger.info("Configured scenario log at " + loggerConfig.getLogfileLocation());
+        logger.debug("Scenario log started");
 
         // Global only processing
         if (args.length == 0) {
@@ -162,7 +165,6 @@ public class NBCLI {
         }
 
         NBCLIOptions options = new NBCLIOptions(args);
-        String sessionName = new SessionNamer().format(options.getSessionName());
         logger = LogManager.getLogger("NBCLI");
 
         NBIO.addGlobalIncludes(options.wantsIncludes());
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/logging/LoggerConfig.java b/engine-core/src/main/java/io/nosqlbench/engine/core/logging/LoggerConfig.java
index 882325897..0338ba8b1 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/logging/LoggerConfig.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/logging/LoggerConfig.java
@@ -13,12 +13,16 @@ import org.apache.logging.log4j.core.config.ConfigurationSource;
 import org.apache.logging.log4j.core.config.builder.api.*;
 import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
 
+import java.nio.file.attribute.*;
+
+
 import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.attribute.PosixFilePermissions;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -202,6 +206,16 @@ public class LoggerConfig extends ConfigurationFactory {
     }
 
     public void activate() {
+        if (!Files.exists(loggerDir)) {
+            try {
+                FileAttribute<Set<PosixFilePermission>> attrs = PosixFilePermissions.asFileAttribute(
+                        PosixFilePermissions.fromString("rwxrwx---")
+                );
+                Path directory = Files.createDirectory(loggerDir, attrs);
+            } catch (Exception e) {
+                throw new RuntimeException("Error while creating directory " + loggerDir.toString() + ": " + e.getMessage(), e);
+            }
+        }
         ConfigurationFactory.setConfigurationFactory(this);
     }
 

From a06be5fcc953e3b943fde360a3553e84f9298f21 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 01:49:55 -0600
Subject: [PATCH 082/164] use json for logged annotation form

---
 .../io/nosqlbench/engine/core/metrics/LoggingAnnotator.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/LoggingAnnotator.java b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/LoggingAnnotator.java
index 4926b64c9..9bcad6c60 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/LoggingAnnotator.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/LoggingAnnotator.java
@@ -28,7 +28,8 @@ public class LoggingAnnotator implements Annotator, ConfigAware {
 
     @Override
     public void recordAnnotation(Annotation annotation) {
-        annotationsLog.log(level, annotation.toString());
+        String inlineForm = annotation.asJson();
+        annotationsLog.log(level, inlineForm);
     }
 
     /**

From 23a1eb88229ade7c953d664cd9a41e7028eb90c9 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 01:50:10 -0600
Subject: [PATCH 083/164] trace core annotations dispatch

---
 .../io/nosqlbench/engine/core/annotation/Annotators.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/annotation/Annotators.java b/engine-core/src/main/java/io/nosqlbench/engine/core/annotation/Annotators.java
index dbe55a2d1..66a7cd042 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/annotation/Annotators.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/annotation/Annotators.java
@@ -96,7 +96,10 @@ public class Annotators {
     }
 
     public static synchronized void recordAnnotation(Annotation annotation) {
-        getAnnotators().forEach(a -> a.recordAnnotation(annotation));
+        for (Annotator annotator : getAnnotators()) {
+            logger.trace("calling annotator " + annotator.getName());
+            annotator.recordAnnotation(annotation);
+        }
     }
 
 //    public static synchronized void recordAnnotation(

From cf008d16111431b0abac22bed939de1409d91100 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 01:50:16 -0600
Subject: [PATCH 084/164] promote docker feedback to info

---
 .../src/main/java/io/nosqlbench/engine/docker/DockerHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java
index b18a8855b..5f5e1e6c6 100644
--- a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java
+++ b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java
@@ -45,7 +45,7 @@ public class DockerHelper {
     }
 
     public String startDocker(String IMG, String tag, String name, List<Integer> ports, List<String> volumeDescList, List<String> envList, List<String> cmdList, String reload, List<String> linkNames) {
-        logger.debug("Starting docker with img=" + IMG + ", tag=" + tag + ", name=" + name + ", " +
+        logger.info("Starting docker with img=" + IMG + ", tag=" + tag + ", name=" + name + ", " +
                 "ports=" + ports + ", volumes=" + volumeDescList + ", env=" + envList + ", cmds=" + cmdList + ", reload=" + reload);
 
         boolean existingContainer = removeExitedContainers(name);

From da87b1c3bd5387536f1ef0075f26441dddd9d402 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 01:50:21 -0600
Subject: [PATCH 085/164] bump grafana to 7.3

---
 .../src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
index 64cae718b..ac1f55f42 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
@@ -135,7 +135,7 @@ public class NBCLIOptions {
     private Scenario.Engine engine = Scenario.Engine.Graalvm;
     private boolean graaljs_compat = false;
     private int hdr_digits = 3;
-    private String docker_grafana_tag = "7.2.2";
+    private String docker_grafana_tag = "7.3.4";
     private boolean showStackTraces = false;
     private boolean compileScript = false;
     private String scriptFile = null;

From f1e3adf5180c7a10d78ff20b5eb612a43e7f8f70 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 01:50:25 -0600
Subject: [PATCH 086/164] avoid discarding exceptions in docker helper

---
 .../java/io/nosqlbench/engine/docker/DockerHelper.java | 10 ++++++----
 .../nosqlbench/engine/docker/DockerMetricsManager.java |  9 +++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java
index 5f5e1e6c6..dd1bd4e46 100644
--- a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java
+++ b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java
@@ -155,7 +155,7 @@ public class DockerHelper {
             logger.error("Unable to contact docker, make sure docker is up and try again.");
             logger.error("If docker is installed make sure this user has access to the docker group.");
             logger.error("$ sudo gpasswd -a ${USER} docker && newgrp docker");
-            System.exit(1);
+            throw e;
         }
 
         return false;
@@ -178,7 +178,7 @@ public class DockerHelper {
             logger.error("Unable to contact docker, make sure docker is up and try again.");
             logger.error("If docker is installed make sure this user has access to the docker group.");
             logger.error("$ sudo gpasswd -a ${USER} docker && newgrp docker");
-            System.exit(1);
+            throw e;
         }
         return false;
     }
@@ -193,7 +193,7 @@ public class DockerHelper {
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("Unable to contact docker, make sure docker is up and try again.");
-            System.exit(1);
+            throw e;
         }
 
         if (runningContainers.size() >= 1) {
@@ -204,9 +204,10 @@ public class DockerHelper {
 
             if (reload != null) {
                 try {
-                    post(reload, null, false, "reloading config");
+                    post(reload, null, false, "reload config");
                 } catch (Exception e) {
                     logger.error(String.format("Unexpected config/state for docker container %s, consider removing the container", name));
+                    throw e;
                 }
             }
 
@@ -233,6 +234,7 @@ public class DockerHelper {
         } catch (InterruptedException e) {
             logger.error("Error getting docker log and detect start for containerId: " + containerId);
             e.printStackTrace();
+            throw new RuntimeException(e);
         }
 
     }
diff --git a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java
index 3cf593765..bf9262255 100644
--- a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java
+++ b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java
@@ -228,7 +228,7 @@ public class DockerMetricsManager {
             logger.error("failed to set permissions on prom backup " +
                     "directory " + userHome + "/.nosqlbench/prometheus)");
             e.printStackTrace();
-            System.exit(1);
+            throw new RuntimeException(e);
         }
 
         try (PrintWriter out = new PrintWriter(
@@ -238,11 +238,11 @@ public class DockerMetricsManager {
         } catch (FileNotFoundException e) {
             e.printStackTrace();
             logger.error("error writing prometheus yaml file to ~/.prometheus");
-            System.exit(1);
+            throw new RuntimeException(e);
         } catch (IOException e) {
             e.printStackTrace();
             logger.error("creating file in ~/.prometheus");
-            System.exit(1);
+            throw new RuntimeException(e);
         }
     }
 
@@ -302,7 +302,7 @@ public class DockerMetricsManager {
             logger.error("failed to set permissions on grafana directory " +
                     "directory " + userHome + "/.nosqlbench/grafana)");
             e.printStackTrace();
-            System.exit(1);
+            throw new RuntimeException(e);
         }
     }
 
@@ -348,6 +348,7 @@ public class DockerMetricsManager {
                     close();
                 } catch (IOException e) {
                     e.printStackTrace();
+                    throw new RuntimeException(e);
                 }
             }
         }

From ad49337599a87df667d1de4196734bc139393529 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 01:50:30 -0600
Subject: [PATCH 087/164] eagerly await activities in separate thread

---
 .../core/lifecycle/ActivityFinisher.java      | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityFinisher.java

diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityFinisher.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityFinisher.java
new file mode 100644
index 000000000..233fb30c5
--- /dev/null
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityFinisher.java
@@ -0,0 +1,23 @@
+package io.nosqlbench.engine.core.lifecycle;
+
+public class ActivityFinisher extends Thread {
+
+    private final ActivityExecutor executor;
+    private final int timeout;
+    private boolean result;
+
+    public ActivityFinisher(ActivityExecutor executor, int timeout) {
+        super(executor.getActivityDef().getAlias() + "_finisher");
+        this.executor = executor;
+        this.timeout = timeout;
+    }
+
+    @Override
+    public void run() {
+        result = executor.awaitCompletion(timeout);
+    }
+
+    public boolean getResult() {
+        return result;
+    }
+}

From 1529f2714e247b067de368e32fcbf1b65bad48cc Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 01:50:34 -0600
Subject: [PATCH 088/164] ensure scenario annotations run on exit

---
 .../core/script/ScenarioShutdownHook.java     | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenarioShutdownHook.java

diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenarioShutdownHook.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenarioShutdownHook.java
new file mode 100644
index 000000000..a8bb700aa
--- /dev/null
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenarioShutdownHook.java
@@ -0,0 +1,20 @@
+package io.nosqlbench.engine.core.script;
+
+import org.apache.logging.log4j.Logger;
+
+public class ScenarioShutdownHook extends Thread {
+
+    private final Scenario scenario;
+    private final Logger logger;
+
+    public ScenarioShutdownHook(Scenario scenario) {
+        this.scenario = scenario;
+        logger = scenario.getLogger();
+    }
+
+    @Override
+    public void run() {
+        scenario.finish();
+    }
+
+}

From 5315b8a98af24aecc2b506b5742a04f10a5cd83d Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 01:50:38 -0600
Subject: [PATCH 089/164] avoid spamming console with metrics for short
 sessions

---
 .../engine/core/lifecycle/ScenariosResults.java       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenariosResults.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenariosResults.java
index daa937ceb..85fa585dd 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenariosResults.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenariosResults.java
@@ -66,8 +66,15 @@ public class ScenariosResults {
             logger.info("results for scenario: " + scenario);
 
             if (oresult != null) {
-                oresult.reportToLog();
-                oresult.reportToConsole();
+                oresult.reportElapsedMillis();
+                if (oresult.getElapsedMillis() >= 60_000) {
+                    oresult.reportToConsole();
+                    oresult.reportToLog();
+                } else {
+                    logger.info("Metrics suppressed because scenario was less than 1 minute long.");
+                    logger.info("Metrics data is not reliable for short sampling periods.");
+                    logger.info("To get metrics on console, run a longer scenario.");
+                }
             } else {
                 logger.error(scenario.getScenarioName() + ": incomplete (missing result)");
             }

From 0d422b5a5f257058ef86dfe72d75feb9e5aef12a Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 01:50:43 -0600
Subject: [PATCH 090/164] add instant and interval annotations

---
 .../core/lifecycle/ActivityExecutor.java      | 102 +++++++++++++-----
 .../core/lifecycle/ScenarioController.java    |  88 ++++++++++++---
 .../engine/core/script/Scenario.java          |  58 ++++++++--
 .../engine/core/script/ScenariosExecutor.java |  12 ++-
 .../resources/ScenarioExecutorEndpoint.java   |   4 +-
 .../nosqlbench/nb/api/annotations/Span.java   |  12 +++
 .../annotations/AnnotationBuilderTest.java    |   6 +-
 7 files changed, 225 insertions(+), 57 deletions(-)
 create mode 100644 nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Span.java

diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java
index b344f97d1..0cb03994f 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java
@@ -18,6 +18,9 @@ import io.nosqlbench.engine.api.activityapi.core.*;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.activityimpl.ParameterMap;
 import io.nosqlbench.engine.api.activityimpl.input.ProgressCapable;
+import io.nosqlbench.engine.core.annotation.Annotators;
+import io.nosqlbench.nb.api.Layer;
+import io.nosqlbench.nb.api.annotations.Annotation;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 
@@ -56,6 +59,10 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
     private RuntimeException stoppingException;
 
     private final static int waitTime = 10000;
+    private String sessionId = "";
+    private long startedAt = 0L;
+    private long stoppedAt = 0L;
+    private String[] annotatedCommand;
 
 //    private RunState intendedState = RunState.Uninitialized;
 
@@ -63,15 +70,19 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
         this.activity = activity;
         this.activityDef = activity.getActivityDef();
         executorService = new ThreadPoolExecutor(
-            0, Integer.MAX_VALUE,
-            0L, TimeUnit.SECONDS,
-            new SynchronousQueue<>(),
-            new IndexedThreadFactory(activity.getAlias(), new ActivityExceptionHandler(this))
+                0, Integer.MAX_VALUE,
+                0L, TimeUnit.SECONDS,
+                new SynchronousQueue<>(),
+                new IndexedThreadFactory(activity.getAlias(), new ActivityExceptionHandler(this))
         );
         activity.getActivityDef().getParams().addListener(this);
         activity.setActivityController(this);
     }
 
+    public void setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+    }
+
 
     // TODO: Doc how uninitialized activities do not propagate parameter map changes and how
     // TODO: this is different from preventing modification to uninitialized activities
@@ -86,9 +97,22 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
      */
     public synchronized void startActivity() {
         logger.info("starting activity " + activity.getAlias() + " for cycles " + activity.getCycleSummary());
+        this.annotatedCommand = annotatedCommand;
+        Annotators.recordAnnotation(Annotation.newBuilder()
+                .session(sessionId)
+                .now()
+                .layer(Layer.Activity)
+                .label("alias", getActivityDef().getAlias())
+                .label("driver", getActivityDef().getActivityType())
+                .label("workload", getActivityDef().getParams().getOptionalString("workload").orElse("none"))
+                .detail("params", getActivityDef().toString())
+                .build()
+        );
+
         activitylogger.debug("START/before alias=(" + activity.getAlias() + ")");
         try {
             activity.setRunState(RunState.Starting);
+            this.startedAt = System.currentTimeMillis();
             activity.initActivity();
             //activity.onActivityDefUpdate(activityDef);
         } catch (Exception e) {
@@ -117,6 +141,17 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
         activity.setRunState(RunState.Stopped);
         logger.info("stopped: " + this.getActivityDef().getAlias() + " with " + motors.size() + " slots");
         activitylogger.debug("STOP/after alias=(" + activity.getAlias() + ")");
+        Annotators.recordAnnotation(Annotation.newBuilder()
+                .session(sessionId)
+                .interval(this.startedAt, this.stoppedAt)
+                .layer(Layer.Activity)
+                .label("alias", getActivityDef().getAlias())
+                .label("driver", getActivityDef().getActivityType())
+                .label("workload", getActivityDef().getParams().getOptionalString("workload").orElse("none"))
+                .detail("params", getActivityDef().toString())
+                .build()
+        );
+
 
     }
 
@@ -179,11 +214,10 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
         }
     }
 
-    public boolean requestStopExecutor(int secondsToWait) {
+    public boolean finishAndShutdownExecutor(int secondsToWait) {
         activitylogger.debug("REQUEST STOP/before alias=(" + activity.getAlias() + ")");
 
-
-        logger.info("Stopping executor for " + activity.getAlias() + " when work completes.");
+        logger.debug("Stopping executor for " + activity.getAlias() + " when work completes.");
 
         executorService.shutdown();
         boolean wasStopped = false;
@@ -202,6 +236,7 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
             activity.closeAutoCloseables();
             activity.setRunState(RunState.Stopped);
         }
+
         if (stoppingException != null) {
             logger.trace("an exception caused the activity to stop:" + stoppingException.getMessage());
             throw stoppingException;
@@ -231,10 +266,10 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
                 adjustToActivityDef(activity.getActivityDef());
             }
             motors.stream()
-                .filter(m -> (m instanceof ActivityDefObserver))
+                    .filter(m -> (m instanceof ActivityDefObserver))
 //                    .filter(m -> m.getSlotStateTracker().getSlotState() != RunState.Uninitialized)
 //                    .filter(m -> m.getSlotStateTracker().getSlotState() != RunState.Starting)
-                .forEach(m -> ((ActivityDefObserver) m).onActivityDefUpdate(activityDef));
+                    .forEach(m -> ((ActivityDefObserver) m).onActivityDefUpdate(activityDef));
         }
     }
 
@@ -242,8 +277,27 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
         return activityDef;
     }
 
+    /**
+     * This is the canonical way to wait for an activity to finish. It ties together
+     * any way that an activity can finish under one blocking call.
+     * This should be awaited asynchronously from the control layer in separate threads.
+     *
+     * TODO: move activity finisher threaad to this class and remove separate implementation
+     */
     public boolean awaitCompletion(int waitTime) {
-        return requestStopExecutor(waitTime);
+        boolean finished = finishAndShutdownExecutor(waitTime);
+        Annotators.recordAnnotation(Annotation.newBuilder()
+                .session(sessionId)
+                .interval(startedAt, this.stoppedAt)
+                .layer(Layer.Activity)
+                .label("alias", getActivityDef().getAlias())
+                .label("driver", getActivityDef().getActivityType())
+                .label("workload", getActivityDef().getParams().getOptionalString("workload").orElse("none"))
+                .detail("params", getActivityDef().toString())
+                .build()
+        );
+
+        return finished;
     }
 
     public boolean awaitFinish(int timeout) {
@@ -267,8 +321,8 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
 
     private String getSlotStatus() {
         return motors.stream()
-            .map(m -> m.getSlotStateTracker().getSlotState().getCode())
-            .collect(Collectors.joining(",", "[", "]"));
+                .map(m -> m.getSlotStateTracker().getSlotState().getCode())
+                .collect(Collectors.joining(",", "[", "]"));
     }
 
     /**
@@ -311,18 +365,18 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
             case Running:
             case Starting:
                 motors.stream()
-                    .filter(m -> m.getSlotStateTracker().getSlotState() != RunState.Running)
-                    .filter(m -> m.getSlotStateTracker().getSlotState() != RunState.Finished)
-                    .filter(m -> m.getSlotStateTracker().getSlotState() != RunState.Starting)
-                    .forEach(m -> {
-                        m.getSlotStateTracker().enterState(RunState.Starting);
-                        executorService.execute(m);
-                    });
+                        .filter(m -> m.getSlotStateTracker().getSlotState() != RunState.Running)
+                        .filter(m -> m.getSlotStateTracker().getSlotState() != RunState.Finished)
+                        .filter(m -> m.getSlotStateTracker().getSlotState() != RunState.Starting)
+                        .forEach(m -> {
+                            m.getSlotStateTracker().enterState(RunState.Starting);
+                            executorService.execute(m);
+                        });
                 break;
             case Stopped:
                 motors.stream()
-                    .filter(m -> m.getSlotStateTracker().getSlotState() != RunState.Stopped)
-                    .forEach(Motor::requestStop);
+                        .filter(m -> m.getSlotStateTracker().getSlotState() != RunState.Stopped)
+                        .forEach(Motor::requestStop);
                 break;
             case Finished:
             case Stopping:
@@ -403,7 +457,7 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
                 awaited = awaitMotorState(motor, waitTime, pollTime, awaitingState);
                 if (!awaited) {
                     logger.trace("failed awaiting motor " + motor.getSlotId() + " for state in " +
-                        Arrays.asList(awaitingState));
+                            Arrays.asList(awaitingState));
                     break;
                 }
             }
@@ -447,8 +501,8 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
         boolean awaitedRequiredState = awaitMotorState(m, waitTime, pollTime, awaitingState);
         if (!awaitedRequiredState) {
             String error = "Unable to await " + activityDef.getAlias() +
-                "/Motor[" + m.getSlotId() + "]: from state " + startingState + " to " + m.getSlotStateTracker().getSlotState()
-                + " after waiting for " + waitTime + "ms";
+                    "/Motor[" + m.getSlotId() + "]: from state " + startingState + " to " + m.getSlotStateTracker().getSlotState()
+                    + " after waiting for " + waitTime + "ms";
             RuntimeException e = new RuntimeException(error);
             logger.error(error);
             throw e;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java
index 26f0a9540..1cdda63d3 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java
@@ -20,6 +20,9 @@ import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.activityimpl.ParameterMap;
 import io.nosqlbench.engine.api.activityimpl.ProgressAndStateMeter;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
+import io.nosqlbench.engine.core.annotation.Annotators;
+import io.nosqlbench.nb.api.Layer;
+import io.nosqlbench.nb.api.annotations.Annotation;
 import io.nosqlbench.nb.api.errors.BasicError;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
@@ -38,6 +41,11 @@ public class ScenarioController {
     private static final Logger scenariologger = LogManager.getLogger("SCENARIO");
 
     private final Map<String, ActivityExecutor> activityExecutors = new ConcurrentHashMap<>();
+    private final String sessionId;
+
+    public ScenarioController(String sessionId) {
+        this.sessionId = sessionId;
+    }
 
     /**
      * Start an activity, given the activity definition for it. The activity will be known in the scenario
@@ -46,9 +54,20 @@ public class ScenarioController {
      * @param activityDef string in alias=value1;driver=value2;... format
      */
     public synchronized void start(ActivityDef activityDef) {
+        Annotators.recordAnnotation(Annotation.newBuilder()
+                .session(sessionId)
+                .now()
+                .layer(Layer.Activity)
+                .label("alias", activityDef.getAlias())
+                .detail("command", "start")
+                .detail("params", activityDef.toString())
+                .build());
+
+
         ActivityExecutor activityExecutor = getActivityExecutor(activityDef, true);
         scenariologger.debug("START " + activityDef.getAlias());
         activityExecutor.startActivity();
+
     }
 
     /**
@@ -84,6 +103,15 @@ public class ScenarioController {
      * @param activityDef A definition for an activity to run
      */
     public synchronized void run(int timeout, ActivityDef activityDef) {
+        Annotators.recordAnnotation(Annotation.newBuilder()
+                .session(sessionId)
+                .now()
+                .layer(Layer.Activity)
+                .label("alias", activityDef.getAlias())
+                .detail("command", "run")
+                .detail("params", activityDef.toString())
+                .build());
+
         ActivityExecutor activityExecutor = getActivityExecutor(activityDef, true);
         scenariologger.debug("RUN alias=" + activityDef.getAlias());
         scenariologger.debug(" (RUN/START) alias=" + activityDef.getAlias());
@@ -135,6 +163,15 @@ public class ScenarioController {
      * @param activityDef An activity def, including at least the alias parameter.
      */
     public synchronized void stop(ActivityDef activityDef) {
+        Annotators.recordAnnotation(Annotation.newBuilder()
+                .session(sessionId)
+                .now()
+                .layer(Layer.Activity)
+                .label("alias", activityDef.getAlias())
+                .detail("command", "stop")
+                .detail("params", activityDef.toString())
+                .build());
+
         ActivityExecutor activityExecutor = getActivityExecutor(activityDef, false);
         if (activityExecutor == null) {
             throw new RuntimeException("could not stop missing activity:" + activityDef);
@@ -179,7 +216,7 @@ public class ScenarioController {
         }
         ActivityExecutor activityExecutor = getActivityExecutor(alias);
         ParameterMap params = activityExecutor.getActivityDef().getParams();
-        scenariologger.debug("SET ("+alias+"/"+param + ")=(" + value + ")");
+        scenariologger.debug("SET (" + alias + "/" + param + ")=(" + value + ")");
         params.set(param, value);
     }
 
@@ -242,25 +279,25 @@ public class ScenarioController {
 
             if (executor == null && createIfMissing) {
 
-                String activityTypeName = activityDef.getParams().getOptionalString("driver","type").orElse(null);
+                String activityTypeName = activityDef.getParams().getOptionalString("driver", "type").orElse(null);
                 List<String> knownTypes = ActivityType.FINDER.getAll().stream().map(ActivityType::getName).collect(Collectors.toList());
 
                 // Infer the type from either alias or yaml if possible (exactly one matches)
-                if (activityTypeName==null) {
+                if (activityTypeName == null) {
                     List<String> matching = knownTypes.stream().filter(
                             n ->
                                     activityDef.getParams().getOptionalString("alias").orElse("").contains(n)
                                             || activityDef.getParams().getOptionalString("yaml", "workload").orElse("").contains(n)
                     ).collect(Collectors.toList());
-                    if (matching.size()==1) {
-                        activityTypeName=matching.get(0);
+                    if (matching.size() == 1) {
+                        activityTypeName = matching.get(0);
                         logger.info("param 'type' was inferred as '" + activityTypeName + "' since it was seen in yaml or alias parameter.");
                     }
                 }
 
-                if (activityTypeName==null) {
+                if (activityTypeName == null) {
                     String errmsg = "You must provide a driver=<driver> parameter. Valid examples are:\n" +
-                            knownTypes.stream().map(t -> " driver="+t+"\n").collect(Collectors.joining());
+                            knownTypes.stream().map(t -> " driver=" + t + "\n").collect(Collectors.joining());
                     throw new BasicError(errmsg);
                 }
 
@@ -345,15 +382,33 @@ public class ScenarioController {
      * @return true, if all activities completed before the timer expired, false otherwise
      */
     public boolean awaitCompletion(int waitTimeMillis) {
-        boolean completed = false;
-        for (ActivityExecutor executor : activityExecutors.values()) {
-            if (!executor.awaitCompletion(waitTimeMillis)) {
-                logger.debug("awaiting completion signaled FALSE");
-                return false;
+        boolean completed = true;
+        long waitstart = System.currentTimeMillis();
+        long remaining = waitTimeMillis;
+
+        List<ActivityFinisher> finishers = new ArrayList<>();
+        for (ActivityExecutor ae : activityExecutors.values()) {
+            ActivityFinisher finisher = new ActivityFinisher(ae, (int) remaining);
+            finishers.add(finisher);
+            finisher.start();
+        }
+
+        for (ActivityFinisher finisher : finishers) {
+            try {
+                finisher.join(waitTimeMillis);
+            } catch (InterruptedException ignored) {
             }
         }
-        logger.debug("All activities awaiting completion signaled TRUE");
-        return true;
+
+        for (ActivityFinisher finisher : finishers) {
+            if (!finisher.getResult()) {
+                logger.debug("finisher for " + finisher.getName() + " did not signal TRUE");
+                completed = false;
+            }
+        }
+
+        return completed;
+
     }
 
     private ActivityDef aliasToDef(String alias) {
@@ -364,9 +419,10 @@ public class ScenarioController {
         }
     }
 
-    public boolean await(Map<String,String> activityDefMap) {
+    public boolean await(Map<String, String> activityDefMap) {
         return this.awaitActivity(activityDefMap);
     }
+
     public boolean awaitActivity(Map<String, String> activityDefMap) {
         ActivityDef ad = new ActivityDef(new ParameterMap(activityDefMap));
         return awaitActivity(ad);
@@ -375,6 +431,7 @@ public class ScenarioController {
     public boolean await(String alias) {
         return this.awaitActivity(alias);
     }
+
     public boolean awaitActivity(String alias) {
         ActivityDef toAwait = aliasToDef(alias);
         return awaitActivity(toAwait);
@@ -383,6 +440,7 @@ public class ScenarioController {
     public boolean await(ActivityDef activityDef) {
         return this.awaitActivity(activityDef);
     }
+
     public boolean awaitActivity(ActivityDef activityDef) {
         ActivityExecutor activityExecutor = getActivityExecutor(activityDef, false);
         if (activityExecutor == null) {
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
index a02afe9d6..89b56dd23 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
@@ -56,14 +56,19 @@ import java.util.stream.Collectors;
 
 public class Scenario implements Callable<ScenarioResult> {
 
+    private final String commandLine;
     private Logger logger = LogManager.getLogger("SCENARIO");
 
     private State state = State.Scheduled;
+    private volatile ScenarioShutdownHook scenarioShutdownHook;
+    private Exception error;
+
 
     public enum State {
         Scheduled,
         Running,
         Errored,
+        Interrupted,
         Finished
     }
 
@@ -96,7 +101,8 @@ public class Scenario implements Callable<ScenarioResult> {
             String progressInterval,
             boolean wantsGraaljsCompatMode,
             boolean wantsStackTraces,
-            boolean wantsCompiledScript) {
+            boolean wantsCompiledScript,
+            String commandLine) {
         this.scenarioName = scenarioName;
         this.scriptfile = scriptfile;
         this.engine = engine;
@@ -104,6 +110,7 @@ public class Scenario implements Callable<ScenarioResult> {
         this.wantsGraaljsCompatMode = wantsGraaljsCompatMode;
         this.wantsStackTraces = wantsStackTraces;
         this.wantsCompiledScript = wantsCompiledScript;
+        this.commandLine = commandLine;
     }
 
     public Scenario setLogger(Logger logger) {
@@ -118,6 +125,7 @@ public class Scenario implements Callable<ScenarioResult> {
     public Scenario(String name, Engine engine) {
         this.scenarioName = name;
         this.engine = engine;
+        this.commandLine = "";
     }
 
     public Scenario addScriptText(String scriptText) {
@@ -180,7 +188,7 @@ public class Scenario implements Callable<ScenarioResult> {
                 break;
         }
 
-        scenarioController = new ScenarioController();
+        scenarioController = new ScenarioController(this.scenarioName);
         if (!progressInterval.equals("disabled")) {
             activityProgressIndicator = new ActivityProgressIndicator(scenarioController, progressInterval);
         }
@@ -229,6 +237,9 @@ public class Scenario implements Callable<ScenarioResult> {
     }
 
     public void run() {
+        scenarioShutdownHook = new ScenarioShutdownHook(this);
+        Runtime.getRuntime().addShutdownHook(scenarioShutdownHook);
+
         state = State.Running;
 
         startedAtMillis = System.currentTimeMillis();
@@ -237,7 +248,6 @@ public class Scenario implements Callable<ScenarioResult> {
                         .session(this.scenarioName)
                         .now()
                         .layer(Layer.Scenario)
-                        .label("scenario", getScenarioName())
                         .detail("engine", this.engine.toString())
                         .build()
         );
@@ -285,14 +295,12 @@ public class Scenario implements Callable<ScenarioResult> {
                 this.state = State.Errored;
                 logger.warn("Error in scenario, shutting down.");
                 this.scenarioController.forceStopScenario(5000, false);
+                this.error = e;
                 throw new RuntimeException(e);
             } finally {
-                if (this.state==State.Running) {
-                    this.state = State.Finished;
-                }
                 System.out.flush();
                 System.err.flush();
-                endedAtMillis=System.currentTimeMillis();
+                endedAtMillis = System.currentTimeMillis();
             }
         }
         int awaitCompletionTime = 86400 * 365 * 1000;
@@ -300,8 +308,38 @@ public class Scenario implements Callable<ScenarioResult> {
         scenarioController.awaitCompletion(awaitCompletionTime);
         //TODO: Ensure control flow covers controller shutdown in event of internal error.
 
-        logger.debug("scenario completed without errors");
-        endedAtMillis=System.currentTimeMillis(); //TODO: Make only one endedAtMillis assignment
+        Runtime.getRuntime().removeShutdownHook(scenarioShutdownHook);
+        scenarioShutdownHook = null;
+        finish();
+    }
+
+    public void finish() {
+        logger.debug("finishing scenario");
+        endedAtMillis = System.currentTimeMillis(); //TODO: Make only one endedAtMillis assignment
+        if (this.state == State.Running) {
+            this.state = State.Finished;
+        }
+
+        if (scenarioShutdownHook != null) {
+            // If this method was called while the shutdown hook is defined, then it means
+            // that the scenario was ended before the hook was uninstalled normally.
+            this.state = State.Interrupted;
+            logger.warn("Scenario was interrupted by process exit, shutting down");
+        }
+
+        logger.info("scenario state: " + this.state);
+
+        // We report the scenario state via annotation even for short runs
+        Annotation annotation = Annotation.newBuilder()
+                .session(this.scenarioName)
+                .interval(this.startedAtMillis, endedAtMillis)
+                .layer(Layer.Scenario)
+                .label("state", this.state.toString())
+                .detail("command_line", this.commandLine)
+                .build();
+
+        Annotators.recordAnnotation(annotation);
+
     }
 
     public long getStartedAtMillis() {
@@ -315,7 +353,7 @@ public class Scenario implements Callable<ScenarioResult> {
     public ScenarioResult call() {
         run();
         String iolog = scriptEnv.getTimedLog();
-        return new ScenarioResult(iolog);
+        return new ScenarioResult(iolog, this.startedAtMillis, this.endedAtMillis);
     }
 
     @Override
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java
index 411c3aea3..a4914ffa5 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java
@@ -149,7 +149,8 @@ public class ScenariosExecutor {
                 try {
                     oResult = Optional.of(resultFuture.get());
                 } catch (Exception e) {
-                    oResult = Optional.of(new ScenarioResult(e));
+                    long now = System.currentTimeMillis();
+                    oResult = Optional.of(new ScenarioResult(e, now, now));
                 }
             }
 
@@ -182,27 +183,28 @@ public class ScenariosExecutor {
         if (resultFuture1 == null) {
             throw new BasicError("Unknown scenario name:" + scenarioName);
         }
+        long now = System.currentTimeMillis();
         if (resultFuture1.isDone()) {
             try {
                 return Optional.ofNullable(resultFuture1.get());
             } catch (Exception e) {
-                return Optional.of(new ScenarioResult(e));
+                return Optional.of(new ScenarioResult(e, now, now));
             }
         } else if (resultFuture1.isCancelled()) {
-            return Optional.of(new ScenarioResult(new Exception("result was cancelled.")));
+            return Optional.of(new ScenarioResult(new Exception("result was cancelled."), now, now));
         }
         return Optional.empty();
     }
 
     public synchronized void stopScenario(String scenarioName) {
-        this.stopScenario(scenarioName,false);
+        this.stopScenario(scenarioName, false);
     }
 
     public synchronized void stopScenario(String scenarioName, boolean rethrow) {
         Optional<Scenario> pendingScenario = getPendingScenario(scenarioName);
         if (pendingScenario.isPresent()) {
             ScenarioController controller = pendingScenario.get().getScenarioController();
-            if (controller!=null) {
+            if (controller != null) {
                 controller.forceStopScenario(0, rethrow);
             }
         } else {
diff --git a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java
index ccf36ce0a..e72d2d0d7 100644
--- a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java
+++ b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java
@@ -108,8 +108,8 @@ public class ScenarioExecutorEndpoint implements WebServiceObject {
                 "disabled",
                 false,
                 true,
-                false
-        );
+                false,
+                cmdList.toString());
 
         scenario.addScriptText(buffer.getParsedScript());
 
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Span.java b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Span.java
new file mode 100644
index 000000000..d13e80b14
--- /dev/null
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Span.java
@@ -0,0 +1,12 @@
+package io.nosqlbench.nb.api.annotations;
+
+public enum Span {
+    /**
+     * A span of time of size zero.
+     */
+    instant,
+    /**
+     * A span in time for which the start and end are different.
+     */
+    interval
+}
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java
index fd4dc8549..0f8f92881 100644
--- a/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java
+++ b/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java
@@ -26,6 +26,7 @@ public class AnnotationBuilderTest {
         String represented = an1.toString();
         assertThat(represented).isEqualTo("session: test-session\n" +
                 "[2020-09-13T12:26:40Z[GMT]]\n" +
+                "span:instant\n" +
                 "details:\n" +
                 " detailk1: detailv1\n" +
                 " detailk2: \n" +
@@ -38,7 +39,10 @@ public class AnnotationBuilderTest {
                 "labels:\n" +
                 " layer: Scenario\n" +
                 " labelka: labelvb\n" +
-                " labelkc: labelvd\n");
+                " labelkc: labelvd\n" +
+                " session: test-session\n" +
+                " span: instant\n" +
+                " appname: nosqlbench\n");
 
     }
 

From 37f1d010fe73a8b3509be51ca8f751fd72440804 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 01:50:52 -0600
Subject: [PATCH 091/164] qualify annotators config in main

---
 .../src/main/java/io/nosqlbench/engine/cli/NBCLI.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
index 3aa8c720d..895394dba 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
@@ -147,8 +147,11 @@ public class NBCLI {
 
         if (metricsAddr != null) {
             reportGraphiteTo = metricsAddr + ":9109";
-            annotatorsConfig = "[{type:'log'},{type:'grafana',baseurl:'http://" + metricsAddr + ":3000/'," +
+            annotatorsConfig = "[{type:'log',level:'info'},{type:'grafana',baseurl:'http://" + metricsAddr + ":3000" +
+                    "/'," +
                     "tags:'appname:nosqlbench',timeoutms:5000,onerror:'warn'}]";
+        } else {
+            annotatorsConfig = "[{type:'log',level:'info'}]";
         }
 
         if (args.length > 0 && args[0].toLowerCase().equals("virtdata")) {
@@ -333,7 +336,8 @@ public class NBCLI {
                 options.getProgressSpec(),
                 options.wantsGraaljsCompatMode(),
                 options.wantsStackTraces(),
-                options.wantsCompileScript()
+                options.wantsCompileScript(),
+                String.join("\n", args)
         );
         ScriptBuffer buffer = new BasicScriptBuffer()
                 .add(options.getCommands().toArray(new Cmd[0]));
@@ -381,7 +385,7 @@ public class NBCLI {
         scenariosResults.reportToLog();
         ShutdownManager.shutdown();
 
-        logger.info(scenariosResults.getExecutionSummary());
+//        logger.info(scenariosResults.getExecutionSummary());
 
         if (scenariosResults.hasError()) {
             Exception exception = scenariosResults.getOne().getException().get();

From a9a1994527cc73e518c07fc8e1d947cc53f1f9d8 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 01:50:56 -0600
Subject: [PATCH 092/164] move classis metrics log to debug

---
 .../engine/core/lifecycle/ScenarioResult.java | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioResult.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioResult.java
index 57f6c43d2..56bf419ac 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioResult.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioResult.java
@@ -31,23 +31,33 @@ import java.util.concurrent.TimeUnit;
 public class ScenarioResult {
 
     private final static Logger logger = LogManager.getLogger(ScenarioResult.class);
+    private final long startedAt;
+    private final long endedAt;
 
     private Exception exception;
     private final String iolog;
 
-    public ScenarioResult(String iolog) {
+    public ScenarioResult(String iolog, long startedAt, long endedAt) {
         this.iolog = iolog;
+        this.startedAt = startedAt;
+        this.endedAt = endedAt;
     }
 
-    public ScenarioResult(Exception e) {
+    public ScenarioResult(Exception e, long startedAt, long endedAt) {
         this.iolog = e.getMessage();
+        this.startedAt = startedAt;
+        this.endedAt = endedAt;
         this.exception = e;
     }
 
-    public void reportToLog() {
+    public void reportElapsedMillis() {
+        logger.info("-- SCENARIO TOOK " + getElapsedMillis() + "ms --");
+    }
 
-        logger.info("-- BEGIN METRICS DETAIL --");
+    public void reportToLog() {
+        logger.debug("-- BEGIN METRICS DETAIL --");
         Log4JMetricsReporter reporter = Log4JMetricsReporter.forRegistry(ActivityMetrics.getMetricRegistry())
+                .withLoggingLevel(Log4JMetricsReporter.LoggingLevel.DEBUG)
                 .convertDurationsTo(TimeUnit.MICROSECONDS)
                 .convertRatesTo(TimeUnit.SECONDS)
                 .filter(MetricFilter.ALL)
@@ -87,4 +97,7 @@ public class ScenarioResult {
         return this.iolog;
     }
 
+    public long getElapsedMillis() {
+        return endedAt - startedAt;
+    }
 }

From 9ca1a47b646478fe8feac5bfd52b222addde1e24 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 01:51:01 -0600
Subject: [PATCH 093/164] add span semantics to general annotation

---
 .../grafana/GrafanaMetricsAnnotator.java      | 11 +++--
 .../nb/api/annotations/Annotation.java        |  8 ++++
 .../nb/api/annotations/MutableAnnotation.java | 48 +++++++++++++++----
 3 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaMetricsAnnotator.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaMetricsAnnotator.java
index 25d50aac6..86b46c0cd 100644
--- a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaMetricsAnnotator.java
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaMetricsAnnotator.java
@@ -23,7 +23,7 @@ import java.util.function.Supplier;
 public class GrafanaMetricsAnnotator implements Annotator, ConfigAware {
 
     private final static Logger logger = LogManager.getLogger("ANNOTATORS" );
-    private final static Logger annotationsLog = LogManager.getLogger("ANNOTATIONS" );
+    //private final static Logger annotationsLog = LogManager.getLogger("ANNOTATIONS" );
     private OnError onError = OnError.Warn;
 
     private GrafanaClient client;
@@ -45,9 +45,15 @@ public class GrafanaMetricsAnnotator implements Annotator, ConfigAware {
             });
             ga.getTags().add("layer:" + annotation.getLayer().toString());
 
+            if (annotation.getStart() == annotation.getEnd()) {
+                ga.getTags().add("span:instant");
+            } else {
+                ga.getTags().add("span:interval");
+            }
+
             Map<String, String> labels = annotation.getLabels();
 
-            Optional.ofNullable(labels.get("alertId" ))
+            Optional.ofNullable(labels.get("alertId"))
                     .map(Integer::parseInt).ifPresent(ga::setAlertId);
 
             ga.setText(annotation.toString());
@@ -82,7 +88,6 @@ public class GrafanaMetricsAnnotator implements Annotator, ConfigAware {
 
             // Details
 
-            annotationsLog.info("ANNOTATION:" + ga.toString());
             GrafanaAnnotation created = this.client.createAnnotation(ga);
 
         } catch (Exception e) {
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotation.java b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotation.java
index 3d2febfff..70209db61 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotation.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotation.java
@@ -73,4 +73,12 @@ public interface Annotation {
         return new AnnotationBuilder();
     }
 
+    /**
+     * This should return {@link Span#interval} if the span of time is not an instant, and
+     * {@link Span#instant}, otherwise.
+     */
+    Span getSpan();
+
+    String asJson();
+
 }
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/MutableAnnotation.java b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/MutableAnnotation.java
index 8bcefc917..57d3641b5 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/MutableAnnotation.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/MutableAnnotation.java
@@ -1,5 +1,8 @@
 package io.nosqlbench.nb.api.annotations;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.annotations.Expose;
 import io.nosqlbench.nb.api.Layer;
 
 import java.time.Instant;
@@ -9,13 +12,25 @@ import java.util.*;
 
 public class MutableAnnotation implements Annotation {
 
+    private final static Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
     private String session = "SESSION_UNNAMED";
+
+    @Expose
     private Layer layer;
+
+    @Expose
     private long start = 0L;
+
+    @Expose
     private long end = 0L;
+
+    @Expose
     private Map<String, String> labels = new LinkedHashMap<>();
+
+    @Expose
     private Map<String, String> details = new LinkedHashMap<>();
-    private ZoneId zoneid = ZoneId.of("GMT");
+
+    private final ZoneId zoneid = ZoneId.of("GMT");
 
     public MutableAnnotation(
             TimeZone timezone,
@@ -25,24 +40,28 @@ public class MutableAnnotation implements Annotation {
             long end,
             LinkedHashMap<String, String> labels,
             LinkedHashMap<String, String> details) {
-        this.session = session;
-        this.layer = layer;
-        this.start = start;
-        this.end = end;
-        this.details = details;
-        this.labels = labels;
+        setLabels(labels);
+        setSession(session);
+        setLayer(layer);
+        setStart(start);
+        setEnd(end);
+        setDetails(details);
+        labels.put("appname", "nosqlbench");
     }
 
     public void setSession(String sessionName) {
         this.session = sessionName;
+        this.labels.put("session", sessionName);
     }
 
     public void setStart(long intervalStart) {
         this.start = intervalStart;
+        this.labels.put("span", getSpan().toString());
     }
 
     public void setEnd(long intervalEnd) {
         this.end = intervalEnd;
+        this.labels.put("span", getSpan().toString());
     }
 
     public void setLabels(Map<String, String> labels) {
@@ -80,6 +99,9 @@ public class MutableAnnotation implements Annotation {
 
     @Override
     public Map<String, String> getLabels() {
+//        if (!labels.containsKey("span")) {
+//            labels.put("span",getSpan().toString());
+//        }
         return labels;
     }
 
@@ -102,6 +124,8 @@ public class MutableAnnotation implements Annotation {
             sb.append(" - ").append(endTime);
         }
         sb.append("]\n");
+
+        sb.append("span:").append(getSpan()).append("\n");
         sb.append("details:\n");
         formatMap(sb, getDetails());
         sb.append("labels:\n");
@@ -126,8 +150,16 @@ public class MutableAnnotation implements Annotation {
         });
     }
 
-
     public Annotation asReadOnly() {
         return this;
     }
+
+    public Span getSpan() {
+        return (getStart() == getEnd()) ? Span.instant : Span.interval;
+    }
+
+    public String asJson() {
+        String inlineForm = gson.toJson(this);
+        return inlineForm;
+    }
 }

From f09335755ce1b9919aeb4a43d893fc49e8693a20 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 01:51:05 -0600
Subject: [PATCH 094/164] add dashboard for nb4

---
 .../dashboards/classic-nb-dashboard.json      | 7077 -----------------
 .../dashboards/nb4-default-dashboard.json     | 1230 +++
 .../docker/dashboards/new-nb-dashboard.json   | 2198 ++---
 3 files changed, 2344 insertions(+), 8161 deletions(-)
 delete mode 100644 engine-docker/src/main/resources/docker/dashboards/classic-nb-dashboard.json
 create mode 100644 engine-docker/src/main/resources/docker/dashboards/nb4-default-dashboard.json

diff --git a/engine-docker/src/main/resources/docker/dashboards/classic-nb-dashboard.json b/engine-docker/src/main/resources/docker/dashboards/classic-nb-dashboard.json
deleted file mode 100644
index 243ebf231..000000000
--- a/engine-docker/src/main/resources/docker/dashboards/classic-nb-dashboard.json
+++ /dev/null
@@ -1,7077 +0,0 @@
-{
-  "meta": {
-    "type": "db",
-    "canSave": true,
-    "canEdit": true,
-    "canAdmin": true,
-    "canStar": true,
-    "slug": "analysis",
-    "url": "/d/FEp0TiXik/analysis",
-    "expires": "0001-01-01T00:00:00Z",
-    "created": "2019-06-11T16:21:40Z",
-    "updated": "2019-06-11T16:21:40Z",
-    "updatedBy": "Anonymous",
-    "createdBy": "Anonymous",
-    "version": 1,
-    "hasAcl": false,
-    "isFolder": false,
-    "folderId": 0,
-    "folderTitle": "General",
-    "folderUrl": "",
-    "provisioned": true
-  },
-  "dashboard": {
-    "id": null,
-    "__inputs": [
-      {
-        "description": "",
-        "label": "prometheus",
-        "name": "DS_PROMETHEUS",
-        "pluginId": "prometheus",
-        "pluginName": "Prometheus",
-        "type": "datasource"
-      }
-    ],
-    "__requires": [
-      {
-        "id": "grafana",
-        "name": "Grafana",
-        "type": "grafana",
-        "version": "5.3.2"
-      },
-      {
-        "id": "graph",
-        "name": "Graph",
-        "type": "panel",
-        "version": "5.0.0"
-      },
-      {
-        "id": "prometheus",
-        "name": "Prometheus",
-        "type": "datasource",
-        "version": "5.0.0"
-      },
-      {
-        "id": "singlestat",
-        "name": "Singlestat",
-        "type": "panel",
-        "version": "5.0.0"
-      }
-    ],
-    "annotations": {
-      "list": [
-        {
-          "builtIn": 1,
-          "datasource": "-- Grafana --",
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations & Alerts",
-          "type": "dashboard"
-        }
-      ]
-    },
-    "editable": true,
-    "gnetId": null,
-    "graphTooltip": 1,
-    "iteration": 1552332041877,
-    "links": [],
-    "panels": [
-      {
-        "collapsed": false,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 0
-        },
-        "id": 91,
-        "panels": [],
-        "title": "nosqlbench and DSE",
-        "type": "row"
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fill": 1,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 0,
-          "y": 1
-        },
-        "id": 95,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_m1_rate\"}",
-            "format": "time_series",
-            "hide": false,
-            "intervalFactor": 1,
-            "legendFormat": "main ops",
-            "refId": "A"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_success_m1_rate\"}",
-            "format": "time_series",
-            "hide": false,
-            "intervalFactor": 1,
-            "legendFormat": "main success",
-            "refId": "C"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_m1_rate\"}",
-            "format": "time_series",
-            "hide": false,
-            "intervalFactor": 1,
-            "legendFormat": "rampup ops",
-            "refId": "B"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_success_m1_rate\"}",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "rampup success",
-            "refId": "D"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "Ops and Successful Ops",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fill": 1,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 6,
-          "y": 1
-        },
-        "id": 93,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "connected",
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_errorcounts_WriteTimeoutException_count\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main write timeout",
-            "refId": "H"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_errorcounts_ReadTimeoutException_count\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main read timeout",
-            "refId": "A"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_errorcounts_OperationTimedOutException_count\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main op timeout",
-            "refId": "B"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_errorcounts_WriteTimeoutException_count\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup write timeout",
-            "refId": "C"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_errorcounts_ReadTimeoutException_count\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup read timeout",
-            "refId": "D"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_errorcounts_OperationTimedOutException_count\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup op timeout",
-            "refId": "E"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_errorcounts_NoHostAvailableException_count\"}",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "refId": "F"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_errorcounts_UnavailableException_count\"}",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "refId": "G"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "Error Counts",
-        "tooltip": {
-          "shared": true,
-          "sort": 2,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fill": 1,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 12,
-          "y": 1
-        },
-        "id": 97,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_success_min\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main min",
-            "refId": "A"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_success_p50\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main p50",
-            "refId": "B"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_success_p75\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main p75",
-            "refId": "D"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_success_p95\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main p95",
-            "refId": "C"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_success_p98\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main p98",
-            "refId": "E"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_success_p99\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main p99",
-            "refId": "F"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_success_p999\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main p999",
-            "refId": "G"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_success_min\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup min",
-            "refId": "H"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_success_p50\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup p50",
-            "refId": "I"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_success_p75\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup p75",
-            "refId": "J"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_success_p95\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup p95",
-            "refId": "K"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_success_p99\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup p99",
-            "refId": "L"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_success_p999\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup p999",
-            "refId": "M"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_success_max \"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main max",
-            "refId": "N"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_success_max\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup max",
-            "refId": "O"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "service time distribution",
-        "tooltip": {
-          "shared": true,
-          "sort": 2,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "ns",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fill": 1,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 18,
-          "y": 1
-        },
-        "id": 109,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_success_max\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main max",
-            "refId": "A"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_success_max\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup max",
-            "refId": "B"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "service time max",
-        "tooltip": {
-          "shared": true,
-          "sort": 2,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "ns",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fill": 1,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 0,
-          "y": 7
-        },
-        "id": 99,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "percentage": false,
-        "pointradius": 1,
-        "points": true,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_bind_p75\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main bind p75",
-            "refId": "C"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_execute_p75\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main execute p75",
-            "refId": "A"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_p75\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main result p75",
-            "refId": "B"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_read_input_p75\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main input p75",
-            "refId": "D"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_bind_p75\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup bind p75",
-            "refId": "E"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_execute_p75\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup execute p75",
-            "refId": "F"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_p75\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup result p75",
-            "refId": "G"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_read_input_p75\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup input p75",
-            "refId": "H"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "p75 client overhead",
-        "tooltip": {
-          "shared": true,
-          "sort": 2,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "decimals": null,
-            "format": "ns",
-            "label": null,
-            "logBase": 10,
-            "max": null,
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fill": 1,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 6,
-          "y": 7
-        },
-        "id": 111,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "percentage": false,
-        "pointradius": 1,
-        "points": true,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_bind_p99\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main bind p99",
-            "refId": "C"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_execute_p99\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main execute p99",
-            "refId": "A"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_p99\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main result p99",
-            "refId": "B"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_read_input_p99\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main input p99",
-            "refId": "D"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_bind_p99\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup bind p99",
-            "refId": "E"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_execute_p99\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup execute p99",
-            "refId": "F"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_result_p99\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup result p99",
-            "refId": "G"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_read_input_p99\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup input p99",
-            "refId": "H"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "p99 client overhead",
-        "tooltip": {
-          "shared": true,
-          "sort": 2,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "decimals": null,
-            "format": "ns",
-            "label": null,
-            "logBase": 10,
-            "max": null,
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fill": 1,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 12,
-          "y": 7
-        },
-        "id": 98,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_tries_min\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main min tries",
-            "refId": "H"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_tries_p50  \"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main median tries",
-            "refId": "A"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_tries_p999\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main p999 tries",
-            "refId": "B"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_tries_max\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "main max tries",
-            "refId": "C"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_tries_min\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup min tries",
-            "refId": "D"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_tries_p50  \"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup median tries",
-            "refId": "E"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_tries_p999\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup p999 tries",
-            "refId": "F"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_tries_max\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "rampup max tries",
-            "refId": "G"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "op tries distribution",
-        "tooltip": {
-          "shared": true,
-          "sort": 2,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "ns",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fill": 1,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 18,
-          "y": 7
-        },
-        "id": 101,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "connected",
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "sum(dse_storage_load_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}) by ($by)",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "{{$by}}",
-            "refId": "A"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "Storage Load / $by",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "bytes",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "decimals": null,
-        "description": "Read/Write bytes/sec",
-        "fill": 4,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 6,
-          "y": 13
-        },
-        "height": "",
-        "id": 105,
-        "legend": {
-          "alignAsTable": false,
-          "avg": false,
-          "current": false,
-          "hideEmpty": true,
-          "hideZero": true,
-          "max": false,
-          "min": false,
-          "rightSide": false,
-          "show": true,
-          "sort": "current",
-          "sortDesc": false,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "minSpan": 4,
-        "nullPointMode": "null",
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [
-          {
-            "alias": "/.*Read.*/",
-            "transform": "negative-Y"
-          }
-        ],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "irate(collectd_disk_disk_octets_read_total{disk=~\".*\\\\d+\"}[$rate])",
-            "format": "time_series",
-            "hide": true,
-            "instant": false,
-            "intervalFactor": 1,
-            "legendFormat": "{{instance}} {{disk}} - Reads",
-            "refId": "A",
-            "step": 240
-          },
-          {
-            "expr": "irate(collectd_disk_disk_octets_write_total{disk=~\".*\\\\d+\"}[$rate])",
-            "format": "time_series",
-            "hide": true,
-            "instant": false,
-            "intervalFactor": 1,
-            "legendFormat": "{{instance}} {{disk}} - Writes",
-            "refId": "B"
-          },
-          {
-            "expr": "irate(collectd_disk_disk_octets_read_total{disk=~\".*md0\"}[$rate])",
-            "format": "time_series",
-            "instant": false,
-            "intervalFactor": 1,
-            "legendFormat": "{{instance}} {{disk}} - Reads",
-            "refId": "C",
-            "step": 240
-          },
-          {
-            "expr": "irate(collectd_disk_disk_octets_write_total{disk=~\".*md0\"}[$rate])",
-            "format": "time_series",
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "{{instance}} {{disk}} - Write",
-            "refId": "D",
-            "step": 240
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "Disk Rate / sec",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "decimals": null,
-            "format": "Bps",
-            "label": "IO read (-) / write (+)",
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": false
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {
-          "Recv_bytes_eth2": "#7EB26D",
-          "Recv_bytes_lo": "#0A50A1",
-          "Recv_drop_eth2": "#6ED0E0",
-          "Recv_drop_lo": "#E0F9D7",
-          "Recv_errs_eth2": "#BF1B00",
-          "Recv_errs_lo": "#CCA300",
-          "Trans_bytes_eth2": "#7EB26D",
-          "Trans_bytes_lo": "#0A50A1",
-          "Trans_drop_eth2": "#6ED0E0",
-          "Trans_drop_lo": "#E0F9D7",
-          "Trans_errs_eth2": "#BF1B00",
-          "Trans_errs_lo": "#CCA300",
-          "recv_bytes_lo": "#0A50A1",
-          "recv_drop_eth0": "#99440A",
-          "recv_drop_lo": "#967302",
-          "recv_errs_eth0": "#BF1B00",
-          "recv_errs_lo": "#890F02",
-          "trans_bytes_eth0": "#7EB26D",
-          "trans_bytes_lo": "#0A50A1",
-          "trans_drop_eth0": "#99440A",
-          "trans_drop_lo": "#967302",
-          "trans_errs_eth0": "#BF1B00",
-          "trans_errs_lo": "#890F02"
-        },
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "description": "Basic network info per interface",
-        "fill": 4,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 12,
-          "y": 13
-        },
-        "id": 103,
-        "legend": {
-          "alignAsTable": true,
-          "avg": true,
-          "current": true,
-          "hideEmpty": false,
-          "hideZero": true,
-          "max": true,
-          "min": true,
-          "rightSide": false,
-          "show": true,
-          "sort": "current",
-          "sortDesc": true,
-          "total": false,
-          "values": true
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [
-          {
-            "alias": "/.*read.*/",
-            "transform": "negative-Y"
-          },
-          {
-            "alias": "/.*lo.*/",
-            "color": "#7EB26D"
-          },
-          {
-            "alias": "/.*eth0.*/"
-          },
-          {
-            "alias": "/.*eth1.*/",
-            "color": "#6ED0E0"
-          },
-          {
-            "alias": "/.*eth2.*/",
-            "color": "#EF843C"
-          },
-          {
-            "alias": "/.*eth3.*/",
-            "color": "#E24D42"
-          },
-          {
-            "alias": "/.*eth4.*/",
-            "color": "#1F78C1"
-          },
-          {
-            "alias": "/.*eth5.*/",
-            "color": "#BA43A9"
-          }
-        ],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "irate(collectd_interface_if_octets_rx_total[1m]) * 8",
-            "format": "time_series",
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "{{instance}} {{interface}} read ",
-            "refId": "A",
-            "step": 240
-          },
-          {
-            "expr": "irate(collectd_interface_if_octets_tx_total[1m]) * 8",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "{{instance}} {{interface}} write",
-            "refId": "B",
-            "step": 240
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "Network Traffic Basic",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "transparent": false,
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "decimals": null,
-            "format": "bps",
-            "label": "Read (-) /  Write (+)",
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          },
-          {
-            "format": "pps",
-            "label": "",
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": false
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fill": 1,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 18,
-          "y": 13
-        },
-        "id": 113,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_cycles_responsetime_count\"}",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "response count",
-            "refId": "A"
-          },
-          {
-            "expr": "{__name__=~\"nosqlbench__workloads_.+_cycles_servicetime_count\"}",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "response count",
-            "refId": "B"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "Cycle Count",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "collapsed": false,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 19
-        },
-        "id": 4,
-        "panels": [],
-        "title": "Cluster Overview",
-        "type": "row"
-      },
-      {
-        "cacheTimeout": null,
-        "colorBackground": false,
-        "colorValue": true,
-        "colors": [
-          "#d44a3a",
-          "rgba(237, 129, 40, 0.89)",
-          "#7eb26d"
-        ],
-        "datasource": "prometheus",
-        "decimals": null,
-        "format": "none",
-        "gauge": {
-          "maxValue": 100,
-          "minValue": 0,
-          "show": false,
-          "thresholdLabels": false,
-          "thresholdMarkers": true
-        },
-        "gridPos": {
-          "h": 3,
-          "w": 2,
-          "x": 0,
-          "y": 20
-        },
-        "id": 8,
-        "interval": null,
-        "links": [],
-        "mappingType": 1,
-        "mappingTypes": [
-          {
-            "name": "value to text",
-            "value": 1
-          },
-          {
-            "name": "range to text",
-            "value": 2
-          }
-        ],
-        "maxDataPoints": 100,
-        "nullPointMode": "connected",
-        "nullText": null,
-        "postfix": "",
-        "postfixFontSize": "50%",
-        "prefix": "",
-        "prefixFontSize": "50%",
-        "rangeMaps": [
-          {
-            "from": "null",
-            "text": "N/A",
-            "to": "null"
-          }
-        ],
-        "sparkline": {
-          "fillColor": "rgba(31, 118, 189, 0.18)",
-          "full": false,
-          "lineColor": "rgb(31, 120, 193)",
-          "show": false
-        },
-        "tableColumn": "",
-        "targets": [
-          {
-            "expr": "count(dse_compaction_completed_tasks{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"} >= 0) or vector(0)",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "",
-            "refId": "A"
-          }
-        ],
-        "thresholds": "1,1,1999",
-        "title": "Nodes Up",
-        "type": "singlestat",
-        "valueFontSize": "80%",
-        "valueMaps": [
-          {
-            "op": "=",
-            "text": "N/A",
-            "value": "null"
-          }
-        ],
-        "valueName": "current"
-      },
-      {
-        "cacheTimeout": null,
-        "colorBackground": false,
-        "colorValue": true,
-        "colors": [
-          "#299c46",
-          "rgba(237, 129, 40, 0.89)",
-          "#d44a3a"
-        ],
-        "datasource": "prometheus",
-        "format": "none",
-        "gauge": {
-          "maxValue": 100,
-          "minValue": 0,
-          "show": false,
-          "thresholdLabels": false,
-          "thresholdMarkers": true
-        },
-        "gridPos": {
-          "h": 3,
-          "w": 2,
-          "x": 2,
-          "y": 20
-        },
-        "id": 9,
-        "interval": null,
-        "links": [],
-        "mappingType": 1,
-        "mappingTypes": [
-          {
-            "name": "value to text",
-            "value": 1
-          },
-          {
-            "name": "range to text",
-            "value": 2
-          }
-        ],
-        "maxDataPoints": 100,
-        "nullPointMode": "connected",
-        "nullText": null,
-        "postfix": "",
-        "postfixFontSize": "50%",
-        "prefix": "",
-        "prefixFontSize": "50%",
-        "rangeMaps": [
-          {
-            "from": "null",
-            "text": "N/A",
-            "to": "null"
-          }
-        ],
-        "sparkline": {
-          "fillColor": "rgba(31, 118, 189, 0.18)",
-          "full": false,
-          "lineColor": "rgb(31, 120, 193)",
-          "show": false
-        },
-        "tableColumn": "",
-        "targets": [
-          {
-            "expr": "count(absent(sum(rate(dse_compaction_completed_tasks{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[2m])))) OR vector(0)",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "",
-            "refId": "A"
-          }
-        ],
-        "thresholds": "1,1,1000",
-        "title": "Nodes Down",
-        "type": "singlestat",
-        "valueFontSize": "80%",
-        "valueMaps": [
-          {
-            "op": "=",
-            "text": "N/A",
-            "value": "null"
-          }
-        ],
-        "valueName": "current"
-      },
-      {
-        "cacheTimeout": null,
-        "colorBackground": false,
-        "colorValue": false,
-        "colors": [
-          "#299c46",
-          "rgba(237, 129, 40, 0.89)",
-          "#d44a3a"
-        ],
-        "datasource": "prometheus",
-        "decimals": 0,
-        "format": "none",
-        "gauge": {
-          "maxValue": 100,
-          "minValue": 0,
-          "show": false,
-          "thresholdLabels": false,
-          "thresholdMarkers": true
-        },
-        "gridPos": {
-          "h": 3,
-          "w": 2,
-          "x": 4,
-          "y": 20
-        },
-        "id": 16,
-        "interval": null,
-        "links": [],
-        "mappingType": 1,
-        "mappingTypes": [
-          {
-            "name": "value to text",
-            "value": 1
-          },
-          {
-            "name": "range to text",
-            "value": 2
-          }
-        ],
-        "maxDataPoints": 100,
-        "nullPointMode": "connected",
-        "nullText": null,
-        "postfix": "",
-        "postfixFontSize": "50%",
-        "prefix": "",
-        "prefixFontSize": "50%",
-        "rangeMaps": [
-          {
-            "from": "null",
-            "text": "N/A",
-            "to": "null"
-          }
-        ],
-        "sparkline": {
-          "fillColor": "rgba(31, 118, 189, 0.18)",
-          "full": false,
-          "lineColor": "rgb(31, 120, 193)",
-          "show": true
-        },
-        "tableColumn": "",
-        "targets": [
-          {
-            "expr": "sum(irate(dse_compaction_completed_tasks{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate]))",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "",
-            "refId": "A"
-          }
-        ],
-        "thresholds": "",
-        "title": "Compactions / $rate",
-        "type": "singlestat",
-        "valueFontSize": "80%",
-        "valueMaps": [
-          {
-            "op": "=",
-            "text": "N/A",
-            "value": "null"
-          }
-        ],
-        "valueName": "avg"
-      },
-      {
-        "cacheTimeout": null,
-        "colorBackground": false,
-        "colorValue": false,
-        "colors": [
-          "#299c46",
-          "rgba(237, 129, 40, 0.89)",
-          "#d44a3a"
-        ],
-        "datasource": "prometheus",
-        "format": "none",
-        "gauge": {
-          "maxValue": 100,
-          "minValue": 0,
-          "show": false,
-          "thresholdLabels": false,
-          "thresholdMarkers": true
-        },
-        "gridPos": {
-          "h": 3,
-          "w": 3,
-          "x": 6,
-          "y": 20
-        },
-        "id": 10,
-        "interval": null,
-        "links": [],
-        "mappingType": 1,
-        "mappingTypes": [
-          {
-            "name": "value to text",
-            "value": 1
-          },
-          {
-            "name": "range to text",
-            "value": 2
-          }
-        ],
-        "maxDataPoints": 100,
-        "nullPointMode": "connected",
-        "nullText": null,
-        "postfix": "",
-        "postfixFontSize": "50%",
-        "prefix": "",
-        "prefixFontSize": "50%",
-        "rangeMaps": [
-          {
-            "from": "null",
-            "text": "N/A",
-            "to": "null"
-          }
-        ],
-        "sparkline": {
-          "fillColor": "rgba(31, 118, 189, 0.18)",
-          "full": false,
-          "lineColor": "rgb(31, 120, 193)",
-          "show": true
-        },
-        "tableColumn": "",
-        "targets": [
-          {
-            "expr": "sum(irate(dse_client_request_latency_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate]))",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "",
-            "refId": "A"
-          }
-        ],
-        "thresholds": "",
-        "title": "Requests / $rate",
-        "type": "singlestat",
-        "valueFontSize": "80%",
-        "valueMaps": [
-          {
-            "op": "=",
-            "text": "N/A",
-            "value": "null"
-          }
-        ],
-        "valueName": "avg"
-      },
-      {
-        "cacheTimeout": null,
-        "colorBackground": false,
-        "colorValue": false,
-        "colors": [
-          "#299c46",
-          "rgba(237, 129, 40, 0.89)",
-          "#d44a3a"
-        ],
-        "datasource": "prometheus",
-        "decimals": 0,
-        "format": "none",
-        "gauge": {
-          "maxValue": 100,
-          "minValue": 0,
-          "show": false,
-          "thresholdLabels": false,
-          "thresholdMarkers": true
-        },
-        "gridPos": {
-          "h": 3,
-          "w": 3,
-          "x": 9,
-          "y": 20
-        },
-        "id": 17,
-        "interval": null,
-        "links": [],
-        "mappingType": 1,
-        "mappingTypes": [
-          {
-            "name": "value to text",
-            "value": 1
-          },
-          {
-            "name": "range to text",
-            "value": 2
-          }
-        ],
-        "maxDataPoints": 100,
-        "nullPointMode": "connected",
-        "nullText": null,
-        "postfix": "",
-        "postfixFontSize": "50%",
-        "prefix": "",
-        "prefixFontSize": "50%",
-        "rangeMaps": [
-          {
-            "from": "null",
-            "text": "N/A",
-            "to": "null"
-          }
-        ],
-        "sparkline": {
-          "fillColor": "rgba(31, 118, 189, 0.18)",
-          "full": false,
-          "lineColor": "rgb(31, 120, 193)",
-          "show": true
-        },
-        "tableColumn": "",
-        "targets": [
-          {
-            "expr": "sum(irate(dse_table_dropped_mutations_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate]))",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "",
-            "refId": "A"
-          }
-        ],
-        "thresholds": "10,100,100000",
-        "title": "Dropped Messages / $rate",
-        "type": "singlestat",
-        "valueFontSize": "80%",
-        "valueMaps": [
-          {
-            "op": "=",
-            "text": "N/A",
-            "value": "null"
-          }
-        ],
-        "valueName": "avg"
-      },
-      {
-        "cacheTimeout": null,
-        "colorBackground": false,
-        "colorValue": false,
-        "colors": [
-          "#299c46",
-          "rgba(237, 129, 40, 0.89)",
-          "#d44a3a"
-        ],
-        "datasource": "prometheus",
-        "decimals": 0,
-        "format": "none",
-        "gauge": {
-          "maxValue": 100,
-          "minValue": 0,
-          "show": false,
-          "thresholdLabels": false,
-          "thresholdMarkers": true
-        },
-        "gridPos": {
-          "h": 3,
-          "w": 3,
-          "x": 12,
-          "y": 20
-        },
-        "id": 18,
-        "interval": null,
-        "links": [],
-        "mappingType": 1,
-        "mappingTypes": [
-          {
-            "name": "value to text",
-            "value": 1
-          },
-          {
-            "name": "range to text",
-            "value": 2
-          }
-        ],
-        "maxDataPoints": 100,
-        "nullPointMode": "connected",
-        "nullText": null,
-        "postfix": "",
-        "postfixFontSize": "50%",
-        "prefix": "",
-        "prefixFontSize": "50%",
-        "rangeMaps": [
-          {
-            "from": "null",
-            "text": "N/A",
-            "to": "null"
-          }
-        ],
-        "sparkline": {
-          "fillColor": "rgba(31, 118, 189, 0.18)",
-          "full": false,
-          "lineColor": "rgb(31, 120, 193)",
-          "show": true
-        },
-        "tableColumn": "",
-        "targets": [
-          {
-            "expr": "sum(dse_client_connected_native_clients{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"})",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "",
-            "refId": "A"
-          }
-        ],
-        "thresholds": "10,100,100000",
-        "title": "Clients Connected",
-        "type": "singlestat",
-        "valueFontSize": "80%",
-        "valueMaps": [
-          {
-            "op": "=",
-            "text": "N/A",
-            "value": "null"
-          }
-        ],
-        "valueName": "avg"
-      },
-      {
-        "cacheTimeout": null,
-        "colorBackground": false,
-        "colorValue": false,
-        "colors": [
-          "#299c46",
-          "rgba(237, 129, 40, 0.89)",
-          "#d44a3a"
-        ],
-        "datasource": "prometheus",
-        "decimals": 0,
-        "format": "none",
-        "gauge": {
-          "maxValue": 100,
-          "minValue": 0,
-          "show": false,
-          "thresholdLabels": false,
-          "thresholdMarkers": true
-        },
-        "gridPos": {
-          "h": 3,
-          "w": 3,
-          "x": 15,
-          "y": 20
-        },
-        "id": 19,
-        "interval": null,
-        "links": [],
-        "mappingType": 1,
-        "mappingTypes": [
-          {
-            "name": "value to text",
-            "value": 1
-          },
-          {
-            "name": "range to text",
-            "value": 2
-          }
-        ],
-        "maxDataPoints": 100,
-        "nullPointMode": "connected",
-        "nullText": null,
-        "postfix": "",
-        "postfixFontSize": "50%",
-        "prefix": "",
-        "prefixFontSize": "50%",
-        "rangeMaps": [
-          {
-            "from": "null",
-            "text": "N/A",
-            "to": "null"
-          }
-        ],
-        "sparkline": {
-          "fillColor": "rgba(31, 118, 189, 0.18)",
-          "full": false,
-          "lineColor": "rgb(31, 120, 193)",
-          "show": true
-        },
-        "tableColumn": "",
-        "targets": [
-          {
-            "expr": "sum(irate(dse_client_request_timeouts_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate]))",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "",
-            "refId": "A"
-          }
-        ],
-        "thresholds": "10,100,100000",
-        "title": "Client Timeouts / $rate",
-        "type": "singlestat",
-        "valueFontSize": "80%",
-        "valueMaps": [
-          {
-            "op": "=",
-            "text": "N/A",
-            "value": "null"
-          }
-        ],
-        "valueName": "avg"
-      },
-      {
-        "cacheTimeout": null,
-        "colorBackground": false,
-        "colorValue": false,
-        "colors": [
-          "#299c46",
-          "rgba(237, 129, 40, 0.89)",
-          "#d44a3a"
-        ],
-        "datasource": "prometheus",
-        "decimals": 0,
-        "format": "none",
-        "gauge": {
-          "maxValue": 100,
-          "minValue": 0,
-          "show": false,
-          "thresholdLabels": false,
-          "thresholdMarkers": true
-        },
-        "gridPos": {
-          "h": 3,
-          "w": 3,
-          "x": 18,
-          "y": 20
-        },
-        "id": 20,
-        "interval": null,
-        "links": [],
-        "mappingType": 1,
-        "mappingTypes": [
-          {
-            "name": "value to text",
-            "value": 1
-          },
-          {
-            "name": "range to text",
-            "value": 2
-          }
-        ],
-        "maxDataPoints": 100,
-        "nullPointMode": "connected",
-        "nullText": null,
-        "postfix": "",
-        "postfixFontSize": "50%",
-        "prefix": "",
-        "prefixFontSize": "50%",
-        "rangeMaps": [
-          {
-            "from": "null",
-            "text": "N/A",
-            "to": "null"
-          }
-        ],
-        "sparkline": {
-          "fillColor": "rgba(31, 118, 189, 0.18)",
-          "full": false,
-          "lineColor": "rgb(31, 120, 193)",
-          "show": true
-        },
-        "tableColumn": "",
-        "targets": [
-          {
-            "expr": "sum(dse_storage_hints_on_disk_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"})",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "",
-            "refId": "A"
-          }
-        ],
-        "thresholds": "10,100,100000",
-        "title": "Total Hints",
-        "type": "singlestat",
-        "valueFontSize": "80%",
-        "valueMaps": [
-          {
-            "op": "=",
-            "text": "N/A",
-            "value": "null"
-          }
-        ],
-        "valueName": "avg"
-      },
-      {
-        "cacheTimeout": null,
-        "colorBackground": false,
-        "colorValue": false,
-        "colors": [
-          "#299c46",
-          "rgba(237, 129, 40, 0.89)",
-          "#d44a3a"
-        ],
-        "datasource": "prometheus",
-        "decimals": 0,
-        "format": "decbytes",
-        "gauge": {
-          "maxValue": 100,
-          "minValue": 0,
-          "show": false,
-          "thresholdLabels": false,
-          "thresholdMarkers": true
-        },
-        "gridPos": {
-          "h": 3,
-          "w": 3,
-          "x": 21,
-          "y": 20
-        },
-        "id": 44,
-        "interval": null,
-        "links": [],
-        "mappingType": 1,
-        "mappingTypes": [
-          {
-            "name": "value to text",
-            "value": 1
-          },
-          {
-            "name": "range to text",
-            "value": 2
-          }
-        ],
-        "maxDataPoints": 100,
-        "nullPointMode": "connected",
-        "nullText": null,
-        "postfix": "",
-        "postfixFontSize": "50%",
-        "prefix": "",
-        "prefixFontSize": "50%",
-        "rangeMaps": [
-          {
-            "from": "null",
-            "text": "N/A",
-            "to": "null"
-          }
-        ],
-        "sparkline": {
-          "fillColor": "rgba(31, 118, 189, 0.18)",
-          "full": false,
-          "lineColor": "rgb(31, 120, 193)",
-          "show": true
-        },
-        "tableColumn": "",
-        "targets": [
-          {
-            "expr": "sum(dse_table_live_disk_space_used_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"})",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "",
-            "refId": "A"
-          }
-        ],
-        "thresholds": "",
-        "title": "Live Data Size",
-        "type": "singlestat",
-        "valueFontSize": "80%",
-        "valueMaps": [
-          {
-            "op": "=",
-            "text": "N/A",
-            "value": "null"
-          }
-        ],
-        "valueName": "current"
-      },
-      {
-        "collapsed": true,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 23
-        },
-        "id": 14,
-        "panels": [
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 0,
-              "y": 18
-            },
-            "id": 6,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": true,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "sum(irate(dse_client_request_latency_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by ($by, request_type)",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{$by}}:{{request_type}}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Requests Served / $by / $rate",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 8,
-              "y": 18
-            },
-            "id": 45,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": true,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "sum(dse_client_connected_native_clients{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}) by ($by)",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{$by}}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Clients Connected / $by",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 16,
-              "y": 18
-            },
-            "id": 46,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": true,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "sum(irate(dse_client_request_timeouts_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by ($by)",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{$by}}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Client Timeouts / $by / $rate",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 0,
-              "y": 27
-            },
-            "id": 51,
-            "legend": {
-              "alignAsTable": false,
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "histogram_quantile(0.50, sum(rate(dse_client_request_latency_bucket{request_type=\"read\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P50 ",
-                "refId": "B"
-              },
-              {
-                "expr": "histogram_quantile(0.75, sum(rate(dse_client_request_latency_bucket{request_type=\"read\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P75",
-                "refId": "A"
-              },
-              {
-                "expr": "histogram_quantile(0.90, sum(rate(dse_client_request_latency_bucket{request_type=\"read\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P90",
-                "refId": "C"
-              },
-              {
-                "expr": "histogram_quantile(0.95, sum(rate(dse_client_request_latency_bucket{request_type=\"read\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P95",
-                "refId": "D"
-              },
-              {
-                "expr": "histogram_quantile(0.99, sum(rate(dse_client_request_latency_bucket{request_type=\"read\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P99",
-                "refId": "E"
-              },
-              {
-                "expr": "histogram_quantile(0.999, sum(rate(dse_client_request_latency_bucket{request_type=\"read\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P999",
-                "refId": "F"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Coordinator Read Latency / $by / $rate",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "decimals": null,
-                "format": "µs",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 8,
-              "y": 27
-            },
-            "id": 11,
-            "legend": {
-              "alignAsTable": false,
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "histogram_quantile(0.50, sum(rate(dse_client_request_latency_bucket{request_type=\"write\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P50 ",
-                "refId": "B"
-              },
-              {
-                "expr": "histogram_quantile(0.75, sum(rate(dse_client_request_latency_bucket{request_type=\"write\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P75",
-                "refId": "A"
-              },
-              {
-                "expr": "histogram_quantile(0.90, sum(rate(dse_client_request_latency_bucket{request_type=\"write\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P90",
-                "refId": "C"
-              },
-              {
-                "expr": "histogram_quantile(0.95, sum(rate(dse_client_request_latency_bucket{request_type=\"write\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P95",
-                "refId": "D"
-              },
-              {
-                "expr": "histogram_quantile(0.99, sum(rate(dse_client_request_latency_bucket{request_type=\"write\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P99",
-                "refId": "E"
-              },
-              {
-                "expr": "histogram_quantile(0.999, sum(rate(dse_client_request_latency_bucket{request_type=\"write\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P999",
-                "refId": "F"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Coordinator Write Latency / $by / $rate",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "decimals": null,
-                "format": "µs",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 16,
-              "y": 27
-            },
-            "id": 21,
-            "legend": {
-              "alignAsTable": false,
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "histogram_quantile(0.50, sum(irate(dse_client_request_latency_bucket{request_type=\"range_slice\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P50 ",
-                "refId": "B"
-              },
-              {
-                "expr": "histogram_quantile(0.75, sum(rate(dse_client_request_latency_bucket{request_type=\"range_slice\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P75",
-                "refId": "A"
-              },
-              {
-                "expr": "histogram_quantile(0.90, sum(rate(dse_client_request_latency_bucket{request_type=\"range_slice\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P90",
-                "refId": "C"
-              },
-              {
-                "expr": "histogram_quantile(0.95, sum(rate(dse_client_request_latency_bucket{request_type=\"range_slice\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P95",
-                "refId": "D"
-              },
-              {
-                "expr": "histogram_quantile(0.99, sum(rate(dse_client_request_latency_bucket{request_type=\"range_slice\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P99",
-                "refId": "E"
-              },
-              {
-                "expr": "histogram_quantile(0.999, sum(rate(dse_client_request_latency_bucket{request_type=\"range_slice\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P999",
-                "refId": "F"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Coordinator Range Read Latency / $by / $rate",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "decimals": null,
-                "format": "µs",
-                "label": "",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "decimals": null,
-                "format": "short",
-                "label": "foo",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 0,
-              "y": 36
-            },
-            "id": 22,
-            "legend": {
-              "alignAsTable": false,
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "histogram_quantile(0.50, sum(irate(dse_client_request_latency_bucket{request_type=\"cas_read\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P50 ",
-                "refId": "B"
-              },
-              {
-                "expr": "histogram_quantile(0.75, sum(rate(dse_client_request_latency_bucket{request_type=\"cas_read\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P75",
-                "refId": "A"
-              },
-              {
-                "expr": "histogram_quantile(0.90, sum(rate(dse_client_request_latency_bucket{request_type=\"cas_read\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P90",
-                "refId": "C"
-              },
-              {
-                "expr": "histogram_quantile(0.95, sum(rate(dse_client_request_latency_bucket{request_type=\"cas_read\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P95",
-                "refId": "D"
-              },
-              {
-                "expr": "histogram_quantile(0.99, sum(rate(dse_client_request_latency_bucket{request_type=\"cas_read\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P99",
-                "refId": "E"
-              },
-              {
-                "expr": "histogram_quantile(0.999, sum(rate(dse_client_request_latency_bucket{request_type=\"cas_read\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P999",
-                "refId": "F"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Coordinator CAS Read Latency / $by / $rate",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "decimals": null,
-                "format": "µs",
-                "label": "",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "decimals": null,
-                "format": "short",
-                "label": "foo",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 8,
-              "y": 36
-            },
-            "id": 48,
-            "legend": {
-              "alignAsTable": false,
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "histogram_quantile(0.50, sum(irate(dse_client_request_latency_bucket{request_type=\"cas_read\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P50 ",
-                "refId": "B"
-              },
-              {
-                "expr": "histogram_quantile(0.75, sum(rate(dse_client_request_latency_bucket{request_type=\"cas_read\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P75",
-                "refId": "A"
-              },
-              {
-                "expr": "histogram_quantile(0.90, sum(rate(dse_client_request_latency_bucket{request_type=\"cas_read\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P90",
-                "refId": "C"
-              },
-              {
-                "expr": "histogram_quantile(0.95, sum(rate(dse_client_request_latency_bucket{request_type=\"cas_read\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P95",
-                "refId": "D"
-              },
-              {
-                "expr": "histogram_quantile(0.99, sum(rate(dse_client_request_latency_bucket{request_type=\"cas_read\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P99",
-                "refId": "E"
-              },
-              {
-                "expr": "histogram_quantile(0.999, sum(rate(dse_client_request_latency_bucket{request_type=\"cas_read\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P999",
-                "refId": "F"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Coordinator CAS Read Latency / $by / $rate",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "decimals": null,
-                "format": "µs",
-                "label": "",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "decimals": null,
-                "format": "short",
-                "label": "foo",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 16,
-              "y": 36
-            },
-            "id": 47,
-            "legend": {
-              "alignAsTable": false,
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "histogram_quantile(0.50, sum(irate(dse_client_request_latency_bucket{request_type=\"view_write\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P50 ",
-                "refId": "B"
-              },
-              {
-                "expr": "histogram_quantile(0.75, sum(rate(dse_client_request_latency_bucket{request_type=\"view_write\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P75",
-                "refId": "A"
-              },
-              {
-                "expr": "histogram_quantile(0.90, sum(rate(dse_client_request_latency_bucket{request_type=\"view_write\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P90",
-                "refId": "C"
-              },
-              {
-                "expr": "histogram_quantile(0.95, sum(rate(dse_client_request_latency_bucket{request_type=\"view_write\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P95",
-                "refId": "D"
-              },
-              {
-                "expr": "histogram_quantile(0.99, sum(rate(dse_client_request_latency_bucket{request_type=\"view_write\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P99",
-                "refId": "E"
-              },
-              {
-                "expr": "histogram_quantile(0.999, sum(rate(dse_client_request_latency_bucket{request_type=\"view_write\", cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P999",
-                "refId": "F"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Coordinator View Write Latency / $by / $rate",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "decimals": null,
-                "format": "µs",
-                "label": "",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "decimals": null,
-                "format": "short",
-                "label": "foo",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          }
-        ],
-        "title": "Coordinator Metrics (no keyspace/table filters apply)",
-        "type": "row"
-      },
-      {
-        "collapsed": true,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 24
-        },
-        "id": 43,
-        "panels": [
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 0,
-              "y": 19
-            },
-            "id": 15,
-            "legend": {
-              "alignAsTable": false,
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "histogram_quantile(0.50, sum(irate(dse_table_coordinator_read_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P50 ",
-                "refId": "B"
-              },
-              {
-                "expr": "histogram_quantile(0.75, sum(irate(dse_table_coordinator_read_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P75",
-                "refId": "A"
-              },
-              {
-                "expr": "histogram_quantile(0.90, sum(irate(dse_table_coordinator_read_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P90",
-                "refId": "C"
-              },
-              {
-                "expr": "histogram_quantile(0.95, sum(irate(dse_table_coordinator_read_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P95",
-                "refId": "D"
-              },
-              {
-                "expr": "histogram_quantile(0.99, sum(irate(dse_table_coordinator_read_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P99",
-                "refId": "E"
-              },
-              {
-                "expr": "histogram_quantile(0.999, sum(irate(dse_table_coordinator_read_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P999",
-                "refId": "F"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Coordinator Table Read Latency / $by / $rate",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "decimals": null,
-                "format": "µs",
-                "label": "",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "decimals": null,
-                "format": "short",
-                "label": "foo",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 8,
-              "y": 19
-            },
-            "id": 49,
-            "legend": {
-              "alignAsTable": false,
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "histogram_quantile(0.50, sum(irate(dse_table_read_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P50 ",
-                "refId": "B"
-              },
-              {
-                "expr": "histogram_quantile(0.75, sum(irate(dse_table_read_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P75",
-                "refId": "A"
-              },
-              {
-                "expr": "histogram_quantile(0.90, sum(irate(dse_table_read_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P90",
-                "refId": "C"
-              },
-              {
-                "expr": "histogram_quantile(0.95, sum(irate(dse_table_read_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P95",
-                "refId": "D"
-              },
-              {
-                "expr": "histogram_quantile(0.99, sum(irate(dse_table_read_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P99",
-                "refId": "E"
-              },
-              {
-                "expr": "histogram_quantile(0.999, sum(irate(dse_table_read_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P999",
-                "refId": "F"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Local Table Read Latency / $by / $rate",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "decimals": null,
-                "format": "µs",
-                "label": "",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "decimals": null,
-                "format": "short",
-                "label": "foo",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 16,
-              "y": 19
-            },
-            "id": 23,
-            "legend": {
-              "alignAsTable": false,
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "histogram_quantile(0.50, sum(irate(dse_table_write_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P50 ",
-                "refId": "B"
-              },
-              {
-                "expr": "histogram_quantile(0.75, sum(irate(dse_table_write_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P75",
-                "refId": "A"
-              },
-              {
-                "expr": "histogram_quantile(0.90, sum(irate(dse_table_write_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P90",
-                "refId": "C"
-              },
-              {
-                "expr": "histogram_quantile(0.95, sum(irate(dse_table_write_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P95",
-                "refId": "D"
-              },
-              {
-                "expr": "histogram_quantile(0.99, sum(irate(dse_table_write_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P99",
-                "refId": "E"
-              },
-              {
-                "expr": "histogram_quantile(0.999, sum(irate(dse_table_write_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P999",
-                "refId": "F"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Local Table Write Latency / $by / $rate",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "decimals": null,
-                "format": "µs",
-                "label": "",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "decimals": null,
-                "format": "short",
-                "label": "foo",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 0,
-              "y": 28
-            },
-            "id": 52,
-            "legend": {
-              "alignAsTable": false,
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "histogram_quantile(0.50, sum(irate(dse_table_coordinator_scan_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P50 ",
-                "refId": "B"
-              },
-              {
-                "expr": "histogram_quantile(0.75, sum(irate(dse_table_coordinator_scan_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P75",
-                "refId": "A"
-              },
-              {
-                "expr": "histogram_quantile(0.90, sum(irate(dse_table_coordinator_scan_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "interval": "",
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P90",
-                "refId": "C"
-              },
-              {
-                "expr": "histogram_quantile(0.95, sum(irate(dse_table_coordinator_scan_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P95",
-                "refId": "D"
-              },
-              {
-                "expr": "histogram_quantile(0.99, sum(irate(dse_table_coordinator_scan_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P99",
-                "refId": "E"
-              },
-              {
-                "expr": "histogram_quantile(0.999, sum(irate(dse_table_coordinator_scan_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P999",
-                "refId": "F"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Coordinator Table Range Scan Latency / $by / $rate",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "decimals": null,
-                "format": "µs",
-                "label": "",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "decimals": null,
-                "format": "short",
-                "label": "foo",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 8,
-              "y": 28
-            },
-            "id": 53,
-            "legend": {
-              "alignAsTable": false,
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "histogram_quantile(0.50, sum(irate(dse_table_range_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P50 ",
-                "refId": "B"
-              },
-              {
-                "expr": "histogram_quantile(0.75, sum(irate(dse_table_range_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P75",
-                "refId": "A"
-              },
-              {
-                "expr": "histogram_quantile(0.90, sum(irate(dse_table_range_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P90",
-                "refId": "C"
-              },
-              {
-                "expr": "histogram_quantile(0.95, sum(irate(dse_table_range_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P95",
-                "refId": "D"
-              },
-              {
-                "expr": "histogram_quantile(0.99, sum(irate(dse_table_range_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P99",
-                "refId": "E"
-              },
-              {
-                "expr": "histogram_quantile(0.999, sum(irate(dse_table_range_latency_bucket{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (le, $by))",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 1,
-                "legendFormat": "$by:{{$by}} P999",
-                "refId": "F"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Local Table Range Scan Latency / $by / $rate",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "decimals": null,
-                "format": "µs",
-                "label": "",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "decimals": null,
-                "format": "short",
-                "label": "foo",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 16,
-              "y": 28
-            },
-            "id": 50,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Flushes/",
-                "bars": true,
-                "lines": false,
-                "yaxis": 2
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "sum(dse_table_memtable_off_heap_size{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}) by ($by)",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{$by}} : Off Heap",
-                "refId": "A"
-              },
-              {
-                "expr": "sum(dse_table_memtable_on_heap_size{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}) by ($by)",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{$by}} : On Heap",
-                "refId": "B"
-              },
-              {
-                "expr": "sum(dse_table_memtable_live_data_size{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}) by ($by)",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{$by}} : Data Size",
-                "refId": "C"
-              },
-              {
-                "expr": "sum(idelta(dse_table_memtable_switch_count_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by ($by)",
-                "format": "time_series",
-                "instant": false,
-                "intervalFactor": 2,
-                "legendFormat": "{{$by}} : Flushes",
-                "refId": "D"
-              },
-              {
-                "expr": "sum(idelta(dse_table_pending_flushes_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by ($by)",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{$by}} : Pending Flushes",
-                "refId": "E"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Memtable Space  $keyspace.$table / $by",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "decimals": 0,
-                "format": "short",
-                "label": "Flushes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 8,
-              "y": 37
-            },
-            "id": 88,
-            "legend": {
-              "alignAsTable": false,
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "sum(dse_table_ss_tables_per_read_histogram{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\", quantile=~\".\\\\d+\"}) by (quantile, instance) * 1000",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 1,
-                "legendFormat": "Node {{instance}} P{{quantile}}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "SSTables Per Read / Node",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "decimals": 0,
-                "format": "short",
-                "label": "",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "decimals": null,
-                "format": "short",
-                "label": "foo",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 16,
-              "y": 37
-            },
-            "id": 89,
-            "legend": {
-              "alignAsTable": false,
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "sum(dse_table_tombstone_scanned_histogram{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\", quantile=~\".\\\\d+\"}) by (quantile, instance) * 1000",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 1,
-                "legendFormat": "{{instance}} : P{{quantile}}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Tombstones Scanned / Node",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "decimals": 0,
-                "format": "short",
-                "label": "",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "decimals": null,
-                "format": "short",
-                "label": "foo",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          }
-        ],
-        "title": "Table Metrics",
-        "type": "row"
-      },
-      {
-        "collapsed": false,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 25
-        },
-        "id": 25,
-        "panels": [],
-        "title": "Storage Metrics",
-        "type": "row"
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fill": 1,
-        "gridPos": {
-          "h": 7,
-          "w": 6,
-          "x": 0,
-          "y": 26
-        },
-        "id": 54,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "sum(dse_table_total_disk_space_used_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}) by ($by)",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "{{$by}}",
-            "refId": "A"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "Live Disk Space Used / $by",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "bytes",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fill": 1,
-        "gridPos": {
-          "h": 7,
-          "w": 6,
-          "x": 6,
-          "y": 26
-        },
-        "id": 55,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "sum(dse_storage_load_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}) by ($by)",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "{{$by}}",
-            "refId": "A"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "Storage Load / $by",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "bytes",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fill": 1,
-        "gridPos": {
-          "h": 7,
-          "w": 6,
-          "x": 12,
-          "y": 26
-        },
-        "id": 57,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "sum(irate(dse_storage_total_hints_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by ($by)",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "{{$by}}",
-            "refId": "A"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "Total Hints / $by / $rate",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "none",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fill": 1,
-        "gridPos": {
-          "h": 7,
-          "w": 6,
-          "x": 18,
-          "y": 26
-        },
-        "id": 58,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "sum(increase(dse_storage_hints_on_disk_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by ($by)",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "{{$by}}",
-            "refId": "A"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "Hints on Disk / $by / $rate",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "none",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "collapsed": true,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 33
-        },
-        "id": 39,
-        "panels": [
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 6,
-              "w": 8,
-              "x": 0,
-              "y": 21
-            },
-            "id": 59,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "avg(dse_cql_prepared_statements_ratio{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}) by ($by)",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{$by}}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Prepared Statement Ratio / $by",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "percentunit",
-                "label": null,
-                "logBase": 1,
-                "max": "1",
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 6,
-              "w": 8,
-              "x": 8,
-              "y": 21
-            },
-            "id": 60,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "sum(dse_cql_prepared_statements_count{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}) by ($by)",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{$by}}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Prepared Statements / $by",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "none",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 6,
-              "w": 8,
-              "x": 16,
-              "y": 21
-            },
-            "id": 61,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "sum(increase(dse_cql_prepared_statements_executed_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by ($by)",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{$by}}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Executed Prepared Statements / $by / $rate",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "none",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          }
-        ],
-        "title": "CQL Metrics",
-        "type": "row"
-      },
-      {
-        "collapsed": true,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 34
-        },
-        "id": 41,
-        "panels": [
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 6,
-              "w": 6,
-              "x": 0,
-              "y": 22
-            },
-            "id": 62,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "dse_jvm_memory_pool_used{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", dse=\"jvm.memory.pools.g1_eden_space.used\"}",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{ instance }}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "JVM G1 Eden Space Used / node",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 6,
-              "w": 6,
-              "x": 6,
-              "y": 22
-            },
-            "id": 63,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "dse_jvm_memory_pool_used{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", dse=\"jvm.memory.pools.g1_old_gen.used\"}",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{ instance }}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "JVM G1 Old Gen Used / node",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 6,
-              "w": 6,
-              "x": 12,
-              "y": 22
-            },
-            "id": 64,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "dse_jvm_memory_pool_used{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", dse=\"jvm.memory.pools.g1_survivor_space.used\"}",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{ instance }}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "JVM G1 Survivor Space / node",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 6,
-              "w": 6,
-              "x": 18,
-              "y": 22
-            },
-            "id": 65,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "increase(dse_jvm_gc_time{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", dse=\"jvm.gc.g1_young_generation.time\"}[$rate])",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{ instance }}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "JVM GC Young Gen / node / $rate",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "ms",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 6,
-              "w": 8,
-              "x": 0,
-              "y": 28
-            },
-            "id": 68,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "increase(dse_jvm_gc_count{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", dse=\"jvm.gc.g1_young_generation.count\"}[$rate])",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{ instance }}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "JVM GC Old Gen Count / node / $rate",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "none",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 6,
-              "w": 8,
-              "x": 8,
-              "y": 28
-            },
-            "id": 66,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "increase(dse_jvm_gc_time{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", dse=\"jvm.gc.g1_old_generation.time\"}[$rate])",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{ instance }}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "JVM GC Old Gen / node / $rate",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "ms",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 6,
-              "w": 8,
-              "x": 16,
-              "y": 28
-            },
-            "id": 67,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "increase(dse_jvm_gc_count{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", dse=\"jvm.gc.g1_old_generation.count\"}[$rate])",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{ instance }}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "JVM GC Old Gen Count / node / $rate",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "none",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          }
-        ],
-        "title": "JVM Metrics",
-        "type": "row"
-      },
-      {
-        "collapsed": false,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 35
-        },
-        "id": 31,
-        "panels": [],
-        "title": "Compaction Metrics",
-        "type": "row"
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fill": 1,
-        "gridPos": {
-          "h": 9,
-          "w": 8,
-          "x": 0,
-          "y": 36
-        },
-        "id": 69,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "sum(dse_compaction_pending_tasks{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}) by ($by)",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "{{ $by }}",
-            "refId": "A"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "Pending Compactions / node / $rate",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "none",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fill": 1,
-        "gridPos": {
-          "h": 9,
-          "w": 8,
-          "x": 8,
-          "y": 36
-        },
-        "id": 70,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "sum(increase(dse_compaction_completed_tasks{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by ($by)",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "{{ $by }}",
-            "refId": "A"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "Completed Compactions / node / $rate",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "none",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fill": 1,
-        "gridPos": {
-          "h": 9,
-          "w": 8,
-          "x": 16,
-          "y": 36
-        },
-        "id": 71,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "sum(increase(dse_compaction_bytes_compacted_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by ($by)",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "{{ $by }}",
-            "refId": "A"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "Compacted Bytes / node / $rate",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "bytes",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "collapsed": false,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 45
-        },
-        "id": 29,
-        "panels": [],
-        "title": "Hint Metrics",
-        "type": "row"
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fill": 1,
-        "gridPos": {
-          "h": 9,
-          "w": 8,
-          "x": 0,
-          "y": 46
-        },
-        "id": 72,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "sum(increase(dse_hints_hint_delays_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by ($by)",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "{{ $by }}",
-            "refId": "A"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "Hint Delays / $by / $rate",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "ms",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fill": 1,
-        "gridPos": {
-          "h": 9,
-          "w": 8,
-          "x": 8,
-          "y": 46
-        },
-        "id": 73,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "sum(increase(dse_hints_hints_succeeded_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by ($by)",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "{{ $by }}",
-            "refId": "A"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "Hints Succeeded / $by / $rate",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "none",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fill": 1,
-        "gridPos": {
-          "h": 9,
-          "w": 8,
-          "x": 16,
-          "y": 46
-        },
-        "id": 74,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "sum(increase(dse_hints_hints_failed_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by ($by)",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "{{ $by }}",
-            "refId": "A"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "Hints Failed / $by / $rate",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "none",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "collapsed": false,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 55
-        },
-        "id": 37,
-        "panels": [],
-        "title": "NodeSync Metrics",
-        "type": "row"
-      },
-      {
-        "collapsed": true,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 56
-        },
-        "id": 35,
-        "panels": [
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 0,
-              "y": 16
-            },
-            "id": 77,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "sum(increase(dse_table_repair_jobs_completed_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (table, $by)",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{ $by }} : {{ table }}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Repairs Completed / $by / $rate",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "none",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 8,
-              "y": 16
-            },
-            "id": 78,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "sum(increase(dse_table_read_repair_requests_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", keyspace=~\"$keyspace\", table=~\"$table\"}[$rate])) by (table, $by)",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{ $by }} : {{ table }}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Read Repair Requests / $by / $rate",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "none",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          }
-        ],
-        "title": "Repair Metrics",
-        "type": "row"
-      },
-      {
-        "collapsed": true,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 57
-        },
-        "id": 33,
-        "panels": [
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 0,
-              "y": 17
-            },
-            "id": 79,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "sum(idelta(dse_streaming_incoming_bytes_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by ($by)",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{ $by }}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Streaming Incoming Bytes / $by / sec",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "Bps",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 8,
-              "y": 17
-            },
-            "id": 80,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "sum(idelta(dse_streaming_outgoing_bytes_total{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\"}[$rate])) by ($by)",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{ $by }}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Streaming Outgoing Bytes / $by / sec",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "Bps",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          }
-        ],
-        "title": "Streaming Metrics",
-        "type": "row"
-      },
-      {
-        "collapsed": true,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 58
-        },
-        "id": 27,
-        "panels": [
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 0,
-              "y": 18
-            },
-            "id": 81,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "avg(dse_cache_hit_rate{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", cache_name=\"chunk_cache\"}) by ($by)",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{ $by }}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Chunk Cache Hit Rate / $by",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "percentunit",
-                "label": null,
-                "logBase": 1,
-                "max": "1",
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 8,
-              "y": 18
-            },
-            "id": 82,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "avg(dse_cache_hit_rate{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", cache_name=\"counter_cache\"}) by ($by)",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{ $by }}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Counter Cache Hit Rate / $by",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "percentunit",
-                "label": null,
-                "logBase": 1,
-                "max": "1",
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 9,
-              "w": 8,
-              "x": 16,
-              "y": 18
-            },
-            "id": 83,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "avg(dse_cache_hit_rate{cluster=~\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", cache_name=\"key_cache\"}) by ($by)",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{ $by }}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Key Cache Hit Rate / $by",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "percentunit",
-                "label": null,
-                "logBase": 1,
-                "max": "1",
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          }
-        ],
-        "title": "Cache Metrics",
-        "type": "row"
-      },
-      {
-        "collapsed": true,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 59
-        },
-        "id": 85,
-        "panels": [
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "prometheus",
-            "fill": 1,
-            "gridPos": {
-              "h": 10,
-              "w": 24,
-              "x": 0,
-              "y": 29
-            },
-            "id": 87,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "hideEmpty": true,
-              "hideZero": true,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "sum(rate(dse_thread_pools_completed_tasks{pool_name=~\"tpc_.*\"}[$rate])) by (pool_name, $by)",
-                "format": "time_series",
-                "intervalFactor": 1,
-                "legendFormat": "{{pool_name}}",
-                "refId": "A"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "TPC Task Types",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "ops",
-                "label": null,
-                "logBase": 10,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          }
-        ],
-        "title": "TPC Metrics",
-        "type": "row"
-      }
-    ],
-    "refresh": "30s",
-    "schemaVersion": 16,
-    "style": "dark",
-    "tags": [
-      "dse"
-    ],
-    "templating": {
-      "list": [
-        {
-          "allValue": null,
-          "current": {
-            "selected": false,
-            "text": "Node",
-            "value": "instance"
-          },
-          "hide": 0,
-          "includeAll": false,
-          "label": "Group By",
-          "multi": false,
-          "name": "by",
-          "options": [
-            {
-              "selected": false,
-              "text": "Cluster",
-              "value": "cluster"
-            },
-            {
-              "selected": false,
-              "text": "DC",
-              "value": "dc"
-            },
-            {
-              "selected": false,
-              "text": "Rack",
-              "value": "rack"
-            },
-            {
-              "selected": true,
-              "text": "Node",
-              "value": "instance"
-            }
-          ],
-          "query": "cluster,dc,rack,instance",
-          "skipUrlSync": false,
-          "type": "custom"
-        },
-        {
-          "allValue": null,
-          "current": {
-            "selected": true,
-            "text": "1m",
-            "value": "1m"
-          },
-          "hide": 0,
-          "includeAll": false,
-          "label": "Rate",
-          "multi": false,
-          "name": "rate",
-          "options": [
-            {
-              "selected": true,
-              "text": "1m",
-              "value": "1m"
-            },
-            {
-              "selected": false,
-              "text": "5m",
-              "value": "5m"
-            },
-            {
-              "selected": false,
-              "text": "10m",
-              "value": "10m"
-            },
-            {
-              "selected": false,
-              "text": "30m",
-              "value": "30m"
-            },
-            {
-              "selected": false,
-              "text": "1h",
-              "value": "1h"
-            },
-            {
-              "selected": false,
-              "text": "6h",
-              "value": "6h"
-            },
-            {
-              "selected": false,
-              "text": "12h",
-              "value": "12h"
-            }
-          ],
-          "query": "1m,5m,10m,30m,1h,6h,12h",
-          "skipUrlSync": false,
-          "type": "custom"
-        },
-        {
-          "allValue": null,
-          "current": {},
-          "datasource": "prometheus",
-          "hide": 0,
-          "includeAll": false,
-          "label": "Cluster",
-          "multi": false,
-          "name": "cluster",
-          "options": [],
-          "query": "label_values(collectd_cpu_total, cluster)",
-          "refresh": 2,
-          "regex": "",
-          "skipUrlSync": false,
-          "sort": 0,
-          "tagValuesQuery": "",
-          "tags": [],
-          "tagsQuery": "",
-          "type": "query",
-          "useTags": false
-        },
-        {
-          "allValue": ".*",
-          "current": {},
-          "datasource": "prometheus",
-          "hide": 0,
-          "includeAll": true,
-          "label": "DataCenter",
-          "multi": false,
-          "name": "dc",
-          "options": [],
-          "query": "label_values(collectd_cpu_total{cluster=~\"$cluster\"}, dc)",
-          "refresh": 2,
-          "regex": "",
-          "skipUrlSync": false,
-          "sort": 0,
-          "tagValuesQuery": "",
-          "tags": [],
-          "tagsQuery": "",
-          "type": "query",
-          "useTags": false
-        },
-        {
-          "allValue": ".*",
-          "current": {},
-          "datasource": "prometheus",
-          "hide": 0,
-          "includeAll": true,
-          "label": "Rack",
-          "multi": false,
-          "name": "rack",
-          "options": [],
-          "query": "label_values(collectd_cpu_total{cluster=~\"$cluster\", dc=~\"$dc\"}, rack)",
-          "refresh": 2,
-          "regex": "",
-          "skipUrlSync": false,
-          "sort": 0,
-          "tagValuesQuery": "",
-          "tags": [],
-          "tagsQuery": "",
-          "type": "query",
-          "useTags": false
-        },
-        {
-          "allValue": ".*",
-          "current": {},
-          "datasource": "prometheus",
-          "hide": 0,
-          "includeAll": true,
-          "label": "Keyspace",
-          "multi": false,
-          "name": "keyspace",
-          "options": [],
-          "query": "label_values(dse_table_read_latency{cluster=~\"$cluster\"}, keyspace)",
-          "refresh": 2,
-          "regex": "",
-          "skipUrlSync": false,
-          "sort": 0,
-          "tagValuesQuery": "",
-          "tags": [],
-          "tagsQuery": "",
-          "type": "query",
-          "useTags": false
-        },
-        {
-          "allValue": ".*",
-          "current": {},
-          "datasource": "prometheus",
-          "hide": 0,
-          "includeAll": true,
-          "label": "Table",
-          "multi": false,
-          "name": "table",
-          "options": [],
-          "query": "label_values(dse_table_read_latency{keyspace=~\"$keyspace\"}, table)",
-          "refresh": 2,
-          "regex": "",
-          "skipUrlSync": false,
-          "sort": 1,
-          "tagValuesQuery": "",
-          "tags": [],
-          "tagsQuery": "",
-          "type": "query",
-          "useTags": true
-        }
-      ]
-    },
-    "time": {
-      "from": "now-30m",
-      "to": "now"
-    },
-    "timepicker": {
-      "refresh_intervals": [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m",
-        "15m",
-        "30m",
-        "1h",
-        "2h",
-        "1d"
-      ],
-      "time_options": [
-        "5m",
-        "15m",
-        "1h",
-        "6h",
-        "12h",
-        "24h",
-        "2d",
-        "7d",
-        "30d"
-      ]
-    },
-    "timezone": "",
-    "title": "NoSQLBench (deprecated)",
-    "id": null,
-    "uid": null,
-    "version": 1
-  }
-}
diff --git a/engine-docker/src/main/resources/docker/dashboards/nb4-default-dashboard.json b/engine-docker/src/main/resources/docker/dashboards/nb4-default-dashboard.json
new file mode 100644
index 000000000..4e58484f8
--- /dev/null
+++ b/engine-docker/src/main/resources/docker/dashboards/nb4-default-dashboard.json
@@ -0,0 +1,1230 @@
+{
+  "dashboard": {
+    "annotations": {
+      "list": [
+        {
+          "datasource": "-- Grafana --",
+          "enable": true,
+          "hide": true,
+          "iconColor": "#C0D8FF",
+          "limit": 100,
+          "name": "Annotation Focus",
+          "showIn": 0,
+          "tags": [
+            "appname:nosqlbench",
+            "layer:$Layer"
+          ],
+          "type": "tags"
+        },
+        {
+          "datasource": "-- Grafana --",
+          "enable": false,
+          "hide": false,
+          "iconColor": "#E0B400",
+          "limit": 2000,
+          "matchAny": true,
+          "name": "All Annotations",
+          "showIn": 0,
+          "tags": [
+            "appname",
+            "layer:$Layer"
+          ],
+          "type": "tags"
+        },
+        {
+          "builtIn": 1,
+          "datasource": "-- Grafana --",
+          "enable": true,
+          "hide": true,
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "name": "Annotations & Alerts",
+          "type": "dashboard"
+        }
+      ]
+    },
+    "description": "Basic Dashboard with Annotations for NoSQLBench 4",
+    "editable": true,
+    "gnetId": null,
+    "graphTooltip": 1,
+    "id": null,
+    "links": [],
+    "panels": [
+      {
+        "collapsed": true,
+        "datasource": null,
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 0
+        },
+        "id": 115,
+        "panels": [
+          {
+            "datasource": null,
+            "fieldConfig": {
+              "defaults": {
+                "custom": {}
+              },
+              "overrides": []
+            },
+            "gridPos": {
+              "h": 2,
+              "w": 24,
+              "x": 0,
+              "y": 1
+            },
+            "id": 128,
+            "options": {
+              "content": "The descriptions below are in the same position as the metric they desscribe.\nYou can collapse this row when you no longer need the descriptions.\nSome of the descriptions have additional details if you scroll with\nyour mouse wheel.\n\n\n",
+              "mode": "markdown"
+            },
+            "pluginVersion": "7.3.4",
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "",
+            "transparent": true,
+            "type": "text"
+          },
+          {
+            "datasource": null,
+            "description": "",
+            "fieldConfig": {
+              "defaults": {
+                "custom": {}
+              },
+              "overrides": []
+            },
+            "gridPos": {
+              "h": 3,
+              "w": 6,
+              "x": 0,
+              "y": 3
+            },
+            "id": 117,
+            "options": {
+              "content": "These two metrics show the 1-minute averaged ops per second for all ops (successes and errors) and succesful ops (no errors during execution) separately.\n\nWhen there are no errors, these metrics should be the same. When there are errors, there will be a difference. In that case, you can look at the error metrics to learn more about what is happening.\n\nBy comparing these two metrics for any activity, you have a quick first-glance sanity check that your tests are configured properly and\nthat there are no serious configuration or resource issues. In addition, this is the primary throughput metric.\n\n\n\n\n\n",
+              "mode": "markdown"
+            },
+            "pluginVersion": "7.3.4",
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "Ops and Successful Ops",
+            "transparent": true,
+            "type": "text"
+          },
+          {
+            "datasource": null,
+            "description": "",
+            "fieldConfig": {
+              "defaults": {
+                "custom": {}
+              },
+              "overrides": []
+            },
+            "gridPos": {
+              "h": 3,
+              "w": 6,
+              "x": 6,
+              "y": 3
+            },
+            "id": 118,
+            "options": {
+              "content": "When an exception is caught and counted in a scenario, a specially named metric is emited which includes a simplified name of the error type.\nEach of these metrics is created as needed in the NoSQLBench runtime.\n\nThese metrics are formated with a name pattern of `errorcounts.NAME` where NAME is the simple name\nof the exception class which was caught during the operation. For example, For an activity\nnamed foo (with alias=foo), you would expect an exception named 'FooTimeoutException' to be shown\nwith a metric name of ...`foo.errorcounts.FooTimeoutException`\n\n\n\n\n",
+              "mode": "markdown"
+            },
+            "pluginVersion": "7.3.4",
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "Error Counts",
+            "transparent": true,
+            "type": "text"
+          },
+          {
+            "datasource": null,
+            "description": "",
+            "fieldConfig": {
+              "defaults": {
+                "custom": {}
+              },
+              "overrides": []
+            },
+            "gridPos": {
+              "h": 3,
+              "w": 6,
+              "x": 12,
+              "y": 3
+            },
+            "id": 119,
+            "options": {
+              "content": "The service time distribution is an HDR histogram that represents the time elapsed from when an operation is submitted for execution to when its result has been received.\n\nFrom the vantage point of the NoSQLBench runtime, this is a client-side metric. Thus, the service time captures the processing time that an application would see, including driver logic, wire time (transport), and server-side processing. \n\nThis metric does not include the waittime or the responsetime metrics. These metrics are only meaningful (and provided) when a `cyclerate=` is provided to an activity. When computing the responsetime metric, the servicetime is added to the waittime for a given operation.\n",
+              "mode": "markdown"
+            },
+            "pluginVersion": "7.3.4",
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "Service Time Distribution",
+            "transparent": true,
+            "type": "text"
+          },
+          {
+            "datasource": null,
+            "description": "",
+            "fieldConfig": {
+              "defaults": {
+                "custom": {}
+              },
+              "overrides": []
+            },
+            "gridPos": {
+              "h": 3,
+              "w": 6,
+              "x": 18,
+              "y": 3
+            },
+            "id": 120,
+            "options": {
+              "content": "The tries distribution is an HDR histogram which represents how many times an operation was submitted. In a well balanced system,\ntries should be 1 across the board.\n\nEvery operation which is executed within NoSQLBench should have a `tries` metric. For example, with CQL, the number of times an operation is submitted\nbefore it is succesful is ideally 1. If you are overloading your target system, thus forcing resource contention, you may see operations timeout.\n\nBy default, NoSQLBench will try up to 10 times to submit operations before giving up and throwing an error for an operation.\n\nThe tries metric can be used as a low-noise indicator of system saturation. For example, if you are running a system marginally\nbeyond its capacity, the tries for operations will go above 1 at the higher percentiles such as P99. If you increase the load even further, more retries\nwill be needed and less work will be completed, thus showing higher retries at even lower percentiles, like P95, for example.\n\nAs such, you can use the tries metric as an indicator of relative saturation.",
+              "mode": "markdown"
+            },
+            "pluginVersion": "7.3.4",
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "Op Tries Distribution",
+            "transparent": true,
+            "type": "text"
+          },
+          {
+            "datasource": null,
+            "description": "",
+            "fieldConfig": {
+              "defaults": {
+                "custom": {}
+              },
+              "overrides": []
+            },
+            "gridPos": {
+              "h": 3,
+              "w": 6,
+              "x": 0,
+              "y": 6
+            },
+            "id": 121,
+            "options": {
+              "content": "This panel shows the P75 service times for the internal stages of NoSQLBench processing. It provides a sanity check to ensure that the client processing time is low and predictable. \n\nIf there are spikes in this data, then you are likely trying to run your workloads on insufficient client hardware. In order to ensure high fidelity results in the other metrics, the client\nneeds to be capable of driving the workload without saturating or introducing signifcant local resource contention.\n\n- **read-input** - the time it takes for a worker thread to acquire a stride (range of cycles) for execution.\n- **bind** - the time it takes to convert a cycle value into a set of fields for us in an operation.\n- **execute** - the time it takes to submit work to a protocol-specific driver.",
+              "mode": "markdown"
+            },
+            "pluginVersion": "7.3.4",
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "P75 NB Internals",
+            "transparent": true,
+            "type": "text"
+          },
+          {
+            "datasource": null,
+            "description": "",
+            "fieldConfig": {
+              "defaults": {
+                "custom": {}
+              },
+              "overrides": []
+            },
+            "gridPos": {
+              "h": 3,
+              "w": 6,
+              "x": 6,
+              "y": 6
+            },
+            "id": 122,
+            "options": {
+              "content": "This panel shows the P99 service times for the internal stages of NoSQLBench processing. It provides a sanity check to ensure that the client processing time is low and predictable. \n\nIf there are spikes in this data, then you are likely trying to run your workloads on insufficient client hardware. In order to ensure high fidelity results in the other metrics, the client\nneeds to be capable of driving the workload without saturating or introducing signifcant local resource contention.\n\n- **read-input** - the time it takes for a worker thread to acquire a stride (range of cycles) for execution.\n- **bind** - the time it takes to convert a cycle value into a set of fields for us in an operation.\n- **execute** - the time it takes to submit work to a protocol-specific driver.",
+              "mode": "markdown"
+            },
+            "pluginVersion": "7.3.4",
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "P99 NB Internals",
+            "transparent": true,
+            "type": "text"
+          },
+          {
+            "datasource": null,
+            "description": "",
+            "fieldConfig": {
+              "defaults": {
+                "custom": {}
+              },
+              "overrides": []
+            },
+            "gridPos": {
+              "h": 3,
+              "w": 6,
+              "x": 12,
+              "y": 6
+            },
+            "id": 123,
+            "options": {
+              "content": "This panel simply breaks out the service time range in a simpler view. This is a good metric to look at when you want to know what the best and worse case value is for any given histogram interval.\n\nThese values come from a discrete HDR histogram reservoir. They are the actual best and worst service times, unaffected by time-decaying reservoir logic.\n",
+              "mode": "markdown"
+            },
+            "pluginVersion": "7.3.4",
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "Service Time Range",
+            "transparent": true,
+            "type": "text"
+          },
+          {
+            "datasource": null,
+            "description": "",
+            "fieldConfig": {
+              "defaults": {
+                "custom": {}
+              },
+              "overrides": []
+            },
+            "gridPos": {
+              "h": 3,
+              "w": 6,
+              "x": 18,
+              "y": 6
+            },
+            "id": 124,
+            "options": {
+              "content": "This is a simple visual reference for the cycle count within each activity. This makes it easy to see the relative progress of an activity over time.",
+              "mode": "markdown"
+            },
+            "pluginVersion": "7.3.4",
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "Cycle Count",
+            "transparent": true,
+            "type": "text"
+          }
+        ],
+        "title": "NoSQLBench Metrics Guide",
+        "type": "row"
+      },
+      {
+        "collapsed": false,
+        "datasource": null,
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 1
+        },
+        "id": 91,
+        "panels": [],
+        "title": "NoSQLBench Metrics",
+        "type": "row"
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "description": "",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {},
+            "links": []
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 0,
+          "y": 2
+        },
+        "hiddenSeries": false,
+        "id": 95,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "7.3.4",
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "result{type=\"avg_rate\",avg_of=\"1m\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-allops",
+            "refId": "C"
+          },
+          {
+            "expr": "result_success{type=\"avg_rate\",avg_of=\"1m\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-okops",
+            "refId": "A"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Ops and Successful Ops",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {},
+            "links": []
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 6,
+          "y": 2
+        },
+        "hiddenSeries": false,
+        "id": 93,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": true,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "connected",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "7.3.4",
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "{__name__=~\"errorcounts.*\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-{{error}}",
+            "refId": "B"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Error Counts",
+        "tooltip": {
+          "shared": true,
+          "sort": 2,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {},
+            "links": []
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 12,
+          "y": 2
+        },
+        "hiddenSeries": false,
+        "id": 97,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "rightSide": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "7.3.4",
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "result_success{type=\"pctile\"}",
+            "hide": false,
+            "interval": "",
+            "legendFormat": "{{alias}}-p{{pctile}}",
+            "refId": "B"
+          },
+          {
+            "expr": "cycles_servicetime{type=\"pctile\"}",
+            "hide": true,
+            "interval": "",
+            "legendFormat": "{{alias}}-{{pctile}}",
+            "refId": "A"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "service time distribution",
+        "tooltip": {
+          "shared": true,
+          "sort": 2,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "ns",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {},
+            "links": []
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 18,
+          "y": 2
+        },
+        "hiddenSeries": false,
+        "id": 98,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "7.3.4",
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "tries{type=\"pctile\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-p{{pctile}}",
+            "refId": "A"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "op tries distribution",
+        "tooltip": {
+          "shared": true,
+          "sort": 2,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {},
+            "links": []
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 0,
+          "y": 8
+        },
+        "hiddenSeries": false,
+        "id": 99,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "7.3.4",
+        "pointradius": 1,
+        "points": true,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"75\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-{{__name__}}-p{{pctile}}",
+            "refId": "A"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "p75 client overhead",
+        "tooltip": {
+          "shared": true,
+          "sort": 2,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "decimals": null,
+            "format": "ns",
+            "label": null,
+            "logBase": 10,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {},
+            "links": []
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 6,
+          "y": 8
+        },
+        "hiddenSeries": false,
+        "id": 111,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "7.3.4",
+        "pointradius": 1,
+        "points": true,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"99\"}",
+            "format": "time_series",
+            "hide": false,
+            "instant": false,
+            "interval": "",
+            "intervalFactor": 1,
+            "legendFormat": "{{alias}}-{{__name__}}-p{{pctile}}",
+            "refId": "C"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "p99 client overhead",
+        "tooltip": {
+          "shared": true,
+          "sort": 2,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "decimals": null,
+            "format": "ns",
+            "label": null,
+            "logBase": 10,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "description": "",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {},
+            "links": []
+          },
+          "overrides": []
+        },
+        "fill": 2,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 12,
+          "y": 8
+        },
+        "hiddenSeries": false,
+        "id": 109,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 2,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "7.3.4",
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "result_success{type=\"pctile\",pctile=\"0\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-min",
+            "refId": "B"
+          },
+          {
+            "expr": "result_success{type=\"pctile\",pctile=\"100\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-max",
+            "refId": "A"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "service time range",
+        "tooltip": {
+          "shared": true,
+          "sort": 2,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "ns",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {},
+            "links": []
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 18,
+          "y": 8
+        },
+        "hiddenSeries": false,
+        "id": 113,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "7.3.4",
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "cycles_servicetime{type=\"counter\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-count",
+            "refId": "C"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Cycle Count",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      }
+    ],
+    "refresh": false,
+    "schemaVersion": 26,
+    "style": "dark",
+    "tags": [
+      "NoSQLBench"
+    ],
+    "templating": {
+      "list": [
+        {
+          "allValue": null,
+          "current": {
+            "selected": false,
+            "text": "CLI",
+            "value": "CLI"
+          },
+          "error": null,
+          "hide": 0,
+          "includeAll": false,
+          "label": "Annotation Filter",
+          "multi": false,
+          "name": "Layer",
+          "options": [
+            {
+              "selected": false,
+              "text": "NONE",
+              "value": "NONE"
+            },
+            {
+              "selected": false,
+              "text": "CLI",
+              "value": "CLI"
+            },
+            {
+              "selected": false,
+              "text": "Scenario",
+              "value": "Scenario"
+            },
+            {
+              "selected": false,
+              "text": "Script",
+              "value": "Script"
+            },
+            {
+              "selected": true,
+              "text": "Activity",
+              "value": "Activity"
+            },
+            {
+              "selected": false,
+              "text": "Motor",
+              "value": "Motor"
+            }
+          ],
+          "query": "NONE,CLI,Scenario,Script,Activity,Motor",
+          "queryValue": "",
+          "skipUrlSync": false,
+          "type": "custom"
+        }
+      ]
+    },
+    "time": {
+      "from": "now-5m",
+      "to": "now"
+    },
+    "timepicker": {
+      "refresh_intervals": [
+        "10s",
+        "30s",
+        "1m",
+        "5m",
+        "15m",
+        "30m",
+        "1h",
+        "2h",
+        "1d"
+      ],
+      "time_options": [
+        "5m",
+        "15m",
+        "1h",
+        "6h",
+        "12h",
+        "24h",
+        "2d",
+        "7d",
+        "30d"
+      ]
+    },
+    "timezone": "",
+    "title": "NB4 Dashboard",
+    "uid": "aIIX1f6Wz",
+    "version": 6
+  }
+}
diff --git a/engine-docker/src/main/resources/docker/dashboards/new-nb-dashboard.json b/engine-docker/src/main/resources/docker/dashboards/new-nb-dashboard.json
index 8460ab572..22989c17e 100644
--- a/engine-docker/src/main/resources/docker/dashboards/new-nb-dashboard.json
+++ b/engine-docker/src/main/resources/docker/dashboards/new-nb-dashboard.json
@@ -1,1105 +1,1135 @@
 {
   "dashboard": {
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 1,
-  "id": null,
-  "links": [],
-  "panels": [
-    {
-      "collapsed": false,
-      "datasource": null,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "id": 115,
-      "panels": [],
-      "title": "NoSQLBench Metrics Guide",
-      "type": "row"
-    },
-    {
-      "content": "The descriptions below are in the same position as the metric they desscribe.\nYou can collapse this row when you no longer need the descriptions.\nSome of the descriptions have additional details if you scroll with\nyour mouse wheel.\n\n\n",
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 2,
-        "w": 24,
-        "x": 0,
-        "y": 1
-      },
-      "id": 128,
-      "mode": "markdown",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "",
-      "transparent": true,
-      "type": "text"
-    },
-    {
-      "content": "These two metrics show the 1-minute averaged ops per second for all ops (successes and errors) and succesful ops (no errors during execution) separately.\n\nWhen there are no errors, these metrics should be the same. When there are errors, there will be a difference. In that case, you can look at the error metrics to learn more about what is happening.\n\nBy comparing these two metrics for any activity, you have a quick first-glance sanity check that your tests are configured properly and\nthat there are no serious configuration or resource issues. In addition, this is the primary throughput metric.\n\n\n\n\n\n",
-      "datasource": null,
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 6,
-        "x": 0,
-        "y": 3
-      },
-      "id": 117,
-      "mode": "markdown",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Ops and Successful Ops",
-      "transparent": true,
-      "type": "text"
-    },
-    {
-      "content": "When an exception is caught and counted in a scenario, a specially named metric is emited which includes a simplified name of the error type.\nEach of these metrics is created as needed in the NoSQLBench runtime.\n\nThese metrics are formated with a name pattern of `errorcounts.NAME` where NAME is the simple name\nof the exception class which was caught during the operation. For example, For an activity\nnamed foo (with alias=foo), you would expect an exception named 'FooTimeoutException' to be shown\nwith a metric name of ...`foo.errorcounts.FooTimeoutException`\n\n\n\n\n",
-      "datasource": null,
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 6,
-        "x": 6,
-        "y": 3
-      },
-      "id": 118,
-      "mode": "markdown",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Error Counts",
-      "transparent": true,
-      "type": "text"
-    },
-    {
-      "content": "The service time distribution is an HDR histogram that represents the time elapsed from when an operation is submitted for execution to when its result has been received.\n\nFrom the vantage point of the NoSQLBench runtime, this is a client-side metric. Thus, the service time captures the processing time that an application would see, including driver logic, wire time (transport), and server-side processing. \n\nThis metric does not include the waittime or the responsetime metrics. These metrics are only meaningful (and provided) when a `cyclerate=` is provided to an activity. When computing the responsetime metric, the servicetime is added to the waittime for a given operation.\n",
-      "datasource": null,
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 6,
-        "x": 12,
-        "y": 3
-      },
-      "id": 119,
-      "mode": "markdown",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Service Time Distribution",
-      "transparent": true,
-      "type": "text"
-    },
-    {
-      "content": "The tries distribution is an HDR histogram which represents how many times an operation was submitted. In a well balanced system,\ntries should be 1 across the board.\n\nEvery operation which is executed within NoSQLBench should have a `tries` metric. For example, with CQL, the number of times an operation is submitted\nbefore it is succesful is ideally 1. If you are overloading your target system, thus forcing resource contention, you may see operations timeout.\n\nBy default, NoSQLBench will try up to 10 times to submit operations before giving up and throwing an error for an operation.\n\nThe tries metric can be used as a low-noise indicator of system saturation. For example, if you are running a system marginally\nbeyond its capacity, the tries for operations will go above 1 at the higher percentiles such as P99. If you increase the load even further, more retries\nwill be needed and less work will be completed, thus showing higher retries at even lower percentiles, like P95, for example.\n\nAs such, you can use the tries metric as an indicator of relative saturation.",
-      "datasource": null,
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 6,
-        "x": 18,
-        "y": 3
-      },
-      "id": 120,
-      "mode": "markdown",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Op Tries Distribution",
-      "transparent": true,
-      "type": "text"
-    },
-    {
-      "content": "This panel shows the P75 service times for the internal stages of NoSQLBench processing. It provides a sanity check to ensure that the client processing time is low and predictable. \n\nIf there are spikes in this data, then you are likely trying to run your workloads on insufficient client hardware. In order to ensure high fidelity results in the other metrics, the client\nneeds to be capable of driving the workload without saturating or introducing signifcant local resource contention.\n\n- **read-input** - the time it takes for a worker thread to acquire a stride (range of cycles) for execution.\n- **bind** - the time it takes to convert a cycle value into a set of fields for us in an operation.\n- **execute** - the time it takes to submit work to a protocol-specific driver.",
-      "datasource": null,
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 6,
-        "x": 0,
-        "y": 6
-      },
-      "id": 121,
-      "mode": "markdown",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "P75 NB Internals",
-      "transparent": true,
-      "type": "text"
-    },
-    {
-      "content": "This panel shows the P99 service times for the internal stages of NoSQLBench processing. It provides a sanity check to ensure that the client processing time is low and predictable. \n\nIf there are spikes in this data, then you are likely trying to run your workloads on insufficient client hardware. In order to ensure high fidelity results in the other metrics, the client\nneeds to be capable of driving the workload without saturating or introducing signifcant local resource contention.\n\n- **read-input** - the time it takes for a worker thread to acquire a stride (range of cycles) for execution.\n- **bind** - the time it takes to convert a cycle value into a set of fields for us in an operation.\n- **execute** - the time it takes to submit work to a protocol-specific driver.",
-      "datasource": null,
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 6,
-        "x": 6,
-        "y": 6
-      },
-      "id": 122,
-      "mode": "markdown",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "P99 NB Internals",
-      "transparent": true,
-      "type": "text"
-    },
-    {
-      "content": "This panel simply breaks out the service time range in a simpler view. This is a good metric to look at when you want to know what the best and worse case value is for any given histogram interval.\n\nThese values come from a discrete HDR histogram reservoir. They are the actual best and worst service times, unaffected by time-decaying reservoir logic.\n",
-      "datasource": null,
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 6,
-        "x": 12,
-        "y": 6
-      },
-      "id": 123,
-      "mode": "markdown",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Service Time Range",
-      "transparent": true,
-      "type": "text"
-    },
-    {
-      "content": "This is a simple visual reference for the cycle count within each activity. This makes it easy to see the relative progress of an activity over time.",
-      "datasource": null,
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 6,
-        "x": 18,
-        "y": 6
-      },
-      "id": 124,
-      "mode": "markdown",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Cycle Count",
-      "transparent": true,
-      "type": "text"
-    },
-    {
-      "collapsed": false,
-      "datasource": null,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 9
-      },
-      "id": 91,
-      "panels": [],
-      "title": "NoSQLBench Metrics",
-      "type": "row"
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "prometheus",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 0,
-        "y": 10
-      },
-      "hiddenSeries": false,
-      "id": 95,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
+    "annotations": {
+      "list": [
         {
-          "expr": "result{type=\"avg_rate\",avg_of=\"1m\"}",
-          "interval": "",
-          "legendFormat": "{{alias}}-allops",
-          "refId": "C"
-        },
-        {
-          "expr": "result_success{type=\"avg_rate\",avg_of=\"1m\"}",
-          "interval": "",
-          "legendFormat": "{{alias}}-okops",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Ops and Successful Ops",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "transparent": true,
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "prometheus",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 6,
-        "y": 10
-      },
-      "hiddenSeries": false,
-      "id": 93,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "{__name__=~\"errorcounts.*\"}",
-          "interval": "",
-          "legendFormat": "{{alias}}-{{error}}",
-          "refId": "B"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Error Counts",
-      "tooltip": {
-        "shared": true,
-        "sort": 2,
-        "value_type": "individual"
-      },
-      "transparent": true,
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "prometheus",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 12,
-        "y": 10
-      },
-      "hiddenSeries": false,
-      "id": 97,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "rightSide": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "result_success{type=\"pctile\"}",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "{{alias}}-p{{pctile}}",
-          "refId": "B"
-        },
-        {
-          "expr": "cycles_servicetime{type=\"pctile\"}",
+          "datasource": "-- Grafana --",
+          "enable": true,
           "hide": true,
-          "interval": "",
-          "legendFormat": "{{alias}}-{{pctile}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "service time distribution",
-      "tooltip": {
-        "shared": true,
-        "sort": 2,
-        "value_type": "individual"
-      },
-      "transparent": true,
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "ns",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
+          "iconColor": "#C0D8FF",
+          "limit": 100,
+          "name": "Annotation Focus",
+          "showIn": 0,
+          "tags": [
+            "appname:nosqlbench",
+            "layer:$Layer"
+          ],
+          "type": "tags"
         },
         {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "prometheus",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 18,
-        "y": 10
-      },
-      "hiddenSeries": false,
-      "id": 98,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "tries{type=\"pctile\"}",
-          "interval": "",
-          "legendFormat": "{{alias}}-p{{pctile}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "op tries distribution",
-      "tooltip": {
-        "shared": true,
-        "sort": 2,
-        "value_type": "individual"
-      },
-      "transparent": true,
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "prometheus",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 0,
-        "y": 16
-      },
-      "hiddenSeries": false,
-      "id": 99,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 1,
-      "points": true,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"75\"}",
-          "interval": "",
-          "legendFormat": "{{alias}}-{{__name__}}-p{{pctile}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "p75 client overhead",
-      "tooltip": {
-        "shared": true,
-        "sort": 2,
-        "value_type": "individual"
-      },
-      "transparent": true,
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": null,
-          "format": "ns",
-          "label": null,
-          "logBase": 10,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "prometheus",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 6,
-        "y": 16
-      },
-      "hiddenSeries": false,
-      "id": 111,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 1,
-      "points": true,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"99\"}",
-          "format": "time_series",
+          "datasource": "-- Grafana --",
+          "enable": false,
           "hide": false,
-          "instant": false,
-          "interval": "",
-          "intervalFactor": 1,
-          "legendFormat": "{{alias}}-{{__name__}}-p{{pctile}}",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "p99 client overhead",
-      "tooltip": {
-        "shared": true,
-        "sort": 2,
-        "value_type": "individual"
-      },
-      "transparent": true,
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": null,
-          "format": "ns",
-          "label": null,
-          "logBase": 10,
-          "max": null,
-          "min": "0",
-          "show": true
+          "iconColor": "#E0B400",
+          "limit": 2000,
+          "matchAny": true,
+          "name": "All Annotations",
+          "showIn": 0,
+          "tags": [
+            "appname",
+            "layer:$Layer"
+          ],
+          "type": "tags"
         },
         {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
+          "builtIn": 1,
+          "datasource": "-- Grafana --",
+          "enable": true,
+          "hide": true,
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "name": "Annotations & Alerts",
+          "type": "dashboard"
         }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
+      ]
     },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "prometheus",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
+    "description": "Dashboard for NoSQLBench 3",
+    "editable": true,
+    "gnetId": null,
+    "graphTooltip": 1,
+    "id": null,
+    "links": [],
+    "panels": [
+      {
+        "collapsed": true,
+        "datasource": null,
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 0
         },
-        "overrides": []
+        "id": 115,
+        "panels": [],
+        "title": "NoSQLBench Metrics Guide",
+        "type": "row"
       },
-      "fill": 2,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 12,
-        "y": 16
-      },
-      "hiddenSeries": false,
-      "id": 109,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "result_success{type=\"pctile\",pctile=\"0\"}",
-          "interval": "",
-          "legendFormat": "{{alias}}-min",
-          "refId": "B"
+      {
+        "content": "The descriptions below are in the same position as the metric they desscribe.\nYou can collapse this row when you no longer need the descriptions.\nSome of the descriptions have additional details if you scroll with\nyour mouse wheel.\n\n\n",
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
         },
-        {
-          "expr": "result_success{type=\"pctile\",pctile=\"100\"}",
-          "interval": "",
-          "legendFormat": "{{alias}}-max",
-          "refId": "A"
+        "gridPos": {
+          "h": 2,
+          "w": 24,
+          "x": 0,
+          "y": 1
+        },
+        "id": 128,
+        "mode": "markdown",
+        "timeFrom": null,
+        "timeShift": null,
+        "title": "",
+        "transparent": true,
+        "type": "text"
+      },
+      {
+        "content": "These two metrics show the 1-minute averaged ops per second for all ops (successes and errors) and succesful ops (no errors during execution) separately.\n\nWhen there are no errors, these metrics should be the same. When there are errors, there will be a difference. In that case, you can look at the error metrics to learn more about what is happening.\n\nBy comparing these two metrics for any activity, you have a quick first-glance sanity check that your tests are configured properly and\nthat there are no serious configuration or resource issues. In addition, this is the primary throughput metric.\n\n\n\n\n\n",
+        "datasource": null,
+        "description": "",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 3,
+          "w": 6,
+          "x": 0,
+          "y": 3
+        },
+        "id": 117,
+        "mode": "markdown",
+        "timeFrom": null,
+        "timeShift": null,
+        "title": "Ops and Successful Ops",
+        "transparent": true,
+        "type": "text"
+      },
+      {
+        "content": "When an exception is caught and counted in a scenario, a specially named metric is emited which includes a simplified name of the error type.\nEach of these metrics is created as needed in the NoSQLBench runtime.\n\nThese metrics are formated with a name pattern of `errorcounts.NAME` where NAME is the simple name\nof the exception class which was caught during the operation. For example, For an activity\nnamed foo (with alias=foo), you would expect an exception named 'FooTimeoutException' to be shown\nwith a metric name of ...`foo.errorcounts.FooTimeoutException`\n\n\n\n\n",
+        "datasource": null,
+        "description": "",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 3,
+          "w": 6,
+          "x": 6,
+          "y": 3
+        },
+        "id": 118,
+        "mode": "markdown",
+        "timeFrom": null,
+        "timeShift": null,
+        "title": "Error Counts",
+        "transparent": true,
+        "type": "text"
+      },
+      {
+        "content": "The service time distribution is an HDR histogram that represents the time elapsed from when an operation is submitted for execution to when its result has been received.\n\nFrom the vantage point of the NoSQLBench runtime, this is a client-side metric. Thus, the service time captures the processing time that an application would see, including driver logic, wire time (transport), and server-side processing. \n\nThis metric does not include the waittime or the responsetime metrics. These metrics are only meaningful (and provided) when a `cyclerate=` is provided to an activity. When computing the responsetime metric, the servicetime is added to the waittime for a given operation.\n",
+        "datasource": null,
+        "description": "",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 3,
+          "w": 6,
+          "x": 12,
+          "y": 3
+        },
+        "id": 119,
+        "mode": "markdown",
+        "timeFrom": null,
+        "timeShift": null,
+        "title": "Service Time Distribution",
+        "transparent": true,
+        "type": "text"
+      },
+      {
+        "content": "The tries distribution is an HDR histogram which represents how many times an operation was submitted. In a well balanced system,\ntries should be 1 across the board.\n\nEvery operation which is executed within NoSQLBench should have a `tries` metric. For example, with CQL, the number of times an operation is submitted\nbefore it is succesful is ideally 1. If you are overloading your target system, thus forcing resource contention, you may see operations timeout.\n\nBy default, NoSQLBench will try up to 10 times to submit operations before giving up and throwing an error for an operation.\n\nThe tries metric can be used as a low-noise indicator of system saturation. For example, if you are running a system marginally\nbeyond its capacity, the tries for operations will go above 1 at the higher percentiles such as P99. If you increase the load even further, more retries\nwill be needed and less work will be completed, thus showing higher retries at even lower percentiles, like P95, for example.\n\nAs such, you can use the tries metric as an indicator of relative saturation.",
+        "datasource": null,
+        "description": "",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 3,
+          "w": 6,
+          "x": 18,
+          "y": 3
+        },
+        "id": 120,
+        "mode": "markdown",
+        "timeFrom": null,
+        "timeShift": null,
+        "title": "Op Tries Distribution",
+        "transparent": true,
+        "type": "text"
+      },
+      {
+        "content": "This panel shows the P75 service times for the internal stages of NoSQLBench processing. It provides a sanity check to ensure that the client processing time is low and predictable. \n\nIf there are spikes in this data, then you are likely trying to run your workloads on insufficient client hardware. In order to ensure high fidelity results in the other metrics, the client\nneeds to be capable of driving the workload without saturating or introducing signifcant local resource contention.\n\n- **read-input** - the time it takes for a worker thread to acquire a stride (range of cycles) for execution.\n- **bind** - the time it takes to convert a cycle value into a set of fields for us in an operation.\n- **execute** - the time it takes to submit work to a protocol-specific driver.",
+        "datasource": null,
+        "description": "",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 3,
+          "w": 6,
+          "x": 0,
+          "y": 6
+        },
+        "id": 121,
+        "mode": "markdown",
+        "timeFrom": null,
+        "timeShift": null,
+        "title": "P75 NB Internals",
+        "transparent": true,
+        "type": "text"
+      },
+      {
+        "content": "This panel shows the P99 service times for the internal stages of NoSQLBench processing. It provides a sanity check to ensure that the client processing time is low and predictable. \n\nIf there are spikes in this data, then you are likely trying to run your workloads on insufficient client hardware. In order to ensure high fidelity results in the other metrics, the client\nneeds to be capable of driving the workload without saturating or introducing signifcant local resource contention.\n\n- **read-input** - the time it takes for a worker thread to acquire a stride (range of cycles) for execution.\n- **bind** - the time it takes to convert a cycle value into a set of fields for us in an operation.\n- **execute** - the time it takes to submit work to a protocol-specific driver.",
+        "datasource": null,
+        "description": "",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 3,
+          "w": 6,
+          "x": 6,
+          "y": 6
+        },
+        "id": 122,
+        "mode": "markdown",
+        "timeFrom": null,
+        "timeShift": null,
+        "title": "P99 NB Internals",
+        "transparent": true,
+        "type": "text"
+      },
+      {
+        "content": "This panel simply breaks out the service time range in a simpler view. This is a good metric to look at when you want to know what the best and worse case value is for any given histogram interval.\n\nThese values come from a discrete HDR histogram reservoir. They are the actual best and worst service times, unaffected by time-decaying reservoir logic.\n",
+        "datasource": null,
+        "description": "",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 3,
+          "w": 6,
+          "x": 12,
+          "y": 6
+        },
+        "id": 123,
+        "mode": "markdown",
+        "timeFrom": null,
+        "timeShift": null,
+        "title": "Service Time Range",
+        "transparent": true,
+        "type": "text"
+      },
+      {
+        "content": "This is a simple visual reference for the cycle count within each activity. This makes it easy to see the relative progress of an activity over time.",
+        "datasource": null,
+        "description": "",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 3,
+          "w": 6,
+          "x": 18,
+          "y": 6
+        },
+        "id": 124,
+        "mode": "markdown",
+        "timeFrom": null,
+        "timeShift": null,
+        "title": "Cycle Count",
+        "transparent": true,
+        "type": "text"
+      },
+      {
+        "collapsed": false,
+        "datasource": null,
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 9
+        },
+        "id": 91,
+        "panels": [],
+        "title": "NoSQLBench Metrics",
+        "type": "row"
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "description": "",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 0,
+          "y": 10
+        },
+        "hiddenSeries": false,
+        "id": 95,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "result{type=\"avg_rate\",avg_of=\"1m\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-allops",
+            "refId": "C"
+          },
+          {
+            "expr": "result_success{type=\"avg_rate\",avg_of=\"1m\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-okops",
+            "refId": "A"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Ops and Successful Ops",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
         }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "service time range",
-      "tooltip": {
-        "shared": true,
-        "sort": 2,
-        "value_type": "individual"
       },
-      "transparent": true,
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "ns",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
         },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 6,
+          "y": 10
+        },
+        "hiddenSeries": false,
+        "id": 93,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": true,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "connected",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "{__name__=~\"errorcounts.*\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-{{error}}",
+            "refId": "B"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Error Counts",
+        "tooltip": {
+          "shared": true,
+          "sort": 2,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 12,
+          "y": 10
+        },
+        "hiddenSeries": false,
+        "id": 97,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "rightSide": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "result_success{type=\"pctile\"}",
+            "hide": false,
+            "interval": "",
+            "legendFormat": "{{alias}}-p{{pctile}}",
+            "refId": "B"
+          },
+          {
+            "expr": "cycles_servicetime{type=\"pctile\"}",
+            "hide": true,
+            "interval": "",
+            "legendFormat": "{{alias}}-{{pctile}}",
+            "refId": "A"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "service time distribution",
+        "tooltip": {
+          "shared": true,
+          "sort": 2,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "ns",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 18,
+          "y": 10
+        },
+        "hiddenSeries": false,
+        "id": 98,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "tries{type=\"pctile\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-p{{pctile}}",
+            "refId": "A"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "op tries distribution",
+        "tooltip": {
+          "shared": true,
+          "sort": 2,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 0,
+          "y": 16
+        },
+        "hiddenSeries": false,
+        "id": 99,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 1,
+        "points": true,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"75\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-{{__name__}}-p{{pctile}}",
+            "refId": "A"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "p75 client overhead",
+        "tooltip": {
+          "shared": true,
+          "sort": 2,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "decimals": null,
+            "format": "ns",
+            "label": null,
+            "logBase": 10,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 6,
+          "y": 16
+        },
+        "hiddenSeries": false,
+        "id": 111,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 1,
+        "points": true,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"99\"}",
+            "format": "time_series",
+            "hide": false,
+            "instant": false,
+            "interval": "",
+            "intervalFactor": 1,
+            "legendFormat": "{{alias}}-{{__name__}}-p{{pctile}}",
+            "refId": "C"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "p99 client overhead",
+        "tooltip": {
+          "shared": true,
+          "sort": 2,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "decimals": null,
+            "format": "ns",
+            "label": null,
+            "logBase": 10,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "description": "",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 2,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 12,
+          "y": 16
+        },
+        "hiddenSeries": false,
+        "id": 109,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 2,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "result_success{type=\"pctile\",pctile=\"0\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-min",
+            "refId": "B"
+          },
+          {
+            "expr": "result_success{type=\"pctile\",pctile=\"100\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-max",
+            "refId": "A"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "service time range",
+        "tooltip": {
+          "shared": true,
+          "sort": 2,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "ns",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 18,
+          "y": 16
+        },
+        "hiddenSeries": false,
+        "id": 113,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "cycles_servicetime{type=\"counter\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-count",
+            "refId": "C"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Cycle Count",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
         }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
       }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "prometheus",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 18,
-        "y": 16
-      },
-      "hiddenSeries": false,
-      "id": 113,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "cycles_servicetime{type=\"counter\"}",
-          "interval": "",
-          "legendFormat": "{{alias}}-count",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Cycle Count",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "transparent": true,
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    }
-  ],
-  "refresh": false,
-  "schemaVersion": 25,
-  "style": "dark",
-  "tags": [
-    "dse"
-  ],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-5m",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": [
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
     ],
-    "time_options": [
-      "5m",
-      "15m",
-      "1h",
-      "6h",
-      "12h",
-      "24h",
-      "2d",
-      "7d",
-      "30d"
-    ]
-  },
-  "timezone": "",
-  "title": "NoSQLBench",
-  "uid": "aIIX1f6Wz",
-  "version": 3
-}
+    "refresh": false,
+    "schemaVersion": 25,
+    "style": "dark",
+    "tags": [
+      "dse"
+    ],
+    "templating": {
+      "list": []
+    },
+    "time": {
+      "from": "now-5m",
+      "to": "now"
+    },
+    "timepicker": {
+      "refresh_intervals": [
+        "10s",
+        "30s",
+        "1m",
+        "5m",
+        "15m",
+        "30m",
+        "1h",
+        "2h",
+        "1d"
+      ],
+      "time_options": [
+        "5m",
+        "15m",
+        "1h",
+        "6h",
+        "12h",
+        "24h",
+        "2d",
+        "7d",
+        "30d"
+      ]
+    },
+    "timezone": "",
+    "title": "NoSQLBench",
+    "uid": "aIIX1f6Wz",
+    "version": 3
+  }
 }

From 87f895e0691941bfbe8ab17179591098fbdb708e Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 01:55:11 -0600
Subject: [PATCH 095/164] nb4 rc build

---
 RELEASENOTES.md                               |  6 ++++--
 .../io/nosqlbench/nb/api/labels/Labeled.java  |  7 +++++++
 .../nb/api/labels/MutableLabels.java          | 19 +++++++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 nb-api/src/main/java/io/nosqlbench/nb/api/labels/Labeled.java
 create mode 100644 nb-api/src/main/java/io/nosqlbench/nb/api/labels/MutableLabels.java

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index dc5b172e3..bf5af52e2 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,5 +1,7 @@
-
-- 3d2ff55f (main) auto create apikey
+- e4f325c4 (origin/main, main) disable test which is present in feature branch
+- 78463838 make main brain build cleanly again
+- 608d1f72 Update DOWNLOADS.md
+- 3d2ff55f auto create apikey
 - cfa92eab package organization
 - 2ab118f4 package organization
 - a23808b3 update appimage build script for j15
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/labels/Labeled.java b/nb-api/src/main/java/io/nosqlbench/nb/api/labels/Labeled.java
new file mode 100644
index 000000000..90818152c
--- /dev/null
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/labels/Labeled.java
@@ -0,0 +1,7 @@
+package io.nosqlbench.nb.api.labels;
+
+import java.util.Map;
+
+public interface Labeled {
+    public Map<String,String> getLabels();
+}
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/labels/MutableLabels.java b/nb-api/src/main/java/io/nosqlbench/nb/api/labels/MutableLabels.java
new file mode 100644
index 000000000..d26ed0c0c
--- /dev/null
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/labels/MutableLabels.java
@@ -0,0 +1,19 @@
+package io.nosqlbench.nb.api.labels;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class MutableLabels extends HashMap<String,String> implements Labeled {
+
+    public static MutableLabels fromMaps(Map<String,String> entries) {
+        MutableLabels mutableLabels = new MutableLabels();
+        mutableLabels.putAll(entries);
+        return mutableLabels;
+    }
+
+
+    @Override
+    public Map<String, String> getLabels() {
+        return this;
+    }
+}

From 494becd4868813aa67fd1de3453fa397870e5c11 Mon Sep 17 00:00:00 2001
From: nb-droid <nosqlbenchdroid@gmail.com>
Date: Mon, 7 Dec 2020 10:30:58 +0000
Subject: [PATCH 096/164] [maven-release-plugin] prepare release
 nosqlbench-4.0.1

---
 docsys/pom.xml                 |  6 +++---
 driver-cql-shaded/pom.xml      |  6 +++---
 driver-cqlverify/pom.xml       |  6 +++---
 driver-diag/pom.xml            |  6 +++---
 driver-dsegraph-shaded/pom.xml |  6 +++---
 driver-http/pom.xml            |  6 +++---
 driver-jmx/pom.xml             |  6 +++---
 driver-kafka/pom.xml           |  6 +++---
 driver-mongodb/pom.xml         |  6 +++---
 driver-stdout/pom.xml          |  6 +++---
 driver-tcp/pom.xml             |  8 ++++----
 driver-web/pom.xml             |  6 +++---
 drivers-api/pom.xml            |  6 +++---
 engine-api/pom.xml             | 10 +++++-----
 engine-cli/pom.xml             |  6 +++---
 engine-clients/pom.xml         |  4 ++--
 engine-core/pom.xml            |  8 ++++----
 engine-docker/pom.xml          |  4 ++--
 engine-docs/pom.xml            |  4 ++--
 engine-extensions/pom.xml      |  4 ++--
 engine-rest/pom.xml            |  4 ++--
 mvn-defaults/pom.xml           |  4 ++--
 nb-annotations/pom.xml         |  2 +-
 nb-api/pom.xml                 |  4 ++--
 nb/pom.xml                     | 36 +++++++++++++++++-----------------
 pom.xml                        |  4 ++--
 virtdata-api/pom.xml           |  6 +++---
 virtdata-lang/pom.xml          |  2 +-
 virtdata-lib-basics/pom.xml    |  4 ++--
 virtdata-lib-curves4/pom.xml   |  6 +++---
 virtdata-lib-random/pom.xml    |  6 +++---
 virtdata-lib-realer/pom.xml    |  4 ++--
 virtdata-realdata/pom.xml      |  4 ++--
 virtdata-userlibs/pom.xml      | 16 +++++++--------
 34 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/docsys/pom.xml b/docsys/pom.xml
index cf517242a..701093eaa 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>4.0.1-SNAPSHOT</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.1-SNAPSHOT</version>
+            <version>4.0.1</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index 0d0cce552..0ebd29972 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.0.1-SNAPSHOT</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.0.1-SNAPSHOT</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index 6ab08544e..0d8a4eda8 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.0.1-SNAPSHOT</version>
+    <version>4.0.1</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cql-shaded</artifactId>
-      <version>4.0.1-SNAPSHOT</version>
+      <version>4.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.0.1-SNAPSHOT</version>
+      <version>4.0.1</version>
     </dependency>
 
   </dependencies>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index b11049d44..6bb15feae 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index 2bad65e0e..a60edbef0 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.0.1-SNAPSHOT</version>
+    <version>4.0.1</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -23,13 +23,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.0.1-SNAPSHOT</version>
+      <version>4.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.0.1-SNAPSHOT</version>
+      <version>4.0.1</version>
     </dependency>
 
     <dependency>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index f336d7900..2ad463093 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index 1d94240ff..a04a7519b 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.0.1-SNAPSHOT</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.0.1-SNAPSHOT</version>
+            <version>4.0.1</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index e44edcb54..0a125137d 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -44,13 +44,13 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-api</artifactId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>driver-stdout</artifactId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
       </dependency>
 
       <!--        <dependency>-->
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index b71dbe3f5..35005e9ad 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
         <dependency>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index fbdba5650..ce7ae4b0e 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index 604bdd10d..3256e675f 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,19 +24,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index c5ae29e21..2b0a42507 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
         <dependency>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index 17de21e56..2c2105b39 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index 378732418..2b524a984 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,25 +23,25 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>4.0.1-SNAPSHOT</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.0.1-SNAPSHOT</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>4.0.1-SNAPSHOT</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>4.0.1-SNAPSHOT</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index aa81fa9f0..f5260f443 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-            <version>4.0.1-SNAPSHOT</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-            <version>4.0.1-SNAPSHOT</version>
+            <version>4.0.1</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index 7d0943820..44fbaac69 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.0.1-SNAPSHOT</version>
+    <version>4.0.1</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.0.1-SNAPSHOT</version>
+      <version>4.0.1</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index 6af74b22b..8db45fb35 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-clients</artifactId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index 178702733..bb6c5fc54 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index 2d86bf2d3..f84681886 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.0.1-SNAPSHOT</version>
+    <version>4.0.1</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>docsys</artifactId>
-      <version>4.0.1-SNAPSHOT</version>
+      <version>4.0.1</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index 4bd7deb56..0760081de 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index 5be95850c..7d590945b 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
     </dependencies>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index d46a7c4f6..4ab31aa27 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>io.nosqlbench</groupId>
   <artifactId>mvn-defaults</artifactId>
-  <version>4.0.1-SNAPSHOT</version>
+  <version>4.0.1</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -92,7 +92,7 @@
   <scm>
     <url>scm:git:https://github.com/nosqlbench/nosqlbench.git</url>
     <!--        <tag>nosqlbench-2.0.102-SNAPSHOT</tag>-->
-    <tag>HEAD</tag>
+    <tag>nosqlbench-4.0.1</tag>
   </scm>
 
   <dependencyManagement>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index 8cc915f9e..e6dd128d5 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 9eb392cbc..14a96049d 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.0.1-SNAPSHOT</version>
+    <version>4.0.1</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>nb-annotations</artifactId>
-      <version>4.0.1-SNAPSHOT</version>
+      <version>4.0.1</version>
     </dependency>
 
     <dependency>
diff --git a/nb/pom.xml b/nb/pom.xml
index 6830ad4b4..bd40bd1b1 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,31 +24,31 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-rest</artifactId>
-      <version>4.0.1-SNAPSHOT</version>
+      <version>4.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-cli</artifactId>
-      <version>4.0.1-SNAPSHOT</version>
+      <version>4.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-docs</artifactId>
-      <version>4.0.1-SNAPSHOT</version>
+      <version>4.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-core</artifactId>
-      <version>4.0.1-SNAPSHOT</version>
+      <version>4.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-extensions</artifactId>
-      <version>4.0.1-SNAPSHOT</version>
+      <version>4.0.1</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -60,67 +60,67 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-web</artifactId>
-      <version>4.0.1-SNAPSHOT</version>
+      <version>4.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-kafka</artifactId>
-      <version>4.0.1-SNAPSHOT</version>
+      <version>4.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-stdout</artifactId>
-      <version>4.0.1-SNAPSHOT</version>
+      <version>4.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-diag</artifactId>
-      <version>4.0.1-SNAPSHOT</version>
+      <version>4.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-tcp</artifactId>
-      <version>4.0.1-SNAPSHOT</version>
+      <version>4.0.1</version>
     </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-http</artifactId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-jmx</artifactId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-dsegraph-shaded</artifactId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cql-shaded</artifactId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cqlverify</artifactId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-mongodb</artifactId>
-      <version>4.0.1-SNAPSHOT</version>
+      <version>4.0.1</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -257,7 +257,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-mongodb</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/pom.xml b/pom.xml
index f1fe1927d..b63f3e85d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
@@ -145,7 +145,7 @@
             scm:git:https://github.com/nosqlbench/nosqlbench.git
         </developerConnection>
         <url>scm:git:git@github.com:nosqlbench/nosqlbench.git</url>
-        <tag>HEAD</tag>
+        <tag>nosqlbench-4.0.1</tag>
     </scm>
 
     <distributionManagement>
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index ea8949990..c408f1999 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index 6313e02dd..c25ea007e 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index 1b826c0f7..31db599d1 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.1-SNAPSHOT</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index 42346d9be..b0d4dd1c1 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index edc0089b4..a2ffb84cd 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.1-SNAPSHOT</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>4.0.1-SNAPSHOT</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index 3e80ada57..306950121 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index 7dc21a0bb..d0d397df8 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.0.1-SNAPSHOT</version>
+          <version>4.0.1</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index 4d205c4a9..6dbb66b3c 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1-SNAPSHOT</version>
+        <version>4.0.1</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,36 +18,36 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-            <version>4.0.1-SNAPSHOT</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-            <version>4.0.1-SNAPSHOT</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.1-SNAPSHOT</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-            <version>4.0.1-SNAPSHOT</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>4.0.1-SNAPSHOT</version>
+            <version>4.0.1</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>4.0.1-SNAPSHOT</version>
+            <version>4.0.1</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-            <version>4.0.1-SNAPSHOT</version>
+            <version>4.0.1</version>
         </dependency>
 
     </dependencies>

From 98beb9ed370a7fd8ace1aef0fdbb2ed3b004d409 Mon Sep 17 00:00:00 2001
From: nb-droid <nosqlbenchdroid@gmail.com>
Date: Mon, 7 Dec 2020 10:31:05 +0000
Subject: [PATCH 097/164] [maven-release-plugin] prepare for next development
 iteration

---
 docsys/pom.xml                 |  6 +++---
 driver-cql-shaded/pom.xml      |  6 +++---
 driver-cqlverify/pom.xml       |  6 +++---
 driver-diag/pom.xml            |  6 +++---
 driver-dsegraph-shaded/pom.xml |  6 +++---
 driver-http/pom.xml            |  6 +++---
 driver-jmx/pom.xml             |  6 +++---
 driver-kafka/pom.xml           |  6 +++---
 driver-mongodb/pom.xml         |  6 +++---
 driver-stdout/pom.xml          |  6 +++---
 driver-tcp/pom.xml             |  8 ++++----
 driver-web/pom.xml             |  6 +++---
 drivers-api/pom.xml            |  6 +++---
 engine-api/pom.xml             | 10 +++++-----
 engine-cli/pom.xml             |  6 +++---
 engine-clients/pom.xml         |  4 ++--
 engine-core/pom.xml            |  8 ++++----
 engine-docker/pom.xml          |  4 ++--
 engine-docs/pom.xml            |  4 ++--
 engine-extensions/pom.xml      |  4 ++--
 engine-rest/pom.xml            |  4 ++--
 mvn-defaults/pom.xml           |  4 ++--
 nb-annotations/pom.xml         |  2 +-
 nb-api/pom.xml                 |  4 ++--
 nb/pom.xml                     | 36 +++++++++++++++++-----------------
 pom.xml                        |  4 ++--
 virtdata-api/pom.xml           |  6 +++---
 virtdata-lang/pom.xml          |  2 +-
 virtdata-lib-basics/pom.xml    |  4 ++--
 virtdata-lib-curves4/pom.xml   |  6 +++---
 virtdata-lib-random/pom.xml    |  6 +++---
 virtdata-lib-realer/pom.xml    |  4 ++--
 virtdata-realdata/pom.xml      |  4 ++--
 virtdata-userlibs/pom.xml      | 16 +++++++--------
 34 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/docsys/pom.xml b/docsys/pom.xml
index 701093eaa..fee955054 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index 0ebd29972..9c8b6608a 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index 0d8a4eda8..c6e966a26 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.0.1</version>
+    <version>4.0.2-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cql-shaded</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index 6bb15feae..048ef2c7b 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index a60edbef0..afdb5776e 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.0.1</version>
+    <version>4.0.2-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -23,13 +23,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index 2ad463093..18e157ad5 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index a04a7519b..1beda4170 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index 0a125137d..a55b0971c 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -44,13 +44,13 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-api</artifactId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>driver-stdout</artifactId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
       </dependency>
 
       <!--        <dependency>-->
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index 35005e9ad..77f49c46e 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index ce7ae4b0e..e225acb49 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index 3256e675f..a43f0dd6f 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,19 +24,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index 2b0a42507..98215a9c2 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index 2c2105b39..f63682b9d 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index 2b524a984..beea8a7e1 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,25 +23,25 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index f5260f443..1cee2faed 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index 44fbaac69..3b83838cc 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.0.1</version>
+    <version>4.0.2-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index 8db45fb35..787577544 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-clients</artifactId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index bb6c5fc54..7d4bf67a6 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index f84681886..146886192 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.0.1</version>
+    <version>4.0.2-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>docsys</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index 0760081de..6028257b9 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index 7d590945b..2b2ee2ec8 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 4ab31aa27..8dfc49c8d 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>io.nosqlbench</groupId>
   <artifactId>mvn-defaults</artifactId>
-  <version>4.0.1</version>
+  <version>4.0.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -92,7 +92,7 @@
   <scm>
     <url>scm:git:https://github.com/nosqlbench/nosqlbench.git</url>
     <!--        <tag>nosqlbench-2.0.102-SNAPSHOT</tag>-->
-    <tag>nosqlbench-4.0.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencyManagement>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index e6dd128d5..b8dd56050 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 14a96049d..6bf769781 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.0.1</version>
+    <version>4.0.2-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>nb-annotations</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/nb/pom.xml b/nb/pom.xml
index bd40bd1b1..0df2b392d 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,31 +24,31 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-rest</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-cli</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-docs</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-core</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-extensions</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.2-SNAPSHOT</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -60,67 +60,67 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-web</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-kafka</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-stdout</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-diag</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-tcp</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.2-SNAPSHOT</version>
     </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-http</artifactId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-jmx</artifactId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-dsegraph-shaded</artifactId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cql-shaded</artifactId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cqlverify</artifactId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-mongodb</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.2-SNAPSHOT</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -257,7 +257,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-mongodb</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/pom.xml b/pom.xml
index b63f3e85d..410cb8a3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
@@ -145,7 +145,7 @@
             scm:git:https://github.com/nosqlbench/nosqlbench.git
         </developerConnection>
         <url>scm:git:git@github.com:nosqlbench/nosqlbench.git</url>
-        <tag>nosqlbench-4.0.1</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index c408f1999..f42e96a01 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index c25ea007e..3e50176d3 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index 31db599d1..d17408e13 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index b0d4dd1c1..c6df6b7f1 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index a2ffb84cd..36dc325b2 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index 306950121..fbf4ac8d1 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index d0d397df8..0cdbc62d9 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.0.1</version>
+          <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index 6dbb66b3c..61ff4feb9 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,36 +18,36 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

From 70f22ad8992706241e92bb3c677d4da59eb2a5a6 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 13:36:22 -0600
Subject: [PATCH 098/164] support J14 or J15 in appimage build

---
 nb/build-bin.sh | 72 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 52 insertions(+), 20 deletions(-)

diff --git a/nb/build-bin.sh b/nb/build-bin.sh
index 3f8fce4d3..4689448d2 100755
--- a/nb/build-bin.sh
+++ b/nb/build-bin.sh
@@ -29,28 +29,60 @@ fi
 
 rsync -av appimage/skel/ "${APPDIR}/"
 cp target/nb.jar "${APPDIR}/usr/bin/nb.jar"
-
-if [ ! -d "cache/jre15" ]
-then
-  printf "getting jre once into cache/jre15\n";
-  mkdir -p cache
-  (cd cache && (
-   if [ "$BUILD_OPENJ9" = "true" ]
-   then
-    wget -c wget -c https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2020-11-19-07-04/OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
-    tar -xf OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
-    mv jdk-15.0.1+9-jre jre15
-    rm OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
-   else
-    wget -c https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2020-11-19-07-04/OpenJDK15U-jre_x64_linux_hotspot_2020-11-19-07-04.tar.gz
-    tar xf OpenJDK15U-jre_x64_linux_hotspot_2020-11-19-07-04.tar.gz
-    mv jdk-15.0.1+9-jre jre15
-   fi
-  ))
-fi
+JAVA_VERSION="14"
 
 mkdir -p "${APPDIR}/usr/bin/jre"
-rsync -av cache/jre15/ "${APPDIR}/usr/bin/jre/"
+
+if [ "$JAVA_VERSION" == "15" ]
+then
+  if [ ! -d "cache/jre15" ] ; then
+    printf "getting jre once into cache/jre15\n";
+    mkdir -p cache
+    (cd cache && (
+     if [ "$BUILD_OPENJ9" = "true" ]
+     then
+      wget -c wget -c https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2020-11-19-07-04/OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
+      tar -xf OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
+      mv jdk-15.0.1+9-jre jre15
+      rm OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
+     else
+      wget -c https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2020-11-19-07-04/OpenJDK15U-jre_x64_linux_hotspot_2020-11-19-07-04.tar.gz
+      tar xf OpenJDK15U-jre_x64_linux_hotspot_2020-11-19-07-04.tar.gz
+      mv jdk-15.0.1+9-jre jre15
+     fi
+    ))
+  fi
+  rsync -av cache/jre15/ "${APPDIR}/usr/bin/jre/"
+# Java 14 should run binaries targeted to Java 11 bytecode
+elif [ "$JAVA_VERSION" == "14" ] ; then
+  if [ ! -d "cache/jre14" ] ; then
+    printf "getting jre once into cache/jre14\n";
+    mkdir -p cache
+    (cd cache && (
+     if [ "$BUILD_OPENJ9" = "true" ]
+     then
+      wget -c https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk14u-2020-04-27-07-27/OpenJDK14U-jre_x64_linux_openj9_linuxXL_2020-04-27-07-27.tar.gz
+      tar xf OpenJDK14U-jre_x64_linux_openj9_linuxXL_2020-04-27-07-27.tar.gz
+      mv jdk-14.0.1+7-jre jre14
+      rm OpenJDK14U-jre_x64_linux_openj9_linuxXL_2020-04-27-07-27.tar.gz
+     else
+      wget -c https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk14u-2020-04-27-07-27/OpenJDK14U-jre_x64_linux_hotspot_2020-04-27-07-27.tar.gz
+      tar xf OpenJDK14U-jre_x64_linux_hotspot_2020-04-27-07-27.tar.gz
+      mv jdk-14.0.1+7-jre jre14
+     fi
+    ))
+  fi
+  rsync -av cache/jre14/ "${APPDIR}/usr/bin/jre/"
+else
+  printf "Unknown java version indicated in $0"
+  exit 2
+   # wget -c https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.2%2B10/OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz
+   # tar xf OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz
+   # mv jdk-12.0.2+10-jre jre
+   # rm OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz
+fi
+
+
 
 if [ ! -f "${APPDIR}/AppRun" ]
   then

From d089ff245009603688729da435bdd5c7586a8f4a Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 13:36:45 -0600
Subject: [PATCH 099/164] document Java version references in project

---
 devdocs/java_versions.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 devdocs/java_versions.md

diff --git a/devdocs/java_versions.md b/devdocs/java_versions.md
new file mode 100644
index 000000000..538a2b734
--- /dev/null
+++ b/devdocs/java_versions.md
@@ -0,0 +1,18 @@
+# Java Version Updates
+
+This is a list of all the places that the Java version is referenced in
+the NoSQLBench project. If you change versions or need to do
+version-specific troubleshooting, this list will help.
+
+- In the Dockerfile, in the parent image "FROM" tag.
+  [here](../Dockerfile)
+- In the Maven pom files, under `<source>...</source>`, `<release>...
+  </release>`, `<target>...</target>`
+  [here](../mvn-defaults/pom.xml)
+- In some cases, a Maven variable '<java.target.version>...</java.target.
+  version>` is used.
+  [here](../mvn-defaults/pom.xml)
+- In the nb appimage build scripts under nb/build-bin.sh.
+  [here](../nb/build-bin.sh)
+- In the github actions workflows for the Java runtime version
+

From 2bfe24eb9b787cab69901b7eb072fb5984d04f08 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 13:37:28 -0600
Subject: [PATCH 100/164] backport auto pre-releases on -rc branches

---
 scripts/release-perform.sh | 7 ++++++-
 scripts/release-prepare.sh | 8 +++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/scripts/release-perform.sh b/scripts/release-perform.sh
index 131d8e446..2ae4aae49 100755
--- a/scripts/release-perform.sh
+++ b/scripts/release-perform.sh
@@ -19,10 +19,15 @@ if [[ "${last_release_commit_hash}" = "${GITHUB_SHA}" ]]; then
      exit 0
 fi
 
+PRERELEASE_BRANCH_PATTERN=${PRERELEASE_BRANCH_PATTERN:?PRERELEASE_BRANCH_PATTERN must be provided}
 # Filter the branch to execute the release on
 readonly local current_branch=$(git rev-parse --abbrev-ref HEAD)
 echo "Current branch: ${branch}"
-if [[ -n "$RELEASE_BRANCH_NAME" && ! "${current_branch}" = "$RELEASE_BRANCH_NAME" ]]; then
+if [[ -n "$RELEASE_BRANCH_NAME" && "${current_branch}" = "$RELEASE_BRANCH_NAME" ]]; then
+    echo "Building for release branch $RELEASE_BRANCH_NAME"
+elif [[ -n "${current_branch}" && "${current_branch}" == *"${PRERELEASE_BRANCH_PATTERN}"* ]]; then
+    echo "Building prerelease for branch $RELEASE_BRANCH_NAME"
+else
      echo "Skipping for ${current_branch} branch"
      exit 0
 fi
diff --git a/scripts/release-prepare.sh b/scripts/release-prepare.sh
index 033b461a1..ea84d7ea8 100755
--- a/scripts/release-prepare.sh
+++ b/scripts/release-prepare.sh
@@ -6,12 +6,18 @@ GIT_RELEASE_BOT_NAME=${GIT_RELEASE_BOT_NAME:?GIT_RELEASE_BOT_NAME must be provid
 GITHUB_SHA=${GITHUB_SHA:?GITHUB_SHA must be provided}
 GITHUB_REF=${GITHUB_REF:?GITHUB_REF must be provided}
 RELEASE_BRANCH_NAME=${RELEASE_BRANCH_NAME:?RELEASE_BRANCH_NAME must be provided}
+PRERELEASE_BRANCH_PATTERN=${PRERELEASE_BRANCH_PATTERN:?PRERELEASE_BRANCH_PATTERN must be provided}
+
 #git rev-parse --abbrev-ref HEAD
 
 # Filter the branch to execute the release on
 readonly local current_branch=$(git rev-parse --abbrev-ref HEAD)
 echo "Current branch: ${current_branch}"
-if [[ -n "$RELEASE_BRANCH_NAME" && ! "${current_branch}" = "$RELEASE_BRANCH_NAME" ]]; then
+if [[ -n "$RELEASE_BRANCH_NAME" && "${current_branch}" = "$RELEASE_BRANCH_NAME" ]]; then
+    echo "Building for release branch $RELEASE_BRANCH_NAME"
+elif [[ -n "${current_branch}" && "${current_branch}" == *"${PRERELEASE_BRANCH_PATTERN}"* ]]; then
+    echo "Building prerelease for branch $RELEASE_BRANCH_NAME"
+else 
      echo "Skipping for ${current_branch} branch"
      exit 0
 fi

From daea786c1f9cb1f2d4526fd199aee0db548e2765 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 13:38:19 -0600
Subject: [PATCH 101/164] leave source and targets at J11 and runtime at J14
 for NB3

---
 mvn-defaults/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 42b5c62aa..b3acd02d7 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -506,8 +506,8 @@
         <configuration>
           <debug>true</debug>
           <!--                    <release>${java.target.version}</release>-->
-          <source>15</source>
-          <target>15</target>
+          <source>11</source>
+          <target>11</target>
           <!--                    <compilerArgs>-->
           <!--                        &#45;&#45;enable-preview-->
           <!--                    </compilerArgs>-->

From 8cce0173ff30bb1a0dc8fa9a7ffdad834a9f504c Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 13:41:12 -0600
Subject: [PATCH 102/164] backport auto pre-release on -rc branches

---
 .github/workflows/release.yml | 49 ++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8757d8361..fdad4a3d0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
 
-    - name: checkout repo
+      - name: checkout repo
       uses: actions/checkout@v2
 
     - name: setup java
@@ -87,7 +87,8 @@ jobs:
     - name: prepare release
       run: scripts/release-prepare.sh
       env:
-       RELEASE_BRANCH_NAME: "main"
+        RELEASE_BRANCH_NAME: "main"
+        PRERELEASE_BRANCH_PATTERN: "-rc"
        GIT_RELEASE_BOT_NAME: "nb-droid"
        GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }}
        ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }}
@@ -103,7 +104,7 @@ jobs:
     - name: bundle integration test logs
       run: |
         pwd
-        ls -l
+        find nb
         mkdir -p itlogs/nb
         cp -R nb/logs itlogs/nb
 
@@ -138,22 +139,34 @@ jobs:
         mkdir staging
         cp nb/target/nb.jar nb/target/nb staging
 
-    - name: upload artifacts
-      uses: actions/upload-artifact@v1
-      with:
-       name: binaries
-       path: staging
+      - name: upload artifacts
+        uses: actions/upload-artifact@v1
+        with:
+          name: binaries
+          path: staging
 
-    - name: docker push
-      uses: docker/build-push-action@v1
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        repository: nosqlbench/nosqlbench
-        tags: latest, ${{ env.RELEASE_VERSION }}
-        tag_with_ref: false
+      - name: select release type from branch name
+        run: |
+          current_branch=$(git rev-parse --abbrev-ref HEAD)
+          if [[ ${current_branch} == *"-rc"* ]]
+           then
+            echo "PRERELEASE=true" >> $GITHUB_ENV
+            echo "DOCKER_TAGS='"${{ env.RELEASE_VERSION }}"'" >> $GITHUB_ENV
+           else
+            echo "PRERELEASE=false" >> $GITHUB_ENV
+            echo "DOCKER_TAGS='latest,"${{ env.RELEASE_VERSION }}"'" >> $GITHUB_ENV
+          fi
 
-    - name: bundle guidebook
+      - name: docker push
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: nosqlbench/nosqlbench
+          tags: ${{ env.DOCKER_TAGS }}
+          tag_with_ref: false
+
+      - name: bundle guidebook
       run: mkdir guidebook && cp -R nb/target/guidebook guidebook
 
     - name: upload guidebook
@@ -171,7 +184,7 @@ jobs:
         tag_name: ${{ env.RELEASE_TAGNAME }}
         release_name: Release ${{ env.RELEASE_TAGNAME }}
         draft: false
-        prerelease: false
+        prerelease: ${{ env.PRERELEASE }}
         body: ${{ steps.prepare_summary.outputs.release_summary }}
 
     - name: upload nb.jar

From 89c15d381c352062f7716c0c820b5cf323d78d05 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 13:41:16 -0600
Subject: [PATCH 103/164] backport github breaking change fixes

---
 .github/workflows/release.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fdad4a3d0..4d1662b7a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,8 +27,10 @@ jobs:
 
     - name: capture tty for gpg
       run: |
-       echo "::set-env name=TTY::"$(tty)
-       echo "::set-env name=GPG_TTY::"$(tty)
+        echo "TTY="$(tty) >> $GITHUB_ENV
+        echo "GPG_TTY="$(tty) >> $GITHUB_ENV
+        # echo "::set-env name=TTY::"$(tty)
+        # echo "::set-env name=GPG_TTY::"$(tty)
 
     - name: initialize gpg
       run: |
@@ -70,9 +72,12 @@ jobs:
         NEXT_MINOR_VERSION=$(( MINOR_VERSION+1))
         NEXT_SNAPSHOT="${BASE_VERSION}.${NEXT_MINOR_VERSION}-SNAPSHOT"
         RELEASE_TAGNAME="nosqlbench-${RELEASE_VERSION}"
-        echo "::set-env name=NEXT_SNAPSHOT::${NEXT_SNAPSHOT}"
-        echo "::set-env name=RELEASE_VERSION::${RELEASE_VERSION}"
-        echo "::set-env name=RELEASE_TAGNAME::${RELEASE_TAGNAME}"
+        echo "NEXT_SNAPSHOT=${NEXT_SNAPSHOT}" >> $GITHUB_ENV
+        echo "RELEASE_VERSION=${RELEASE_VERSION}" >> $GITHUB_ENV
+        echo "RELEASE_TAGNAME=${RELEASE_TAGNAME}" >> $GITHUB_ENV
+        # echo "::set-env name=NEXT_SNAPSHOT::${NEXT_SNAPSHOT}"
+        # echo "::set-env name=RELEASE_VERSION::${RELEASE_VERSION}"
+        # echo "::set-env name=RELEASE_TAGNAME::${RELEASE_TAGNAME}"
 
     - name: prepare release summary
       id: prepare_summary

From 3f4d130496b9b9123c1ccbf62d6f563f27e046ef Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 13:41:20 -0600
Subject: [PATCH 104/164] build NB3 with J14

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4d1662b7a..f32de1586 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
     - name: setup java
       uses: actions/setup-java@v1
       with:
-        java-version: '15'
+        java-version: '14'
         java-package: jdk
         architecture: x64
 

From 040db4782fa42b92f2f36c8dc69f2e81db0396cd Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 13:41:27 -0600
Subject: [PATCH 105/164] backport github actions breaking change fix

---
 .nosqlbench/grafana_apikey                    |   1 +
 .../ratelimits/InlineTokenPool.java           | 376 +++++++++++
 sort_docs/design/opstate.puml                 |  61 ++
 sort_docs/eb_iterates_cycles.puml             |  29 +
 sort_docs/eb_iterates_cycles.svg              | 221 +++++++
 sort_docs/eb_iterates_phases.puml             |  42 ++
 sort_docs/eb_iterates_phases.svg              | 284 ++++++++
 sort_docs/eb_latency_details.puml             |  38 ++
 sort_docs/eb_latency_terms.puml               |  30 +
 sort_docs/eb_latency_terms.svg                | 235 +++++++
 sort_docs/op_state_nomnoml.png                | Bin 0 -> 59238 bytes
 sort_docs/opstate_nomnoml.svg                 |  78 +++
 sort_docs/package_layout.md                   |   7 +
 sort_docs/parts.puml                          |   0
 sort_docs/rate_limiter_design.puml            |  82 +++
 sort_docs/ratelimiter_timelines.puml          |  47 ++
 sort_docs/research/multivariate.svg           | 540 ++++++++++++++++
 sort_docs/research/op_tracking.svg            | 611 ++++++++++++++++++
 sort_docs/testseq_early.png                   | Bin 0 -> 25703 bytes
 sort_docs/testseq_early.puml                  |  45 ++
 sort_docs/testseq_late.png                    | Bin 0 -> 25478 bytes
 sort_docs/testseq_late.puml                   |  51 ++
 sort_docs/todo.md                             |  16 +
 23 files changed, 2794 insertions(+)
 create mode 100644 .nosqlbench/grafana_apikey
 create mode 100644 engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/InlineTokenPool.java
 create mode 100644 sort_docs/design/opstate.puml
 create mode 100644 sort_docs/eb_iterates_cycles.puml
 create mode 100644 sort_docs/eb_iterates_cycles.svg
 create mode 100644 sort_docs/eb_iterates_phases.puml
 create mode 100644 sort_docs/eb_iterates_phases.svg
 create mode 100644 sort_docs/eb_latency_details.puml
 create mode 100644 sort_docs/eb_latency_terms.puml
 create mode 100644 sort_docs/eb_latency_terms.svg
 create mode 100644 sort_docs/op_state_nomnoml.png
 create mode 100644 sort_docs/opstate_nomnoml.svg
 create mode 100644 sort_docs/package_layout.md
 create mode 100644 sort_docs/parts.puml
 create mode 100644 sort_docs/rate_limiter_design.puml
 create mode 100644 sort_docs/ratelimiter_timelines.puml
 create mode 100644 sort_docs/research/multivariate.svg
 create mode 100644 sort_docs/research/op_tracking.svg
 create mode 100644 sort_docs/testseq_early.png
 create mode 100644 sort_docs/testseq_early.puml
 create mode 100644 sort_docs/testseq_late.png
 create mode 100644 sort_docs/testseq_late.puml
 create mode 100644 sort_docs/todo.md

diff --git a/.nosqlbench/grafana_apikey b/.nosqlbench/grafana_apikey
new file mode 100644
index 000000000..11d760aed
--- /dev/null
+++ b/.nosqlbench/grafana_apikey
@@ -0,0 +1 @@
+eyJrIjoibVFjRkV5Z096VHE0MjhXYk1RM2p1cnFuUkhQMXVZNGwiLCJuIjoibm9zcWxiZW5jaC0xMC4xMC4xMDAuNTItMTYwNzMxMDE2MDM0OCIsImlkIjoxfQ==
\ No newline at end of file
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/InlineTokenPool.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/InlineTokenPool.java
new file mode 100644
index 000000000..dfbfc8f36
--- /dev/null
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/InlineTokenPool.java
@@ -0,0 +1,376 @@
+/*
+ *
+ *    Copyright 2016 jshook
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ * /
+ */
+
+package io.nosqlbench.engine.api.activityapi.ratelimits;
+
+import com.codahale.metrics.Timer;
+import io.nosqlbench.engine.api.activityimpl.ActivityDef;
+import io.nosqlbench.engine.api.metrics.ActivityMetrics;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.RandomAccessFile;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.LockSupport;
+import java.util.concurrent.locks.ReentrantLock;
+
+import static io.nosqlbench.engine.api.util.Colors.*;
+
+/**
+ * <h2>Synopsis</h2>
+ *
+ * This TokenPool represents a finite quantity which can be
+ * replenished with regular refills. Extra tokens that do not fit
+ * within the active token pool are saved in a waiting token pool and
+ * used to backfill when allowed according to the backfill rate.
+ *
+ * A detailed explanation for how this works will be included
+ * at @link "http://docs.nosqlbench.io/" under dev notes.
+ *
+ * <p>This is the basis for the token-based rate limiters in
+ * NB. This mechanism is easily adaptable to bursting
+ * capability as well as a degree of stricter timing at speed.
+ * Various methods for doing this in a lock free way were
+ * investigated, but the intrinsic locks provided by synchronized
+ * method won out for now. This may be revisited when EB is
+ * retrofitted for J11.
+ * </p>
+ */
+public class InlineTokenPool {
+
+    private final static Logger logger = LogManager.getLogger(InlineTokenPool.class);
+
+    public static final double MIN_CONCURRENT_OPS = 5;
+
+    // Size limit of active pool
+    private long maxActivePoolSize;
+    // Size limit of burst pool incremental above active pool
+    private long maxBurstPoolSize;
+    // Size limit of total active tokens which can be waiting in active pool, considering burst
+    private long maxActiveAndBurstSize;
+
+    // Ratio of speed relative to base speed at which bursting is allowed
+    private double burstRatio;
+
+    // TODO Consider removing volatile after investigating
+
+    // The active number of tokens (ns) available for consumers
+    private volatile long activePool;
+    // The tokens which were not claimed on time, and were moved into the waitime (reserve) pool
+    private volatile long waitingPool;
+    // How many tokens (ns) represent passage of time for a single op, given the op rate
+    private long nanosPerOp;
+
+    // The nanotime of the last refill
+    private volatile long lastRefillAt;
+    // metrics for refill
+    private final Timer refillTimer;
+    // update rate for refiller
+    private final long interval = (long) 1E6;
+
+
+    private RateSpec rateSpec;
+//    private long debugTrigger=0L;
+//    private long debugRate=1000000000;
+
+    // Total number of thread blocks that occured since this token pool was started
+    private long blocks = 0L;
+
+    private final Lock lock = new ReentrantLock();
+    private final Condition lockheld = lock.newCondition();
+
+    /**
+     * This constructor tries to pick reasonable defaults for the token pool for
+     * a given rate spec. The active pool must be large enough to contain one
+     * op worth of time, and the burst ratio
+     *
+     * @param rateSpec a {@link RateSpec}
+     */
+    public InlineTokenPool(RateSpec rateSpec, ActivityDef def) {
+        ByteBuffer logbuf = getBuffer();
+        apply(rateSpec);
+        logger.debug("initialized token pool: " + this.toString() + " for rate:" + rateSpec.toString());
+        this.refillTimer = ActivityMetrics.timer(def, "tokenfiller");
+    }
+
+    public InlineTokenPool(long poolsize, double burstRatio, ActivityDef def) {
+        ByteBuffer logbuf = getBuffer();
+        this.maxActivePoolSize = poolsize;
+        this.burstRatio = burstRatio;
+        this.maxActiveAndBurstSize = (long) (maxActivePoolSize * burstRatio);
+        this.maxBurstPoolSize = maxActiveAndBurstSize - maxActivePoolSize;
+        this.refillTimer = ActivityMetrics.timer(def, "tokenfiller");
+    }
+
+    /**
+     * Change the settings of this token pool, and wake any blocked callers
+     * just in case it allows them to proceed.
+     *
+     * @param rateSpec The rate specifier.
+     */
+    public synchronized void apply(RateSpec rateSpec) {
+        this.rateSpec = rateSpec;
+        // maxActivePool is set to the higher of 1M or however many nanos are needed for 2 ops to be buffered
+        this.maxActivePoolSize = Math.max((long) 1E6, (long) ((double) rateSpec.getNanosPerOp() * MIN_CONCURRENT_OPS));
+        this.maxActiveAndBurstSize = (long) (maxActivePoolSize * rateSpec.getBurstRatio());
+        this.burstRatio = rateSpec.getBurstRatio();
+
+        this.maxBurstPoolSize = maxActiveAndBurstSize - maxActivePoolSize;
+        this.nanosPerOp = rateSpec.getNanosPerOp();
+        notifyAll();
+    }
+
+
+    public double getBurstRatio() {
+        return burstRatio;
+    }
+
+    /**
+     * Take tokens up to amt tokens form the pool and report
+     * the amount of token removed.
+     *
+     * @param amt tokens requested
+     * @return actual number of tokens removed, greater to or equal to zero
+     */
+    public synchronized long takeUpTo(long amt) {
+        long take = Math.min(amt, activePool);
+        activePool -= take;
+        return take;
+    }
+
+    /**
+     * wait for the given number of tokens to be available, and then remove
+     * them from the pool.
+     *
+     * @return the total number of tokens untaken, including wait tokens
+     */
+    public long blockAndTake() {
+        synchronized (this) {
+            if (activePool >= nanosPerOp) {
+                activePool -= nanosPerOp;
+                return waitingPool + activePool;
+            }
+        }
+        while (true) {
+            if (lock.tryLock()) {
+                try {
+                    while (activePool < nanosPerOp) {
+                        dorefill();
+                    }
+                    lockheld.signal();
+                    lockheld.signal();
+                } finally {
+                    lock.unlock();
+                }
+            } else {
+                try {
+                    lockheld.await();
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+//        while (activePool < nanosPerOp) {
+//            blocks++;
+//            //System.out.println(ANSI_BrightRed +  "waiting for " + amt + "/" + activePool + " of max " + maxActivePool + ANSI_Reset);
+//            try {
+//                wait();
+////                wait(maxActivePoolSize / 1000000, (int) maxActivePoolSize % 1000000);
+//            } catch (InterruptedException ignored) {
+//            } catch (Exception e) {
+//                throw new RuntimeException(e);
+//            }
+//            //System.out.println("waited for " + amt + "/" + activePool + " tokens");
+//        }
+//        //System.out.println(ANSI_BrightYellow + "taking " + amt + "/" + activePool + ANSI_Reset);
+//
+//        activePool -= nanosPerOp;
+//        return waitingPool + activePool;
+    }
+
+    public synchronized long blockAndTakeOps(long ops) {
+        long totalNanosNeeded = ops * nanosPerOp;
+        while (activePool < totalNanosNeeded) {
+            blocks++;
+            //System.out.println(ANSI_BrightRed +  "waiting for " + amt + "/" + activePool + " of max " + maxActivePool + ANSI_Reset);
+            try {
+                wait();
+//                wait(maxActivePoolSize / 1000000, (int) maxActivePoolSize % 1000000);
+            } catch (InterruptedException ignored) {
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+            //System.out.println("waited for " + amt + "/" + activePool + " tokens");
+        }
+        //System.out.println(ANSI_BrightYellow + "taking " + amt + "/" + activePool + ANSI_Reset);
+
+        activePool -= totalNanosNeeded;
+        return waitingPool + activePool;
+    }
+
+    public synchronized long blockAndTake(long tokens) {
+        while (activePool < tokens) {
+            //System.out.println(ANSI_BrightRed +  "waiting for " + amt + "/" + activePool + " of max " + maxActivePool + ANSI_Reset);
+            try {
+                wait();
+//                wait(maxActivePoolSize / 1000000, (int) maxActivePoolSize % 1000000);
+            } catch (InterruptedException ignored) {
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+            //System.out.println("waited for " + amt + "/" + activePool + " tokens");
+        }
+        //System.out.println(ANSI_BrightYellow + "taking " + amt + "/" + activePool + ANSI_Reset);
+
+        activePool -= tokens;
+        return waitingPool + activePool;
+    }
+
+    public long getWaitTime() {
+        return activePool + waitingPool;
+    }
+
+    public long getWaitPool() {
+        return waitingPool;
+    }
+
+    public long getActivePool() {
+        return activePool;
+    }
+
+    /**
+     * Add the given number of new tokens to the pool, forcing any amount
+     * that would spill over the current pool size into the wait token pool, but
+     * moving up to the configured burst tokens back from the wait token pool
+     * otherwise.
+     *
+     * The amount of backfilling that occurs is controlled by the backfill ratio,
+     * based on the number of tokens submitted. This causes normalizes the
+     * backfilling rate to the fill rate, so that it is not sensitive to refill
+     * scheduling.
+     *
+     * @param newTokens The number of new tokens to add to the token pools
+     * @return the total number of tokens in all pools
+     */
+    public synchronized long refill(long newTokens) {
+        boolean debugthis = false;
+//        long debugAt = System.nanoTime();
+//        if (debugAt>debugTrigger+debugRate) {
+//            debugTrigger=debugAt;
+//            debugthis=true;
+//        }
+
+        long needed = Math.max(maxActivePoolSize - activePool, 0L);
+        long allocatedToActivePool = Math.min(newTokens, needed);
+        activePool += allocatedToActivePool;
+
+
+        // overflow logic
+        long allocatedToOverflowPool = newTokens - allocatedToActivePool;
+        waitingPool += allocatedToOverflowPool;
+
+        // backfill logic
+        double refillFactor = Math.min((double) newTokens / maxActivePoolSize, 1.0D);
+        long burstFillAllowed = (long) (refillFactor * maxBurstPoolSize);
+
+        burstFillAllowed = Math.min(maxActiveAndBurstSize - activePool, burstFillAllowed);
+        long burstFill = Math.min(burstFillAllowed, waitingPool);
+
+        waitingPool -= burstFill;
+        activePool += burstFill;
+
+        if (debugthis) {
+            System.out.print(this);
+            System.out.print(ANSI_BrightBlue + " adding=" + allocatedToActivePool);
+            if (allocatedToOverflowPool > 0) {
+                System.out.print(ANSI_Red + " OVERFLOW:" + allocatedToOverflowPool + ANSI_Reset);
+            }
+            if (burstFill > 0) {
+                System.out.print(ANSI_BrightGreen + " BACKFILL:" + burstFill + ANSI_Reset);
+            }
+            System.out.println();
+        }
+
+        //System.out.println(this);
+        notifyAll();
+
+        return activePool + waitingPool;
+    }
+
+    @Override
+    public String toString() {
+        return "Tokens: active=" + activePool + "/" + maxActivePoolSize
+                + String.format(
+                " (%3.1f%%)A (%3.1f%%)B ",
+                (((double) activePool / (double) maxActivePoolSize) * 100.0),
+                (((double) activePool / (double) maxActiveAndBurstSize) * 100.0)) + " waiting=" + waitingPool +
+                " blocks=" + blocks +
+                " rateSpec:" + ((rateSpec != null) ? rateSpec.toString() : "NULL");
+    }
+
+    public RateSpec getRateSpec() {
+        return rateSpec;
+    }
+
+    public synchronized long restart() {
+        long wait = activePool + waitingPool;
+        activePool = 0L;
+        waitingPool = 0L;
+        return wait;
+    }
+
+    private ByteBuffer getBuffer() {
+        RandomAccessFile image = null;
+        try {
+            image = new RandomAccessFile("tokenbucket.binlog", "rw");
+            ByteBuffer mbb = image.getChannel().map(FileChannel.MapMode.READ_WRITE, 0, image.length());
+            return mbb;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public synchronized void dorefill() {
+        lastRefillAt = System.nanoTime();
+        long nextRefillTime = lastRefillAt + interval;
+        long thisRefillTime = System.nanoTime();
+        while (thisRefillTime < nextRefillTime) {
+//            while (thisRefillTime < lastRefillAt + interval) {
+            long parkfor = Math.max(nextRefillTime - thisRefillTime, 0L);
+            //System.out.println(ANSI_Blue + "parking for " + parkfor + "ns" + ANSI_Reset);
+            LockSupport.parkNanos(parkfor);
+            thisRefillTime = System.nanoTime();
+        }
+
+//            this.times[iteration]=thisRefillTime;
+        long delta = thisRefillTime - lastRefillAt;
+//            this.amounts[iteration]=delta;
+        lastRefillAt = thisRefillTime;
+
+        //System.out.println(this);
+        refill(delta);
+        refillTimer.update(delta, TimeUnit.NANOSECONDS);
+//            iteration++;
+
+    }
+
+
+}
diff --git a/sort_docs/design/opstate.puml b/sort_docs/design/opstate.puml
new file mode 100644
index 000000000..eb6be73d4
--- /dev/null
+++ b/sort_docs/design/opstate.puml
@@ -0,0 +1,61 @@
+@startuml
+scale 600 width
+[*] --> TrackedOp : track()
+
+ TrackedOp: setCycle(cycle)
+ TrackedOp: setWaitTime(delay)
+ TrackedOp: start()
+ TrackedOp:
+ TrackedOp: setData(data)
+ TrackedOp: getData()
+ TrackedOp: skip(reason)
+
+State InProtocol {
+
+    TrackedOp --> StartedOp : start()
+
+    StartedOp: getCycle()
+    StartedOp: setData(data)
+    StartedOp: getData()
+    StartedOp: succeed(status)
+    StartedOp:
+    StartedOp: retry()
+    StartedOp: fail(status)
+    StartedOp: getStartedAtNanos()
+    StartedOp: getCurrentServiceTimeNanos()
+    StartedOp: getCurrentResponseTimeNanos()
+
+    StartedOp -> StartedOp : retry()
+
+    StartedOp --> SucceededOp : succeed()
+    SucceededOp: getCycle()
+    SucceededOp: getResult()
+    SucceededOp: getTries()
+    SucceededOp: getStartedAtNanos()
+    SucceededOp: getServiceTimeNanos()
+    SucceededOp: getResponseTimeNanos()
+
+    StartedOp --> FailedOp: fail()
+    FailedOp: getCycle()
+    FailedOp: getResult()
+    FailedOp: getTries()
+    FailedOp: getStartedAtNanos()
+    FailedOp: getServiceTimeNanos()
+    FailedOp: getResponseTimeNanos()
+}
+
+TrackedOp --> SkippedOp : skip()
+SkippedOp: getSkippedReason()
+SkippedOp:
+SkippedOp: getCycle()
+SkippedOp: getResult()
+SkippedOp: getStartedAtNanos()
+SkippedOp: getData()
+SkippedOp: setData(data)
+
+
+SucceededOp --> [*]
+FailedOp --> [*]
+SkippedOp --> [*]
+
+@enduml
\ No newline at end of file
diff --git a/sort_docs/eb_iterates_cycles.puml b/sort_docs/eb_iterates_cycles.puml
new file mode 100644
index 000000000..15d22bfca
--- /dev/null
+++ b/sort_docs/eb_iterates_cycles.puml
@@ -0,0 +1,29 @@
+@startuml
+
+Participant Input as i
+Participant Thread as t
+Participant Action as a
+
+== acquire input ==
+
+group TIMER read-input
+ t -> i : get segment(stride)
+ activate i
+ t <- i : <cycle segment>[stride]
+ deactivate i
+end
+
+group TIMER strides
+
+ loop over cycle values in segment
+  group TIMER cycle & phase
+    t -> a : runCycle(cycle)
+    activate a
+    t <- a : result
+    deactivate a
+   end
+end
+
+end # strides
+
+@enduml
\ No newline at end of file
diff --git a/sort_docs/eb_iterates_cycles.svg b/sort_docs/eb_iterates_cycles.svg
new file mode 100644
index 000000000..d7e447ca2
--- /dev/null
+++ b/sort_docs/eb_iterates_cycles.svg
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+     contentScriptType="application/ecmascript" contentStyleType="text/css" height="687.6px"
+     preserveAspectRatio="none"
+     style="width:919px;height:687px;" version="1.1" viewBox="0 0 919 687" width="919.8px"
+     zoomAndPan="magnify">
+  <defs>
+    <filter height="300%" id="f1a0022fu680ij" width="300%" x="-1" y="-1">
+      <feGaussianBlur result="blurOut" stdDeviation="3.5999999046325684"/>
+      <feColorMatrix in="blurOut" result="blurOut2" type="matrix"
+                     values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
+      <feOffset dx="7.199999809265137" dy="7.199999809265137" in="blurOut2" result="blurOut3"/>
+      <feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/>
+    </filter>
+  </defs>
+  <g>
+    <rect fill="#FFFFFF" filter="url(#f1a0022fu680ij)" height="52.4391"
+          style="stroke: #A80036; stroke-width: 1.7999999523162842;" width="18" x="80.1"
+          y="245.8125"/>
+    <rect fill="#FFFFFF" filter="url(#f1a0022fu680ij)" height="52.4391"
+          style="stroke: #A80036; stroke-width: 1.7999999523162842;" width="18" x="639.9"
+          y="493.6078"/>
+    <rect fill="#FFFFFF" filter="url(#f1a0022fu680ij)" height="135.7172"
+          style="stroke: #000000; stroke-width: 3.5999999046325684;" width="486" x="23.4"
+          y="177.1734"/>
+    <rect fill="#FFFFFF" filter="url(#f1a0022fu680ij)" height="247.7953"
+          style="stroke: #000000; stroke-width: 3.5999999046325684;" width="563.4" x="316.8"
+          y="338.0906"/>
+    <rect fill="#FFFFFF" filter="url(#f1a0022fu680ij)" height="191.7562"
+          style="stroke: #000000; stroke-width: 3.5999999046325684;" width="527.4" x="334.8"
+          y="381.5297"/>
+    <rect fill="#FFFFFF" filter="url(#f1a0022fu680ij)" height="135.7172"
+          style="stroke: #000000; stroke-width: 3.5999999046325684;" width="369" x="352.8"
+          y="424.9687"/>
+    <line style="stroke: #A80036; stroke-width: 1.7999999523162842; stroke-dasharray: 5.0,5.0;"
+          x1="88.2" x2="88.2"
+          y1="68.9344" y2="616.4859"/>
+    <line style="stroke: #A80036; stroke-width: 1.7999999523162842; stroke-dasharray: 5.0,5.0;"
+          x1="430.2"
+          x2="430.2" y1="68.9344" y2="616.4859"/>
+    <line style="stroke: #A80036; stroke-width: 1.7999999523162842; stroke-dasharray: 5.0,5.0;"
+          x1="648" x2="648"
+          y1="68.9344" y2="616.4859"/>
+    <rect fill="#FEFECE" filter="url(#f1a0022fu680ij)" height="54.5344"
+          style="stroke: #A80036; stroke-width: 2.6999999284744263;" width="88.2" x="41.4" y="5.4"/>
+    <text fill="#000000" font-family="sans-serif" font-size="25.2" lengthAdjust="spacingAndGlyphs"
+          textLength="63"
+          x="54" y="41.3912">Input
+    </text>
+    <rect fill="#FEFECE" filter="url(#f1a0022fu680ij)" height="54.5344"
+          style="stroke: #A80036; stroke-width: 2.6999999284744263;" width="88.2" x="41.4"
+          y="614.6859"/>
+    <text fill="#000000" font-family="sans-serif" font-size="25.2" lengthAdjust="spacingAndGlyphs"
+          textLength="63"
+          x="54" y="650.6771">Input
+    </text>
+    <rect fill="#FEFECE" filter="url(#f1a0022fu680ij)" height="54.5344"
+          style="stroke: #A80036; stroke-width: 2.6999999284744263;" width="113.4" x="370.8"
+          y="5.4"/>
+    <text fill="#000000" font-family="sans-serif" font-size="25.2" lengthAdjust="spacingAndGlyphs"
+          textLength="88.2"
+          x="383.4" y="41.3912">Thread
+    </text>
+    <rect fill="#FEFECE" filter="url(#f1a0022fu680ij)" height="54.5344"
+          style="stroke: #A80036; stroke-width: 2.6999999284744263;" width="113.4" x="370.8"
+          y="614.6859"/>
+    <text fill="#000000" font-family="sans-serif" font-size="25.2" lengthAdjust="spacingAndGlyphs"
+          textLength="88.2"
+          x="383.4" y="650.6771">Thread
+    </text>
+    <rect fill="#FEFECE" filter="url(#f1a0022fu680ij)" height="54.5344"
+          style="stroke: #A80036; stroke-width: 2.6999999284744263;" width="102.6" x="594" y="5.4"/>
+    <text fill="#000000" font-family="sans-serif" font-size="25.2" lengthAdjust="spacingAndGlyphs"
+          textLength="77.4"
+          x="606.6" y="41.3912">Action
+    </text>
+    <rect fill="#FEFECE" filter="url(#f1a0022fu680ij)" height="54.5344"
+          style="stroke: #A80036; stroke-width: 2.6999999284744263;" width="102.6" x="594"
+          y="614.6859"/>
+    <text fill="#000000" font-family="sans-serif" font-size="25.2" lengthAdjust="spacingAndGlyphs"
+          textLength="77.4"
+          x="606.6" y="650.6771">Action
+    </text>
+    <rect fill="#FFFFFF" filter="url(#f1a0022fu680ij)" height="52.4391"
+          style="stroke: #A80036; stroke-width: 1.7999999523162842;" width="18" x="80.1"
+          y="245.8125"/>
+    <rect fill="#FFFFFF" filter="url(#f1a0022fu680ij)" height="52.4391"
+          style="stroke: #A80036; stroke-width: 1.7999999523162842;" width="18" x="639.9"
+          y="493.6078"/>
+    <rect fill="#EEEEEE" filter="url(#f1a0022fu680ij)" height="5.4"
+          style="stroke: #EEEEEE; stroke-width: 1.7999999523162842;" width="892.8" x="5.4"
+          y="123.9539"/>
+    <line style="stroke: #000000; stroke-width: 1.7999999523162842;" x1="5.4" x2="898.2"
+          y1="123.9539"
+          y2="123.9539"/>
+    <line style="stroke: #000000; stroke-width: 1.7999999523162842;" x1="5.4" x2="898.2"
+          y1="129.3539"
+          y2="129.3539"/>
+    <rect fill="#EEEEEE" filter="url(#f1a0022fu680ij)" height="41.6391"
+          style="stroke: #000000; stroke-width: 3.5999999046325684;" width="210.6" x="346.5"
+          y="104.9344"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" font-weight="bold"
+          lengthAdjust="spacingAndGlyphs" textLength="176.4" x="357.3" y="133.8548">acquire input
+    </text>
+    <rect fill="none" height="135.7172" style="stroke: #000000; stroke-width: 3.5999999046325684;"
+          width="486"
+          x="23.4" y="177.1734"/>
+    <polygon fill="#EEEEEE"
+             points="23.4,177.1734,331.2,177.1734,331.2,189.7734,313.2,207.7734,23.4,207.7734,23.4,177.1734"
+             style="stroke: #000000; stroke-width: 3.5999999046325684;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" font-weight="bold"
+          lengthAdjust="spacingAndGlyphs" textLength="226.8" x="50.4" y="200.6938">TIMER read-input
+    </text>
+    <polygon fill="#A80036" points="117.9,238.6125,99.9,245.8125,117.9,253.0125,110.7,245.8125"
+             style="stroke: #A80036; stroke-width: 1.7999999523162842;"/>
+    <line style="stroke: #A80036; stroke-width: 1.7999999523162842;" x1="107.1" x2="429.3"
+          y1="245.8125"
+          y2="245.8125"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" lengthAdjust="spacingAndGlyphs"
+          textLength="230.4" x="128.7" y="236.9329">get segment(stride)
+    </text>
+    <polygon fill="#A80036" points="409.5,291.0516,427.5,298.2516,409.5,305.4516,416.7,298.2516"
+             style="stroke: #A80036; stroke-width: 1.7999999523162842;"/>
+    <line style="stroke: #A80036; stroke-width: 1.7999999523162842;" x1="89.1" x2="420.3"
+          y1="298.2516"
+          y2="298.2516"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" lengthAdjust="spacingAndGlyphs"
+          textLength="289.8" x="101.7" y="289.372">&lt;cycle segment&gt;[stride]
+    </text>
+    <rect fill="none" height="247.7953" style="stroke: #000000; stroke-width: 3.5999999046325684;"
+          width="563.4"
+          x="316.8" y="338.0906"/>
+    <polygon fill="#EEEEEE"
+             points="316.8,338.0906,577.8,338.0906,577.8,350.6906,559.8,368.6906,316.8,368.6906,316.8,338.0906"
+             style="stroke: #000000; stroke-width: 3.5999999046325684;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" font-weight="bold"
+          lengthAdjust="spacingAndGlyphs" textLength="180" x="343.8" y="361.611">TIMER strides
+    </text>
+    <rect fill="none" height="191.7562" style="stroke: #000000; stroke-width: 3.5999999046325684;"
+          width="527.4"
+          x="334.8" y="381.5297"/>
+    <polygon fill="#EEEEEE"
+             points="334.8,381.5297,473.4,381.5297,473.4,394.1297,455.4,412.1297,334.8,412.1297,334.8,381.5297"
+             style="stroke: #000000; stroke-width: 3.5999999046325684;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" font-weight="bold"
+          lengthAdjust="spacingAndGlyphs" textLength="57.6" x="361.8" y="405.0501">loop
+    </text>
+    <text fill="#000000" font-family="sans-serif" font-size="19.8" font-weight="bold"
+          lengthAdjust="spacingAndGlyphs" textLength="352.8" x="500.4" y="403.5085">[over cycle
+      values in segment]
+    </text>
+    <rect fill="none" height="135.7172" style="stroke: #000000; stroke-width: 3.5999999046325684;"
+          width="369"
+          x="352.8" y="424.9687"/>
+    <polygon fill="#EEEEEE"
+             points="352.8,424.9687,707.4,424.9687,707.4,437.5687,689.4,455.5687,352.8,455.5687,352.8,424.9687"
+             style="stroke: #000000; stroke-width: 3.5999999046325684;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" font-weight="bold"
+          lengthAdjust="spacingAndGlyphs" textLength="273.6" x="379.8" y="448.4891">TIMER cycle
+      &amp; phase
+    </text>
+    <polygon fill="#A80036" points="618.3,486.4078,636.3,493.6078,618.3,500.8078,625.5,493.6078"
+             style="stroke: #A80036; stroke-width: 1.7999999523162842;"/>
+    <line style="stroke: #A80036; stroke-width: 1.7999999523162842;" x1="431.1" x2="629.1"
+          y1="493.6078"
+          y2="493.6078"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" lengthAdjust="spacingAndGlyphs"
+          textLength="174.6" x="443.7" y="484.7282">runCycle(cycle)
+    </text>
+    <polygon fill="#A80036" points="450.9,538.8469,432.9,546.0469,450.9,553.2469,443.7,546.0469"
+             style="stroke: #A80036; stroke-width: 1.7999999523162842;"/>
+    <line style="stroke: #A80036; stroke-width: 1.7999999523162842;" x1="440.1" x2="647.1"
+          y1="546.0469"
+          y2="546.0469"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" lengthAdjust="spacingAndGlyphs"
+          textLength="64.8"
+          x="461.7" y="537.1673">result
+    </text><!--
+@startuml
+
+Participant Input as i
+Participant Thread as t
+Participant Action as a
+
+== acquire input ==
+
+group TIMER read-input
+ t -> i : get segment(stride)
+ activate i
+ t <- i : <cycle segment>[stride]
+ deactivate i
+end
+
+group TIMER strides
+
+ loop over cycle values in segment
+  group TIMER cycle & phase
+    t -> a : runCycle(cycle)
+    activate a
+    t <- a : result
+    deactivate a
+   end
+end
+
+end # strides
+
+@enduml
+
+PlantUML version 1.2017.15(Mon Jul 03 11:45:34 CDT 2017)
+(GPL source distribution)
+Java Runtime: OpenJDK Runtime Environment
+JVM: OpenJDK 64-Bit Server VM
+Java Version: 1.8.0_152-release-1024-b11
+Operating System: Linux
+OS Version: 4.10.0-42-generic
+Default Encoding: UTF-8
+Language: en
+Country: US
+-->
+  </g>
+</svg>
\ No newline at end of file
diff --git a/sort_docs/eb_iterates_phases.puml b/sort_docs/eb_iterates_phases.puml
new file mode 100644
index 000000000..ff3d1c82a
--- /dev/null
+++ b/sort_docs/eb_iterates_phases.puml
@@ -0,0 +1,42 @@
+@startuml
+
+Participant Input as i
+Participant Thread as t
+Participant Action as a
+
+== acquire input data ==
+
+group TIMER read-input
+ t -> i : get segment(stride)
+ activate i
+ t <- i : <cycle segment>[stride]
+ deactivate i
+end
+
+group TIMER strides
+
+ loop over cycle values in segment
+  group TIMER cycle
+   group TIMER phase
+    t -> a : runCycle(cycle)
+    activate a
+    t <- a : result
+    deactivate a
+   end
+
+== additional phases ==
+
+group TIMER phase
+ loop until phases complete
+ t -> a : runPhase(cycle)
+ activate a
+ t <- a : result
+ deactivate a
+end
+end
+end
+end
+
+end # strides
+
+@enduml
\ No newline at end of file
diff --git a/sort_docs/eb_iterates_phases.svg b/sort_docs/eb_iterates_phases.svg
new file mode 100644
index 000000000..577addfd1
--- /dev/null
+++ b/sort_docs/eb_iterates_phases.svg
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+     contentScriptType="application/ecmascript" contentStyleType="text/css" height="1038.6px"
+     preserveAspectRatio="none" style="width:912px;height:1038px;" version="1.1"
+     viewBox="0 0 912 1038" width="912.6px" zoomAndPan="magnify">
+  <defs>
+    <filter height="300%" id="f1elad485baf09" width="300%" x="-1" y="-1">
+      <feGaussianBlur result="blurOut" stdDeviation="3.5999999046325684"/>
+      <feColorMatrix in="blurOut" result="blurOut2" type="matrix"
+                     values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
+      <feOffset dx="7.199999809265137" dy="7.199999809265137" in="blurOut2" result="blurOut3"/>
+      <feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/>
+    </filter>
+  </defs>
+  <g>
+    <rect fill="#FFFFFF" filter="url(#f1elad485baf09)" height="52.4391"
+          style="stroke: #A80036; stroke-width: 1.7999999523162842;" width="18" x="80.1"
+          y="245.8125"/>
+    <rect fill="#FFFFFF" filter="url(#f1elad485baf09)" height="52.4391"
+          style="stroke: #A80036; stroke-width: 1.7999999523162842;" width="18" x="648.9"
+          y="537.0469"/>
+    <rect fill="#FFFFFF" filter="url(#f1elad485baf09)" height="52.4391"
+          style="stroke: #A80036; stroke-width: 1.7999999523162842;" width="18" x="648.9"
+          y="819.0422"/>
+    <rect fill="#FFFFFF" filter="url(#f1elad485baf09)" height="135.7172"
+          style="stroke: #000000; stroke-width: 3.5999999046325684;" width="486" x="23.4"
+          y="177.1734"/>
+    <rect fill="#FFFFFF" filter="url(#f1elad485baf09)" height="598.4297"
+          style="stroke: #000000; stroke-width: 3.5999999046325684;" width="592.2" x="280.8"
+          y="338.0906"/>
+    <rect fill="#FFFFFF" filter="url(#f1elad485baf09)" height="542.3906"
+          style="stroke: #000000; stroke-width: 3.5999999046325684;" width="556.2" x="298.8"
+          y="381.5297"/>
+    <rect fill="#FFFFFF" filter="url(#f1elad485baf09)" height="486.3515"
+          style="stroke: #000000; stroke-width: 3.5999999046325684;" width="520.2" x="316.8"
+          y="424.9687"/>
+    <rect fill="#FFFFFF" filter="url(#f1elad485baf09)" height="135.7172"
+          style="stroke: #000000; stroke-width: 3.5999999046325684;" width="378" x="352.8"
+          y="468.4078"/>
+    <rect fill="#FFFFFF" filter="url(#f1elad485baf09)" height="191.7562"
+          style="stroke: #000000; stroke-width: 3.5999999046325684;" width="484.2" x="334.8"
+          y="706.964"/>
+    <rect fill="#FFFFFF" filter="url(#f1elad485baf09)" height="135.7172"
+          style="stroke: #000000; stroke-width: 3.5999999046325684;" width="448.2" x="352.8"
+          y="750.4031"/>
+    <line style="stroke: #A80036; stroke-width: 1.7999999523162842; stroke-dasharray: 5.0,5.0;"
+          x1="88.2" x2="88.2" y1="68.9344" y2="967.1203"/>
+    <line style="stroke: #A80036; stroke-width: 1.7999999523162842; stroke-dasharray: 5.0,5.0;"
+          x1="430.2" x2="430.2" y1="68.9344" y2="967.1203"/>
+    <line style="stroke: #A80036; stroke-width: 1.7999999523162842; stroke-dasharray: 5.0,5.0;"
+          x1="657" x2="657" y1="68.9344" y2="967.1203"/>
+    <rect fill="#FEFECE" filter="url(#f1elad485baf09)" height="54.5344"
+          style="stroke: #A80036; stroke-width: 2.6999999284744263;" width="88.2" x="41.4" y="5.4"/>
+    <text fill="#000000" font-family="sans-serif" font-size="25.2" lengthAdjust="spacingAndGlyphs"
+          textLength="63" x="54" y="41.3912">Input
+    </text>
+    <rect fill="#FEFECE" filter="url(#f1elad485baf09)" height="54.5344"
+          style="stroke: #A80036; stroke-width: 2.6999999284744263;" width="88.2" x="41.4"
+          y="965.3203"/>
+    <text fill="#000000" font-family="sans-serif" font-size="25.2" lengthAdjust="spacingAndGlyphs"
+          textLength="63" x="54" y="1001.3115">Input
+    </text>
+    <rect fill="#FEFECE" filter="url(#f1elad485baf09)" height="54.5344"
+          style="stroke: #A80036; stroke-width: 2.6999999284744263;" width="113.4" x="370.8"
+          y="5.4"/>
+    <text fill="#000000" font-family="sans-serif" font-size="25.2" lengthAdjust="spacingAndGlyphs"
+          textLength="88.2" x="383.4" y="41.3912">Thread
+    </text>
+    <rect fill="#FEFECE" filter="url(#f1elad485baf09)" height="54.5344"
+          style="stroke: #A80036; stroke-width: 2.6999999284744263;" width="113.4" x="370.8"
+          y="965.3203"/>
+    <text fill="#000000" font-family="sans-serif" font-size="25.2" lengthAdjust="spacingAndGlyphs"
+          textLength="88.2" x="383.4" y="1001.3115">Thread
+    </text>
+    <rect fill="#FEFECE" filter="url(#f1elad485baf09)" height="54.5344"
+          style="stroke: #A80036; stroke-width: 2.6999999284744263;" width="102.6" x="603" y="5.4"/>
+    <text fill="#000000" font-family="sans-serif" font-size="25.2" lengthAdjust="spacingAndGlyphs"
+          textLength="77.4" x="615.6" y="41.3912">Action
+    </text>
+    <rect fill="#FEFECE" filter="url(#f1elad485baf09)" height="54.5344"
+          style="stroke: #A80036; stroke-width: 2.6999999284744263;" width="102.6" x="603"
+          y="965.3203"/>
+    <text fill="#000000" font-family="sans-serif" font-size="25.2" lengthAdjust="spacingAndGlyphs"
+          textLength="77.4" x="615.6" y="1001.3115">Action
+    </text>
+    <rect fill="#FFFFFF" filter="url(#f1elad485baf09)" height="52.4391"
+          style="stroke: #A80036; stroke-width: 1.7999999523162842;" width="18" x="80.1"
+          y="245.8125"/>
+    <rect fill="#FFFFFF" filter="url(#f1elad485baf09)" height="52.4391"
+          style="stroke: #A80036; stroke-width: 1.7999999523162842;" width="18" x="648.9"
+          y="537.0469"/>
+    <rect fill="#FFFFFF" filter="url(#f1elad485baf09)" height="52.4391"
+          style="stroke: #A80036; stroke-width: 1.7999999523162842;" width="18" x="648.9"
+          y="819.0422"/>
+    <rect fill="#EEEEEE" filter="url(#f1elad485baf09)" height="5.4"
+          style="stroke: #EEEEEE; stroke-width: 1.7999999523162842;" width="885.6" x="5.4"
+          y="123.9539"/>
+    <line style="stroke: #000000; stroke-width: 1.7999999523162842;" x1="5.4" x2="891" y1="123.9539"
+          y2="123.9539"/>
+    <line style="stroke: #000000; stroke-width: 1.7999999523162842;" x1="5.4" x2="891" y1="129.3539"
+          y2="129.3539"/>
+    <rect fill="#EEEEEE" filter="url(#f1elad485baf09)" height="41.6391"
+          style="stroke: #000000; stroke-width: 3.5999999046325684;" width="280.8" x="307.8"
+          y="104.9344"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" font-weight="bold"
+          lengthAdjust="spacingAndGlyphs" textLength="246.6" x="318.6" y="133.8548">acquire input
+      data
+    </text>
+    <rect fill="none" height="135.7172" style="stroke: #000000; stroke-width: 3.5999999046325684;"
+          width="486" x="23.4" y="177.1734"/>
+    <polygon fill="#EEEEEE"
+             points="23.4,177.1734,331.2,177.1734,331.2,189.7734,313.2,207.7734,23.4,207.7734,23.4,177.1734"
+             style="stroke: #000000; stroke-width: 3.5999999046325684;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" font-weight="bold"
+          lengthAdjust="spacingAndGlyphs" textLength="226.8" x="50.4" y="200.6938">TIMER read-input
+    </text>
+    <polygon fill="#A80036" points="117.9,238.6125,99.9,245.8125,117.9,253.0125,110.7,245.8125"
+             style="stroke: #A80036; stroke-width: 1.7999999523162842;"/>
+    <line style="stroke: #A80036; stroke-width: 1.7999999523162842;" x1="107.1" x2="429.3"
+          y1="245.8125" y2="245.8125"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" lengthAdjust="spacingAndGlyphs"
+          textLength="230.4" x="128.7" y="236.9329">get segment(stride)
+    </text>
+    <polygon fill="#A80036" points="409.5,291.0516,427.5,298.2516,409.5,305.4516,416.7,298.2516"
+             style="stroke: #A80036; stroke-width: 1.7999999523162842;"/>
+    <line style="stroke: #A80036; stroke-width: 1.7999999523162842;" x1="89.1" x2="420.3"
+          y1="298.2516" y2="298.2516"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" lengthAdjust="spacingAndGlyphs"
+          textLength="289.8" x="101.7" y="289.372">&lt;cycle segment&gt;[stride]
+    </text>
+    <rect fill="none" height="598.4297" style="stroke: #000000; stroke-width: 3.5999999046325684;"
+          width="592.2" x="280.8" y="338.0906"/>
+    <polygon fill="#EEEEEE"
+             points="280.8,338.0906,541.8,338.0906,541.8,350.6906,523.8,368.6906,280.8,368.6906,280.8,338.0906"
+             style="stroke: #000000; stroke-width: 3.5999999046325684;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" font-weight="bold"
+          lengthAdjust="spacingAndGlyphs" textLength="180" x="307.8" y="361.611">TIMER strides
+    </text>
+    <rect fill="none" height="542.3906" style="stroke: #000000; stroke-width: 3.5999999046325684;"
+          width="556.2" x="298.8" y="381.5297"/>
+    <polygon fill="#EEEEEE"
+             points="298.8,381.5297,437.4,381.5297,437.4,394.1297,419.4,412.1297,298.8,412.1297,298.8,381.5297"
+             style="stroke: #000000; stroke-width: 3.5999999046325684;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" font-weight="bold"
+          lengthAdjust="spacingAndGlyphs" textLength="57.6" x="325.8" y="405.0501">loop
+    </text>
+    <text fill="#000000" font-family="sans-serif" font-size="19.8" font-weight="bold"
+          lengthAdjust="spacingAndGlyphs" textLength="352.8" x="464.4" y="403.5085">[over cycle
+      values in segment]
+    </text>
+    <rect fill="none" height="486.3515" style="stroke: #000000; stroke-width: 3.5999999046325684;"
+          width="520.2" x="316.8" y="424.9687"/>
+    <polygon fill="#EEEEEE"
+             points="316.8,424.9687,552.6,424.9687,552.6,437.5687,534.6,455.5687,316.8,455.5687,316.8,424.9687"
+             style="stroke: #000000; stroke-width: 3.5999999046325684;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" font-weight="bold"
+          lengthAdjust="spacingAndGlyphs" textLength="154.8" x="343.8" y="448.4891">TIMER cycle
+    </text>
+    <rect fill="none" height="135.7172" style="stroke: #000000; stroke-width: 3.5999999046325684;"
+          width="378" x="352.8" y="468.4078"/>
+    <polygon fill="#EEEEEE"
+             points="352.8,468.4078,603,468.4078,603,481.0078,585,499.0078,352.8,499.0078,352.8,468.4078"
+             style="stroke: #000000; stroke-width: 3.5999999046325684;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" font-weight="bold"
+          lengthAdjust="spacingAndGlyphs" textLength="169.2" x="379.8" y="491.9282">TIMER phase
+    </text>
+    <polygon fill="#A80036" points="627.3,529.8469,645.3,537.0469,627.3,544.2469,634.5,537.0469"
+             style="stroke: #A80036; stroke-width: 1.7999999523162842;"/>
+    <line style="stroke: #A80036; stroke-width: 1.7999999523162842;" x1="431.1" x2="638.1"
+          y1="537.0469" y2="537.0469"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" lengthAdjust="spacingAndGlyphs"
+          textLength="174.6" x="443.7" y="528.1673">runCycle(cycle)
+    </text>
+    <polygon fill="#A80036" points="450.9,582.2859,432.9,589.4859,450.9,596.6859,443.7,589.4859"
+             style="stroke: #A80036; stroke-width: 1.7999999523162842;"/>
+    <line style="stroke: #A80036; stroke-width: 1.7999999523162842;" x1="440.1" x2="656.1"
+          y1="589.4859" y2="589.4859"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" lengthAdjust="spacingAndGlyphs"
+          textLength="64.8" x="461.7" y="580.6063">result
+    </text>
+    <rect fill="#EEEEEE" filter="url(#f1elad485baf09)" height="5.4"
+          style="stroke: #EEEEEE; stroke-width: 1.7999999523162842;" width="885.6" x="5.4"
+          y="653.7445"/>
+    <line style="stroke: #000000; stroke-width: 1.7999999523162842;" x1="5.4" x2="891" y1="653.7445"
+          y2="653.7445"/>
+    <line style="stroke: #000000; stroke-width: 1.7999999523162842;" x1="5.4" x2="891" y1="659.1445"
+          y2="659.1445"/>
+    <rect fill="#EEEEEE" filter="url(#f1elad485baf09)" height="41.6391"
+          style="stroke: #000000; stroke-width: 3.5999999046325684;" width="271.8" x="312.3"
+          y="634.725"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" font-weight="bold"
+          lengthAdjust="spacingAndGlyphs" textLength="237.6" x="323.1" y="663.6454">additional
+      phases
+    </text>
+    <rect fill="none" height="191.7562" style="stroke: #000000; stroke-width: 3.5999999046325684;"
+          width="484.2" x="334.8" y="706.964"/>
+    <polygon fill="#EEEEEE"
+             points="334.8,706.964,585,706.964,585,719.564,567,737.564,334.8,737.564,334.8,706.964"
+             style="stroke: #000000; stroke-width: 3.5999999046325684;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" font-weight="bold"
+          lengthAdjust="spacingAndGlyphs" textLength="169.2" x="361.8" y="730.4845">TIMER phase
+    </text>
+    <rect fill="none" height="135.7172" style="stroke: #000000; stroke-width: 3.5999999046325684;"
+          width="448.2" x="352.8" y="750.4031"/>
+    <polygon fill="#EEEEEE"
+             points="352.8,750.4031,491.4,750.4031,491.4,763.0031,473.4,781.0031,352.8,781.0031,352.8,750.4031"
+             style="stroke: #000000; stroke-width: 3.5999999046325684;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" font-weight="bold"
+          lengthAdjust="spacingAndGlyphs" textLength="57.6" x="379.8" y="773.9235">loop
+    </text>
+    <text fill="#000000" font-family="sans-serif" font-size="19.8" font-weight="bold"
+          lengthAdjust="spacingAndGlyphs" textLength="273.6" x="518.4" y="772.3819">[until phases
+      complete]
+    </text>
+    <polygon fill="#A80036" points="627.3,811.8422,645.3,819.0422,627.3,826.2422,634.5,819.0422"
+             style="stroke: #A80036; stroke-width: 1.7999999523162842;"/>
+    <line style="stroke: #A80036; stroke-width: 1.7999999523162842;" x1="431.1" x2="638.1"
+          y1="819.0422" y2="819.0422"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" lengthAdjust="spacingAndGlyphs"
+          textLength="183.6" x="443.7" y="810.1626">runPhase(cycle)
+    </text>
+    <polygon fill="#A80036" points="450.9,864.2812,432.9,871.4812,450.9,878.6812,443.7,871.4812"
+             style="stroke: #A80036; stroke-width: 1.7999999523162842;"/>
+    <line style="stroke: #A80036; stroke-width: 1.7999999523162842;" x1="440.1" x2="656.1"
+          y1="871.4812" y2="871.4812"/>
+    <text fill="#000000" font-family="sans-serif" font-size="23.4" lengthAdjust="spacingAndGlyphs"
+          textLength="64.8" x="461.7" y="862.6016">result
+    </text><!--
+@startuml
+
+Participant Input as i
+Participant Thread as t
+Participant Action as a
+
+== acquire input data ==
+
+group TIMER read-input
+ t -> i : get segment(stride)
+ activate i
+ t <- i : <cycle segment>[stride]
+ deactivate i
+end
+
+group TIMER strides
+
+ loop over cycle values in segment
+  group TIMER cycle
+   group TIMER phase
+    t -> a : runCycle(cycle)
+    activate a
+    t <- a : result
+    deactivate a
+   end
+
+== additional phases ==
+
+group TIMER phase
+ loop until phases complete
+ t -> a : runPhase(cycle)
+ activate a
+ t <- a : result
+ deactivate a
+end
+end
+end
+end
+
+end # strides
+
+@enduml
+
+PlantUML version 1.2017.15(Mon Jul 03 11:45:34 CDT 2017)
+(GPL source distribution)
+Java Runtime: OpenJDK Runtime Environment
+JVM: OpenJDK 64-Bit Server VM
+Java Version: 1.8.0_152-release-1024-b11
+Operating System: Linux
+OS Version: 4.10.0-42-generic
+Default Encoding: UTF-8
+Language: en
+Country: US
+-->
+  </g>
+</svg>
\ No newline at end of file
diff --git a/sort_docs/eb_latency_details.puml b/sort_docs/eb_latency_details.puml
new file mode 100644
index 000000000..9081a4928
--- /dev/null
+++ b/sort_docs/eb_latency_details.puml
@@ -0,0 +1,38 @@
+@startuml
+Participant user as u
+Participant client as c
+Participant resource as cr
+Participant transport as t
+Participant server as s
+
+group responsetime
+ u -> c: request
+ activate c #Black
+ group waittime
+  c -> cr: wait
+  activate cr #Yellow
+  note left of cr: client\nwaits\nfor\nresource
+  cr -> c:
+  deactivate cr
+ end
+
+ group servicetime
+ c ->> t: request
+ activate t #Red
+  group servertime
+   t ->> s: request
+   deactivate t
+   activate s #Blue
+   note right of s: server\nprocesses\nrequest
+   s ->> t: response
+   deactivate s
+   activate t #Red
+  end
+  t ->> c: response
+  deactivate t
+ end
+ c -> u: response
+ deactivate c
+end
+
+@enduml
\ No newline at end of file
diff --git a/sort_docs/eb_latency_terms.puml b/sort_docs/eb_latency_terms.puml
new file mode 100644
index 000000000..c7f6d336a
--- /dev/null
+++ b/sort_docs/eb_latency_terms.puml
@@ -0,0 +1,30 @@
+@startuml
+Participant user as u
+Participant client as c
+Participant resource as cr
+Participant server as s
+
+group responsetime
+ u -> c: request
+ activate c #Black
+' note left of c: user\nwaits\nfor\nresponse
+ group waittime
+  c -> cr: wait
+  activate cr #Yellow
+  note right of cr: client\nwaits\nfor\nresource
+  cr -> c:
+  deactivate cr
+ end
+
+ group servicetime
+  c ->> s: request
+  activate s #Blue
+  note right of s: server\nprocesses\nrequest
+  s ->> c: response
+  deactivate s
+ end
+ c -> u: response
+ deactivate c
+end
+
+@enduml
\ No newline at end of file
diff --git a/sort_docs/eb_latency_terms.svg b/sort_docs/eb_latency_terms.svg
new file mode 100644
index 000000000..ccfe22776
--- /dev/null
+++ b/sort_docs/eb_latency_terms.svg
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+     contentScriptType="application/ecmascript" contentStyleType="text/css" height="808px"
+     preserveAspectRatio="none" style="width:683px;height:808px;" version="1.1"
+     viewBox="0 0 683 808" width="683.2px" zoomAndPan="magnify">
+  <defs>
+    <filter height="300%" id="f1bddk88ttqrkr" width="300%" x="-1" y="-1">
+      <feGaussianBlur result="blurOut" stdDeviation="3.200000047683716"/>
+      <feColorMatrix in="blurOut" result="blurOut2" type="matrix"
+                     values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
+      <feOffset dx="6.400000095367432" dy="6.400000095367432" in="blurOut2" result="blurOut3"/>
+      <feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/>
+    </filter>
+  </defs>
+  <g>
+    <rect fill="#000000" filter="url(#f1bddk88ttqrkr)" height="554.7625"
+          style="stroke: #A80036; stroke-width: 1.600000023841858;" width="16" x="208.8"
+          y="149.4875"/>
+    <rect fill="#FFFF00" filter="url(#f1bddk88ttqrkr)" height="157.8625"
+          style="stroke: #A80036; stroke-width: 1.600000023841858;" width="16" x="335.2"
+          y="234.7125"/>
+    <rect fill="#0000FF" filter="url(#f1bddk88ttqrkr)" height="157.65"
+          style="stroke: #A80036; stroke-width: 1.600000023841858;" width="16" x="466.4"
+          y="488.7875"/>
+    <rect fill="#FFFFFF" filter="url(#f1bddk88ttqrkr)" height="628.7875"
+          style="stroke: #000000; stroke-width: 3.200000047683716;" width="644.8" x="20.8"
+          y="88.475"/>
+    <rect fill="#FFFFFF" filter="url(#f1bddk88ttqrkr)" height="231.675"
+          style="stroke: #000000; stroke-width: 3.200000047683716;" width="348.8" x="155.2"
+          y="173.7"/>
+    <rect fill="#FFFFFF" filter="url(#f1bddk88ttqrkr)" height="231.675"
+          style="stroke: #000000; stroke-width: 3.200000047683716;" width="494.4" x="155.2"
+          y="427.775"/>
+    <line style="stroke: #A80036; stroke-width: 1.600000023841858; stroke-dasharray: 5.0,5.0;"
+          x1="75.2" x2="75.2" y1="61.275" y2="744.4625"/>
+    <line style="stroke: #A80036; stroke-width: 1.600000023841858; stroke-dasharray: 5.0,5.0;"
+          x1="216" x2="216" y1="61.275" y2="744.4625"/>
+    <line style="stroke: #A80036; stroke-width: 1.600000023841858; stroke-dasharray: 5.0,5.0;"
+          x1="342.4" x2="342.4" y1="61.275" y2="744.4625"/>
+    <line style="stroke: #A80036; stroke-width: 1.600000023841858; stroke-dasharray: 5.0,5.0;"
+          x1="473.6" x2="473.6" y1="61.275" y2="744.4625"/>
+    <rect fill="#FEFECE" filter="url(#f1bddk88ttqrkr)" height="48.475"
+          style="stroke: #A80036; stroke-width: 2.400000035762787;" width="72" x="36.8" y="4.8"/>
+    <text fill="#000000" font-family="sans-serif" font-size="22.4" lengthAdjust="spacingAndGlyphs"
+          textLength="49.6" x="48" y="36.7922">user
+    </text>
+    <rect fill="#FEFECE" filter="url(#f1bddk88ttqrkr)" height="48.475"
+          style="stroke: #A80036; stroke-width: 2.400000035762787;" width="72" x="36.8"
+          y="742.8625"/>
+    <text fill="#000000" font-family="sans-serif" font-size="22.4" lengthAdjust="spacingAndGlyphs"
+          textLength="49.6" x="48" y="774.8547">user
+    </text>
+    <rect fill="#FEFECE" filter="url(#f1bddk88ttqrkr)" height="48.475"
+          style="stroke: #A80036; stroke-width: 2.400000035762787;" width="84.8" x="171.2" y="4.8"/>
+    <text fill="#000000" font-family="sans-serif" font-size="22.4" lengthAdjust="spacingAndGlyphs"
+          textLength="62.4" x="182.4" y="36.7922">client
+    </text>
+    <rect fill="#FEFECE" filter="url(#f1bddk88ttqrkr)" height="48.475"
+          style="stroke: #A80036; stroke-width: 2.400000035762787;" width="84.8" x="171.2"
+          y="742.8625"/>
+    <text fill="#000000" font-family="sans-serif" font-size="22.4" lengthAdjust="spacingAndGlyphs"
+          textLength="62.4" x="182.4" y="774.8547">client
+    </text>
+    <rect fill="#FEFECE" filter="url(#f1bddk88ttqrkr)" height="48.475"
+          style="stroke: #A80036; stroke-width: 2.400000035762787;" width="123.2" x="278.4"
+          y="4.8"/>
+    <text fill="#000000" font-family="sans-serif" font-size="22.4" lengthAdjust="spacingAndGlyphs"
+          textLength="100.8" x="289.6" y="36.7922">resource
+    </text>
+    <rect fill="#FEFECE" filter="url(#f1bddk88ttqrkr)" height="48.475"
+          style="stroke: #A80036; stroke-width: 2.400000035762787;" width="123.2" x="278.4"
+          y="742.8625"/>
+    <text fill="#000000" font-family="sans-serif" font-size="22.4" lengthAdjust="spacingAndGlyphs"
+          textLength="100.8" x="289.6" y="774.8547">resource
+    </text>
+    <rect fill="#FEFECE" filter="url(#f1bddk88ttqrkr)" height="48.475"
+          style="stroke: #A80036; stroke-width: 2.400000035762787;" width="94.4" x="424" y="4.8"/>
+    <text fill="#000000" font-family="sans-serif" font-size="22.4" lengthAdjust="spacingAndGlyphs"
+          textLength="72" x="435.2" y="36.7922">server
+    </text>
+    <rect fill="#FEFECE" filter="url(#f1bddk88ttqrkr)" height="48.475"
+          style="stroke: #A80036; stroke-width: 2.400000035762787;" width="94.4" x="424"
+          y="742.8625"/>
+    <text fill="#000000" font-family="sans-serif" font-size="22.4" lengthAdjust="spacingAndGlyphs"
+          textLength="72" x="435.2" y="774.8547">server
+    </text>
+    <rect fill="#000000" filter="url(#f1bddk88ttqrkr)" height="554.7625"
+          style="stroke: #A80036; stroke-width: 1.600000023841858;" width="16" x="208.8"
+          y="149.4875"/>
+    <rect fill="#FFFF00" filter="url(#f1bddk88ttqrkr)" height="157.8625"
+          style="stroke: #A80036; stroke-width: 1.600000023841858;" width="16" x="335.2"
+          y="234.7125"/>
+    <rect fill="#0000FF" filter="url(#f1bddk88ttqrkr)" height="157.65"
+          style="stroke: #A80036; stroke-width: 1.600000023841858;" width="16" x="466.4"
+          y="488.7875"/>
+    <path d="M20.8,88.475 L252.8,88.475 L252.8,99.675 L236.8,115.675 L20.8,115.675 L20.8,88.475 "
+          fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.600000023841858;"/>
+    <rect fill="none" height="628.7875" style="stroke: #000000; stroke-width: 3.200000047683716;"
+          width="644.8" x="20.8" y="88.475"/>
+    <text fill="#000000" font-family="sans-serif" font-size="20.8" font-weight="bold"
+          lengthAdjust="spacingAndGlyphs" textLength="160" x="44.8" y="109.382">responsetime
+    </text>
+    <polygon fill="#A80036" points="189.6,143.0875,205.6,149.4875,189.6,155.8875,196,149.4875"
+             style="stroke: #A80036; stroke-width: 1.600000023841858;"/>
+    <line style="stroke: #A80036; stroke-width: 1.600000023841858;" x1="76" x2="199.2" y1="149.4875"
+          y2="149.4875"/>
+    <text fill="#000000" font-family="sans-serif" font-size="20.8" lengthAdjust="spacingAndGlyphs"
+          textLength="78.4" x="87.2" y="141.5945">request
+    </text>
+    <path d="M155.2,173.7 L329.6,173.7 L329.6,184.9 L313.6,200.9 L155.2,200.9 L155.2,173.7 "
+          fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.600000023841858;"/>
+    <rect fill="none" height="231.675" style="stroke: #000000; stroke-width: 3.200000047683716;"
+          width="348.8" x="155.2" y="173.7"/>
+    <text fill="#000000" font-family="sans-serif" font-size="20.8" font-weight="bold"
+          lengthAdjust="spacingAndGlyphs" textLength="102.4" x="179.2" y="194.607">waittime
+    </text>
+    <polygon fill="#A80036" points="316,228.3125,332,234.7125,316,241.1125,322.4,234.7125"
+             style="stroke: #A80036; stroke-width: 1.600000023841858;"/>
+    <line style="stroke: #A80036; stroke-width: 1.600000023841858;" x1="224.8" x2="325.6"
+          y1="234.7125" y2="234.7125"/>
+    <text fill="#000000" font-family="sans-serif" font-size="20.8" lengthAdjust="spacingAndGlyphs"
+          textLength="44.8" x="236" y="226.8195">wait
+    </text>
+    <path
+        d="M358.4,255.725 L358.4,367.725 L481.6,367.725 L481.6,271.725 L465.6,255.725 L358.4,255.725 "
+        fill="#FBFB77" filter="url(#f1bddk88ttqrkr)"
+        style="stroke: #A80036; stroke-width: 1.600000023841858;"/>
+    <path d="M465.6,255.725 L465.6,271.725 L481.6,271.725 L465.6,255.725 " fill="#FBFB77"
+          style="stroke: #A80036; stroke-width: 1.600000023841858;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="20.8" lengthAdjust="spacingAndGlyphs"
+          textLength="57.6" x="368" y="283.032">client
+    </text>
+    <text fill="#000000" font-family="sans-serif" font-size="20.8" lengthAdjust="spacingAndGlyphs"
+          textLength="56" x="368" y="307.2445">waits
+    </text>
+    <text fill="#000000" font-family="sans-serif" font-size="20.8" lengthAdjust="spacingAndGlyphs"
+          textLength="28.8" x="368" y="331.457">for
+    </text>
+    <text fill="#000000" font-family="sans-serif" font-size="20.8" lengthAdjust="spacingAndGlyphs"
+          textLength="89.6" x="368" y="355.6695">resource
+    </text>
+    <polygon fill="#A80036" points="242.4,386.175,226.4,392.575,242.4,398.975,236,392.575"
+             style="stroke: #A80036; stroke-width: 1.600000023841858;"/>
+    <line style="stroke: #A80036; stroke-width: 1.600000023841858;" x1="232.8" x2="341.6"
+          y1="392.575" y2="392.575"/>
+    <path
+        d="M155.2,427.775 L363.2,427.775 L363.2,438.975 L347.2,454.975 L155.2,454.975 L155.2,427.775 "
+        fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.600000023841858;"/>
+    <rect fill="none" height="231.675" style="stroke: #000000; stroke-width: 3.200000047683716;"
+          width="494.4" x="155.2" y="427.775"/>
+    <text fill="#000000" font-family="sans-serif" font-size="20.8" font-weight="bold"
+          lengthAdjust="spacingAndGlyphs" textLength="136" x="179.2" y="448.682">servicetime
+    </text>
+    <line style="stroke: #A80036; stroke-width: 1.600000023841858;" x1="463.2" x2="447.2"
+          y1="488.7875" y2="482.3875"/>
+    <line style="stroke: #A80036; stroke-width: 1.600000023841858;" x1="463.2" x2="447.2"
+          y1="488.7875" y2="495.1875"/>
+    <line style="stroke: #A80036; stroke-width: 1.600000023841858;" x1="224.8" x2="464.8"
+          y1="488.7875" y2="488.7875"/>
+    <text fill="#000000" font-family="sans-serif" font-size="20.8" lengthAdjust="spacingAndGlyphs"
+          textLength="78.4" x="236" y="480.8945">request
+    </text>
+    <path d="M489.6,509.8 L489.6,597.8 L627.2,597.8 L627.2,525.8 L611.2,509.8 L489.6,509.8 "
+          fill="#FBFB77" filter="url(#f1bddk88ttqrkr)"
+          style="stroke: #A80036; stroke-width: 1.600000023841858;"/>
+    <path d="M611.2,509.8 L611.2,525.8 L627.2,525.8 L611.2,509.8 " fill="#FBFB77"
+          style="stroke: #A80036; stroke-width: 1.600000023841858;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="20.8" lengthAdjust="spacingAndGlyphs"
+          textLength="65.6" x="499.2" y="537.107">server
+    </text>
+    <text fill="#000000" font-family="sans-serif" font-size="20.8" lengthAdjust="spacingAndGlyphs"
+          textLength="104" x="499.2" y="561.3195">processes
+    </text>
+    <text fill="#000000" font-family="sans-serif" font-size="20.8" lengthAdjust="spacingAndGlyphs"
+          textLength="78.4" x="499.2" y="585.532">request
+    </text>
+    <line style="stroke: #A80036; stroke-width: 1.600000023841858;" x1="224.8" x2="240.8"
+          y1="646.4375" y2="640.0375"/>
+    <line style="stroke: #A80036; stroke-width: 1.600000023841858;" x1="224.8" x2="240.8"
+          y1="646.4375" y2="652.8375"/>
+    <line style="stroke: #A80036; stroke-width: 1.600000023841858;" x1="224.8" x2="472.8"
+          y1="646.4375" y2="646.4375"/>
+    <text fill="#000000" font-family="sans-serif" font-size="20.8" lengthAdjust="spacingAndGlyphs"
+          textLength="94.4" x="252" y="638.5445">response
+    </text>
+    <polygon fill="#A80036" points="93.6,697.85,77.6,704.25,93.6,710.65,87.2,704.25"
+             style="stroke: #A80036; stroke-width: 1.600000023841858;"/>
+    <line style="stroke: #A80036; stroke-width: 1.600000023841858;" x1="84" x2="215.2" y1="704.25"
+          y2="704.25"/>
+    <text fill="#000000" font-family="sans-serif" font-size="20.8" lengthAdjust="spacingAndGlyphs"
+          textLength="94.4" x="103.2" y="696.357">response
+    </text><!--
+@startuml
+Participant user as u
+Participant client as c
+Participant resource as cr
+Participant server as s
+
+group responsetime
+ u -> c: request
+ activate c #Black
+ group waittime
+  c -> cr: wait
+  activate cr #Yellow
+  note right of cr: client\nwaits\nfor\nresource
+  cr -> c:
+  deactivate cr
+ end
+
+ group servicetime
+  c ->> s: request
+  activate s #Blue
+  note right of s: server\nprocesses\nrequest
+  s ->> c: response
+  deactivate s
+ end
+ c -> u: response
+ deactivate c
+end
+
+@enduml
+
+PlantUML version 1.2018.01(Sun Jan 28 12:08:22 CST 2018)
+(GPL source distribution)
+Java Runtime: OpenJDK Runtime Environment
+JVM: OpenJDK 64-Bit Server VM
+Java Version: 1.8.0_152-release-1248-b8
+Operating System: Linux
+OS Version: 4.15.0-33-generic
+Default Encoding: UTF-8
+Language: en
+Country: US
+-->
+  </g>
+</svg>
\ No newline at end of file
diff --git a/sort_docs/op_state_nomnoml.png b/sort_docs/op_state_nomnoml.png
new file mode 100644
index 0000000000000000000000000000000000000000..fbeea86f5ed1b1964f9cdd6f3636e8788eadd548
GIT binary patch
literal 59238
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
O2s~Z=T-G@yGywo0-&jQe

literal 0
HcmV?d00001

diff --git a/sort_docs/opstate_nomnoml.svg b/sort_docs/opstate_nomnoml.svg
new file mode 100644
index 000000000..b9dfb411f
--- /dev/null
+++ b/sort_docs/opstate_nomnoml.svg
@@ -0,0 +1,78 @@
+<svg width="407.5" height="552" version="1.1" baseProfile="full" viewbox="0 0 407.5 552"
+     xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+     xmlns:ev="http://www.w3.org/2001/xml-events"
+     style="font-weight:bold; font-size:12pt; font-family:'Calibri', Helvetica, sans-serif;;stroke-width:3;stroke-linejoin:round;stroke-linecap:round">
+  <path d="M265.8 43.5 L265.8 63.5 L265.8 83.5 L265.8 83.5 "
+        style="stroke:#33322E;fill:none;stroke-dasharray:none;"></path>
+  <path d="M265.8 114.5 L265.8 134.5 L265.8 154.5 L265.8 154.5 "
+        style="stroke:#33322E;fill:none;stroke-dasharray:none;"></path>
+  <path d="M260.4 141.2 L265.8 147.8 L271.1 141.2 L265.8 154.5 Z"
+        style="stroke:#33322E;fill:#33322E;stroke-dasharray:none;"></path>
+  <path d="M227.4 185.5 L178 205.5 L178 225.5 L178 225.5 "
+        style="stroke:#33322E;fill:none;stroke-dasharray:none;"></path>
+  <path d="M304.1 185.5 L353.5 205.5 L353.5 225.5 L353.5 225.5 "
+        style="stroke:#33322E;fill:none;stroke-dasharray:none;"></path>
+  <path d="M178 256.5 L178 276.5 L178 296.5 L178 296.5 "
+        style="stroke:#33322E;fill:none;stroke-dasharray:none;"></path>
+  <path d="M172.7 283.2 L178 289.8 L183.3 283.2 L178 296.5 Z"
+        style="stroke:#33322E;fill:#33322E;stroke-dasharray:none;"></path>
+  <path d="M169.3 327.5 L158 347.5 L169.3 367.5 L169.3 367.5 "
+        style="stroke:#33322E;fill:none;stroke-dasharray:none;"></path>
+  <path d="M136.5 325 L64.5 347.5 L64.5 367.5 L64.5 367.5 "
+        style="stroke:#33322E;fill:none;stroke-dasharray:none;"></path>
+  <path d="M64.5 398.5 L64.5 418.5 L64.5 438.5 L64.5 438.5 "
+        style="stroke:#33322E;fill:none;stroke-dasharray:none;"></path>
+  <path d="M59.2 425.2 L64.5 431.8 L69.8 425.2 L64.5 438.5 Z"
+        style="stroke:#33322E;fill:#33322E;stroke-dasharray:none;"></path>
+  <path d="M64.5 469.5 L64.5 489.5 L238.8 521.7 L238.8 521.7 "
+        style="stroke:#33322E;fill:none;stroke-dasharray:none;"></path>
+  <path d="M224.7 524.5 L232.2 520.5 L226.6 514.1 L238.8 521.7 Z"
+        style="stroke:#33322E;fill:#33322E;stroke-dasharray:none;"></path>
+  <path d="M219.5 326.9 L277 347.5 L277 367.5 L277 367.5 "
+        style="stroke:#33322E;fill:none;stroke-dasharray:none;"></path>
+  <path d="M277 398.5 L277 418.5 L277 438.5 L277 438.5 "
+        style="stroke:#33322E;fill:none;stroke-dasharray:none;"></path>
+  <path d="M271.7 425.2 L277 431.8 L282.3 425.2 L277 438.5 Z"
+        style="stroke:#33322E;fill:#33322E;stroke-dasharray:none;"></path>
+  <path d="M277 469.5 L277 489.5 L263.7 509.5 L263.7 509.5 "
+        style="stroke:#33322E;fill:none;stroke-dasharray:none;"></path>
+  <path d="M266.6 495.4 L267.4 503.9 L275.5 501.3 L263.7 509.5 Z"
+        style="stroke:#33322E;fill:#33322E;stroke-dasharray:none;"></path>
+  <path d="M186.7 367.5 L198 347.5 L186.7 327.5 L186.7 327.5 "
+        style="stroke:#33322E;fill:none;stroke-dasharray:none;"></path>
+  <path d="M197.9 336.5 L190 333.3 L188.6 341.7 L186.7 327.5 Z"
+        style="stroke:#33322E;fill:#33322E;stroke-dasharray:none;"></path>
+  <path d="M353.5 256.5 L353.5 276.5 L353.5 296.5 L353.5 296.5 "
+        style="stroke:#33322E;fill:none;stroke-dasharray:none;"></path>
+  <path d="M348.2 283.2 L353.5 289.8 L358.8 283.2 L353.5 296.5 Z"
+        style="stroke:#33322E;fill:#33322E;stroke-dasharray:none;"></path>
+  <path d="M353.5 327.5 L353.5 347.5 L353.5 489.5 L353.5 489.5 L268.8 519.2 L268.8 519.2 "
+        style="stroke:#33322E;fill:none;stroke-dasharray:none;"></path>
+  <path d="M279.6 509.8 L275 517 L283.1 519.9 L268.8 519.2 Z"
+        style="stroke:#33322E;fill:#33322E;stroke-dasharray:none;"></path>
+  <circle r="12" cx="265.8" cy="28.5" style="stroke:none; fill:#33322E;"></circle>
+  <circle r="10" cx="253.8" cy="524.5"
+          style="stroke:#33322E;fill:#eee8d5;stroke-dasharray:none;"></circle>
+  <circle r="6" cx="253.8" cy="524.5" style="stroke:none; fill:#33322E;"></circle>
+  <text x="241.8" y="105" style="font-weight:normal;">track</text>
+  <text x="154.8" y="247" style="font-weight:normal;">start</text>
+  <text x="334.5" y="247" style="font-weight:normal;">skip</text>
+  <text x="154.8" y="389" style="font-weight:normal;">retry</text>
+  <text x="31.8" y="389" style="font-weight:normal;">succeed</text>
+  <text x="258.5" y="389" style="font-weight:normal;">fail</text>
+  <rect x="224.5" y="154.5" height="31" width="83"
+        style="stroke:#33322E;fill:#eee8d5;stroke-dasharray:none;"></rect>
+  <text x="232.8" y="176" style="">tracked</text>
+  <rect x="136.5" y="296.5" height="31" width="83"
+        style="stroke:#33322E;fill:#eee8d5;stroke-dasharray:none;"></rect>
+  <text x="144.8" y="318" style="">started</text>
+  <rect x="13.5" y="438.5" height="31" width="102"
+        style="stroke:#33322E;fill:#eee8d5;stroke-dasharray:none;"></rect>
+  <text x="21.8" y="460" style="">succeeded</text>
+  <rect x="240.5" y="438.5" height="31" width="73"
+        style="stroke:#33322E;fill:#eee8d5;stroke-dasharray:none;"></rect>
+  <text x="248.5" y="460" style="">failed</text>
+  <rect x="312.5" y="296.5" height="31" width="83"
+        style="stroke:#33322E;fill:#eee8d5;stroke-dasharray:none;"></rect>
+  <text x="320.8" y="318" style="">skipped</text>
+</svg>
\ No newline at end of file
diff --git a/sort_docs/package_layout.md b/sort_docs/package_layout.md
new file mode 100644
index 000000000..2705d7f51
--- /dev/null
+++ b/sort_docs/package_layout.md
@@ -0,0 +1,7 @@
+- io.nosqlbench.engine.<module name>
+- io.nosqlbench.extensions.<extension name>
+- io.nosqlbench.activitytypes.<activity type name>
+
+- io.nosqlbench.virtdata.<module-name>
+- io.nosqlbench.virtdata.library.<library name>
+- io.nosqlbench.docs. ...
\ No newline at end of file
diff --git a/sort_docs/parts.puml b/sort_docs/parts.puml
new file mode 100644
index 000000000..e69de29bb
diff --git a/sort_docs/rate_limiter_design.puml b/sort_docs/rate_limiter_design.puml
new file mode 100644
index 000000000..8a97ff202
--- /dev/null
+++ b/sort_docs/rate_limiter_design.puml
@@ -0,0 +1,82 @@
+@startuml
+
+Participant "Calling\nThread" as t
+Participant "Limiter\nlogic" as l
+Participant "Allocated\nnanos" as a
+Participant "Elapsed\nnanos" as e
+Participant "Clock\nSource" as c
+
+t -> l : acquire(nanos)
+
+group allocate start time
+l -> a : getAndIncrement(nanos)
+activate a #black
+note over l,a
+ **allocated** is an atomic accumulator
+ which represents scheduled time. Each
+ op causes it to be atomically incremented
+ by a time slice of nanos.
+end note
+a -> l : <scheduled_at>
+deactivate a
+end
+
+group calculate delay (cached)
+l -> e : get()
+activate e
+note over e
+ **elapsed** is an
+ atomic register
+ which caches
+ system time.
+end note
+e -> l : <elapsed>
+deactivate e
+l -> l : delay = \nelapsed - scheduled_at
+
+note right
+ **delay** measures external delay
+ that causes an op to fire after
+ the ideal time. **positive delay**
+ thus means the rate limiter doesn't
+ need to impose its own blocking delay
+ in order to ensure delay>=0.
+end note
+
+end
+
+group if delay<0 (cached)
+note over l,c
+ If delay<0, then this operation is too soon according
+ to the cached clock value. Since this could be stale
+ and cause us to block needlessly, we update the cached
+ clock value and recompute delay.
+end note
+l -> c : get() (~25ns)
+activate c #orange
+c -> l : <elapsed>
+deactivate c
+
+l -> e : store(<elapsed>)
+activate e #black
+e -> l
+deactivate e
+l -> l : delay = \nelapsed - scheduled_at
+
+group if delay<0 (updated)
+ l->l: sleep(-delay);\ndelay=0
+ note right
+  If delay is negative, we sleep
+  in the calling thread and
+  set delay=0
+ end note
+ activate l
+ deactivate l
+end
+
+end
+
+l->t: <delay>
+
+
+@enduml
\ No newline at end of file
diff --git a/sort_docs/ratelimiter_timelines.puml b/sort_docs/ratelimiter_timelines.puml
new file mode 100644
index 000000000..649d74a43
--- /dev/null
+++ b/sort_docs/ratelimiter_timelines.puml
@@ -0,0 +1,47 @@
+@startuml
+scale 100 as 100 pixels
+
+Title Rate Limiter - **Timelines**
+
+robust "typical" as W1
+@W1
+0 is past
+100 is allocated #yellow
+200 is scheduled #lightgreen
+632 is now #lightblue
+W1@100 <-> @200: schedule\ndelay
+W1@200 <-> @632:
+
+robust "no waittime" as W2
+@W2
+0 is past
+200 is allocated #yellow
+200.000001 is scheduled #lightgreen
+632 is now #lightblue
+
+robust "caughtup" as W3
+@W3
+0 is past
+100 is allocated #yellow
+200.000001 is scheduled #lightgreen
+232 is now #lightblue
+
+robust "ahead" as W4
+@W4
+0 is past
+100 is allocated #yellow
+200.000001 is scheduled #lightgreen
+232 is now #lightblue
+
+concise "perfect ops" as O
+@O
+0 is op
++100 is op
++100 is op
++100 is op
++100 is op
++100 is op
++100 is op
++100 is op
++100 is op
+@enduml
diff --git a/sort_docs/research/multivariate.svg b/sort_docs/research/multivariate.svg
new file mode 100644
index 000000000..a7f619f7a
--- /dev/null
+++ b/sort_docs/research/multivariate.svg
@@ -0,0 +1,540 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:cc="http://creativecommons.org/ns#"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:svg="http://www.w3.org/2000/svg"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    sodipodi:docname="multivariate.svg"
+    inkscape:version="1.0beta1 (1:0.92.0+devel+201910161548+5c30636)"
+    id="svg8"
+    version="1.1"
+    viewBox="0 0 279.4 292.1"
+    height="11.5in"
+    width="11in">
+  <defs
+      id="defs2">
+    <marker
+        inkscape:stockid="Arrow1Mend"
+        orient="auto"
+        refY="0"
+        refX="0"
+        id="marker10162"
+        style="overflow:visible"
+        inkscape:isstock="true">
+      <path
+          inkscape:connector-curvature="0"
+          id="path10160"
+          d="M 0,0 5,-5 -12.5,0 5,5 Z"
+          style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:1.00000003pt;stroke-opacity:1"
+          transform="matrix(-0.4,0,0,-0.4,-4,0)"/>
+    </marker>
+    <marker
+        inkscape:stockid="Arrow1Mend"
+        orient="auto"
+        refY="0"
+        refX="0"
+        id="marker5537"
+        style="overflow:visible"
+        inkscape:isstock="true">
+      <path
+          inkscape:connector-curvature="0"
+          id="path5535"
+          d="M 0,0 5,-5 -12.5,0 5,5 Z"
+          style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:1.00000003pt;stroke-opacity:1"
+          transform="matrix(-0.4,0,0,-0.4,-4,0)"/>
+    </marker>
+    <marker
+        inkscape:isstock="true"
+        style="overflow:visible;"
+        id="Arrow1Mend"
+        refX="0.0"
+        refY="0.0"
+        orient="auto"
+        inkscape:stockid="Arrow1Mend">
+      <path
+          transform="scale(0.4) rotate(180) translate(10,0)"
+          style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+          id="path3422"/>
+    </marker>
+    <marker
+        inkscape:isstock="true"
+        style="overflow:visible;"
+        id="Arrow1Lend"
+        refX="0.0"
+        refY="0.0"
+        orient="auto"
+        inkscape:stockid="Arrow1Lend">
+      <path
+          transform="scale(0.8) rotate(180) translate(12.5,0)"
+          style="fill-rule:evenodd;stroke:#0000ff;stroke-width:1pt;stroke-opacity:1;fill:#0000ff;fill-opacity:1"
+          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+          id="path3416"/>
+    </marker>
+    <linearGradient
+        id="linearGradient983"
+        inkscape:collect="always">
+      <stop
+          id="stop979"
+          offset="0"
+          style="stop-color:#000000;stop-opacity:1;"/>
+      <stop
+          id="stop981"
+          offset="1"
+          style="stop-color:#000000;stop-opacity:0;"/>
+    </linearGradient>
+    <linearGradient
+        gradientUnits="userSpaceOnUse"
+        y2="63.5"
+        x2="173.12723"
+        y1="63.5"
+        x1="131.67278"
+        id="linearGradient985"
+        xlink:href="#linearGradient983"
+        inkscape:collect="always"/>
+    <linearGradient
+        gradientUnits="userSpaceOnUse"
+        y2="63.5"
+        x2="173.12723"
+        y1="63.5"
+        x1="131.67278"
+        id="linearGradient985-1"
+        xlink:href="#linearGradient983"
+        inkscape:collect="always"
+        gradientTransform="matrix(3.7795276,0,0,3.7795276,-496.71822,-166.61139)"/>
+    <linearGradient
+        gradientUnits="userSpaceOnUse"
+        y2="63.5"
+        x2="173.12723"
+        y1="63.5"
+        x1="131.67278"
+        id="linearGradient985-14"
+        xlink:href="#linearGradient983"
+        inkscape:collect="always"
+        gradientTransform="matrix(3.7795276,0,0,3.7795276,-304.71821,-473.13109)"/>
+    <marker
+        inkscape:isstock="true"
+        style="overflow:visible"
+        id="Arrow1Mend-4"
+        refX="0"
+        refY="0"
+        orient="auto"
+        inkscape:stockid="Arrow1Mend">
+      <path
+          transform="matrix(-0.4,0,0,-0.4,-4,0)"
+          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+          d="M 0,0 5,-5 -12.5,0 5,5 Z"
+          id="path3422-4"
+          inkscape:connector-curvature="0"/>
+    </marker>
+    <marker
+        inkscape:isstock="true"
+        style="overflow:visible"
+        id="Arrow1Mend-9"
+        refX="0"
+        refY="0"
+        orient="auto"
+        inkscape:stockid="Arrow1Mend">
+      <path
+          transform="matrix(-0.4,0,0,-0.4,-4,0)"
+          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+          d="M 0,0 5,-5 -12.5,0 5,5 Z"
+          id="path3422-1"
+          inkscape:connector-curvature="0"/>
+    </marker>
+    <marker
+        inkscape:collect="always"
+        inkscape:isstock="true"
+        style="overflow:visible"
+        id="Arrow1Mend-9-8"
+        refX="0"
+        refY="0"
+        orient="auto"
+        inkscape:stockid="Arrow1Mend">
+      <path
+          transform="matrix(-0.4,0,0,-0.4,-4,0)"
+          style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:1.00000003pt;stroke-opacity:1"
+          d="M 0,0 5,-5 -12.5,0 5,5 Z"
+          id="path3422-1-9"
+          inkscape:connector-curvature="0"/>
+    </marker>
+    <marker
+        inkscape:isstock="true"
+        style="overflow:visible"
+        id="Arrow1Mend-9-0"
+        refX="0"
+        refY="0"
+        orient="auto"
+        inkscape:stockid="Arrow1Mend">
+      <path
+          transform="matrix(-0.4,0,0,-0.4,-4,0)"
+          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+          d="M 0,0 5,-5 -12.5,0 5,5 Z"
+          id="path3422-1-6"
+          inkscape:connector-curvature="0"/>
+    </marker>
+    <marker
+        inkscape:stockid="Arrow1Mend"
+        orient="auto"
+        refY="0"
+        refX="0"
+        id="Arrow1Mend-9-8-6"
+        style="overflow:visible"
+        inkscape:isstock="true">
+      <path
+          inkscape:connector-curvature="0"
+          id="path3422-1-9-6"
+          d="M 0,0 5,-5 -12.5,0 5,5 Z"
+          style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:1pt;stroke-opacity:1"
+          transform="matrix(-0.4,0,0,-0.4,-4,0)"/>
+    </marker>
+  </defs>
+  <sodipodi:namedview
+      inkscape:document-rotation="0"
+      inkscape:window-maximized="1"
+      inkscape:window-y="2160"
+      inkscape:window-x="328"
+      inkscape:window-height="1995"
+      inkscape:window-width="3512"
+      units="in"
+      showgrid="true"
+      inkscape:current-layer="layer1"
+      inkscape:document-units="mm"
+      inkscape:cy="380.56599"
+      inkscape:cx="348.26541"
+      inkscape:zoom="1.6379"
+      inkscape:pageshadow="2"
+      inkscape:pageopacity="0.0"
+      borderopacity="1.0"
+      bordercolor="#666666"
+      pagecolor="#ffffff"
+      id="base">
+    <inkscape:grid
+        empopacity="0.42352941"
+        empcolor="#3f3fff"
+        opacity="0.21568627"
+        color="#3f3fff"
+        empspacing="8"
+        spacingy="3.175"
+        spacingx="3.175"
+        units="in"
+        id="grid895"
+        type="xygrid"/>
+    <inkscape:grid
+        opacity="0.0627451"
+        color="#3f3fff"
+        dotted="false"
+        empspacing="8"
+        spacingy="1.5875"
+        spacingx="1.5875"
+        units="in"
+        id="grid918"
+        type="xygrid"/>
+  </sodipodi:namedview>
+  <metadata
+      id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+          rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+            rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+      inkscape:groupmode="layer"
+      id="layer1"
+      inkscape:label="default">
+    <text
+        transform="scale(0.94694521,1.0560273)"
+        id="text4631-9-2-6"
+        y="56.387547"
+        x="234.92065"
+        style="font-style:normal;font-weight:normal;font-size:6.35px;line-height:1;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;opacity:1;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.0156755;stop-opacity:1"
+        xml:space="preserve"><tspan
+         style="font-weight:bold;text-align:center;text-anchor:middle;fill:#0000ff;fill-opacity:1;stroke-width:0.0156755"
+         y="56.387547"
+         x="234.92065"
+         sodipodi:role="line"
+         id="tspan4194-6">SCORE</tspan></text>
+    <text
+        id="text4362-2-0"
+        y="116.8091"
+        x="222.9207"
+        style="font-size:8.1286px;line-height:1;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;stroke-width:0.508037"
+        xml:space="preserve"><tspan
+         style="stroke-width:0.508037"
+         y="116.8091"
+         x="222.9207"
+         sodipodi:role="line"
+         id="tspan4412-6">value</tspan></text>
+    <text
+        id="text4362-0-1"
+        y="114.82746"
+        x="116.60229"
+        style="font-size:7.20838px;line-height:1;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;stroke-width:0.450523"
+        xml:space="preserve"><tspan
+         id="tspan4381-2-4"
+         style="text-align:start;text-anchor:start;stroke-width:0.450523"
+         y="114.82746"
+         x="116.60229"
+         sodipodi:role="line">throughput</tspan>
+      <tspan
+          id="tspan4643"
+          style="text-align:start;text-anchor:start;stroke-width:0.450523"
+          y="122.03584"
+          x="116.60229"
+          sodipodi:role="line">latency</tspan></text>
+    <text
+        xml:space="preserve"
+        style="font-style:normal;font-weight:normal;font-size:6.35px;line-height:1;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;opacity:1;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.0156755;stop-opacity:1"
+        x="46.883053"
+        y="56.429405"
+        id="text4631-9-2-3-7"
+        transform="scale(0.94694521,1.0560273)"><tspan
+         id="tspan4194-1-6"
+         sodipodi:role="line"
+         x="46.883053"
+         y="56.429405"
+         style="font-weight:bold;text-align:center;text-anchor:middle;fill:#0000ff;fill-opacity:1;stroke-width:0.0156755">PARAMS</tspan></text>
+    <g
+        transform="translate(-25.399999)"
+        id="g4718">
+      <path
+          style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.058128;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+          d="m 50.799999,50.8 v 12.7 l 3.175001,-10e-7 v -1.5875 l -1.5875,1e-6 v -9.525 h 1.5875 v -1.587499 z"
+          id="path4145"
+          inkscape:connector-curvature="0"
+          sodipodi:nodetypes="ccccccccc"/>
+      <path
+          sodipodi:nodetypes="ccccccccc"
+          inkscape:connector-curvature="0"
+          id="path4145-5"
+          d="m 88.899999,50.8 v 12.7 l -3.175,-10e-7 v -1.5875 l 1.5875,1e-6 v -9.525 h -1.5875 v -1.587499 z"
+          style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.0581279;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"/>
+    </g>
+    <g
+        transform="translate(152.4)"
+        id="g4718-6">
+      <path
+          sodipodi:nodetypes="ccccccccc"
+          inkscape:connector-curvature="0"
+          id="path4145-93"
+          d="m 50.799999,50.8 v 12.7 l 3.175001,-10e-7 v -1.5875 l -1.5875,1e-6 v -9.525 h 1.5875 v -1.587499 z"
+          style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.058128;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"/>
+      <path
+          style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.0581279;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+          d="m 88.9,50.8 v 12.7 l -3.175,-10e-7 v -1.5875 l 1.5875,1e-6 v -9.525 H 85.725 v -1.587499 z"
+          id="path4145-5-7"
+          inkscape:connector-curvature="0"
+          sodipodi:nodetypes="ccccccccc"/>
+    </g>
+    <g
+        id="g4718-6-8"
+        transform="translate(63.50001,38.0998)">
+      <path
+          style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.058128;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+          d="m 50.799999,50.8 v 12.7 l 3.175001,-10e-7 v -1.5875 l -1.5875,1e-6 v -9.525 h 1.5875 v -1.587499 z"
+          id="path4145-93-6"
+          inkscape:connector-curvature="0"
+          sodipodi:nodetypes="ccccccccc"/>
+      <path
+          sodipodi:nodetypes="ccccccccc"
+          inkscape:connector-curvature="0"
+          id="path4145-5-7-8"
+          d="m 88.89999,50.8002 v 12.7 l -3.175,-10e-7 v -1.5875 l 1.5875,10e-7 v -9.525 h -1.5875 v -1.587499 z"
+          style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.0581279;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"/>
+    </g>
+    <text
+        xml:space="preserve"
+        style="font-style:normal;font-weight:normal;font-size:6.35px;line-height:1;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;opacity:1;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.0156755;stop-opacity:1"
+        x="140.54529"
+        y="92.507927"
+        id="text4631-9-2-6-8"
+        transform="scale(0.94694521,1.0560273)"><tspan
+         id="tspan4194-6-4"
+         sodipodi:role="line"
+         x="140.54529"
+         y="92.507927"
+         style="font-weight:bold;text-align:center;text-anchor:middle;fill:#0000ff;fill-opacity:1;stroke-width:0.0156755">RESULT</tspan></text>
+    <text
+        xml:space="preserve"
+        style="font-size:6.74675px;line-height:1;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;stroke-width:0.421672"
+        x="32.730816"
+        y="112.82606"
+        id="text4362-4"><tspan
+         sodipodi:role="line"
+         x="32.730816"
+         y="112.82606"
+         style="text-align:start;text-anchor:start;stroke-width:0.421672"
+         id="tspan4364-9">ccph</tspan>
+      <tspan
+          sodipodi:role="line"
+          x="32.730816"
+          y="119.57281"
+          style="text-align:start;text-anchor:start;stroke-width:0.421672"
+          id="tspan4379-2">async</tspan>
+      <tspan
+          sodipodi:role="line"
+          x="32.730816"
+          y="126.31956"
+          style="text-align:start;text-anchor:start;stroke-width:0.421672"
+          id="tspan4381-0">threads</tspan></text>
+    <path
+        sodipodi:nodetypes="cc"
+        inkscape:connector-curvature="0"
+        id="path5393"
+        d="M 133.35,69.85 98.425,85.725"
+        style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#0000ff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker5537);stop-color:#000000;stop-opacity:1"/>
+    <path
+        sodipodi:nodetypes="cc"
+        inkscape:connector-curvature="0"
+        id="path5395"
+        d="m 133.35,69.85 34.925,15.875"
+        style="fill:none;stroke:#0000ff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Mend-9-8)"/>
+    <text
+        transform="scale(0.94694521,1.0560273)"
+        id="text4631-9-2-3-7-0"
+        y="92.508018"
+        x="46.883053"
+        style="font-style:normal;font-weight:normal;font-size:6.35px;line-height:1;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;opacity:1;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.0156755;stop-opacity:1"
+        xml:space="preserve"><tspan
+         style="font-weight:bold;text-align:center;text-anchor:middle;fill:#0000ff;fill-opacity:1;stroke-width:0.0156755"
+         y="92.508018"
+         x="46.883053"
+         sodipodi:role="line"
+         id="tspan4194-1-6-4">PARAMS</tspan></text>
+    <g
+        id="g4718-8"
+        transform="translate(-25.4,38.1)">
+      <path
+          sodipodi:nodetypes="ccccccccc"
+          inkscape:connector-curvature="0"
+          id="path4145-7"
+          d="m 50.799999,50.8 v 12.7 l 3.175001,-10e-7 v -1.5875 l -1.5875,1e-6 v -9.525 h 1.5875 v -1.587499 z"
+          style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.058128;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"/>
+      <path
+          style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.0581279;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+          d="m 88.899999,50.8 v 12.7 l -3.175,-10e-7 v -1.5875 l 1.5875,1e-6 v -9.525 h -1.5875 v -1.587499 z"
+          id="path4145-5-1"
+          inkscape:connector-curvature="0"
+          sodipodi:nodetypes="ccccccccc"/>
+    </g>
+    <text
+        xml:space="preserve"
+        style="font-style:normal;font-weight:normal;font-size:6.35px;line-height:1;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;opacity:1;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.0156755;stop-opacity:1"
+        x="234.92065"
+        y="92.466156"
+        id="text4631-9-2-6-7"
+        transform="scale(0.94694521,1.0560273)"><tspan
+         id="tspan4194-6-2"
+         sodipodi:role="line"
+         x="234.92065"
+         y="92.466156"
+         style="font-weight:bold;text-align:center;text-anchor:middle;fill:#0000ff;fill-opacity:1;stroke-width:0.0156755">VALUE</tspan></text>
+    <g
+        id="g4718-6-7"
+        transform="translate(152.4,38.1)">
+      <path
+          style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.058128;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+          d="m 50.799999,50.8 v 12.7 l 3.175001,-10e-7 v -1.5875 l -1.5875,1e-6 v -9.525 h 1.5875 v -1.587499 z"
+          id="path4145-93-2"
+          inkscape:connector-curvature="0"
+          sodipodi:nodetypes="ccccccccc"/>
+      <path
+          sodipodi:nodetypes="ccccccccc"
+          inkscape:connector-curvature="0"
+          id="path4145-5-7-2"
+          d="m 88.9,50.8 v 12.7 l -3.175,-10e-7 v -1.5875 l 1.5875,1e-6 v -9.525 H 85.725 v -1.587499 z"
+          style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.0581279;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"/>
+    </g>
+    <path
+        inkscape:connector-curvature="0"
+        id="path6959"
+        d="m 82.55,88.9 12.7,6.35 -12.7,6.35 z"
+        style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.0581279;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"/>
+    <path
+        style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.0581279;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+        d="M 127,50.8 139.7,57.15 127,63.5 Z"
+        id="path6959-1"
+        inkscape:connector-curvature="0"/>
+    <path
+        style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.0581279;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+        d="m 171.45,88.9 12.7,6.35 -12.7,6.35 z"
+        id="path6959-5"
+        inkscape:connector-curvature="0"/>
+    <text
+        xml:space="preserve"
+        style="font-style:normal;font-weight:normal;font-size:6.35px;line-height:1;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;opacity:1;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.0156755;stop-opacity:1"
+        x="93.353188"
+        y="107.81679"
+        id="text4631-9-2-3-7-0-9"
+        transform="scale(0.94694521,1.0560273)"><tspan
+         id="tspan4194-1-6-4-4"
+         sodipodi:role="line"
+         x="93.353188"
+         y="107.81679"
+         style="font-weight:bold;text-align:center;text-anchor:middle;fill:#0000ff;fill-opacity:1;stroke-width:0.0156755">result</tspan>
+      <tspan
+          id="tspan9760"
+          sodipodi:role="line"
+          x="93.353188"
+          y="114.16679"
+          style="font-weight:bold;text-align:center;text-anchor:middle;fill:#0000ff;fill-opacity:1;stroke-width:0.0156755">function</tspan>
+      <tspan
+          id="tspan9807"
+          sodipodi:role="line"
+          x="93.353188"
+          y="120.51678"
+          style="font-weight:bold;text-align:center;text-anchor:middle;fill:#0000ff;fill-opacity:1;stroke-width:0.0156755">R(P)</tspan></text>
+    <text
+        transform="scale(0.94694521,1.0560273)"
+        id="text4631-9-2-3-7-0-9-9"
+        y="108.20721"
+        x="188.93344"
+        style="font-style:normal;font-weight:normal;font-size:6.35px;line-height:1;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;opacity:1;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.0156755;stop-opacity:1"
+        xml:space="preserve"><tspan
+         style="font-weight:bold;text-align:center;text-anchor:middle;fill:#0000ff;fill-opacity:1;stroke-width:0.0156755"
+         y="108.20721"
+         x="188.93344"
+         sodipodi:role="line"
+         id="tspan9760-9">value</tspan>
+      <tspan
+          id="tspan9785"
+          style="font-weight:bold;text-align:center;text-anchor:middle;fill:#0000ff;fill-opacity:1;stroke-width:0.0156755"
+          y="114.55721"
+          x="188.93344"
+          sodipodi:role="line">function</tspan>
+      <tspan
+          id="tspan9809"
+          style="font-weight:bold;text-align:center;text-anchor:middle;fill:#0000ff;fill-opacity:1;stroke-width:0.0156755"
+          y="120.9072"
+          x="188.93344"
+          sodipodi:role="line">V(R)</tspan></text>
+    <rect
+        y="39.6875"
+        x="15.875"
+        height="28.575001"
+        width="242.8875"
+        id="rect10158"
+        style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#0000ff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker10162);paint-order:markers stroke fill;stop-color:#000000;stop-opacity:1"/>
+    <text
+        xml:space="preserve"
+        style="font-style:normal;font-weight:normal;font-size:6.35px;line-height:1;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;opacity:1;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.0156755;stop-opacity:1"
+        x="141.80322"
+        y="78.606888"
+        id="text4631-9-2-3-7-0-9-1"
+        transform="scale(0.94694521,1.0560273)"><tspan
+         id="tspan9807-1"
+         sodipodi:role="line"
+         x="141.80322"
+         y="78.606888"
+         style="font-weight:bold;text-align:center;text-anchor:middle;fill:#0000ff;fill-opacity:1;stroke-width:0.0156755">V(R(P))</tspan></text>
+  </g>
+</svg>
diff --git a/sort_docs/research/op_tracking.svg b/sort_docs/research/op_tracking.svg
new file mode 100644
index 000000000..d46906623
--- /dev/null
+++ b/sort_docs/research/op_tracking.svg
@@ -0,0 +1,611 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:cc="http://creativecommons.org/ns#"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:svg="http://www.w3.org/2000/svg"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    width="11in"
+    height="11.5in"
+    viewBox="0 0 279.4 292.1"
+    version="1.1"
+    id="svg8"
+    inkscape:version="1.0beta1 (1:0.92.0+devel+201910270845+4b2fe24)"
+    sodipodi:docname="op_tracking.svg">
+  <defs
+      id="defs2">
+    <marker
+        inkscape:stockid="Arrow1Mstart"
+        orient="auto"
+        refY="0.0"
+        refX="0.0"
+        id="Arrow1Mstart"
+        style="overflow:visible"
+        inkscape:isstock="true">
+      <path
+          id="path13431"
+          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+          style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+          transform="scale(0.4) translate(10,0)"/>
+    </marker>
+    <marker
+        inkscape:stockid="Arrow1Mend"
+        orient="auto"
+        refY="0.0"
+        refX="0.0"
+        id="marker13786"
+        style="overflow:visible;"
+        inkscape:isstock="true">
+      <path
+          id="path13434"
+          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+          style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+          transform="scale(0.4) rotate(180) translate(10,0)"/>
+    </marker>
+    <marker
+        inkscape:stockid="ExperimentalArrow"
+        orient="auto-start-reverse"
+        refY="3.0"
+        refX="5.0"
+        id="ExperimentalArrow"
+        inkscape:isstock="true">
+      <path
+          id="path13678"
+          d="m 10,3 -10,3 0,-6 z"
+          style="fill:context-stroke;stroke:#000000;stroke-opacity:1"/>
+    </marker>
+    <marker
+        inkscape:stockid="Arrow1Mend"
+        orient="auto"
+        refY="0.0"
+        refX="0.0"
+        id="marker13321"
+        style="overflow:visible;"
+        inkscape:isstock="true">
+      <path
+          id="path13319"
+          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+          style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+          transform="scale(0.4) rotate(180) translate(10,0)"/>
+    </marker>
+    <marker
+        inkscape:isstock="true"
+        style="overflow:visible;"
+        id="marker13227"
+        refX="0.0"
+        refY="0.0"
+        orient="auto"
+        inkscape:stockid="Arrow1Mend">
+      <path
+          transform="scale(0.4) rotate(180) translate(10,0)"
+          style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+          id="path13225"/>
+    </marker>
+    <marker
+        inkscape:isstock="true"
+        style="overflow:visible;"
+        id="marker13139"
+        refX="0.0"
+        refY="0.0"
+        orient="auto"
+        inkscape:stockid="Arrow1Mend">
+      <path
+          transform="scale(0.4) rotate(180) translate(10,0)"
+          style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+          id="path13137"/>
+    </marker>
+    <marker
+        inkscape:stockid="Arrow1Mend"
+        orient="auto"
+        refY="0.0"
+        refX="0.0"
+        id="marker12937"
+        style="overflow:visible;"
+        inkscape:isstock="true"
+        inkscape:collect="always">
+      <path
+          id="path12935"
+          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+          style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+          transform="scale(0.4) rotate(180) translate(10,0)"/>
+    </marker>
+    <marker
+        inkscape:isstock="true"
+        style="overflow:visible;"
+        id="marker12791"
+        refX="0.0"
+        refY="0.0"
+        orient="auto"
+        inkscape:stockid="Arrow1Mend"
+        inkscape:collect="always">
+      <path
+          transform="scale(0.4) rotate(180) translate(10,0)"
+          style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+          id="path12789"/>
+    </marker>
+    <marker
+        inkscape:stockid="Arrow1Lend"
+        orient="auto"
+        refY="0.0"
+        refX="0.0"
+        id="Arrow1Lend"
+        style="overflow:visible;"
+        inkscape:isstock="true">
+      <path
+          id="path3416"
+          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+          style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+          transform="scale(0.8) rotate(180) translate(12.5,0)"/>
+    </marker>
+    <linearGradient
+        inkscape:collect="always"
+        id="linearGradient983">
+      <stop
+          style="stop-color:#000000;stop-opacity:1;"
+          offset="0"
+          id="stop979"/>
+      <stop
+          style="stop-color:#000000;stop-opacity:0;"
+          offset="1"
+          id="stop981"/>
+    </linearGradient>
+    <linearGradient
+        inkscape:collect="always"
+        xlink:href="#linearGradient983"
+        id="linearGradient985"
+        x1="131.67278"
+        y1="63.5"
+        x2="173.12723"
+        y2="63.5"
+        gradientUnits="userSpaceOnUse"/>
+    <linearGradient
+        gradientTransform="matrix(3.7795276,0,0,3.7795276,-496.71822,-166.61139)"
+        inkscape:collect="always"
+        xlink:href="#linearGradient983"
+        id="linearGradient985-1"
+        x1="131.67278"
+        y1="63.5"
+        x2="173.12723"
+        y2="63.5"
+        gradientUnits="userSpaceOnUse"/>
+    <linearGradient
+        gradientTransform="matrix(3.7795276,0,0,3.7795276,-304.71821,-473.13109)"
+        inkscape:collect="always"
+        xlink:href="#linearGradient983"
+        id="linearGradient985-14"
+        x1="131.67278"
+        y1="63.5"
+        x2="173.12723"
+        y2="63.5"
+        gradientUnits="userSpaceOnUse"/>
+    <marker
+        inkscape:stockid="Arrow1Mend"
+        orient="auto"
+        refY="0"
+        refX="0"
+        id="Arrow1Mend-4"
+        style="overflow:visible"
+        inkscape:isstock="true">
+      <path
+          inkscape:connector-curvature="0"
+          id="path3422-4"
+          d="M 0,0 5,-5 -12.5,0 5,5 Z"
+          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+          transform="matrix(-0.4,0,0,-0.4,-4,0)"/>
+    </marker>
+    <marker
+        inkscape:stockid="Arrow1Mend"
+        orient="auto"
+        refY="0"
+        refX="0"
+        id="Arrow1Mend-9"
+        style="overflow:visible"
+        inkscape:isstock="true">
+      <path
+          inkscape:connector-curvature="0"
+          id="path3422-1"
+          d="M 0,0 5,-5 -12.5,0 5,5 Z"
+          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+          transform="matrix(-0.4,0,0,-0.4,-4,0)"/>
+    </marker>
+    <marker
+        inkscape:stockid="Arrow1Mend"
+        orient="auto"
+        refY="0"
+        refX="0"
+        id="Arrow1Mend-9-8"
+        style="overflow:visible"
+        inkscape:isstock="true">
+      <path
+          inkscape:connector-curvature="0"
+          id="path3422-1-9"
+          d="M 0,0 5,-5 -12.5,0 5,5 Z"
+          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+          transform="matrix(-0.4,0,0,-0.4,-4,0)"/>
+    </marker>
+    <marker
+        inkscape:stockid="Arrow1Mend"
+        orient="auto"
+        refY="0"
+        refX="0"
+        id="Arrow1Mend-9-0"
+        style="overflow:visible"
+        inkscape:isstock="true">
+      <path
+          inkscape:connector-curvature="0"
+          id="path3422-1-6"
+          d="M 0,0 5,-5 -12.5,0 5,5 Z"
+          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+          transform="matrix(-0.4,0,0,-0.4,-4,0)"/>
+    </marker>
+    <marker
+        inkscape:isstock="true"
+        style="overflow:visible"
+        id="Arrow1Mend-2"
+        refX="0"
+        refY="0"
+        orient="auto"
+        inkscape:stockid="Arrow1Mend">
+      <path
+          transform="matrix(-0.4,0,0,-0.4,-4,0)"
+          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+          d="M 0,0 5,-5 -12.5,0 5,5 Z"
+          id="path3422-0"
+          inkscape:connector-curvature="0"/>
+    </marker>
+    <marker
+        inkscape:stockid="Arrow1Mend"
+        orient="auto"
+        refY="0"
+        refX="0"
+        id="marker12791-1"
+        style="overflow:visible"
+        inkscape:isstock="true">
+      <path
+          id="path12789-5"
+          d="M 0,0 5,-5 -12.5,0 5,5 Z"
+          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+          transform="matrix(-0.4,0,0,-0.4,-4,0)"
+          inkscape:connector-curvature="0"/>
+    </marker>
+    <marker
+        inkscape:isstock="true"
+        style="overflow:visible"
+        id="marker12937-4"
+        refX="0"
+        refY="0"
+        orient="auto"
+        inkscape:stockid="Arrow1Mend">
+      <path
+          transform="matrix(-0.4,0,0,-0.4,-4,0)"
+          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+          d="M 0,0 5,-5 -12.5,0 5,5 Z"
+          id="path12935-7"
+          inkscape:connector-curvature="0"/>
+    </marker>
+  </defs>
+  <sodipodi:namedview
+      id="base"
+      pagecolor="#ffffff"
+      bordercolor="#666666"
+      borderopacity="1.0"
+      inkscape:pageopacity="0.0"
+      inkscape:pageshadow="2"
+      inkscape:zoom="1.7621436"
+      inkscape:cx="440.89754"
+      inkscape:cy="403.22142"
+      inkscape:document-units="mm"
+      inkscape:current-layer="layer1"
+      showgrid="true"
+      units="in"
+      inkscape:window-width="3512"
+      inkscape:window-height="1995"
+      inkscape:window-x="328"
+      inkscape:window-y="2160"
+      inkscape:window-maximized="1"
+      inkscape:document-rotation="0">
+    <inkscape:grid
+        type="xygrid"
+        id="grid895"
+        units="in"
+        spacingx="3.175"
+        spacingy="3.175"
+        empspacing="8"
+        color="#3f3fff"
+        opacity="0.21568627"
+        empcolor="#3f3fff"
+        empopacity="0.42352941"/>
+    <inkscape:grid
+        type="xygrid"
+        id="grid918"
+        units="in"
+        spacingx="1.5875"
+        spacingy="1.5875"
+        empspacing="8"
+        dotted="false"
+        color="#3f3fff"
+        opacity="0.0627451"/>
+  </sodipodi:namedview>
+  <metadata
+      id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+          rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+            rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+      inkscape:label="default"
+      id="layer1"
+      inkscape:groupmode="layer">
+    <g
+        id="g10677"
+        transform="translate(155.575,46.037501)"/>
+    <g
+        id="g10677-3-9"
+        transform="translate(155.575,31.75)">
+      <rect
+          y="25.4"
+          x="25.4"
+          height="12.700001"
+          width="22.225"
+          id="rect7301-5-1"
+          style="fill:none;stroke:#000000;stroke-width:1;paint-order:markers stroke fill;stop-color:#000000"/>
+      <text
+          id="text10672-6-2"
+          y="30.548523"
+          x="36.444027"
+          style="font-size:5.29167px;line-height:1;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;stroke-width:0.264583"
+          xml:space="preserve"><tspan
+           style="stroke-width:0.264583"
+           y="30.548523"
+           x="36.444027"
+           id="tspan10670-2-7"
+           sodipodi:role="line">op</tspan>
+        <tspan
+            style="stroke-width:0.264583"
+            y="35.840195"
+            x="36.444027"
+            sodipodi:role="line"
+            id="tspan10763">tracker</tspan></text>
+    </g>
+    <g
+        id="g10677-3-0"
+        transform="translate(19.05,49.2125)">
+      <rect
+          y="26.987499"
+          x="19.049999"
+          height="25.400002"
+          width="203.2"
+          id="rect7301-5-9"
+          style="fill:none;stroke:#000000;stroke-width:1;paint-order:markers stroke fill;stop-color:#000000"/>
+    </g>
+    <g
+        id="g10677-3-0-0">
+      <rect
+          style="fill:none;stroke:#000000;stroke-width:1;paint-order:markers stroke fill;stop-color:#000000"
+          id="rect7301-5-9-6"
+          width="228.60001"
+          height="177.8"
+          x="25.4"
+          y="25.4"/>
+    </g>
+    <g
+        id="g10848"
+        transform="translate(-36.512503,9.5250004)">
+      <rect
+          y="9.5249996"
+          x="71.4375"
+          height="12.7"
+          width="41.275002"
+          id="rect10843"
+          style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6;stroke-miterlimit:4;stroke-dasharray:none;paint-order:markers stroke fill;stop-color:#000000"/>
+      <text
+          id="text10672-6-3-1"
+          y="19.031397"
+          x="92.074997"
+          style="font-size:8.46667px;line-height:0;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;stroke-width:0.264583"
+          xml:space="preserve"><tspan
+           style="stroke-width:0.264583"
+           y="19.031397"
+           x="92.074997"
+           id="tspan10670-2-6-8"
+           sodipodi:role="line">scenario</tspan></text>
+    </g>
+    <g
+        id="g10677-3-0-0-2"
+        transform="translate(3.1749988,19.05)">
+      <rect
+          y="25.4"
+          x="28.574999"
+          height="136.52499"
+          width="215.90001"
+          id="rect7301-5-9-6-0"
+          style="fill:none;stroke:#000000;stroke-width:1;paint-order:markers stroke fill;stop-color:#000000"/>
+    </g>
+    <g
+        transform="translate(-28.575003,28.575)"
+        id="g10848-2">
+      <rect
+          style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;paint-order:markers stroke fill;stop-color:#000000"
+          id="rect10843-3"
+          width="41.275002"
+          height="12.700001"
+          x="66.675003"
+          y="9.5249996"/>
+      <text
+          xml:space="preserve"
+          style="font-size:8.46667px;line-height:0;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;stroke-width:0.264583"
+          x="87.184349"
+          y="18.210775"
+          id="text10672-6-3-1-7"><tspan
+           sodipodi:role="line"
+           id="tspan10670-2-6-8-5"
+           x="87.184349"
+           y="18.210775"
+           style="stroke-width:0.264583">activity</tspan></text>
+    </g>
+    <g
+        transform="translate(42.862499,28.575)"
+        id="g10677-2">
+      <rect
+          style="fill:none;stroke:#000000;stroke-width:1;paint-order:markers stroke fill;stop-color:#000000"
+          id="rect7301-2"
+          width="25.4"
+          height="12.700001"
+          x="20.637501"
+          y="25.4"/>
+      <text
+          xml:space="preserve"
+          style="font-size:5.29167px;line-height:1;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;stroke-width:0.264583"
+          x="33.152756"
+          y="33.209862"
+          id="text10672-8"><tspan
+           id="tspan10765-7"
+           sodipodi:role="line"
+           x="33.152756"
+           y="33.209862"
+           style="stroke-width:0.264583">input</tspan></text>
+    </g>
+    <g
+        transform="translate(214.3125,39.6875)"
+        id="g10677-31">
+      <rect
+          style="fill:none;stroke:#000000;stroke-width:1;paint-order:markers stroke fill;stop-color:#000000"
+          id="rect7301-9"
+          width="22.225"
+          height="12.700001"
+          x="4.7624998"
+          y="17.4625"/>
+      <text
+          xml:space="preserve"
+          style="font-size:5.29167px;line-height:1;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;stroke-width:0.264583"
+          x="15.882751"
+          y="22.611023"
+          id="text10672-4"><tspan
+           id="tspan10765-8"
+           sodipodi:role="line"
+           x="15.882751"
+           y="22.611023"
+           style="stroke-width:0.264583">async</tspan>
+        <tspan
+            sodipodi:role="line"
+            x="15.882751"
+            y="27.902693"
+            style="stroke-width:0.264583"
+            id="tspan14012">count</tspan></text>
+    </g>
+    <g
+        transform="translate(114.3,57.15)"
+        id="g10677-3-9-4">
+      <rect
+          style="fill:none;stroke:#000000;stroke-width:1;paint-order:markers stroke fill;stop-color:#000000"
+          id="rect7301-5-1-5"
+          width="25.4"
+          height="12.699999"
+          x="25.4"
+          y="25.4"/>
+      <text
+          xml:space="preserve"
+          style="font-size:5.29167px;line-height:1;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;stroke-width:0.264583"
+          x="38.031528"
+          y="31.076914"
+          id="text10672-6-2-0"><tspan
+           sodipodi:role="line"
+           id="tspan10670-2-7-3"
+           x="38.031528"
+           y="31.076914"
+           style="stroke-width:0.264583">stride</tspan>
+        <tspan
+            id="tspan10763-6"
+            sodipodi:role="line"
+            x="38.031528"
+            y="36.368584"
+            style="stroke-width:0.264583">tracker</tspan></text>
+    </g>
+    <g
+        id="g10677-31-1"
+        transform="translate(85.724998,61.912501)">
+      <rect
+          y="20.637499"
+          x="12.7"
+          height="12.7"
+          width="28.575001"
+          id="rect7301-9-0"
+          style="fill:none;stroke:#000000;stroke-width:1;paint-order:markers stroke fill;stop-color:#000000"/>
+      <text
+          id="text10672-4-6"
+          y="25.801523"
+          x="26.908693"
+          style="font-size:5.29167px;line-height:1;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;stroke-width:0.264583"
+          xml:space="preserve"><tspan
+           style="stroke-width:0.264583"
+           y="25.801523"
+           x="26.908693"
+           sodipodi:role="line"
+           id="tspan10765-8-3">cycle</tspan>
+        <tspan
+            style="stroke-width:0.264583"
+            y="31.093193"
+            x="26.908693"
+            sodipodi:role="line"
+            id="tspan12217">segment</tspan></text>
+    </g>
+    <path
+        style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker12791);stop-color:#000000;stop-opacity:1"
+        d="m 127,88.9 12.7,-1e-6"
+        id="path12719"
+        inkscape:connector-type="polyline"
+        inkscape:connector-curvature="0"
+        inkscape:connection-start="#g10677-31-1"
+        inkscape:connection-end="#g10677-3-9-4"/>
+    <path
+        style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker12937);stop-color:#000000;stop-opacity:1"
+        d="m 162.32187,82.55 19.84375,-12.7"
+        id="path12853"
+        inkscape:connector-type="polyline"
+        inkscape:connector-curvature="0"
+        inkscape:connection-start="#g10677-3-9-4"
+        inkscape:connection-end="#g10677-3-9"/>
+    <path
+        style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#Arrow1Mstart);marker-end:url(#marker13786);stop-color:#000000;stop-opacity:1"
+        d="m 203.2,63.5 15.875,0"
+        id="path13043"
+        inkscape:connector-type="polyline"
+        inkscape:connector-curvature="0"
+        inkscape:connection-start="#g10677-3-9"
+        inkscape:connection-end="#g10677-31"/>
+    <g
+        id="g10848-2-5"
+        transform="matrix(0,-0.6153845,0.6153845,0,32.238463,142.63076)">
+      <rect
+          y="9.5249996"
+          x="66.675003"
+          height="12.700001"
+          width="41.275002"
+          id="rect10843-3-6"
+          style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;paint-order:markers stroke fill;stop-color:#000000"/>
+      <text
+          id="text10672-6-3-1-7-9"
+          y="18.210775"
+          x="87.184349"
+          style="font-size:8.46667px;line-height:0;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;stroke-width:0.264583"
+          xml:space="preserve"><tspan
+           style="stroke-width:0.264583"
+           y="18.210775"
+           x="87.184349"
+           id="tspan10670-2-6-8-5-3"
+           sodipodi:role="line">thread</tspan></text>
+    </g>
+  </g>
+</svg>
diff --git a/sort_docs/testseq_early.png b/sort_docs/testseq_early.png
new file mode 100644
index 0000000000000000000000000000000000000000..df14d6361284e87b5e337fc07679e527385965a9
GIT binary patch
literal 25703
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

literal 0
HcmV?d00001

diff --git a/sort_docs/testseq_early.puml b/sort_docs/testseq_early.puml
new file mode 100644
index 000000000..a3bc77d93
--- /dev/null
+++ b/sort_docs/testseq_early.puml
@@ -0,0 +1,45 @@
+@startuml
+scale 100 as 100 pixels
+
+Title Rate Limit - **EARLY**
+concise "clock" as C
+concise "elapsed" as E
+concise "scheduled" as S
+concise "allocated" as A
+
+C is the_past #red
+E is elapsed  #lightblue
+S is scheduled #orange
+A is allocated #yellow
+
+@C
+732 is future #white
+E->C
+
+@E
+500 is unseen #white
+@500 <-> @732: **error** = 232
+A -> C
+
+@S
+0 is idle #grey
+100 is scheduled #orange
+600 is unscheduled #white
+@500 <-> @600: **scheduling_delay** =\nelapsed - scheduled = -100
+
+@A
+300 is unallocated #white
+@300 <-> @500: **wait_time** =\nelapsed - allocated = 200
+
+concise "Ops" as O
+@O
+0 is op
++100 is op
++100 is op
++100 is op
++100 is op
++100 is op
++100 is op
++100 is op
++100 is op
+@enduml
diff --git a/sort_docs/testseq_late.png b/sort_docs/testseq_late.png
new file mode 100644
index 0000000000000000000000000000000000000000..95c894b08a83e6338079b754d2765b4fabd24b1f
GIT binary patch
literal 25478
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
Q;U~*<we$~U?XwB}CxO=Ri2wiq

literal 0
HcmV?d00001

diff --git a/sort_docs/testseq_late.puml b/sort_docs/testseq_late.puml
new file mode 100644
index 000000000..f6f17e5a4
--- /dev/null
+++ b/sort_docs/testseq_late.puml
@@ -0,0 +1,51 @@
+@startuml
+scale 100 as 100 pixels
+
+Title Rate Limit **LATE**
+concise "clock" as C
+concise "elapsed" as E
+concise "scheduled" as S
+concise "allocated" as A
+
+C is the_past #red
+E is NOWTIME #lightblue
+S is scheduled #orange
+A is allocated #yellow
+
+@0
+S is idle #grey
+
+@100
+A is unallocated #white
+S is scheduled #orange
+
+@200
+S is unscheduled #white
+
+@500
+E is unseen #white
+A -> C
+
+@632
+C is future #white
+E->C
+
+@A
+@100 <-> @500: **wait_time** =\nelapsed - allocated = 400
+@E
+@500 <-> @632: **error** = 132
+@S
+@200 <-> @500: **scheduling_delay** =\nelapsed - scheduled = 300
+
+concise "Ops" as O
+@O
+0 is op
++100 is op
++100 is op
++100 is op
++100 is op
++100 is op
++100 is op
++100 is op
++100 is op
+@enduml
diff --git a/sort_docs/todo.md b/sort_docs/todo.md
new file mode 100644
index 000000000..a173147ef
--- /dev/null
+++ b/sort_docs/todo.md
@@ -0,0 +1,16 @@
+- convert core input to be equivalent
+  of `input=type:interval,cycles:N[..M]`
+- Add doc support for input, input filters, outputs, output filters
+- Build metadata scaffolding for parameters, so unused parameters may be
+  warned about.
+    - parameters should be part of the activity API
+    - parameters should not re-trigger def observers for non-change
+      evhandler
+    - parameters across all subsystems should be discoverable or
+      enumerable
+- make stride auto-sizing uniformly apply after sequencing
+- reimplement core activity and scenario logic as async/reactor with
+  monitors
+- convert to Java 9
+- add activity library commands
+- add --list-input-filters and --list-output-filters 
\ No newline at end of file

From 2148a24c0a5522fd3f6dea4b1fa35d958d4a2e5c Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 13:42:51 -0600
Subject: [PATCH 106/164] Stabilize NB3 builds

---
 RELEASENOTES.md | 83 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 54 insertions(+), 29 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ba35d0396..7fce76402 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,29 +1,54 @@
-- 1e958a7e (HEAD -> main) simplify logger naming for core systems
-- 1382d33d argsfiles and statedirs
-- b5901679 environment and sys prop support
-- fd74ccba move common topics to resources base
-- 6a8dfef1 qualify grafana docker with tag
-- 2830d070 simple workload improvements
-- b9607d07 make argsfiles use double dash
-- a9b0dc9d argsfile support
-- f702736f (HEAD -> main) flatten maps in OpTemplates to allow map consumers
-- 4a9fa81b pull Named service up
-- 574a89e7 pull ConfigAware api up
-- 71195d0a http release fixes
-- 3fa89ebc partial work for --args
-- 262df571 improved error messages
-- 453b1b2c extract ratio from optemplate before construction
-- dcf458c4 annotation progress
-- 7017b6cd add SplitLongs function
-- 0758670f add nb clients module
-- 1dbf36c4 add grafana annotation client
-- 120d9761 remove warning for speculative defaults
-- c78f1e92 typos and minor fixes
-- f3f1b8f4 add annotations design sketch
-- 394580d6 more idea sketches
-- 9e5972f5 comment cleanup
-- 06edfcc9 fix NPE when binding has undefined value
-- 510746b7 improve mismatched scenario name feedback
-- 735b32e1 add illustrative test for EpochMillisToJavaLocalDate
-- 2390f253 Initial Migration of DSE Graph
-- 2275573c Update Readme
+- 040db478 backport github actions breaking change fix
+- 3f4d1304 build NB3 with J14
+- 89c15d38 backport github breaking change fixes
+- 8cce0173 backport auto pre-release on -rc branches
+- daea786c leave source and targets at J11 and runtime at J14 for NB3
+- 2bfe24eb backport auto pre-releases on -rc branches
+- d089ff24 document Java version references in project
+- 70f22ad8 support J14 or J15 in appimage build
+- e4f325c4 disable test which is present in feature branch
+- 8a0b326f (origin/dependabot/maven/mvn-defaults/jetty.version-9.4.35.v20201120) Bump jetty.version in /mvn-defaults
+- 78463838 make main brain build cleanly again
+- 608d1f72 Update DOWNLOADS.md
+- 3d2ff55f auto create apikey
+- cfa92eab package organization
+- 2ab118f4 package organization
+- a23808b3 update appimage build script for j15
+- 7b0e37ab add metrics manifest to polyglot
+- 7e6aa1a2 bump source and target to Java 15
+- 2752fa50 bump major version to 4.0.0-SNAPSHOT
+- 7e880b91 experimental grammar
+- 3f65a054 console friendly metrics summary
+- 146686e0 simplify custom logging configuration
+- d0592454 typos, alignment, cruft
+- 45307081 backfill missing default
+- b7c24642 centralize log4j2 and slf4j stub config
+- 2215fc94 typos, alignment, cruft
+- 0ef26c82 update logger deps for dsegraph
+- 975ea40d merge fixups
+- ae419a26 logging annotator module
+- 6c0632fb grafana annotator module
+- 317ffab4 api for annotations
+- c2cec235 allow configurable delimiter in params parser
+- a09efbe9 consolidate to log4j2
+- 6a523dc4 remove slf4j
+- 67eefbbe fix activity run state bug
+- a88d0376 docker-metrics improvements
+- 667fbdba add log4j2 programmatic configuration
+- 60fa0529 add default log4j configs
+- a3e0739a add FixedValues for double
+- fa85704b add SPI impl selector field 'selector'
+- 4996d206 config API improvements
+- e0498ff2 docs updates
+- e9d2b489 environment API improvements
+- 897a8389 generalize log level to NB
+- a97db87f include JSON support in project API
+- 2c09b8ae typos, culling, and alignment
+- a3a51381 update inactive coords
+- 83136139 generalize op source
+- 089a29d8 grafana api tokens
+- e6e70f71 support DoubleToIntFunction in function matrix
+- 52b029f8 typos, culling, and alignment
+- 4d65dc62 update inactive coords
+- 55edec53 add ToByteBuffer binding function
+- 93e10e6a config model improvements

From 82d5e0219f72b47c9acf70c7c09e6bace1c0feab Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 13:48:57 -0600
Subject: [PATCH 107/164] fix workload typo

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f32de1586..c5705bad3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
 
-      - name: checkout repo
+    - name: checkout repo
       uses: actions/checkout@v2
 
     - name: setup java

From d740078c088dbad0b2286cb31bf166648fe2c544 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 13:49:37 -0600
Subject: [PATCH 108/164] fixing build

---
 RELEASENOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 7fce76402..c4f543b74 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,3 +1,4 @@
+- force build
 - 040db478 backport github actions breaking change fix
 - 3f4d1304 build NB3 with J14
 - 89c15d38 backport github breaking change fixes

From 3fa958c933271575b3333fbba60c9a5bef543fa4 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 14:19:40 -0600
Subject: [PATCH 109/164] update docker actions and add sanity check

---
 .github/workflows/release.yml | 150 ++++++++++++++++++++--------------
 1 file changed, 87 insertions(+), 63 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c5705bad3..93122a8c8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -144,34 +144,58 @@ jobs:
         mkdir staging
         cp nb/target/nb.jar nb/target/nb staging
 
-      - name: upload artifacts
-        uses: actions/upload-artifact@v1
-        with:
-          name: binaries
-          path: staging
+    - name: upload artifacts
+      uses: actions/upload-artifact@v1
+      with:
+        name: binaries
+        path: staging
 
-      - name: select release type from branch name
-        run: |
-          current_branch=$(git rev-parse --abbrev-ref HEAD)
-          if [[ ${current_branch} == *"-rc"* ]]
-           then
-            echo "PRERELEASE=true" >> $GITHUB_ENV
-            echo "DOCKER_TAGS='"${{ env.RELEASE_VERSION }}"'" >> $GITHUB_ENV
-           else
-            echo "PRERELEASE=false" >> $GITHUB_ENV
-            echo "DOCKER_TAGS='latest,"${{ env.RELEASE_VERSION }}"'" >> $GITHUB_ENV
-          fi
+    - name: select release type from branch name
+      run: |
+        current_branch=$(git rev-parse --abbrev-ref HEAD)
+        if [[ ${current_branch} == *"-rc"* ]]
+         then
+          echo "PRERELEASE=true" >> $GITHUB_ENV
+          echo "DOCKER_TAGS='nosqlbench/nosqlbench:"${{ env.RELEASE_VERSION }}"'" >> $GITHUB_ENV
+         else
+          echo "PRERELEASE=false" >> $GITHUB_ENV
+          echo "DOCKER_TAGS='nosqlbench/nosqlbench:latest,nosqlbench/nosqlbench:"${{ env
+        .RELEASE_VERSION }}"'" >> $GITHUB_ENV
+      fi
 
-      - name: docker push
-        uses: docker/build-push-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: nosqlbench/nosqlbench
-          tags: ${{ env.DOCKER_TAGS }}
-          tag_with_ref: false
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
 
-      - name: bundle guidebook
+    - name: docker hub login
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+
+    - name: docker build
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        file: Dockerfile
+        pull: true
+        push: false
+        load: true
+        tags: ${{ env.DOCKER_TAGS }}
+
+    - name: sanity check docker image
+      run: |
+        docker run --rm -i -t nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }} --version
+
+    - name: docker push
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        file: Dockerfile
+        pull: true
+        push: true
+        tags: ${{ env.DOCKER_TAGS }}
+
+    - name: bundle guidebook
       run: mkdir guidebook && cp -R nb/target/guidebook guidebook
 
     - name: upload guidebook
@@ -219,49 +243,49 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
 
-      - name: set git username
-        run: git config --global user.email "${{ secrets.NBDROID_EMAIL }}"
+    - name: set git username
+      run: git config --global user.email "${{ secrets.NBDROID_EMAIL }}"
 
-      - name: set git email
-        run: git config --global user.name "${{ secrets.NBDROID_NAME }}"
+    - name: set git email
+      run: git config --global user.name "${{ secrets.NBDROID_NAME }}"
 
-      - name: download guidebook
-        uses: actions/download-artifact@v1
-        with:
-         name: guidebook
-         path: guidebook
+    - name: download guidebook
+      uses: actions/download-artifact@v1
+      with:
+       name: guidebook
+       path: guidebook
 
-      - run: ls -la
+    - run: ls -la
 
-      - name: clone nosqlbench-docs
-        env:
-          NBDROID_NAME: ${{ secrets.NBDROID_NAME }}
-          NBDROID_TOKEN: ${{ secrets.NBDROID_TOKEN }}
-        run: |
-         git clone https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-docs.git nosqlbench-docs
-         cd nosqlbench-docs
-         echo "files listing"
-         find .
-         git remote set-url origin https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-docs.git
-         git remote -v
+    - name: clone nosqlbench-docs
+      env:
+        NBDROID_NAME: ${{ secrets.NBDROID_NAME }}
+        NBDROID_TOKEN: ${{ secrets.NBDROID_TOKEN }}
+      run: |
+       git clone https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-docs.git nosqlbench-docs
+       cd nosqlbench-docs
+       echo "files listing"
+       find .
+       git remote set-url origin https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-docs.git
+       git remote -v
 
-      - name: push changes
-        env:
-          NBDROID_NAME: ${{ secrets.NBDROID_NAME }}
-          NBDROID_TOKEN: ${{ secrets.NBDROID_TOKEN }}
-        run: |
-         rsync -av --delete guidebook/guidebook/ nosqlbench-docs/docs/
-         echo "docs.nosqlbench.io" > nosqlbench-docs/docs/CNAME
-         cd nosqlbench-docs
-         git add docs
-         git add -u
-         CHANGES=$(git status --porcelain 2>/dev/null| wc -l)
-         echo "found $CHANGES to push for doc updates"
-         if (( $CHANGES > 0 ))
-         then
-           git commit -m"docs update for $GITHUB_REF"
-           git push
-         fi
+    - name: push changes
+      env:
+        NBDROID_NAME: ${{ secrets.NBDROID_NAME }}
+        NBDROID_TOKEN: ${{ secrets.NBDROID_TOKEN }}
+      run: |
+       rsync -av --delete guidebook/guidebook/ nosqlbench-docs/docs/
+       echo "docs.nosqlbench.io" > nosqlbench-docs/docs/CNAME
+       cd nosqlbench-docs
+       git add docs
+       git add -u
+       CHANGES=$(git status --porcelain 2>/dev/null| wc -l)
+       echo "found $CHANGES to push for doc updates"
+       if (( $CHANGES > 0 ))
+       then
+         git commit -m"docs update for $GITHUB_REF"
+         git push
+       fi
 
 
 

From d00a50f1aa799370813a2bae2d0f47014cce25e7 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 14:19:59 -0600
Subject: [PATCH 110/164] test build scripts

---
 RELEASENOTES.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index c4f543b74..e70442ac3 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,4 +1,7 @@
-- force build
+- 3fa958c9 (HEAD -> main, origin/main) update docker actions and add sanity check
+- d740078c fixing build
+- 82d5e021 fix workload typo
+- 2148a24c Stabilize NB3 builds
 - 040db478 backport github actions breaking change fix
 - 3f4d1304 build NB3 with J14
 - 89c15d38 backport github breaking change fixes

From 2b17cdccfcfa66a79c957ced76007bfed29ba2e2 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 14:34:01 -0600
Subject: [PATCH 111/164] fix broken autoformat

---
 .github/workflows/release.yml | 474 +++++++++++++++++-----------------
 1 file changed, 237 insertions(+), 237 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 93122a8c8..d31ebf525 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,282 +10,282 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
 
-    - name: checkout repo
-      uses: actions/checkout@v2
+      - name: checkout repo
+        uses: actions/checkout@v2
 
-    - name: setup java
-      uses: actions/setup-java@v1
-      with:
-        java-version: '14'
-        java-package: jdk
-        architecture: x64
+      - name: setup java
+        uses: actions/setup-java@v1
+        with:
+          java-version: '14'
+          java-package: jdk
+          architecture: x64
 
-    - name: avoid release loop
-      run: scripts/avoid-release-loop.sh
-      env:
-       GIT_RELEASE_BOT_NAME: "nb-droid"
+      - name: avoid release loop
+        run: scripts/avoid-release-loop.sh
+        env:
+          GIT_RELEASE_BOT_NAME: "nb-droid"
 
-    - name: capture tty for gpg
-      run: |
-        echo "TTY="$(tty) >> $GITHUB_ENV
-        echo "GPG_TTY="$(tty) >> $GITHUB_ENV
-        # echo "::set-env name=TTY::"$(tty)
-        # echo "::set-env name=GPG_TTY::"$(tty)
+      - name: capture tty for gpg
+        run: |
+          echo "TTY="$(tty) >> $GITHUB_ENV
+          echo "GPG_TTY="$(tty) >> $GITHUB_ENV
+          # echo "::set-env name=TTY::"$(tty)
+          # echo "::set-env name=GPG_TTY::"$(tty)
 
-    - name: initialize gpg
-      run: |
-        set -x
-        echo "${{ secrets.GITHUB_GPG_KEY }}" | base64 -d > private.key
-        gpg --import --batch ./private.key
-        rm ./private.key
-        echo "gnupg files:"
-        ls -l ~/.gnupg/
+      - name: initialize gpg
+        run: |
+          set -x
+          echo "${{ secrets.GITHUB_GPG_KEY }}" | base64 -d > private.key
+          gpg --import --batch ./private.key
+          rm ./private.key
+          echo "gnupg files:"
+          ls -l ~/.gnupg/
 
-    - name: set git username
-      run: git config --global user.email "${{ secrets.NBDROID_EMAIL }}"
+      - name: set git username
+        run: git config --global user.email "${{ secrets.NBDROID_EMAIL }}"
 
-    - name: set git email
-      run: git config --global user.name "${{ secrets.NBDROID_NAME }}"
+      - name: set git email
+        run: git config --global user.name "${{ secrets.NBDROID_NAME }}"
 
-    - name: free disk space
-      run: |
-        sudo swapoff -a
-        sudo rm -f /swapfile
-        sudo apt clean
-        docker rmi $(docker image ls -aq)
-        df -h
+      - name: free disk space
+        run: |
+          sudo swapoff -a
+          sudo rm -f /swapfile
+          sudo apt clean
+          docker rmi $(docker image ls -aq)
+          df -h
 
-    - name: Cache Maven packages
-      uses: actions/cache@v1
-      with:
-        path: ~/.m2
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
+      - name: Cache Maven packages
+        uses: actions/cache@v1
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
 
-    - name: read versions
-      run: |
-        set -x
-        CURRENT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-        RELEASE_VERSION=${CURRENT_VERSION%%-SNAPSHOT}
-        BASE_VERSION=$(echo "$RELEASE_VERSION" | cut -d'.' -f1-2)
-        MINOR_VERSION=$(echo "$RELEASE_VERSION" | cut -d'.' -f3)
-        NEXT_MINOR_VERSION=$(( MINOR_VERSION+1))
-        NEXT_SNAPSHOT="${BASE_VERSION}.${NEXT_MINOR_VERSION}-SNAPSHOT"
-        RELEASE_TAGNAME="nosqlbench-${RELEASE_VERSION}"
-        echo "NEXT_SNAPSHOT=${NEXT_SNAPSHOT}" >> $GITHUB_ENV
-        echo "RELEASE_VERSION=${RELEASE_VERSION}" >> $GITHUB_ENV
-        echo "RELEASE_TAGNAME=${RELEASE_TAGNAME}" >> $GITHUB_ENV
-        # echo "::set-env name=NEXT_SNAPSHOT::${NEXT_SNAPSHOT}"
-        # echo "::set-env name=RELEASE_VERSION::${RELEASE_VERSION}"
-        # echo "::set-env name=RELEASE_TAGNAME::${RELEASE_TAGNAME}"
+      - name: read versions
+        run: |
+          set -x
+          CURRENT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          RELEASE_VERSION=${CURRENT_VERSION%%-SNAPSHOT}
+          BASE_VERSION=$(echo "$RELEASE_VERSION" | cut -d'.' -f1-2)
+          MINOR_VERSION=$(echo "$RELEASE_VERSION" | cut -d'.' -f3)
+          NEXT_MINOR_VERSION=$(( MINOR_VERSION+1))
+          NEXT_SNAPSHOT="${BASE_VERSION}.${NEXT_MINOR_VERSION}-SNAPSHOT"
+          RELEASE_TAGNAME="nosqlbench-${RELEASE_VERSION}"
+          echo "NEXT_SNAPSHOT=${NEXT_SNAPSHOT}" >> $GITHUB_ENV
+          echo "RELEASE_VERSION=${RELEASE_VERSION}" >> $GITHUB_ENV
+          echo "RELEASE_TAGNAME=${RELEASE_TAGNAME}" >> $GITHUB_ENV
+          # echo "::set-env name=NEXT_SNAPSHOT::${NEXT_SNAPSHOT}"
+          # echo "::set-env name=RELEASE_VERSION::${RELEASE_VERSION}"
+          # echo "::set-env name=RELEASE_TAGNAME::${RELEASE_TAGNAME}"
 
-    - name: prepare release summary
-      id: prepare_summary
-      run: |
-       #summary=$(scripts/release-notes.sh)
-       summary=$(cat RELEASENOTES.md)
-       summary="${summary//'%'/'%25'}"
-       summary="${summary//$'\n'/'%0A'}"
-       summary="${summary//$'\r'/'%0D'}"
-       echo "::set-output name=release_summary::$summary"
+      - name: prepare release summary
+        id: prepare_summary
+        run: |
+          #summary=$(scripts/release-notes.sh)
+          summary=$(cat RELEASENOTES.md)
+          summary="${summary//'%'/'%25'}"
+          summary="${summary//$'\n'/'%0A'}"
+          summary="${summary//$'\r'/'%0D'}"
+          echo "::set-output name=release_summary::$summary"
 
-    - name: prepare release
-      run: scripts/release-prepare.sh
-      env:
-        RELEASE_BRANCH_NAME: "main"
-        PRERELEASE_BRANCH_PATTERN: "-rc"
-       GIT_RELEASE_BOT_NAME: "nb-droid"
-       GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }}
-       ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }}
-       GPG_ENABLED: "true"
-       GPG_KEY_ID: ${{ secrets.GITHUB_GPG_KEY_ID }}
-       GPG_KEY: ${{ secrets.GITHUB_GPG_KEY }}
-       GPG_SERVER_NAME: ${{ secrets.GPG_SERVER_NAME }}
-       GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-       MAVEN_REPO_SERVER_ID: ${{ secrets.MAVEN_REPO_SERVER_ID }}
-       MAVEN_REPO_SERVER_USERNAME: ${{ secrets.MVN_REPO_PRIVATE_REPO_USER }}
-       MAVEN_REPO_SERVER_PASSWORD: ${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }}
+      - name: prepare release
+        run: scripts/release-prepare.sh
+        env:
+          RELEASE_BRANCH_NAME: "main"
+          PRERELEASE_BRANCH_PATTERN: "-rc"
+          GIT_RELEASE_BOT_NAME: "nb-droid"
+          GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }}
+          ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }}
+          GPG_ENABLED: "true"
+          GPG_KEY_ID: ${{ secrets.GITHUB_GPG_KEY_ID }}
+          GPG_KEY: ${{ secrets.GITHUB_GPG_KEY }}
+          GPG_SERVER_NAME: ${{ secrets.GPG_SERVER_NAME }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          MAVEN_REPO_SERVER_ID: ${{ secrets.MAVEN_REPO_SERVER_ID }}
+          MAVEN_REPO_SERVER_USERNAME: ${{ secrets.MVN_REPO_PRIVATE_REPO_USER }}
+          MAVEN_REPO_SERVER_PASSWORD: ${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }}
 
-    - name: bundle integration test logs
-      run: |
-        pwd
-        find nb
-        mkdir -p itlogs/nb
-        cp -R nb/logs itlogs/nb
+      - name: bundle integration test logs
+        run: |
+          pwd
+          find nb
+          mkdir -p itlogs/nb
+          cp -R nb/logs itlogs/nb
 
-    - name: upload integration test logs
-      uses: actions/upload-artifact@v1
-      with:
-        name: itlogs
-        path: itlogs
+      - name: upload integration test logs
+        uses: actions/upload-artifact@v1
+        with:
+          name: itlogs
+          path: itlogs
 
 
-    - name: perform release
-      run: scripts/release-perform.sh
-      continue-on-error: true
-      env:
-       RELEASE_BRANCH_NAME: "main"
-       GIT_RELEASE_BOT_NAME: "nb-droid"
-       GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }}
-       ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }}
-       GPG_ENABLED: "true"
-       GPG_KEY_ID: ${{ secrets.GITHUB_GPG_KEY_ID }}
-       GPG_KEY: ${{ secrets.GITHUB_GPG_KEY }}
-       GPG_SERVER_NAME: ${{ secrets.GPG_SERVER_NAME }}
-       GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-       MAVEN_REPO_SERVER_ID: ${{ secrets.MAVEN_REPO_SERVER_ID }}
-       MAVEN_REPO_SERVER_USERNAME: ${{ secrets.MVN_REPO_PRIVATE_REPO_USER }}
-       MAVEN_REPO_SERVER_PASSWORD: ${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }}
+      - name: perform release
+        run: scripts/release-perform.sh
+        continue-on-error: true
+        env:
+          RELEASE_BRANCH_NAME: "main"
+          GIT_RELEASE_BOT_NAME: "nb-droid"
+          GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }}
+          ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }}
+          GPG_ENABLED: "true"
+          GPG_KEY_ID: ${{ secrets.GITHUB_GPG_KEY_ID }}
+          GPG_KEY: ${{ secrets.GITHUB_GPG_KEY }}
+          GPG_SERVER_NAME: ${{ secrets.GPG_SERVER_NAME }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          MAVEN_REPO_SERVER_ID: ${{ secrets.MAVEN_REPO_SERVER_ID }}
+          MAVEN_REPO_SERVER_USERNAME: ${{ secrets.MVN_REPO_PRIVATE_REPO_USER }}
+          MAVEN_REPO_SERVER_PASSWORD: ${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }}
 
-    - name: bundle artifacts
-      run: |
-        pwd
-        ls -l
-        mkdir staging
-        cp nb/target/nb.jar nb/target/nb staging
+      - name: bundle artifacts
+        run: |
+          pwd
+          ls -l
+          mkdir staging
+          cp nb/target/nb.jar nb/target/nb staging
 
-    - name: upload artifacts
-      uses: actions/upload-artifact@v1
-      with:
-        name: binaries
-        path: staging
+      - name: upload artifacts
+        uses: actions/upload-artifact@v1
+        with:
+          name: binaries
+          path: staging
 
-    - name: select release type from branch name
-      run: |
-        current_branch=$(git rev-parse --abbrev-ref HEAD)
-        if [[ ${current_branch} == *"-rc"* ]]
-         then
-          echo "PRERELEASE=true" >> $GITHUB_ENV
-          echo "DOCKER_TAGS='nosqlbench/nosqlbench:"${{ env.RELEASE_VERSION }}"'" >> $GITHUB_ENV
-         else
-          echo "PRERELEASE=false" >> $GITHUB_ENV
-          echo "DOCKER_TAGS='nosqlbench/nosqlbench:latest,nosqlbench/nosqlbench:"${{ env
-        .RELEASE_VERSION }}"'" >> $GITHUB_ENV
-      fi
+      - name: select release type from branch name
+        run: |
+          current_branch=$(git rev-parse --abbrev-ref HEAD)
+          if [[ ${current_branch} == *"-rc"* ]]
+           then
+            echo "PRERELEASE=true" >> $GITHUB_ENV
+            echo "DOCKER_TAGS='nosqlbench/nosqlbench:"${{ env.RELEASE_VERSION }}"'" >> $GITHUB_ENV
+           else
+            echo "PRERELEASE=false" >> $GITHUB_ENV
+            echo "DOCKER_TAGS='nosqlbench/nosqlbench:latest,nosqlbench/nosqlbench:"${{ env
+          .RELEASE_VERSION }}"'" >> $GITHUB_ENV
+        fi
 
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
 
-    - name: docker hub login
-      uses: docker/login-action@v1
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: docker hub login
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
-    - name: docker build
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: Dockerfile
-        pull: true
-        push: false
-        load: true
-        tags: ${{ env.DOCKER_TAGS }}
+      - name: docker build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: Dockerfile
+          pull: true
+          push: false
+          load: true
+          tags: ${{ env.DOCKER_TAGS }}
 
-    - name: sanity check docker image
-      run: |
-        docker run --rm -i -t nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }} --version
+      - name: sanity check docker image
+        run: |
+          docker run --rm -i -t nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }} --version
 
-    - name: docker push
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: Dockerfile
-        pull: true
-        push: true
-        tags: ${{ env.DOCKER_TAGS }}
+      - name: docker push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: Dockerfile
+          pull: true
+          push: true
+          tags: ${{ env.DOCKER_TAGS }}
 
-    - name: bundle guidebook
-      run: mkdir guidebook && cp -R nb/target/guidebook guidebook
+      - name: bundle guidebook
+        run: mkdir guidebook && cp -R nb/target/guidebook guidebook
 
-    - name: upload guidebook
-      uses: actions/upload-artifact@v1
-      with:
-        name: guidebook
-        path: guidebook
+      - name: upload guidebook
+        uses: actions/upload-artifact@v1
+        with:
+          name: guidebook
+          path: guidebook
 
-    - name: create release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ env.RELEASE_TAGNAME }}
-        release_name: Release ${{ env.RELEASE_TAGNAME }}
-        draft: false
-        prerelease: ${{ env.PRERELEASE }}
-        body: ${{ steps.prepare_summary.outputs.release_summary }}
+      - name: create release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ env.RELEASE_TAGNAME }}
+          release_name: Release ${{ env.RELEASE_TAGNAME }}
+          draft: false
+          prerelease: ${{ env.PRERELEASE }}
+          body: ${{ steps.prepare_summary.outputs.release_summary }}
 
-    - name: upload nb.jar
-      id: upload-nb-jar
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: nb/target/nb.jar
-        asset_name: nb.jar
-        asset_content_type: application/octet-stream
+      - name: upload nb.jar
+        id: upload-nb-jar
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: nb/target/nb.jar
+          asset_name: nb.jar
+          asset_content_type: application/octet-stream
 
-    - name: upload nb binary
-      id: upload-nb-binary
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: nb/target/nb
-        asset_name: nb
-        asset_content_type: application/octet-stream
+      - name: upload nb binary
+        id: upload-nb-binary
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: nb/target/nb
+          asset_name: nb
+          asset_content_type: application/octet-stream
 
   docs:
     needs: release
     runs-on: ubuntu-18.04
     steps:
 
-    - name: set git username
-      run: git config --global user.email "${{ secrets.NBDROID_EMAIL }}"
+      - name: set git username
+        run: git config --global user.email "${{ secrets.NBDROID_EMAIL }}"
 
-    - name: set git email
-      run: git config --global user.name "${{ secrets.NBDROID_NAME }}"
+      - name: set git email
+        run: git config --global user.name "${{ secrets.NBDROID_NAME }}"
 
-    - name: download guidebook
-      uses: actions/download-artifact@v1
-      with:
-       name: guidebook
-       path: guidebook
+      - name: download guidebook
+        uses: actions/download-artifact@v1
+        with:
+          name: guidebook
+          path: guidebook
 
-    - run: ls -la
+      - run: ls -la
 
-    - name: clone nosqlbench-docs
-      env:
-        NBDROID_NAME: ${{ secrets.NBDROID_NAME }}
-        NBDROID_TOKEN: ${{ secrets.NBDROID_TOKEN }}
-      run: |
-       git clone https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-docs.git nosqlbench-docs
-       cd nosqlbench-docs
-       echo "files listing"
-       find .
-       git remote set-url origin https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-docs.git
-       git remote -v
+      - name: clone nosqlbench-docs
+        env:
+          NBDROID_NAME: ${{ secrets.NBDROID_NAME }}
+          NBDROID_TOKEN: ${{ secrets.NBDROID_TOKEN }}
+        run: |
+          git clone https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-docs.git nosqlbench-docs
+          cd nosqlbench-docs
+          echo "files listing"
+          find .
+          git remote set-url origin https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-docs.git
+          git remote -v
 
-    - name: push changes
-      env:
-        NBDROID_NAME: ${{ secrets.NBDROID_NAME }}
-        NBDROID_TOKEN: ${{ secrets.NBDROID_TOKEN }}
-      run: |
-       rsync -av --delete guidebook/guidebook/ nosqlbench-docs/docs/
-       echo "docs.nosqlbench.io" > nosqlbench-docs/docs/CNAME
-       cd nosqlbench-docs
-       git add docs
-       git add -u
-       CHANGES=$(git status --porcelain 2>/dev/null| wc -l)
-       echo "found $CHANGES to push for doc updates"
-       if (( $CHANGES > 0 ))
-       then
-         git commit -m"docs update for $GITHUB_REF"
-         git push
-       fi
+      - name: push changes
+        env:
+          NBDROID_NAME: ${{ secrets.NBDROID_NAME }}
+          NBDROID_TOKEN: ${{ secrets.NBDROID_TOKEN }}
+        run: |
+          rsync -av --delete guidebook/guidebook/ nosqlbench-docs/docs/
+          echo "docs.nosqlbench.io" > nosqlbench-docs/docs/CNAME
+          cd nosqlbench-docs
+          git add docs
+          git add -u
+          CHANGES=$(git status --porcelain 2>/dev/null| wc -l)
+          echo "found $CHANGES to push for doc updates"
+          if (( $CHANGES > 0 ))
+          then
+            git commit -m"docs update for $GITHUB_REF"
+            git push
+          fi
 
 
 

From c119ec141559ff70ffaa8847ecd22522dc489823 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 14:34:29 -0600
Subject: [PATCH 112/164] test build scripts

---
 RELEASENOTES.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index e70442ac3..79bdc8142 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,4 +1,6 @@
-- 3fa958c9 (HEAD -> main, origin/main) update docker actions and add sanity check
+- 2b17cdcc (HEAD -> main) fix broken autoformat
+- d00a50f1 (origin/main) test build scripts
+- 3fa958c9 update docker actions and add sanity check
 - d740078c fixing build
 - 82d5e021 fix workload typo
 - 2148a24c Stabilize NB3 builds

From 6048be95cb437da85eea96bda4a97592f09f3c6e Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 14:37:04 -0600
Subject: [PATCH 113/164] fix broken autoformat

---
 .github/workflows/release.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d31ebf525..f8c293d66 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -159,8 +159,7 @@ jobs:
             echo "DOCKER_TAGS='nosqlbench/nosqlbench:"${{ env.RELEASE_VERSION }}"'" >> $GITHUB_ENV
            else
             echo "PRERELEASE=false" >> $GITHUB_ENV
-            echo "DOCKER_TAGS='nosqlbench/nosqlbench:latest,nosqlbench/nosqlbench:"${{ env
-          .RELEASE_VERSION }}"'" >> $GITHUB_ENV
+            echo "DOCKER_TAGS='nosqlbench/nosqlbench:latest,nosqlbench/nosqlbench:"${{ env.RELEASE_VERSION }}"'" >> $GITHUB_ENV
         fi
 
       - name: Set up Docker Buildx

From 633cbea79daaad7dbbe1f2b82498808359335fa7 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 14:37:14 -0600
Subject: [PATCH 114/164] test build scripts

---
 RELEASENOTES.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 79bdc8142..9f7f17cda 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,5 +1,7 @@
-- 2b17cdcc (HEAD -> main) fix broken autoformat
-- d00a50f1 (origin/main) test build scripts
+- 6048be95 (HEAD -> main) fix broken autoformat
+- c119ec14 (origin/main) test build scripts
+- 2b17cdcc fix broken autoformat
+- d00a50f1 test build scripts
 - 3fa958c9 update docker actions and add sanity check
 - d740078c fixing build
 - 82d5e021 fix workload typo

From ecaeab142a0f8c3265f92306b2c2cb0b662bd61c Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 14:41:17 -0600
Subject: [PATCH 115/164] build testing

---
 .github/workflows/release.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f8c293d66..22b361c34 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -156,13 +156,13 @@ jobs:
           if [[ ${current_branch} == *"-rc"* ]]
            then
             echo "PRERELEASE=true" >> $GITHUB_ENV
-            echo "DOCKER_TAGS='nosqlbench/nosqlbench:"${{ env.RELEASE_VERSION }}"'" >> $GITHUB_ENV
+            echo "DOCKER_TAGS=nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }}" >> $GITHUB_ENV
            else
             echo "PRERELEASE=false" >> $GITHUB_ENV
-            echo "DOCKER_TAGS='nosqlbench/nosqlbench:latest,nosqlbench/nosqlbench:"${{ env.RELEASE_VERSION }}"'" >> $GITHUB_ENV
+            echo "DOCKER_TAGS=nosqlbench/nosqlbench:latest,nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }}" >> $GITHUB_ENV
         fi
 
-      - name: Set up Docker Buildx
+      - name: Setup docker buildx
         uses: docker/setup-buildx-action@v1
 
       - name: docker hub login

From 17251bb6026bad752dd3affdb1d88df5ac9adec1 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 14:41:25 -0600
Subject: [PATCH 116/164] build testing

---
 RELEASENOTES.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 9f7f17cda..ecbb96694 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,5 +1,7 @@
-- 6048be95 (HEAD -> main) fix broken autoformat
-- c119ec14 (origin/main) test build scripts
+- ecaeab14 (HEAD -> main) build testing
+- 633cbea7 (origin/main) test build scripts
+- 6048be95 fix broken autoformat
+- c119ec14 test build scripts
 - 2b17cdcc fix broken autoformat
 - d00a50f1 test build scripts
 - 3fa958c9 update docker actions and add sanity check

From e334e4562a5e2fadb1b6eb483f675be667d4c6b0 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 14:45:53 -0600
Subject: [PATCH 117/164] build testing

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 22b361c34..8c8133c0d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -160,7 +160,7 @@ jobs:
            else
             echo "PRERELEASE=false" >> $GITHUB_ENV
             echo "DOCKER_TAGS=nosqlbench/nosqlbench:latest,nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }}" >> $GITHUB_ENV
-        fi
+          fi
 
       - name: Setup docker buildx
         uses: docker/setup-buildx-action@v1

From 0fb043e3aed93c62035b15fc7c5657bed9dd2dfd Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 14:45:57 -0600
Subject: [PATCH 118/164] build testing

---
 RELEASENOTES.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ecbb96694..b2e6866e4 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,5 +1,7 @@
-- ecaeab14 (HEAD -> main) build testing
-- 633cbea7 (origin/main) test build scripts
+- e334e456 (HEAD -> main) build testing
+- 17251bb6 (origin/main) build testing
+- ecaeab14 build testing
+- 633cbea7 test build scripts
 - 6048be95 fix broken autoformat
 - c119ec14 test build scripts
 - 2b17cdcc fix broken autoformat

From d865c03c70da1f117bf747cc9f0a87a76ce8f6a6 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 17:46:00 -0600
Subject: [PATCH 119/164] make perf sensitive test less sensitive

---
 .../engine/core/script/AsyncScriptIntegrationTests.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java b/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
index 5662373dd..8ab46e3ea 100644
--- a/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
+++ b/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
@@ -175,7 +175,7 @@ public class AsyncScriptIntegrationTests {
                 "logs/histostats.csv"));
         String logdata = strings.stream().collect(Collectors.joining("\n"));
         assertThat(logdata).contains("min,p25,p50,p75,p90,p95,");
-        assertThat(logdata.split("Tag=testhistostatslogger.cycles.servicetime,").length).isGreaterThanOrEqualTo(3);
+        assertThat(logdata.split("Tag=testhistostatslogger.cycles.servicetime,").length).isGreaterThanOrEqualTo(2);
     }
 
     @Test

From 3b4ecaca0f090acee43c976f0da3b04c7ba51350 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 17:46:43 -0600
Subject: [PATCH 120/164] build testing

---
 RELEASENOTES.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index b2e6866e4..faca36f0b 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,5 +1,7 @@
-- e334e456 (HEAD -> main) build testing
-- 17251bb6 (origin/main) build testing
+- d865c03c (HEAD -> main, origin/main) make perf sensitive test less sensitive
+- 0fb043e3 build testing
+- e334e456 build testing
+- 17251bb6 build testing
 - ecaeab14 build testing
 - 633cbea7 test build scripts
 - 6048be95 fix broken autoformat

From 5abb2da773e975214c83cc43a54335c5e286199c Mon Sep 17 00:00:00 2001
From: nb-droid <nosqlbenchdroid@gmail.com>
Date: Mon, 7 Dec 2020 23:56:43 +0000
Subject: [PATCH 121/164] [maven-release-plugin] prepare release
 nosqlbench-4.0.0

---
 docsys/pom.xml                 |  6 ++---
 driver-cql-shaded/pom.xml      |  6 ++---
 driver-cqlverify/pom.xml       |  6 ++---
 driver-diag/pom.xml            |  6 ++---
 driver-dsegraph-shaded/pom.xml | 13 ++++-------
 driver-http/pom.xml            |  6 ++---
 driver-jmx/pom.xml             |  6 ++---
 driver-kafka/pom.xml           |  6 ++---
 driver-mongodb/pom.xml         |  6 ++---
 driver-stdout/pom.xml          |  6 ++---
 driver-tcp/pom.xml             |  8 +++----
 driver-web/pom.xml             |  6 ++---
 drivers-api/pom.xml            |  6 ++---
 engine-api/pom.xml             | 10 ++++----
 engine-cli/pom.xml             |  6 ++---
 engine-clients/pom.xml         |  4 ++--
 engine-core/pom.xml            |  8 +++----
 engine-docker/pom.xml          |  4 ++--
 engine-docs/pom.xml            |  4 ++--
 engine-extensions/pom.xml      |  4 ++--
 engine-rest/pom.xml            |  4 ++--
 mvn-defaults/pom.xml           |  8 +++----
 nb-annotations/pom.xml         |  2 +-
 nb-api/pom.xml                 |  8 +++----
 nb/pom.xml                     | 42 ++++++++++++++++------------------
 pom.xml                        |  4 ++--
 virtdata-api/pom.xml           |  6 ++---
 virtdata-lang/pom.xml          |  2 +-
 virtdata-lib-basics/pom.xml    |  4 ++--
 virtdata-lib-curves4/pom.xml   |  6 ++---
 virtdata-lib-random/pom.xml    |  6 ++---
 virtdata-lib-realer/pom.xml    |  4 ++--
 virtdata-realdata/pom.xml      |  4 ++--
 virtdata-userlibs/pom.xml      | 16 ++++++-------
 34 files changed, 117 insertions(+), 126 deletions(-)

diff --git a/docsys/pom.xml b/docsys/pom.xml
index 7eebb773c..7e5dc9d44 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index 7db495c03..38df9e73d 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index fa0ca8512..fa57e1002 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cql-shaded</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
   </dependencies>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index 806dbf7b5..031bdae02 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index fdf041a23..b0db08b39 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -1,12 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -25,13 +23,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
@@ -237,8 +235,7 @@
             </includes>
           </artifactSet>
           <transformers combine.children="append">
-            <transformer
-                implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+            <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
               <mainClass>io.nosqlbench.engine.cli.NBCLI</mainClass>
             </transformer>
           </transformers>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index 9664f160d..1ea3ab509 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index 54280f347..6dfb9b86e 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index d30e3b1f3..84fbd6592 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -44,13 +44,13 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-api</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>driver-stdout</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
       </dependency>
 
       <!--        <dependency>-->
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index 0957359b1..2599ce8e5 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index 7ef528d72..d72700f7a 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index cd329ff8d..df32a3d6d 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,19 +24,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index 5a20d1e09..07ee184ee 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index e82e035bc..ab177f941 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index cf11ea2f7..1e719e348 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,25 +23,25 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index 451f496da..04a00cfb7 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index 390edc0aa..c46f59d84 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index 59d3a5640..20f31ccef 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-clients</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index 97db59a7d..fad6e5465 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index 9d15529d8..31279c6da 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>docsys</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index 3e628ac58..07ddf66d3 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index e96b5a2cd..9e392b334 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 3285a1086..ad3aad6b3 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -1,11 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>io.nosqlbench</groupId>
   <artifactId>mvn-defaults</artifactId>
-  <version>4.0.0-SNAPSHOT</version>
+  <version>4.0.0</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -95,7 +93,7 @@
   <scm>
     <url>scm:git:https://github.com/nosqlbench/nosqlbench.git</url>
     <!--        <tag>nosqlbench-2.0.102-SNAPSHOT</tag>-->
-    <tag>HEAD</tag>
+    <tag>nosqlbench-4.0.0</tag>
   </scm>
 
   <dependencyManagement>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index 69e28547f..3fd356bf5 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 43ec01752..a963ad059 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -1,13 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
 
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -33,7 +31,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>nb-annotations</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
diff --git a/nb/pom.xml b/nb/pom.xml
index a7fb4f804..b1d2c81f3 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -1,13 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
 
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -26,31 +24,31 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-rest</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-cli</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-docs</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-core</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-extensions</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -62,67 +60,67 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-web</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-kafka</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-stdout</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-diag</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-tcp</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-http</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-jmx</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-dsegraph-shaded</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cql-shaded</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cqlverify</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-mongodb</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -259,7 +257,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-mongodb</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
       </dependencies>
     </profile>
@@ -313,7 +311,7 @@
             <artifactId>maven-enforcer-plugin</artifactId>
             <configuration>
               <rules>
-                <dependencyConvergence/>
+                <dependencyConvergence />
               </rules>
             </configuration>
           </plugin>
diff --git a/pom.xml b/pom.xml
index 6df766ae1..1c1e9e9ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
@@ -145,7 +145,7 @@
             scm:git:https://github.com/nosqlbench/nosqlbench.git
         </developerConnection>
         <url>scm:git:git@github.com:nosqlbench/nosqlbench.git</url>
-        <tag>HEAD</tag>
+        <tag>nosqlbench-4.0.0</tag>
     </scm>
 
     <distributionManagement>
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index 47d79cb23..3bcd6e425 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index a55f473ff..15e90d5c2 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index 70ee7b286..fd5746fea 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index 33701045b..a9b946651 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index db6f7bd2f..8bf958b91 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index 5b8949cb7..83ff35ac9 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index dd826699a..f37e1e38e 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>4.0.0</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index 8ae260df5..a6011ff1d 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,36 +18,36 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0</version>
         </dependency>
 
     </dependencies>

From f9e509dd2570b900b6934a8ae09032cdab47f451 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 18:21:29 -0600
Subject: [PATCH 122/164] correct pom version for NB3 branch

---
 docsys/pom.xml                 |  6 +++---
 driver-cql-shaded/pom.xml      |  6 +++---
 driver-cqld4/pom.xml           |  8 +++----
 driver-cqlverify/pom.xml       |  6 +++---
 driver-diag/pom.xml            |  6 +++---
 driver-dsegraph-shaded/pom.xml |  6 +++---
 driver-http/pom.xml            |  6 +++---
 driver-jmx/pom.xml             |  6 +++---
 driver-kafka/pom.xml           |  6 +++---
 driver-mongodb/pom.xml         |  6 +++---
 driver-stdout/pom.xml          |  6 +++---
 driver-tcp/pom.xml             |  8 +++----
 driver-web/pom.xml             |  6 +++---
 drivers-api/pom.xml            |  6 +++---
 engine-api/pom.xml             | 10 ++++-----
 engine-cli/pom.xml             |  6 +++---
 engine-clients/pom.xml         |  4 ++--
 engine-core/pom.xml            |  8 +++----
 engine-docker/pom.xml          |  4 ++--
 engine-docs/pom.xml            |  4 ++--
 engine-extensions/pom.xml      |  4 ++--
 engine-rest/pom.xml            |  4 ++--
 mvn-defaults/pom.xml           |  2 +-
 nb-annotations/pom.xml         |  2 +-
 nb-api/pom.xml                 |  4 ++--
 nb/pom.xml                     | 38 +++++++++++++++++-----------------
 pom.xml                        |  2 +-
 virtdata-api/pom.xml           |  6 +++---
 virtdata-lang/pom.xml          |  2 +-
 virtdata-lib-basics/pom.xml    |  4 ++--
 virtdata-lib-curves4/pom.xml   |  6 +++---
 virtdata-lib-random/pom.xml    |  6 +++---
 virtdata-lib-realer/pom.xml    |  4 ++--
 virtdata-realdata/pom.xml      |  4 ++--
 virtdata-userlibs/pom.xml      | 16 +++++++-------
 35 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/docsys/pom.xml b/docsys/pom.xml
index 7eebb773c..addd7fe67 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index 7db495c03..caff96fff 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-cqld4/pom.xml b/driver-cqld4/pom.xml
index a7ed99184..d70a761e7 100644
--- a/driver-cqld4/pom.xml
+++ b/driver-cqld4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
 
@@ -61,7 +61,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index fa0ca8512..68fac6e23 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>3.12.157-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cql-shaded</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>3.12.157-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>3.12.157-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index 806dbf7b5..304172733 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index fdf041a23..f1451a003 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>3.12.157-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -25,13 +25,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>3.12.157-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>3.12.157-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index 9664f160d..10bf110de 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index 54280f347..00337427d 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index d30e3b1f3..e4c8065d0 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -44,13 +44,13 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-api</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>driver-stdout</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
       </dependency>
 
       <!--        <dependency>-->
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index 0957359b1..85fa3ac0b 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index 7ef528d72..8447148d9 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index cd329ff8d..9d23bd505 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,19 +24,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index 5a20d1e09..34e38784a 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index e82e035bc..0f81c8e90 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index cf11ea2f7..1cd98c9b1 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,25 +23,25 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index 451f496da..463f8ae94 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index 390edc0aa..451c83f02 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>3.12.157-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>3.12.157-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index 59d3a5640..b957998b5 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-clients</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index 97db59a7d..2a91cc20c 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index 9d15529d8..e2a68f43f 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>3.12.157-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>docsys</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>3.12.157-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index 3e628ac58..d87c5fcf0 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index e96b5a2cd..4373bc771 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 3285a1086..3bea940b6 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>io.nosqlbench</groupId>
   <artifactId>mvn-defaults</artifactId>
-  <version>4.0.0-SNAPSHOT</version>
+  <version>3.12.157-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index 69e28547f..73f57f5b4 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 43ec01752..a874199c9 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>3.12.157-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>nb-annotations</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>3.12.157-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/nb/pom.xml b/nb/pom.xml
index a7fb4f804..44322a546 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -26,31 +26,31 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-rest</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>3.12.157-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-cli</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>3.12.157-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-docs</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>3.12.157-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-core</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>3.12.157-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-extensions</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>3.12.157-SNAPSHOT</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -62,67 +62,67 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-web</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>3.12.157-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-kafka</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>3.12.157-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-stdout</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>3.12.157-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-diag</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>3.12.157-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-tcp</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>3.12.157-SNAPSHOT</version>
     </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-http</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-jmx</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-dsegraph-shaded</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cql-shaded</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cqlverify</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-mongodb</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>3.12.157-SNAPSHOT</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -246,7 +246,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cqld4</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
       </dependencies>
     </profile>
@@ -259,7 +259,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-mongodb</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/pom.xml b/pom.xml
index 6df766ae1..4d307dc9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index 47d79cb23..710855c82 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index a55f473ff..21ed67d3e 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index 70ee7b286..4f5324cd0 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index 33701045b..5d134970b 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index db6f7bd2f..2d4714a74 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index 5b8949cb7..7f19ce429 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index dd826699a..fb5c46681 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.0.0-SNAPSHOT</version>
+          <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index 8ae260df5..53113ce74 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.12.157-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,36 +18,36 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.12.157-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

From 93e2675902881207ab1f4a8ac4a4a8930e21d2c0 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 18:33:42 -0600
Subject: [PATCH 123/164] reset version for nb3

---
 RELEASENOTES.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index faca36f0b..19cd881bb 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,4 +1,6 @@
-- d865c03c (HEAD -> main, origin/main) make perf sensitive test less sensitive
+- f9e509dd correct pom version for NB3 branch
+- 3b4ecaca build testing
+- d865c03c make perf sensitive test less sensitive
 - 0fb043e3 build testing
 - e334e456 build testing
 - 17251bb6 build testing

From 0c01e5b3a728295797d7041413c2e33428b0b433 Mon Sep 17 00:00:00 2001
From: nb-droid <nosqlbenchdroid@gmail.com>
Date: Tue, 8 Dec 2020 01:49:03 +0000
Subject: [PATCH 124/164] [maven-release-plugin] prepare release
 nosqlbench-3.12.157

---
 docsys/pom.xml                 |  6 ++---
 driver-cql-shaded/pom.xml      |  6 ++---
 driver-cqlverify/pom.xml       |  6 ++---
 driver-diag/pom.xml            |  6 ++---
 driver-dsegraph-shaded/pom.xml | 13 ++++-------
 driver-http/pom.xml            |  6 ++---
 driver-jmx/pom.xml             |  6 ++---
 driver-kafka/pom.xml           |  6 ++---
 driver-mongodb/pom.xml         |  6 ++---
 driver-stdout/pom.xml          |  6 ++---
 driver-tcp/pom.xml             |  8 +++----
 driver-web/pom.xml             |  6 ++---
 drivers-api/pom.xml            |  6 ++---
 engine-api/pom.xml             | 10 ++++----
 engine-cli/pom.xml             |  6 ++---
 engine-clients/pom.xml         |  4 ++--
 engine-core/pom.xml            |  8 +++----
 engine-docker/pom.xml          |  4 ++--
 engine-docs/pom.xml            |  4 ++--
 engine-extensions/pom.xml      |  4 ++--
 engine-rest/pom.xml            |  4 ++--
 mvn-defaults/pom.xml           |  8 +++----
 nb-annotations/pom.xml         |  2 +-
 nb-api/pom.xml                 |  8 +++----
 nb/pom.xml                     | 42 ++++++++++++++++------------------
 pom.xml                        |  4 ++--
 virtdata-api/pom.xml           |  6 ++---
 virtdata-lang/pom.xml          |  2 +-
 virtdata-lib-basics/pom.xml    |  4 ++--
 virtdata-lib-curves4/pom.xml   |  6 ++---
 virtdata-lib-random/pom.xml    |  6 ++---
 virtdata-lib-realer/pom.xml    |  4 ++--
 virtdata-realdata/pom.xml      |  4 ++--
 virtdata-userlibs/pom.xml      | 16 ++++++-------
 34 files changed, 117 insertions(+), 126 deletions(-)

diff --git a/docsys/pom.xml b/docsys/pom.xml
index addd7fe67..cfd503722 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>3.12.157-SNAPSHOT</version>
+            <version>3.12.157</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.157-SNAPSHOT</version>
+            <version>3.12.157</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index caff96fff..8290a1298 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.157-SNAPSHOT</version>
+            <version>3.12.157</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.157-SNAPSHOT</version>
+            <version>3.12.157</version>
         </dependency>
 
         <dependency>
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index 68fac6e23..36e0b5082 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>3.12.157-SNAPSHOT</version>
+    <version>3.12.157</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cql-shaded</artifactId>
-      <version>3.12.157-SNAPSHOT</version>
+      <version>3.12.157</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>3.12.157-SNAPSHOT</version>
+      <version>3.12.157</version>
     </dependency>
 
   </dependencies>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index 304172733..8de4463b5 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index f1451a003..897522958 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -1,12 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>3.12.157-SNAPSHOT</version>
+    <version>3.12.157</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -25,13 +23,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>3.12.157-SNAPSHOT</version>
+      <version>3.12.157</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>3.12.157-SNAPSHOT</version>
+      <version>3.12.157</version>
     </dependency>
 
     <dependency>
@@ -237,8 +235,7 @@
             </includes>
           </artifactSet>
           <transformers combine.children="append">
-            <transformer
-                implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+            <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
               <mainClass>io.nosqlbench.engine.cli.NBCLI</mainClass>
             </transformer>
           </transformers>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index 10bf110de..0ff8c4e4c 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index 00337427d..d60b14d2a 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.157-SNAPSHOT</version>
+            <version>3.12.157</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.157-SNAPSHOT</version>
+            <version>3.12.157</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index e4c8065d0..814679ae1 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -44,13 +44,13 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-api</artifactId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
       </dependency>
 
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>driver-stdout</artifactId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
       </dependency>
 
       <!--        <dependency>-->
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index 85fa3ac0b..4cf9adab2 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
         <dependency>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index 8447148d9..51cc09638 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index 9d23bd505..e49d9e9fc 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,19 +24,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index 34e38784a..1a4617a97 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
         <dependency>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index 0f81c8e90..5644d62e3 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index 1cd98c9b1..e8884a792 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,25 +23,25 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>3.12.157-SNAPSHOT</version>
+            <version>3.12.157</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.157-SNAPSHOT</version>
+            <version>3.12.157</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>3.12.157-SNAPSHOT</version>
+            <version>3.12.157</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>3.12.157-SNAPSHOT</version>
+            <version>3.12.157</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index 463f8ae94..6da0de95c 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-            <version>3.12.157-SNAPSHOT</version>
+            <version>3.12.157</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-            <version>3.12.157-SNAPSHOT</version>
+            <version>3.12.157</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index 451c83f02..1fb71a8c5 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.157-SNAPSHOT</version>
+    <version>3.12.157</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>3.12.157-SNAPSHOT</version>
+      <version>3.12.157</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index b957998b5..43da62793 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-clients</artifactId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index 2a91cc20c..f1611d657 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index e2a68f43f..b791f022b 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.157-SNAPSHOT</version>
+    <version>3.12.157</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>docsys</artifactId>
-      <version>3.12.157-SNAPSHOT</version>
+      <version>3.12.157</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index d87c5fcf0..c365ba7d8 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index 4373bc771..d139c2e69 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
     </dependencies>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 3bea940b6..41cc6b7b4 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -1,11 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>io.nosqlbench</groupId>
   <artifactId>mvn-defaults</artifactId>
-  <version>3.12.157-SNAPSHOT</version>
+  <version>3.12.157</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -95,7 +93,7 @@
   <scm>
     <url>scm:git:https://github.com/nosqlbench/nosqlbench.git</url>
     <!--        <tag>nosqlbench-2.0.102-SNAPSHOT</tag>-->
-    <tag>HEAD</tag>
+    <tag>nosqlbench-3.12.157</tag>
   </scm>
 
   <dependencyManagement>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index 73f57f5b4..1a4ed2c96 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index a874199c9..91d462733 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -1,13 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
 
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.157-SNAPSHOT</version>
+    <version>3.12.157</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -33,7 +31,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>nb-annotations</artifactId>
-      <version>3.12.157-SNAPSHOT</version>
+      <version>3.12.157</version>
     </dependency>
 
     <dependency>
diff --git a/nb/pom.xml b/nb/pom.xml
index 44322a546..b8fe9921f 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -1,13 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
 
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -26,31 +24,31 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-rest</artifactId>
-      <version>3.12.157-SNAPSHOT</version>
+      <version>3.12.157</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-cli</artifactId>
-      <version>3.12.157-SNAPSHOT</version>
+      <version>3.12.157</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-docs</artifactId>
-      <version>3.12.157-SNAPSHOT</version>
+      <version>3.12.157</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-core</artifactId>
-      <version>3.12.157-SNAPSHOT</version>
+      <version>3.12.157</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-extensions</artifactId>
-      <version>3.12.157-SNAPSHOT</version>
+      <version>3.12.157</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -62,67 +60,67 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-web</artifactId>
-      <version>3.12.157-SNAPSHOT</version>
+      <version>3.12.157</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-kafka</artifactId>
-      <version>3.12.157-SNAPSHOT</version>
+      <version>3.12.157</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-stdout</artifactId>
-      <version>3.12.157-SNAPSHOT</version>
+      <version>3.12.157</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-diag</artifactId>
-      <version>3.12.157-SNAPSHOT</version>
+      <version>3.12.157</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-tcp</artifactId>
-      <version>3.12.157-SNAPSHOT</version>
+      <version>3.12.157</version>
     </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-http</artifactId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-jmx</artifactId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-dsegraph-shaded</artifactId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cql-shaded</artifactId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cqlverify</artifactId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-mongodb</artifactId>
-      <version>3.12.157-SNAPSHOT</version>
+      <version>3.12.157</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -259,7 +257,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-mongodb</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
       </dependencies>
     </profile>
@@ -313,7 +311,7 @@
             <artifactId>maven-enforcer-plugin</artifactId>
             <configuration>
               <rules>
-                <dependencyConvergence/>
+                <dependencyConvergence />
               </rules>
             </configuration>
           </plugin>
diff --git a/pom.xml b/pom.xml
index 4d307dc9b..23fc6a28f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
@@ -145,7 +145,7 @@
             scm:git:https://github.com/nosqlbench/nosqlbench.git
         </developerConnection>
         <url>scm:git:git@github.com:nosqlbench/nosqlbench.git</url>
-        <tag>HEAD</tag>
+        <tag>nosqlbench-3.12.157</tag>
     </scm>
 
     <distributionManagement>
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index 710855c82..6fa49f112 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index 21ed67d3e..fdab2781f 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index 4f5324cd0..229625885 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.157-SNAPSHOT</version>
+            <version>3.12.157</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index 5d134970b..6f03deea9 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index 2d4714a74..c76d43567 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.157-SNAPSHOT</version>
+            <version>3.12.157</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>3.12.157-SNAPSHOT</version>
+            <version>3.12.157</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index 7f19ce429..a20843b6d 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index fb5c46681..f536c5819 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>3.12.157-SNAPSHOT</version>
+          <version>3.12.157</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index 53113ce74..fe9667f06 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157-SNAPSHOT</version>
+        <version>3.12.157</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,36 +18,36 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-            <version>3.12.157-SNAPSHOT</version>
+            <version>3.12.157</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-            <version>3.12.157-SNAPSHOT</version>
+            <version>3.12.157</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.157-SNAPSHOT</version>
+            <version>3.12.157</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-            <version>3.12.157-SNAPSHOT</version>
+            <version>3.12.157</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>3.12.157-SNAPSHOT</version>
+            <version>3.12.157</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>3.12.157-SNAPSHOT</version>
+            <version>3.12.157</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-            <version>3.12.157-SNAPSHOT</version>
+            <version>3.12.157</version>
         </dependency>
 
     </dependencies>

From b15a8bb90556584f4dcc7412b0dd6f4bee4c2c86 Mon Sep 17 00:00:00 2001
From: nb-droid <nosqlbenchdroid@gmail.com>
Date: Tue, 8 Dec 2020 01:49:10 +0000
Subject: [PATCH 125/164] [maven-release-plugin] prepare for next development
 iteration

---
 docsys/pom.xml                 |  6 +++---
 driver-cql-shaded/pom.xml      |  6 +++---
 driver-cqlverify/pom.xml       |  6 +++---
 driver-diag/pom.xml            |  6 +++---
 driver-dsegraph-shaded/pom.xml |  6 +++---
 driver-http/pom.xml            |  6 +++---
 driver-jmx/pom.xml             |  6 +++---
 driver-kafka/pom.xml           |  6 +++---
 driver-mongodb/pom.xml         |  6 +++---
 driver-stdout/pom.xml          |  6 +++---
 driver-tcp/pom.xml             |  8 ++++----
 driver-web/pom.xml             |  6 +++---
 drivers-api/pom.xml            |  6 +++---
 engine-api/pom.xml             | 10 +++++-----
 engine-cli/pom.xml             |  6 +++---
 engine-clients/pom.xml         |  4 ++--
 engine-core/pom.xml            |  8 ++++----
 engine-docker/pom.xml          |  4 ++--
 engine-docs/pom.xml            |  4 ++--
 engine-extensions/pom.xml      |  4 ++--
 engine-rest/pom.xml            |  4 ++--
 mvn-defaults/pom.xml           |  4 ++--
 nb-annotations/pom.xml         |  2 +-
 nb-api/pom.xml                 |  4 ++--
 nb/pom.xml                     | 36 +++++++++++++++++-----------------
 pom.xml                        |  4 ++--
 virtdata-api/pom.xml           |  6 +++---
 virtdata-lang/pom.xml          |  2 +-
 virtdata-lib-basics/pom.xml    |  4 ++--
 virtdata-lib-curves4/pom.xml   |  6 +++---
 virtdata-lib-random/pom.xml    |  6 +++---
 virtdata-lib-realer/pom.xml    |  4 ++--
 virtdata-realdata/pom.xml      |  4 ++--
 virtdata-userlibs/pom.xml      | 16 +++++++--------
 34 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/docsys/pom.xml b/docsys/pom.xml
index cfd503722..bdf2e880d 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>3.12.157</version>
+            <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.157</version>
+            <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index 8290a1298..245fd3e74 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.157</version>
+            <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.157</version>
+            <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index 36e0b5082..b94ca41c4 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>3.12.157</version>
+    <version>3.12.158-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cql-shaded</artifactId>
-      <version>3.12.157</version>
+      <version>3.12.158-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>3.12.157</version>
+      <version>3.12.158-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index 8de4463b5..84c42e6cd 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index 897522958..9d5d743f8 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>3.12.157</version>
+    <version>3.12.158-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -23,13 +23,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>3.12.157</version>
+      <version>3.12.158-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>3.12.157</version>
+      <version>3.12.158-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index 0ff8c4e4c..198dc0b37 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index d60b14d2a..5ee53d967 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.157</version>
+            <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.157</version>
+            <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index 814679ae1..6f0faa9ed 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -44,13 +44,13 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-api</artifactId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>driver-stdout</artifactId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
       </dependency>
 
       <!--        <dependency>-->
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index 4cf9adab2..1cf4b94a2 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index 51cc09638..f8df289cb 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index e49d9e9fc..be9d339eb 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,19 +24,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index 1a4617a97..11fbd001a 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index 5644d62e3..9b6efaea7 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index e8884a792..cf0c0076a 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,25 +23,25 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>3.12.157</version>
+            <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.157</version>
+            <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>3.12.157</version>
+            <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>3.12.157</version>
+            <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index 6da0de95c..0edf257d6 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-            <version>3.12.157</version>
+            <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-            <version>3.12.157</version>
+            <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index 1fb71a8c5..17939e4fb 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.157</version>
+    <version>3.12.158-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>3.12.157</version>
+      <version>3.12.158-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index 43da62793..16c52475a 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-clients</artifactId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index f1611d657..d94a8b0f6 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index b791f022b..e4124ef77 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.157</version>
+    <version>3.12.158-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>docsys</artifactId>
-      <version>3.12.157</version>
+      <version>3.12.158-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index c365ba7d8..2af07873d 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index d139c2e69..745c55266 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 41cc6b7b4..57ff08417 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>io.nosqlbench</groupId>
   <artifactId>mvn-defaults</artifactId>
-  <version>3.12.157</version>
+  <version>3.12.158-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -93,7 +93,7 @@
   <scm>
     <url>scm:git:https://github.com/nosqlbench/nosqlbench.git</url>
     <!--        <tag>nosqlbench-2.0.102-SNAPSHOT</tag>-->
-    <tag>nosqlbench-3.12.157</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencyManagement>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index 1a4ed2c96..ce053cd57 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 91d462733..5648e89cd 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.157</version>
+    <version>3.12.158-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>nb-annotations</artifactId>
-      <version>3.12.157</version>
+      <version>3.12.158-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/nb/pom.xml b/nb/pom.xml
index b8fe9921f..890779ad7 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,31 +24,31 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-rest</artifactId>
-      <version>3.12.157</version>
+      <version>3.12.158-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-cli</artifactId>
-      <version>3.12.157</version>
+      <version>3.12.158-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-docs</artifactId>
-      <version>3.12.157</version>
+      <version>3.12.158-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-core</artifactId>
-      <version>3.12.157</version>
+      <version>3.12.158-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-extensions</artifactId>
-      <version>3.12.157</version>
+      <version>3.12.158-SNAPSHOT</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -60,67 +60,67 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-web</artifactId>
-      <version>3.12.157</version>
+      <version>3.12.158-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-kafka</artifactId>
-      <version>3.12.157</version>
+      <version>3.12.158-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-stdout</artifactId>
-      <version>3.12.157</version>
+      <version>3.12.158-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-diag</artifactId>
-      <version>3.12.157</version>
+      <version>3.12.158-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-tcp</artifactId>
-      <version>3.12.157</version>
+      <version>3.12.158-SNAPSHOT</version>
     </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-http</artifactId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-jmx</artifactId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-dsegraph-shaded</artifactId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cql-shaded</artifactId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cqlverify</artifactId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-mongodb</artifactId>
-      <version>3.12.157</version>
+      <version>3.12.158-SNAPSHOT</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -257,7 +257,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-mongodb</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/pom.xml b/pom.xml
index 23fc6a28f..124af6087 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
@@ -145,7 +145,7 @@
             scm:git:https://github.com/nosqlbench/nosqlbench.git
         </developerConnection>
         <url>scm:git:git@github.com:nosqlbench/nosqlbench.git</url>
-        <tag>nosqlbench-3.12.157</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index 6fa49f112..9c4a19bcc 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index fdab2781f..7728f8636 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index 229625885..014a28de1 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.157</version>
+            <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index 6f03deea9..f294ba5e2 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index c76d43567..4e7c10a1f 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.157</version>
+            <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>3.12.157</version>
+            <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index a20843b6d..83dd94f2c 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index f536c5819..1b14ee6b3 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>3.12.157</version>
+          <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index fe9667f06..7c2140152 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.157</version>
+        <version>3.12.158-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,36 +18,36 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-            <version>3.12.157</version>
+            <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-            <version>3.12.157</version>
+            <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.157</version>
+            <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-            <version>3.12.157</version>
+            <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>3.12.157</version>
+            <version>3.12.158-SNAPSHOT</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>3.12.157</version>
+            <version>3.12.158-SNAPSHOT</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-            <version>3.12.157</version>
+            <version>3.12.158-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

From b23338583ef0fffa82dffe6e1c10bb867efaa792 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 20:19:08 -0600
Subject: [PATCH 126/164] make docker test non-pty

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8c8133c0d..e835c049f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -183,7 +183,7 @@ jobs:
 
       - name: sanity check docker image
         run: |
-          docker run --rm -i -t nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }} --version
+          docker run --rm nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }} --version
 
       - name: docker push
         uses: docker/build-push-action@v2

From 9c7f87b881a35d41b54340a22a116110e2d5fc72 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 20:19:22 -0600
Subject: [PATCH 127/164] fix build issue

---
 RELEASENOTES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 19cd881bb..2c9fb84e6 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,3 +1,5 @@
+- b2333858 (HEAD -> main) make docker test non-pty
+- 93e26759 (origin/main) reset version for nb3
 - f9e509dd correct pom version for NB3 branch
 - 3b4ecaca build testing
 - d865c03c make perf sensitive test less sensitive

From 4f6fbf01f495520ae771d62506519e97a04b7648 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 20:30:50 -0600
Subject: [PATCH 128/164] reorder build steps

---
 .github/workflows/release.yml | 93 ++++++++++++++++++-----------------
 1 file changed, 48 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e835c049f..a10f5ff2f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -47,6 +47,10 @@ jobs:
       - name: set git email
         run: git config --global user.name "${{ secrets.NBDROID_NAME }}"
 
+
+
+
+
       - name: free disk space
         run: |
           sudo swapoff -a
@@ -89,7 +93,19 @@ jobs:
           summary="${summary//$'\r'/'%0D'}"
           echo "::set-output name=release_summary::$summary"
 
-      - name: prepare release
+      - name: select release type from branch name
+        run: |
+          current_branch=$(git rev-parse --abbrev-ref HEAD)
+          if [[ ${current_branch} == *"-rc"* ]]
+           then
+            echo "PRERELEASE=true" >> $GITHUB_ENV
+            echo "DOCKER_TAGS=nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }}" >> $GITHUB_ENV
+           else
+            echo "PRERELEASE=false" >> $GITHUB_ENV
+            echo "DOCKER_TAGS=nosqlbench/nosqlbench:latest,nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }}" >> $GITHUB_ENV
+          fi
+
+      - name: prepare Maven release
         run: scripts/release-prepare.sh
         env:
           RELEASE_BRANCH_NAME: "main"
@@ -106,6 +122,29 @@ jobs:
           MAVEN_REPO_SERVER_USERNAME: ${{ secrets.MVN_REPO_PRIVATE_REPO_USER }}
           MAVEN_REPO_SERVER_PASSWORD: ${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }}
 
+      - name: Setup docker buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: docker hub login
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: docker test build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: Dockerfile
+          pull: true
+          push: false
+          load: true
+          tags: ${{ env.DOCKER_TAGS }}
+
+      - name: sanity check docker image
+        run: |
+          docker run --rm nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }} --version
+
       - name: bundle integration test logs
         run: |
           pwd
@@ -119,8 +158,7 @@ jobs:
           name: itlogs
           path: itlogs
 
-
-      - name: perform release
+      - name: perform Maven release
         run: scripts/release-perform.sh
         continue-on-error: true
         env:
@@ -150,42 +188,7 @@ jobs:
           name: binaries
           path: staging
 
-      - name: select release type from branch name
-        run: |
-          current_branch=$(git rev-parse --abbrev-ref HEAD)
-          if [[ ${current_branch} == *"-rc"* ]]
-           then
-            echo "PRERELEASE=true" >> $GITHUB_ENV
-            echo "DOCKER_TAGS=nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }}" >> $GITHUB_ENV
-           else
-            echo "PRERELEASE=false" >> $GITHUB_ENV
-            echo "DOCKER_TAGS=nosqlbench/nosqlbench:latest,nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }}" >> $GITHUB_ENV
-          fi
-
-      - name: Setup docker buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: docker hub login
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: docker build
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: Dockerfile
-          pull: true
-          push: false
-          load: true
-          tags: ${{ env.DOCKER_TAGS }}
-
-      - name: sanity check docker image
-        run: |
-          docker run --rm nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }} --version
-
-      - name: docker push
+      - name: docker push to hub
         uses: docker/build-push-action@v2
         with:
           context: .
@@ -203,8 +206,8 @@ jobs:
           name: guidebook
           path: guidebook
 
-      - name: create release
-        id: create_release
+      - name: create github release
+        id: create_github_release
         uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -215,24 +218,24 @@ jobs:
           prerelease: ${{ env.PRERELEASE }}
           body: ${{ steps.prepare_summary.outputs.release_summary }}
 
-      - name: upload nb.jar
+      - name: upload nb.jar to github release
         id: upload-nb-jar
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          upload_url: ${{ steps.create_github_release.outputs.upload_url }}
           asset_path: nb/target/nb.jar
           asset_name: nb.jar
           asset_content_type: application/octet-stream
 
-      - name: upload nb binary
+      - name: upload nb binary to github release
         id: upload-nb-binary
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          upload_url: ${{ steps.create_github_release.outputs.upload_url }}
           asset_path: nb/target/nb
           asset_name: nb
           asset_content_type: application/octet-stream

From 3771fcc7948e94e9dd35941c8f938e5412c11d3a Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 20:31:09 -0600
Subject: [PATCH 129/164] test release build

---
 RELEASENOTES.md | 75 ++-----------------------------------------------
 1 file changed, 3 insertions(+), 72 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 2c9fb84e6..45c02288e 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,72 +1,3 @@
-- b2333858 (HEAD -> main) make docker test non-pty
-- 93e26759 (origin/main) reset version for nb3
-- f9e509dd correct pom version for NB3 branch
-- 3b4ecaca build testing
-- d865c03c make perf sensitive test less sensitive
-- 0fb043e3 build testing
-- e334e456 build testing
-- 17251bb6 build testing
-- ecaeab14 build testing
-- 633cbea7 test build scripts
-- 6048be95 fix broken autoformat
-- c119ec14 test build scripts
-- 2b17cdcc fix broken autoformat
-- d00a50f1 test build scripts
-- 3fa958c9 update docker actions and add sanity check
-- d740078c fixing build
-- 82d5e021 fix workload typo
-- 2148a24c Stabilize NB3 builds
-- 040db478 backport github actions breaking change fix
-- 3f4d1304 build NB3 with J14
-- 89c15d38 backport github breaking change fixes
-- 8cce0173 backport auto pre-release on -rc branches
-- daea786c leave source and targets at J11 and runtime at J14 for NB3
-- 2bfe24eb backport auto pre-releases on -rc branches
-- d089ff24 document Java version references in project
-- 70f22ad8 support J14 or J15 in appimage build
-- e4f325c4 disable test which is present in feature branch
-- 8a0b326f (origin/dependabot/maven/mvn-defaults/jetty.version-9.4.35.v20201120) Bump jetty.version in /mvn-defaults
-- 78463838 make main brain build cleanly again
-- 608d1f72 Update DOWNLOADS.md
-- 3d2ff55f auto create apikey
-- cfa92eab package organization
-- 2ab118f4 package organization
-- a23808b3 update appimage build script for j15
-- 7b0e37ab add metrics manifest to polyglot
-- 7e6aa1a2 bump source and target to Java 15
-- 2752fa50 bump major version to 4.0.0-SNAPSHOT
-- 7e880b91 experimental grammar
-- 3f65a054 console friendly metrics summary
-- 146686e0 simplify custom logging configuration
-- d0592454 typos, alignment, cruft
-- 45307081 backfill missing default
-- b7c24642 centralize log4j2 and slf4j stub config
-- 2215fc94 typos, alignment, cruft
-- 0ef26c82 update logger deps for dsegraph
-- 975ea40d merge fixups
-- ae419a26 logging annotator module
-- 6c0632fb grafana annotator module
-- 317ffab4 api for annotations
-- c2cec235 allow configurable delimiter in params parser
-- a09efbe9 consolidate to log4j2
-- 6a523dc4 remove slf4j
-- 67eefbbe fix activity run state bug
-- a88d0376 docker-metrics improvements
-- 667fbdba add log4j2 programmatic configuration
-- 60fa0529 add default log4j configs
-- a3e0739a add FixedValues for double
-- fa85704b add SPI impl selector field 'selector'
-- 4996d206 config API improvements
-- e0498ff2 docs updates
-- e9d2b489 environment API improvements
-- 897a8389 generalize log level to NB
-- a97db87f include JSON support in project API
-- 2c09b8ae typos, culling, and alignment
-- a3a51381 update inactive coords
-- 83136139 generalize op source
-- 089a29d8 grafana api tokens
-- e6e70f71 support DoubleToIntFunction in function matrix
-- 52b029f8 typos, culling, and alignment
-- 4d65dc62 update inactive coords
-- 55edec53 add ToByteBuffer binding function
-- 93e10e6a config model improvements
+- 4f6fbf01 (HEAD -> main) reorder build steps
+- 9c7f87b8 fix build issue
+- b2333858 make docker test non-pty

From d92a964fedbe853be94006345bbfb2c00e9c5903 Mon Sep 17 00:00:00 2001
From: nb-droid <nosqlbenchdroid@gmail.com>
Date: Tue, 8 Dec 2020 03:24:12 +0000
Subject: [PATCH 130/164] [maven-release-plugin] prepare release
 nosqlbench-3.12.158

---
 docsys/pom.xml                 |  6 +++---
 driver-cql-shaded/pom.xml      |  6 +++---
 driver-cqlverify/pom.xml       |  6 +++---
 driver-diag/pom.xml            |  6 +++---
 driver-dsegraph-shaded/pom.xml |  6 +++---
 driver-http/pom.xml            |  6 +++---
 driver-jmx/pom.xml             |  6 +++---
 driver-kafka/pom.xml           |  6 +++---
 driver-mongodb/pom.xml         |  6 +++---
 driver-stdout/pom.xml          |  6 +++---
 driver-tcp/pom.xml             |  8 ++++----
 driver-web/pom.xml             |  6 +++---
 drivers-api/pom.xml            |  6 +++---
 engine-api/pom.xml             | 10 +++++-----
 engine-cli/pom.xml             |  6 +++---
 engine-clients/pom.xml         |  4 ++--
 engine-core/pom.xml            |  8 ++++----
 engine-docker/pom.xml          |  4 ++--
 engine-docs/pom.xml            |  4 ++--
 engine-extensions/pom.xml      |  4 ++--
 engine-rest/pom.xml            |  4 ++--
 mvn-defaults/pom.xml           |  4 ++--
 nb-annotations/pom.xml         |  2 +-
 nb-api/pom.xml                 |  4 ++--
 nb/pom.xml                     | 36 +++++++++++++++++-----------------
 pom.xml                        |  4 ++--
 virtdata-api/pom.xml           |  6 +++---
 virtdata-lang/pom.xml          |  2 +-
 virtdata-lib-basics/pom.xml    |  4 ++--
 virtdata-lib-curves4/pom.xml   |  6 +++---
 virtdata-lib-random/pom.xml    |  6 +++---
 virtdata-lib-realer/pom.xml    |  4 ++--
 virtdata-realdata/pom.xml      |  4 ++--
 virtdata-userlibs/pom.xml      | 16 +++++++--------
 34 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/docsys/pom.xml b/docsys/pom.xml
index bdf2e880d..d154b2aa2 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>3.12.158-SNAPSHOT</version>
+            <version>3.12.158</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.158-SNAPSHOT</version>
+            <version>3.12.158</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index 245fd3e74..00f5e245d 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.158-SNAPSHOT</version>
+            <version>3.12.158</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.158-SNAPSHOT</version>
+            <version>3.12.158</version>
         </dependency>
 
         <dependency>
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index b94ca41c4..73b16127f 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>3.12.158-SNAPSHOT</version>
+    <version>3.12.158</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cql-shaded</artifactId>
-      <version>3.12.158-SNAPSHOT</version>
+      <version>3.12.158</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>3.12.158-SNAPSHOT</version>
+      <version>3.12.158</version>
     </dependency>
 
   </dependencies>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index 84c42e6cd..1859cbf8d 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index 9d5d743f8..17e02c677 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>3.12.158-SNAPSHOT</version>
+    <version>3.12.158</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -23,13 +23,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>3.12.158-SNAPSHOT</version>
+      <version>3.12.158</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>3.12.158-SNAPSHOT</version>
+      <version>3.12.158</version>
     </dependency>
 
     <dependency>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index 198dc0b37..2aee8ebe5 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index 5ee53d967..7728a81a0 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.158-SNAPSHOT</version>
+            <version>3.12.158</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.158-SNAPSHOT</version>
+            <version>3.12.158</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index 6f0faa9ed..2b9a5521a 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -44,13 +44,13 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-api</artifactId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
       </dependency>
 
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>driver-stdout</artifactId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
       </dependency>
 
       <!--        <dependency>-->
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index 1cf4b94a2..97cc07446 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
         <dependency>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index f8df289cb..38ece49e8 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index be9d339eb..c1db571e0 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,19 +24,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index 11fbd001a..5e97e0239 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
         <dependency>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index 9b6efaea7..76f49df46 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index cf0c0076a..90a9fe1ce 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,25 +23,25 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>3.12.158-SNAPSHOT</version>
+            <version>3.12.158</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.158-SNAPSHOT</version>
+            <version>3.12.158</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>3.12.158-SNAPSHOT</version>
+            <version>3.12.158</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>3.12.158-SNAPSHOT</version>
+            <version>3.12.158</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index 0edf257d6..1f723276b 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-            <version>3.12.158-SNAPSHOT</version>
+            <version>3.12.158</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-            <version>3.12.158-SNAPSHOT</version>
+            <version>3.12.158</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index 17939e4fb..50c22fbc4 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.158-SNAPSHOT</version>
+    <version>3.12.158</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>3.12.158-SNAPSHOT</version>
+      <version>3.12.158</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index 16c52475a..668b9fe79 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-clients</artifactId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index d94a8b0f6..4189f61d5 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index e4124ef77..8f397b882 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.158-SNAPSHOT</version>
+    <version>3.12.158</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>docsys</artifactId>
-      <version>3.12.158-SNAPSHOT</version>
+      <version>3.12.158</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index 2af07873d..d6d8a79ad 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index 745c55266..997eb2be1 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
     </dependencies>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 57ff08417..b899cb371 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>io.nosqlbench</groupId>
   <artifactId>mvn-defaults</artifactId>
-  <version>3.12.158-SNAPSHOT</version>
+  <version>3.12.158</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -93,7 +93,7 @@
   <scm>
     <url>scm:git:https://github.com/nosqlbench/nosqlbench.git</url>
     <!--        <tag>nosqlbench-2.0.102-SNAPSHOT</tag>-->
-    <tag>HEAD</tag>
+    <tag>nosqlbench-3.12.158</tag>
   </scm>
 
   <dependencyManagement>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index ce053cd57..6a425392a 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 5648e89cd..45f787e34 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.158-SNAPSHOT</version>
+    <version>3.12.158</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>nb-annotations</artifactId>
-      <version>3.12.158-SNAPSHOT</version>
+      <version>3.12.158</version>
     </dependency>
 
     <dependency>
diff --git a/nb/pom.xml b/nb/pom.xml
index 890779ad7..f370bd4b1 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,31 +24,31 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-rest</artifactId>
-      <version>3.12.158-SNAPSHOT</version>
+      <version>3.12.158</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-cli</artifactId>
-      <version>3.12.158-SNAPSHOT</version>
+      <version>3.12.158</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-docs</artifactId>
-      <version>3.12.158-SNAPSHOT</version>
+      <version>3.12.158</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-core</artifactId>
-      <version>3.12.158-SNAPSHOT</version>
+      <version>3.12.158</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-extensions</artifactId>
-      <version>3.12.158-SNAPSHOT</version>
+      <version>3.12.158</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -60,67 +60,67 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-web</artifactId>
-      <version>3.12.158-SNAPSHOT</version>
+      <version>3.12.158</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-kafka</artifactId>
-      <version>3.12.158-SNAPSHOT</version>
+      <version>3.12.158</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-stdout</artifactId>
-      <version>3.12.158-SNAPSHOT</version>
+      <version>3.12.158</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-diag</artifactId>
-      <version>3.12.158-SNAPSHOT</version>
+      <version>3.12.158</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-tcp</artifactId>
-      <version>3.12.158-SNAPSHOT</version>
+      <version>3.12.158</version>
     </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-http</artifactId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-jmx</artifactId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-dsegraph-shaded</artifactId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cql-shaded</artifactId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cqlverify</artifactId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-mongodb</artifactId>
-      <version>3.12.158-SNAPSHOT</version>
+      <version>3.12.158</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -257,7 +257,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-mongodb</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/pom.xml b/pom.xml
index 124af6087..e2b22271f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
@@ -145,7 +145,7 @@
             scm:git:https://github.com/nosqlbench/nosqlbench.git
         </developerConnection>
         <url>scm:git:git@github.com:nosqlbench/nosqlbench.git</url>
-        <tag>HEAD</tag>
+        <tag>nosqlbench-3.12.158</tag>
     </scm>
 
     <distributionManagement>
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index 9c4a19bcc..494951fcb 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index 7728f8636..9903bdec5 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index 014a28de1..56c7372d8 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.158-SNAPSHOT</version>
+            <version>3.12.158</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index f294ba5e2..e7df131ff 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index 4e7c10a1f..e396de6fe 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.158-SNAPSHOT</version>
+            <version>3.12.158</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>3.12.158-SNAPSHOT</version>
+            <version>3.12.158</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index 83dd94f2c..26b88117b 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index 1b14ee6b3..c81f2e5d6 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>3.12.158-SNAPSHOT</version>
+          <version>3.12.158</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index 7c2140152..9b02aeec3 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158-SNAPSHOT</version>
+        <version>3.12.158</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,36 +18,36 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-            <version>3.12.158-SNAPSHOT</version>
+            <version>3.12.158</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-            <version>3.12.158-SNAPSHOT</version>
+            <version>3.12.158</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.158-SNAPSHOT</version>
+            <version>3.12.158</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-            <version>3.12.158-SNAPSHOT</version>
+            <version>3.12.158</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>3.12.158-SNAPSHOT</version>
+            <version>3.12.158</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>3.12.158-SNAPSHOT</version>
+            <version>3.12.158</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-            <version>3.12.158-SNAPSHOT</version>
+            <version>3.12.158</version>
         </dependency>
 
     </dependencies>

From 5f13cb3cf6bc019cfc111f3ba337228eb29cf7bc Mon Sep 17 00:00:00 2001
From: nb-droid <nosqlbenchdroid@gmail.com>
Date: Tue, 8 Dec 2020 03:24:19 +0000
Subject: [PATCH 131/164] [maven-release-plugin] prepare for next development
 iteration

---
 docsys/pom.xml                 |  6 +++---
 driver-cql-shaded/pom.xml      |  6 +++---
 driver-cqlverify/pom.xml       |  6 +++---
 driver-diag/pom.xml            |  6 +++---
 driver-dsegraph-shaded/pom.xml |  6 +++---
 driver-http/pom.xml            |  6 +++---
 driver-jmx/pom.xml             |  6 +++---
 driver-kafka/pom.xml           |  6 +++---
 driver-mongodb/pom.xml         |  6 +++---
 driver-stdout/pom.xml          |  6 +++---
 driver-tcp/pom.xml             |  8 ++++----
 driver-web/pom.xml             |  6 +++---
 drivers-api/pom.xml            |  6 +++---
 engine-api/pom.xml             | 10 +++++-----
 engine-cli/pom.xml             |  6 +++---
 engine-clients/pom.xml         |  4 ++--
 engine-core/pom.xml            |  8 ++++----
 engine-docker/pom.xml          |  4 ++--
 engine-docs/pom.xml            |  4 ++--
 engine-extensions/pom.xml      |  4 ++--
 engine-rest/pom.xml            |  4 ++--
 mvn-defaults/pom.xml           |  4 ++--
 nb-annotations/pom.xml         |  2 +-
 nb-api/pom.xml                 |  4 ++--
 nb/pom.xml                     | 36 +++++++++++++++++-----------------
 pom.xml                        |  4 ++--
 virtdata-api/pom.xml           |  6 +++---
 virtdata-lang/pom.xml          |  2 +-
 virtdata-lib-basics/pom.xml    |  4 ++--
 virtdata-lib-curves4/pom.xml   |  6 +++---
 virtdata-lib-random/pom.xml    |  6 +++---
 virtdata-lib-realer/pom.xml    |  4 ++--
 virtdata-realdata/pom.xml      |  4 ++--
 virtdata-userlibs/pom.xml      | 16 +++++++--------
 34 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/docsys/pom.xml b/docsys/pom.xml
index d154b2aa2..74b4de48b 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>3.12.158</version>
+            <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.158</version>
+            <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index 00f5e245d..7502653df 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.158</version>
+            <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.158</version>
+            <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index 73b16127f..ec57b082b 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>3.12.158</version>
+    <version>3.12.159-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cql-shaded</artifactId>
-      <version>3.12.158</version>
+      <version>3.12.159-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>3.12.158</version>
+      <version>3.12.159-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index 1859cbf8d..49e9a5fd1 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index 17e02c677..8ce0c2f3f 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>3.12.158</version>
+    <version>3.12.159-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -23,13 +23,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>3.12.158</version>
+      <version>3.12.159-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>3.12.158</version>
+      <version>3.12.159-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index 2aee8ebe5..8377364d0 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index 7728a81a0..2e566a289 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.158</version>
+            <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.158</version>
+            <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index 2b9a5521a..f8c1400ac 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -44,13 +44,13 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-api</artifactId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>driver-stdout</artifactId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
       </dependency>
 
       <!--        <dependency>-->
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index 97cc07446..8599fa838 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index 38ece49e8..e162769ee 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index c1db571e0..fad5155f4 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,19 +24,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index 5e97e0239..e8c3d8779 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index 76f49df46..6c92115db 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index 90a9fe1ce..d2232c8bd 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,25 +23,25 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>3.12.158</version>
+            <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.158</version>
+            <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>3.12.158</version>
+            <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>3.12.158</version>
+            <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index 1f723276b..1f710b397 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-            <version>3.12.158</version>
+            <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-            <version>3.12.158</version>
+            <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index 50c22fbc4..fdaa85807 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.158</version>
+    <version>3.12.159-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>3.12.158</version>
+      <version>3.12.159-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index 668b9fe79..784302e7f 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-clients</artifactId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index 4189f61d5..923ff7c84 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index 8f397b882..191b3c503 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.158</version>
+    <version>3.12.159-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>docsys</artifactId>
-      <version>3.12.158</version>
+      <version>3.12.159-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index d6d8a79ad..e4d72fb03 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index 997eb2be1..356e376da 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index b899cb371..c9242760e 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>io.nosqlbench</groupId>
   <artifactId>mvn-defaults</artifactId>
-  <version>3.12.158</version>
+  <version>3.12.159-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -93,7 +93,7 @@
   <scm>
     <url>scm:git:https://github.com/nosqlbench/nosqlbench.git</url>
     <!--        <tag>nosqlbench-2.0.102-SNAPSHOT</tag>-->
-    <tag>nosqlbench-3.12.158</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencyManagement>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index 6a425392a..8f7c504cc 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 45f787e34..1ede5b00a 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.158</version>
+    <version>3.12.159-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>nb-annotations</artifactId>
-      <version>3.12.158</version>
+      <version>3.12.159-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/nb/pom.xml b/nb/pom.xml
index f370bd4b1..9628c1aaa 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,31 +24,31 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-rest</artifactId>
-      <version>3.12.158</version>
+      <version>3.12.159-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-cli</artifactId>
-      <version>3.12.158</version>
+      <version>3.12.159-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-docs</artifactId>
-      <version>3.12.158</version>
+      <version>3.12.159-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-core</artifactId>
-      <version>3.12.158</version>
+      <version>3.12.159-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-extensions</artifactId>
-      <version>3.12.158</version>
+      <version>3.12.159-SNAPSHOT</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -60,67 +60,67 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-web</artifactId>
-      <version>3.12.158</version>
+      <version>3.12.159-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-kafka</artifactId>
-      <version>3.12.158</version>
+      <version>3.12.159-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-stdout</artifactId>
-      <version>3.12.158</version>
+      <version>3.12.159-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-diag</artifactId>
-      <version>3.12.158</version>
+      <version>3.12.159-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-tcp</artifactId>
-      <version>3.12.158</version>
+      <version>3.12.159-SNAPSHOT</version>
     </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-http</artifactId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-jmx</artifactId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-dsegraph-shaded</artifactId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cql-shaded</artifactId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cqlverify</artifactId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-mongodb</artifactId>
-      <version>3.12.158</version>
+      <version>3.12.159-SNAPSHOT</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -257,7 +257,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-mongodb</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/pom.xml b/pom.xml
index e2b22271f..94a9dd7ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
@@ -145,7 +145,7 @@
             scm:git:https://github.com/nosqlbench/nosqlbench.git
         </developerConnection>
         <url>scm:git:git@github.com:nosqlbench/nosqlbench.git</url>
-        <tag>nosqlbench-3.12.158</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index 494951fcb..ed6474dfd 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index 9903bdec5..ba3301d8d 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index 56c7372d8..94d16c9d6 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.158</version>
+            <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index e7df131ff..0321981af 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index e396de6fe..0b77a033e 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.158</version>
+            <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>3.12.158</version>
+            <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index 26b88117b..bfc8537fc 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index c81f2e5d6..ec69561e7 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>3.12.158</version>
+          <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index 9b02aeec3..45002677c 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.158</version>
+        <version>3.12.159-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,36 +18,36 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-            <version>3.12.158</version>
+            <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-            <version>3.12.158</version>
+            <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.158</version>
+            <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-            <version>3.12.158</version>
+            <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>3.12.158</version>
+            <version>3.12.159-SNAPSHOT</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>3.12.158</version>
+            <version>3.12.159-SNAPSHOT</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-            <version>3.12.158</version>
+            <version>3.12.159-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

From 5272aa4911152902628d20662ad7702e620624c4 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 7 Dec 2020 21:59:04 -0600
Subject: [PATCH 132/164] test build reordering

---
 RELEASENOTES.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 45c02288e..e69de29bb 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,3 +0,0 @@
-- 4f6fbf01 (HEAD -> main) reorder build steps
-- 9c7f87b8 fix build issue
-- b2333858 make docker test non-pty

From 6070647cf6815db0a58819e33a7d4bb4533ed35b Mon Sep 17 00:00:00 2001
From: nb-droid <nosqlbenchdroid@gmail.com>
Date: Tue, 8 Dec 2020 04:07:35 +0000
Subject: [PATCH 133/164] [maven-release-plugin] prepare release
 nosqlbench-3.12.159

---
 docsys/pom.xml                 |  6 +++---
 driver-cql-shaded/pom.xml      |  6 +++---
 driver-cqlverify/pom.xml       |  6 +++---
 driver-diag/pom.xml            |  6 +++---
 driver-dsegraph-shaded/pom.xml |  6 +++---
 driver-http/pom.xml            |  6 +++---
 driver-jmx/pom.xml             |  6 +++---
 driver-kafka/pom.xml           |  6 +++---
 driver-mongodb/pom.xml         |  6 +++---
 driver-stdout/pom.xml          |  6 +++---
 driver-tcp/pom.xml             |  8 ++++----
 driver-web/pom.xml             |  6 +++---
 drivers-api/pom.xml            |  6 +++---
 engine-api/pom.xml             | 10 +++++-----
 engine-cli/pom.xml             |  6 +++---
 engine-clients/pom.xml         |  4 ++--
 engine-core/pom.xml            |  8 ++++----
 engine-docker/pom.xml          |  4 ++--
 engine-docs/pom.xml            |  4 ++--
 engine-extensions/pom.xml      |  4 ++--
 engine-rest/pom.xml            |  4 ++--
 mvn-defaults/pom.xml           |  4 ++--
 nb-annotations/pom.xml         |  2 +-
 nb-api/pom.xml                 |  4 ++--
 nb/pom.xml                     | 36 +++++++++++++++++-----------------
 pom.xml                        |  4 ++--
 virtdata-api/pom.xml           |  6 +++---
 virtdata-lang/pom.xml          |  2 +-
 virtdata-lib-basics/pom.xml    |  4 ++--
 virtdata-lib-curves4/pom.xml   |  6 +++---
 virtdata-lib-random/pom.xml    |  6 +++---
 virtdata-lib-realer/pom.xml    |  4 ++--
 virtdata-realdata/pom.xml      |  4 ++--
 virtdata-userlibs/pom.xml      | 16 +++++++--------
 34 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/docsys/pom.xml b/docsys/pom.xml
index 74b4de48b..f14f60158 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>3.12.159-SNAPSHOT</version>
+            <version>3.12.159</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.159-SNAPSHOT</version>
+            <version>3.12.159</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index 7502653df..df744c120 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.159-SNAPSHOT</version>
+            <version>3.12.159</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.159-SNAPSHOT</version>
+            <version>3.12.159</version>
         </dependency>
 
         <dependency>
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index ec57b082b..d1edb1cc0 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>3.12.159-SNAPSHOT</version>
+    <version>3.12.159</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cql-shaded</artifactId>
-      <version>3.12.159-SNAPSHOT</version>
+      <version>3.12.159</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>3.12.159-SNAPSHOT</version>
+      <version>3.12.159</version>
     </dependency>
 
   </dependencies>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index 49e9a5fd1..859884ee8 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index 8ce0c2f3f..5f885be25 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>3.12.159-SNAPSHOT</version>
+    <version>3.12.159</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -23,13 +23,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>3.12.159-SNAPSHOT</version>
+      <version>3.12.159</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>3.12.159-SNAPSHOT</version>
+      <version>3.12.159</version>
     </dependency>
 
     <dependency>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index 8377364d0..9d1d0d1e9 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index 2e566a289..5abf3cc0c 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.159-SNAPSHOT</version>
+            <version>3.12.159</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.159-SNAPSHOT</version>
+            <version>3.12.159</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index f8c1400ac..863d45dc8 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -44,13 +44,13 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-api</artifactId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
       </dependency>
 
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>driver-stdout</artifactId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
       </dependency>
 
       <!--        <dependency>-->
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index 8599fa838..728126e4f 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
         <dependency>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index e162769ee..ebc89cf7c 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index fad5155f4..da0e368fd 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,19 +24,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index e8c3d8779..c9e3e24c5 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
         <dependency>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index 6c92115db..fa53fabcd 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index d2232c8bd..5e31c5ba8 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,25 +23,25 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>3.12.159-SNAPSHOT</version>
+            <version>3.12.159</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.159-SNAPSHOT</version>
+            <version>3.12.159</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>3.12.159-SNAPSHOT</version>
+            <version>3.12.159</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>3.12.159-SNAPSHOT</version>
+            <version>3.12.159</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index 1f710b397..c217785c5 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-            <version>3.12.159-SNAPSHOT</version>
+            <version>3.12.159</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-            <version>3.12.159-SNAPSHOT</version>
+            <version>3.12.159</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index fdaa85807..61699dd42 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.159-SNAPSHOT</version>
+    <version>3.12.159</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>3.12.159-SNAPSHOT</version>
+      <version>3.12.159</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index 784302e7f..bc0843076 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-clients</artifactId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index 923ff7c84..36ae6fc01 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index 191b3c503..66495b223 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.159-SNAPSHOT</version>
+    <version>3.12.159</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>docsys</artifactId>
-      <version>3.12.159-SNAPSHOT</version>
+      <version>3.12.159</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index e4d72fb03..3e18be801 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index 356e376da..3d55ed267 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
     </dependencies>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index c9242760e..3dc922420 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>io.nosqlbench</groupId>
   <artifactId>mvn-defaults</artifactId>
-  <version>3.12.159-SNAPSHOT</version>
+  <version>3.12.159</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -93,7 +93,7 @@
   <scm>
     <url>scm:git:https://github.com/nosqlbench/nosqlbench.git</url>
     <!--        <tag>nosqlbench-2.0.102-SNAPSHOT</tag>-->
-    <tag>HEAD</tag>
+    <tag>nosqlbench-3.12.159</tag>
   </scm>
 
   <dependencyManagement>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index 8f7c504cc..012248902 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 1ede5b00a..2460bc101 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.159-SNAPSHOT</version>
+    <version>3.12.159</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>nb-annotations</artifactId>
-      <version>3.12.159-SNAPSHOT</version>
+      <version>3.12.159</version>
     </dependency>
 
     <dependency>
diff --git a/nb/pom.xml b/nb/pom.xml
index 9628c1aaa..e8ebeacfe 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,31 +24,31 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-rest</artifactId>
-      <version>3.12.159-SNAPSHOT</version>
+      <version>3.12.159</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-cli</artifactId>
-      <version>3.12.159-SNAPSHOT</version>
+      <version>3.12.159</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-docs</artifactId>
-      <version>3.12.159-SNAPSHOT</version>
+      <version>3.12.159</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-core</artifactId>
-      <version>3.12.159-SNAPSHOT</version>
+      <version>3.12.159</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-extensions</artifactId>
-      <version>3.12.159-SNAPSHOT</version>
+      <version>3.12.159</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -60,67 +60,67 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-web</artifactId>
-      <version>3.12.159-SNAPSHOT</version>
+      <version>3.12.159</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-kafka</artifactId>
-      <version>3.12.159-SNAPSHOT</version>
+      <version>3.12.159</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-stdout</artifactId>
-      <version>3.12.159-SNAPSHOT</version>
+      <version>3.12.159</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-diag</artifactId>
-      <version>3.12.159-SNAPSHOT</version>
+      <version>3.12.159</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-tcp</artifactId>
-      <version>3.12.159-SNAPSHOT</version>
+      <version>3.12.159</version>
     </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-http</artifactId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-jmx</artifactId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-dsegraph-shaded</artifactId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cql-shaded</artifactId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cqlverify</artifactId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-mongodb</artifactId>
-      <version>3.12.159-SNAPSHOT</version>
+      <version>3.12.159</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -257,7 +257,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-mongodb</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/pom.xml b/pom.xml
index 94a9dd7ca..f8da72c3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
@@ -145,7 +145,7 @@
             scm:git:https://github.com/nosqlbench/nosqlbench.git
         </developerConnection>
         <url>scm:git:git@github.com:nosqlbench/nosqlbench.git</url>
-        <tag>HEAD</tag>
+        <tag>nosqlbench-3.12.159</tag>
     </scm>
 
     <distributionManagement>
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index ed6474dfd..3540e2601 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index ba3301d8d..c0b078440 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index 94d16c9d6..755463a40 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.159-SNAPSHOT</version>
+            <version>3.12.159</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index 0321981af..cb5bcbc97 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index 0b77a033e..003a0e3b0 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.159-SNAPSHOT</version>
+            <version>3.12.159</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>3.12.159-SNAPSHOT</version>
+            <version>3.12.159</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index bfc8537fc..3ff74c78b 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index ec69561e7..938a00714 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>3.12.159-SNAPSHOT</version>
+          <version>3.12.159</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index 45002677c..05f4d49f4 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159-SNAPSHOT</version>
+        <version>3.12.159</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,36 +18,36 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-            <version>3.12.159-SNAPSHOT</version>
+            <version>3.12.159</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-            <version>3.12.159-SNAPSHOT</version>
+            <version>3.12.159</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.159-SNAPSHOT</version>
+            <version>3.12.159</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-            <version>3.12.159-SNAPSHOT</version>
+            <version>3.12.159</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>3.12.159-SNAPSHOT</version>
+            <version>3.12.159</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>3.12.159-SNAPSHOT</version>
+            <version>3.12.159</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-            <version>3.12.159-SNAPSHOT</version>
+            <version>3.12.159</version>
         </dependency>
 
     </dependencies>

From cbe2c51b23d0faf0ff28eb782e14bd2f68da5cb7 Mon Sep 17 00:00:00 2001
From: nb-droid <nosqlbenchdroid@gmail.com>
Date: Tue, 8 Dec 2020 04:07:41 +0000
Subject: [PATCH 134/164] [maven-release-plugin] prepare for next development
 iteration

---
 docsys/pom.xml                 |  6 +++---
 driver-cql-shaded/pom.xml      |  6 +++---
 driver-cqlverify/pom.xml       |  6 +++---
 driver-diag/pom.xml            |  6 +++---
 driver-dsegraph-shaded/pom.xml |  6 +++---
 driver-http/pom.xml            |  6 +++---
 driver-jmx/pom.xml             |  6 +++---
 driver-kafka/pom.xml           |  6 +++---
 driver-mongodb/pom.xml         |  6 +++---
 driver-stdout/pom.xml          |  6 +++---
 driver-tcp/pom.xml             |  8 ++++----
 driver-web/pom.xml             |  6 +++---
 drivers-api/pom.xml            |  6 +++---
 engine-api/pom.xml             | 10 +++++-----
 engine-cli/pom.xml             |  6 +++---
 engine-clients/pom.xml         |  4 ++--
 engine-core/pom.xml            |  8 ++++----
 engine-docker/pom.xml          |  4 ++--
 engine-docs/pom.xml            |  4 ++--
 engine-extensions/pom.xml      |  4 ++--
 engine-rest/pom.xml            |  4 ++--
 mvn-defaults/pom.xml           |  4 ++--
 nb-annotations/pom.xml         |  2 +-
 nb-api/pom.xml                 |  4 ++--
 nb/pom.xml                     | 36 +++++++++++++++++-----------------
 pom.xml                        |  4 ++--
 virtdata-api/pom.xml           |  6 +++---
 virtdata-lang/pom.xml          |  2 +-
 virtdata-lib-basics/pom.xml    |  4 ++--
 virtdata-lib-curves4/pom.xml   |  6 +++---
 virtdata-lib-random/pom.xml    |  6 +++---
 virtdata-lib-realer/pom.xml    |  4 ++--
 virtdata-realdata/pom.xml      |  4 ++--
 virtdata-userlibs/pom.xml      | 16 +++++++--------
 34 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/docsys/pom.xml b/docsys/pom.xml
index f14f60158..1d8744a79 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>3.12.159</version>
+            <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.159</version>
+            <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index df744c120..455a6769e 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.159</version>
+            <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.159</version>
+            <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index d1edb1cc0..0c6827e29 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>3.12.159</version>
+    <version>3.12.160-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cql-shaded</artifactId>
-      <version>3.12.159</version>
+      <version>3.12.160-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>3.12.159</version>
+      <version>3.12.160-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index 859884ee8..c251fb3ea 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index 5f885be25..1737368c2 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>3.12.159</version>
+    <version>3.12.160-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -23,13 +23,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>3.12.159</version>
+      <version>3.12.160-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>3.12.159</version>
+      <version>3.12.160-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index 9d1d0d1e9..21500ad1a 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index 5abf3cc0c..efd475d99 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.159</version>
+            <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.159</version>
+            <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index 863d45dc8..2790b180e 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -44,13 +44,13 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-api</artifactId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>driver-stdout</artifactId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
       </dependency>
 
       <!--        <dependency>-->
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index 728126e4f..c22d56037 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index ebc89cf7c..7c112009f 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index da0e368fd..43a4349ff 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,19 +24,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index c9e3e24c5..bdcf5f5ac 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index fa53fabcd..0a7a6fce0 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index 5e31c5ba8..4ef4e27aa 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,25 +23,25 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>3.12.159</version>
+            <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>3.12.159</version>
+            <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>3.12.159</version>
+            <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>3.12.159</version>
+            <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index c217785c5..d21d57308 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-            <version>3.12.159</version>
+            <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-            <version>3.12.159</version>
+            <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index 61699dd42..05532cf79 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.159</version>
+    <version>3.12.160-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>3.12.159</version>
+      <version>3.12.160-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index bc0843076..51e02fed3 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-clients</artifactId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index 36ae6fc01..ebbeb5fa4 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index 66495b223..1044de514 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.159</version>
+    <version>3.12.160-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>docsys</artifactId>
-      <version>3.12.159</version>
+      <version>3.12.160-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index 3e18be801..afd0d9a16 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index 3d55ed267..d1d8b01c6 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 3dc922420..f0c771c23 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>io.nosqlbench</groupId>
   <artifactId>mvn-defaults</artifactId>
-  <version>3.12.159</version>
+  <version>3.12.160-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -93,7 +93,7 @@
   <scm>
     <url>scm:git:https://github.com/nosqlbench/nosqlbench.git</url>
     <!--        <tag>nosqlbench-2.0.102-SNAPSHOT</tag>-->
-    <tag>nosqlbench-3.12.159</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencyManagement>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index 012248902..b7921e8e2 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 2460bc101..1d4853a47 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>3.12.159</version>
+    <version>3.12.160-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>nb-annotations</artifactId>
-      <version>3.12.159</version>
+      <version>3.12.160-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/nb/pom.xml b/nb/pom.xml
index e8ebeacfe..e90c14f99 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,31 +24,31 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-rest</artifactId>
-      <version>3.12.159</version>
+      <version>3.12.160-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-cli</artifactId>
-      <version>3.12.159</version>
+      <version>3.12.160-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-docs</artifactId>
-      <version>3.12.159</version>
+      <version>3.12.160-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-core</artifactId>
-      <version>3.12.159</version>
+      <version>3.12.160-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-extensions</artifactId>
-      <version>3.12.159</version>
+      <version>3.12.160-SNAPSHOT</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -60,67 +60,67 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-web</artifactId>
-      <version>3.12.159</version>
+      <version>3.12.160-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-kafka</artifactId>
-      <version>3.12.159</version>
+      <version>3.12.160-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-stdout</artifactId>
-      <version>3.12.159</version>
+      <version>3.12.160-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-diag</artifactId>
-      <version>3.12.159</version>
+      <version>3.12.160-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-tcp</artifactId>
-      <version>3.12.159</version>
+      <version>3.12.160-SNAPSHOT</version>
     </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-http</artifactId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-jmx</artifactId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-dsegraph-shaded</artifactId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cql-shaded</artifactId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cqlverify</artifactId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-mongodb</artifactId>
-      <version>3.12.159</version>
+      <version>3.12.160-SNAPSHOT</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -257,7 +257,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-mongodb</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/pom.xml b/pom.xml
index f8da72c3a..21183db09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
@@ -145,7 +145,7 @@
             scm:git:https://github.com/nosqlbench/nosqlbench.git
         </developerConnection>
         <url>scm:git:git@github.com:nosqlbench/nosqlbench.git</url>
-        <tag>nosqlbench-3.12.159</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index 3540e2601..a6e944b9d 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index c0b078440..c7a86f3b1 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index 755463a40..59f52c38e 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.159</version>
+            <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index cb5bcbc97..115f5f4e2 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index 003a0e3b0..03180bb5c 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.159</version>
+            <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>3.12.159</version>
+            <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index 3ff74c78b..142a532a9 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index 938a00714..8ebba9b05 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>3.12.159</version>
+          <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index 05f4d49f4..f34cb4e79 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>3.12.159</version>
+        <version>3.12.160-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,36 +18,36 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-            <version>3.12.159</version>
+            <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-            <version>3.12.159</version>
+            <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>3.12.159</version>
+            <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-            <version>3.12.159</version>
+            <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>3.12.159</version>
+            <version>3.12.160-SNAPSHOT</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>3.12.159</version>
+            <version>3.12.160-SNAPSHOT</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-            <version>3.12.159</version>
+            <version>3.12.160-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

From fa78e27fc0943a1b1d602fc137989c5eb979b4ec Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Tue, 8 Dec 2020 11:33:36 -0600
Subject: [PATCH 135/164] set NB4 to Java 15

---
 .github/workflows/release.yml                 | 434 ++++++++++--------
 Dockerfile                                    |   2 +-
 devdocs/java_versions.md                      |  18 +
 .../dashboards/nb4-default-dashboard.json     |  84 +++-
 mvn-defaults/pom.xml                          |   2 -
 nb/build-bin.sh                               |  72 ++-
 6 files changed, 367 insertions(+), 245 deletions(-)
 create mode 100644 devdocs/java_versions.md

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5e51ee217..f11fca49e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,205 +10,235 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
 
-    - name: checkout repo
-      uses: actions/checkout@v2
+      - name: checkout repo
+        uses: actions/checkout@v2
 
-    - name: setup java
-      uses: actions/setup-java@v1
-      with:
-        java-version: '15'
-        java-package: jdk
-        architecture: x64
+      - name: setup java
+        uses: actions/setup-java@v1
+        with:
+          java-version: '15'
+          java-package: jdk
+          architecture: x64
 
-    - name: avoid release loop
-      run: scripts/avoid-release-loop.sh
-      env:
-       GIT_RELEASE_BOT_NAME: "nb-droid"
+      - name: avoid release loop
+        run: scripts/avoid-release-loop.sh
+        env:
+          GIT_RELEASE_BOT_NAME: "nb-droid"
 
-    - name: capture tty for gpg
-      run: |
-        echo "TTY="$(tty) >> $GITHUB_ENV
-        echo "GPG_TTY="$(tty) >> $GITHUB_ENV
-        # echo "::set-env name=TTY::"$(tty)
-        # echo "::set-env name=GPG_TTY::"$(tty)
+      - name: capture tty for gpg
+        run: |
+          echo "TTY="$(tty) >> $GITHUB_ENV
+          echo "GPG_TTY="$(tty) >> $GITHUB_ENV
+          # echo "::set-env name=TTY::"$(tty)
+          # echo "::set-env name=GPG_TTY::"$(tty)
 
-    - name: initialize gpg
-      run: |
-        set -x
-        echo "${{ secrets.GITHUB_GPG_KEY }}" | base64 -d > private.key
-        gpg --import --batch ./private.key
-        rm ./private.key
-        echo "gnupg files:"
-        ls -l ~/.gnupg/
+      - name: initialize gpg
+        run: |
+          set -x
+          echo "${{ secrets.GITHUB_GPG_KEY }}" | base64 -d > private.key
+          gpg --import --batch ./private.key
+          rm ./private.key
+          echo "gnupg files:"
+          ls -l ~/.gnupg/
 
-    - name: set git username
-      run: git config --global user.email "${{ secrets.NBDROID_EMAIL }}"
+      - name: set git username
+        run: git config --global user.email "${{ secrets.NBDROID_EMAIL }}"
 
-    - name: set git email
-      run: git config --global user.name "${{ secrets.NBDROID_NAME }}"
-
-    - name: free disk space
-      run: |
-        sudo swapoff -a
-        sudo rm -f /swapfile
-        sudo apt clean
-        docker rmi $(docker image ls -aq)
-        df -h
-
-    - name: Cache Maven packages
-      uses: actions/cache@v1
-      with:
-        path: ~/.m2
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
-
-    - name: read versions
-      run: |
-        set -x
-        CURRENT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-        RELEASE_VERSION=${CURRENT_VERSION%%-SNAPSHOT}
-        BASE_VERSION=$(echo "$RELEASE_VERSION" | cut -d'.' -f1-2)
-        MINOR_VERSION=$(echo "$RELEASE_VERSION" | cut -d'.' -f3)
-        NEXT_MINOR_VERSION=$(( MINOR_VERSION+1))
-        NEXT_SNAPSHOT="${BASE_VERSION}.${NEXT_MINOR_VERSION}-SNAPSHOT"
-        RELEASE_TAGNAME="nosqlbench-${RELEASE_VERSION}"
-        echo "NEXT_SNAPSHOT=${NEXT_SNAPSHOT}" >> $GITHUB_ENV
-        echo "RELEASE_VERSION=${RELEASE_VERSION}" >> $GITHUB_ENV
-        echo "RELEASE_TAGNAME=${RELEASE_TAGNAME}" >> $GITHUB_ENV
-        # echo "::set-env name=NEXT_SNAPSHOT::${NEXT_SNAPSHOT}"
-        # echo "::set-env name=RELEASE_VERSION::${RELEASE_VERSION}"
-        # echo "::set-env name=RELEASE_TAGNAME::${RELEASE_TAGNAME}"
-
-    - name: prepare release summary
-      id: prepare_summary
-      run: |
-       #summary=$(scripts/release-notes.sh)
-       summary=$(cat RELEASENOTES.md)
-       summary="${summary//'%'/'%25'}"
-       summary="${summary//$'\n'/'%0A'}"
-       summary="${summary//$'\r'/'%0D'}"
-       echo "::set-output name=release_summary::$summary"
-
-    - name: prepare release
-      run: scripts/release-prepare.sh
-      env:
-       RELEASE_BRANCH_NAME: "main"
-       PRERELEASE_BRANCH_PATTERN: "-rc"
-       GIT_RELEASE_BOT_NAME: "nb-droid"
-       GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }}
-       ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }}
-       GPG_ENABLED: "true"
-       GPG_KEY_ID: ${{ secrets.GITHUB_GPG_KEY_ID }}
-       GPG_KEY: ${{ secrets.GITHUB_GPG_KEY }}
-       GPG_SERVER_NAME: ${{ secrets.GPG_SERVER_NAME }}
-       GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-       MAVEN_REPO_SERVER_ID: ${{ secrets.MAVEN_REPO_SERVER_ID }}
-       MAVEN_REPO_SERVER_USERNAME: ${{ secrets.MVN_REPO_PRIVATE_REPO_USER }}
-       MAVEN_REPO_SERVER_PASSWORD: ${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }}
-
-    - name: bundle integration test logs
-      run: |
-        pwd
-        find nb
-        mkdir -p itlogs/nb
-        cp -R nb/logs itlogs/nb
-
-    - name: upload integration test logs
-      uses: actions/upload-artifact@v1
-      with:
-        name: itlogs
-        path: itlogs
+      - name: set git email
+        run: git config --global user.name "${{ secrets.NBDROID_NAME }}"
 
 
-    - name: perform release
-      run: scripts/release-perform.sh
-      continue-on-error: true
-      env:
-       RELEASE_BRANCH_NAME: "main"
-       GIT_RELEASE_BOT_NAME: "nb-droid"
-       GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }}
-       ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }}
-       GPG_ENABLED: "true"
-       GPG_KEY_ID: ${{ secrets.GITHUB_GPG_KEY_ID }}
-       GPG_KEY: ${{ secrets.GITHUB_GPG_KEY }}
-       GPG_SERVER_NAME: ${{ secrets.GPG_SERVER_NAME }}
-       GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-       MAVEN_REPO_SERVER_ID: ${{ secrets.MAVEN_REPO_SERVER_ID }}
-       MAVEN_REPO_SERVER_USERNAME: ${{ secrets.MVN_REPO_PRIVATE_REPO_USER }}
-       MAVEN_REPO_SERVER_PASSWORD: ${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }}
 
-    - name: bundle artifacts
-      run: |
-        pwd
-        ls -l
-        mkdir staging
-        cp nb/target/nb.jar nb/target/nb staging
 
-    - name: upload artifacts
-      uses: actions/upload-artifact@v1
-      with:
-       name: binaries
-       path: staging
 
-    - name: docker push
-      uses: docker/build-push-action@v1
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        repository: nosqlbench/nosqlbench
-        tags: latest, ${{ env.RELEASE_VERSION }}
-        tag_with_ref: false
+      - name: free disk space
+        run: |
+          sudo swapoff -a
+          sudo rm -f /swapfile
+          sudo apt clean
+          docker rmi $(docker image ls -aq)
+          df -h
 
-    - name: bundle guidebook
-      run: mkdir guidebook && cp -R nb/target/guidebook guidebook
+      - name: Cache Maven packages
+        uses: actions/cache@v1
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
 
-    - name: upload guidebook
-      uses: actions/upload-artifact@v1
-      with:
-        name: guidebook
-        path: guidebook
+      - name: read versions
+        run: |
+          set -x
+          CURRENT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          RELEASE_VERSION=${CURRENT_VERSION%%-SNAPSHOT}
+          BASE_VERSION=$(echo "$RELEASE_VERSION" | cut -d'.' -f1-2)
+          MINOR_VERSION=$(echo "$RELEASE_VERSION" | cut -d'.' -f3)
+          NEXT_MINOR_VERSION=$(( MINOR_VERSION+1))
+          NEXT_SNAPSHOT="${BASE_VERSION}.${NEXT_MINOR_VERSION}-SNAPSHOT"
+          RELEASE_TAGNAME="nosqlbench-${RELEASE_VERSION}"
+          echo "NEXT_SNAPSHOT=${NEXT_SNAPSHOT}" >> $GITHUB_ENV
+          echo "RELEASE_VERSION=${RELEASE_VERSION}" >> $GITHUB_ENV
+          echo "RELEASE_TAGNAME=${RELEASE_TAGNAME}" >> $GITHUB_ENV
+          # echo "::set-env name=NEXT_SNAPSHOT::${NEXT_SNAPSHOT}"
+          # echo "::set-env name=RELEASE_VERSION::${RELEASE_VERSION}"
+          # echo "::set-env name=RELEASE_TAGNAME::${RELEASE_TAGNAME}"
 
-    - name: select release type from branch name
-      run: |
-       current_branch=$(git rev-parse --abbrev-ref HEAD)
-       if [[ ${current_branch} == *"-rc"* ]]
-        then echo "PRERELEASE=true" >> $GITHUB_ENV
-        else echo "PRERELEASE=false" >> $GITHUB_ENV
-       fi
+      - name: prepare release summary
+        id: prepare_summary
+        run: |
+          #summary=$(scripts/release-notes.sh)
+          summary=$(cat RELEASENOTES.md)
+          summary="${summary//'%'/'%25'}"
+          summary="${summary//$'\n'/'%0A'}"
+          summary="${summary//$'\r'/'%0D'}"
+          echo "::set-output name=release_summary::$summary"
 
-    - name: create release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ env.RELEASE_TAGNAME }}
-        release_name: Release ${{ env.RELEASE_TAGNAME }}
-        draft: false
-        prerelease: ${{ env.PRERELEASE }}
-        body: ${{ steps.prepare_summary.outputs.release_summary }}
+      - name: select release type from branch name
+        run: |
+          current_branch=$(git rev-parse --abbrev-ref HEAD)
+          if [[ ${current_branch} == *"-rc"* ]]
+           then
+            echo "PRERELEASE=true" >> $GITHUB_ENV
+            echo "DOCKER_TAGS=nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }}" >> $GITHUB_ENV
+           else
+            echo "PRERELEASE=false" >> $GITHUB_ENV
+            echo "DOCKER_TAGS=nosqlbench/nosqlbench:latest,nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }}" >> $GITHUB_ENV
+          fi
 
-    - name: upload nb.jar
-      id: upload-nb-jar
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: nb/target/nb.jar
-        asset_name: nb.jar
-        asset_content_type: application/octet-stream
+      - name: prepare Maven release
+        run: scripts/release-prepare.sh
+        env:
+          RELEASE_BRANCH_NAME: "main"
+          PRERELEASE_BRANCH_PATTERN: "-rc"
+          GIT_RELEASE_BOT_NAME: "nb-droid"
+          GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }}
+          ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }}
+          GPG_ENABLED: "true"
+          GPG_KEY_ID: ${{ secrets.GITHUB_GPG_KEY_ID }}
+          GPG_KEY: ${{ secrets.GITHUB_GPG_KEY }}
+          GPG_SERVER_NAME: ${{ secrets.GPG_SERVER_NAME }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          MAVEN_REPO_SERVER_ID: ${{ secrets.MAVEN_REPO_SERVER_ID }}
+          MAVEN_REPO_SERVER_USERNAME: ${{ secrets.MVN_REPO_PRIVATE_REPO_USER }}
+          MAVEN_REPO_SERVER_PASSWORD: ${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }}
 
-    - name: upload nb binary
-      id: upload-nb-binary
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: nb/target/nb
-        asset_name: nb
-        asset_content_type: application/octet-stream
+      - name: Setup docker buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: docker hub login
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: docker test build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: Dockerfile
+          pull: true
+          push: false
+          load: true
+          tags: ${{ env.DOCKER_TAGS }}
+
+      - name: sanity check docker image
+        run: |
+          docker run --rm nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }} --version
+
+      - name: bundle integration test logs
+        run: |
+          pwd
+          find nb
+          mkdir -p itlogs/nb
+          cp -R nb/logs itlogs/nb
+
+      - name: upload integration test logs
+        uses: actions/upload-artifact@v1
+        with:
+          name: itlogs
+          path: itlogs
+
+      - name: perform Maven release
+        run: scripts/release-perform.sh
+        continue-on-error: true
+        env:
+          RELEASE_BRANCH_NAME: "main"
+          GIT_RELEASE_BOT_NAME: "nb-droid"
+          GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }}
+          ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }}
+          GPG_ENABLED: "true"
+          GPG_KEY_ID: ${{ secrets.GITHUB_GPG_KEY_ID }}
+          GPG_KEY: ${{ secrets.GITHUB_GPG_KEY }}
+          GPG_SERVER_NAME: ${{ secrets.GPG_SERVER_NAME }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          MAVEN_REPO_SERVER_ID: ${{ secrets.MAVEN_REPO_SERVER_ID }}
+          MAVEN_REPO_SERVER_USERNAME: ${{ secrets.MVN_REPO_PRIVATE_REPO_USER }}
+          MAVEN_REPO_SERVER_PASSWORD: ${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }}
+
+      - name: bundle artifacts
+        run: |
+          pwd
+          ls -l
+          mkdir staging
+          cp nb/target/nb.jar nb/target/nb staging
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v1
+        with:
+          name: binaries
+          path: staging
+
+      - name: docker push to hub
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: Dockerfile
+          pull: true
+          push: true
+          tags: ${{ env.DOCKER_TAGS }}
+
+      - name: bundle guidebook
+        run: mkdir guidebook && cp -R nb/target/guidebook guidebook
+
+      - name: upload guidebook
+        uses: actions/upload-artifact@v1
+        with:
+          name: guidebook
+          path: guidebook
+
+      - name: create github release
+        id: create_github_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ env.RELEASE_TAGNAME }}
+          release_name: Release ${{ env.RELEASE_TAGNAME }}
+          draft: false
+          prerelease: ${{ env.PRERELEASE }}
+          body: ${{ steps.prepare_summary.outputs.release_summary }}
+
+      - name: upload nb.jar to github release
+        id: upload-nb-jar
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_github_release.outputs.upload_url }}
+          asset_path: nb/target/nb.jar
+          asset_name: nb.jar
+          asset_content_type: application/octet-stream
+
+      - name: upload nb binary to github release
+        id: upload-nb-binary
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_github_release.outputs.upload_url }}
+          asset_path: nb/target/nb
+          asset_name: nb
+          asset_content_type: application/octet-stream
 
   docs:
     needs: release
@@ -224,8 +254,8 @@ jobs:
       - name: download guidebook
         uses: actions/download-artifact@v1
         with:
-         name: guidebook
-         path: guidebook
+          name: guidebook
+          path: guidebook
 
       - run: ls -la
 
@@ -234,30 +264,30 @@ jobs:
           NBDROID_NAME: ${{ secrets.NBDROID_NAME }}
           NBDROID_TOKEN: ${{ secrets.NBDROID_TOKEN }}
         run: |
-         git clone https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-docs.git nosqlbench-docs
-         cd nosqlbench-docs
-         echo "files listing"
-         find .
-         git remote set-url origin https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-docs.git
-         git remote -v
+          git clone https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-docs.git nosqlbench-docs
+          cd nosqlbench-docs
+          echo "files listing"
+          find .
+          git remote set-url origin https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-docs.git
+          git remote -v
 
       - name: push changes
         env:
           NBDROID_NAME: ${{ secrets.NBDROID_NAME }}
           NBDROID_TOKEN: ${{ secrets.NBDROID_TOKEN }}
         run: |
-         rsync -av --delete guidebook/guidebook/ nosqlbench-docs/docs/
-         echo "docs.nosqlbench.io" > nosqlbench-docs/docs/CNAME
-         cd nosqlbench-docs
-         git add docs
-         git add -u
-         CHANGES=$(git status --porcelain 2>/dev/null| wc -l)
-         echo "found $CHANGES to push for doc updates"
-         if (( $CHANGES > 0 ))
-         then
-           git commit -m"docs update for $GITHUB_REF"
-           git push
-         fi
+          rsync -av --delete guidebook/guidebook/ nosqlbench-docs/docs/
+          echo "docs.nosqlbench.io" > nosqlbench-docs/docs/CNAME
+          cd nosqlbench-docs
+          git add docs
+          git add -u
+          CHANGES=$(git status --porcelain 2>/dev/null| wc -l)
+          echo "found $CHANGES to push for doc updates"
+          if (( $CHANGES > 0 ))
+          then
+            git commit -m"docs update for $GITHUB_REF"
+            git push
+          fi
 
 
 
diff --git a/Dockerfile b/Dockerfile
index 80d12e4f5..9d384545d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:14-alpine
+FROM openjdk:15-alpine
 RUN apk --no-cache add curl
 
 COPY nb/target/nb.jar nb.jar
diff --git a/devdocs/java_versions.md b/devdocs/java_versions.md
new file mode 100644
index 000000000..538a2b734
--- /dev/null
+++ b/devdocs/java_versions.md
@@ -0,0 +1,18 @@
+# Java Version Updates
+
+This is a list of all the places that the Java version is referenced in
+the NoSQLBench project. If you change versions or need to do
+version-specific troubleshooting, this list will help.
+
+- In the Dockerfile, in the parent image "FROM" tag.
+  [here](../Dockerfile)
+- In the Maven pom files, under `<source>...</source>`, `<release>...
+  </release>`, `<target>...</target>`
+  [here](../mvn-defaults/pom.xml)
+- In some cases, a Maven variable '<java.target.version>...</java.target.
+  version>` is used.
+  [here](../mvn-defaults/pom.xml)
+- In the nb appimage build scripts under nb/build-bin.sh.
+  [here](../nb/build-bin.sh)
+- In the github actions workflows for the Java runtime version
+
diff --git a/engine-docker/src/main/resources/docker/dashboards/nb4-default-dashboard.json b/engine-docker/src/main/resources/docker/dashboards/nb4-default-dashboard.json
index 4e58484f8..141fec10a 100644
--- a/engine-docker/src/main/resources/docker/dashboards/nb4-default-dashboard.json
+++ b/engine-docker/src/main/resources/docker/dashboards/nb4-default-dashboard.json
@@ -47,6 +47,7 @@
     "gnetId": null,
     "graphTooltip": 1,
     "id": null,
+    "iteration": 1607447891116,
     "links": [],
     "panels": [
       {
@@ -371,13 +372,13 @@
         "steppedLine": false,
         "targets": [
           {
-            "expr": "result{type=\"avg_rate\",avg_of=\"1m\"}",
+            "expr": "result{type=\"avg_rate\",avg_of=\"1m\",alias=\"$Alias\"}",
             "interval": "",
             "legendFormat": "{{alias}}-allops",
             "refId": "C"
           },
           {
-            "expr": "result_success{type=\"avg_rate\",avg_of=\"1m\"}",
+            "expr": "result_success{type=\"avg_rate\",avg_of=\"1m\",alias=\"$Alias\"}",
             "interval": "",
             "legendFormat": "{{alias}}-okops",
             "refId": "A"
@@ -475,7 +476,7 @@
         "steppedLine": false,
         "targets": [
           {
-            "expr": "{__name__=~\"errorcounts.*\"}",
+            "expr": "{__name__=~\"errorcounts.*\",alias=\"$Alias\"}",
             "interval": "",
             "legendFormat": "{{alias}}-{{error}}",
             "refId": "B"
@@ -574,18 +575,18 @@
         "steppedLine": false,
         "targets": [
           {
-            "expr": "result_success{type=\"pctile\"}",
+            "expr": "result_success{type=\"pctile\",alias=\"$Alias\"}",
             "hide": false,
             "interval": "",
             "legendFormat": "{{alias}}-p{{pctile}}",
             "refId": "B"
           },
           {
-            "expr": "cycles_servicetime{type=\"pctile\"}",
-            "hide": true,
+            "expr": "result_success{type=\"pctile\",alias=\"$Alias\"}",
+            "hide": false,
             "interval": "",
-            "legendFormat": "{{alias}}-{{pctile}}",
-            "refId": "A"
+            "legendFormat": "{{alias}}-p{{pctile}}",
+            "refId": "C"
           }
         ],
         "thresholds": [],
@@ -680,7 +681,7 @@
         "steppedLine": false,
         "targets": [
           {
-            "expr": "tries{type=\"pctile\"}",
+            "expr": "tries{type=\"pctile\",alias=\"$Alias\"}",
             "interval": "",
             "legendFormat": "{{alias}}-p{{pctile}}",
             "refId": "A"
@@ -778,7 +779,7 @@
         "steppedLine": false,
         "targets": [
           {
-            "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"75\"}",
+            "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"75\",alias=\"$Alias\"}",
             "interval": "",
             "legendFormat": "{{alias}}-{{__name__}}-p{{pctile}}",
             "refId": "A"
@@ -877,7 +878,7 @@
         "steppedLine": false,
         "targets": [
           {
-            "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"99\"}",
+            "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"99\",alias=\"$Alias\"}",
             "format": "time_series",
             "hide": false,
             "instant": false,
@@ -981,13 +982,13 @@
         "steppedLine": false,
         "targets": [
           {
-            "expr": "result_success{type=\"pctile\",pctile=\"0\"}",
+            "expr": "result_success{type=\"pctile\",pctile=\"0\",alias=\"$Alias\"}",
             "interval": "",
             "legendFormat": "{{alias}}-min",
             "refId": "B"
           },
           {
-            "expr": "result_success{type=\"pctile\",pctile=\"100\"}",
+            "expr": "result_success{type=\"pctile\",pctile=\"100\",alias=\"$Alias\"}",
             "interval": "",
             "legendFormat": "{{alias}}-max",
             "refId": "A"
@@ -1085,7 +1086,7 @@
         "steppedLine": false,
         "targets": [
           {
-            "expr": "cycles_servicetime{type=\"counter\"}",
+            "expr": "cycles_servicetime{type=\"counter\",alias=\"$Alias\"}",
             "interval": "",
             "legendFormat": "{{alias}}-count",
             "refId": "C"
@@ -1145,9 +1146,52 @@
         {
           "allValue": null,
           "current": {
-            "selected": false,
-            "text": "CLI",
-            "value": "CLI"
+            "selected": true,
+            "tags": [],
+            "text": [
+              "All"
+            ],
+            "value": [
+              "$__all"
+            ]
+          },
+          "datasource": "prometheus",
+          "definition": "{appname=\"nosqlbench\"}",
+          "error": null,
+          "hide": 0,
+          "includeAll": true,
+          "label": "Alias",
+          "multi": true,
+          "name": "Alias",
+          "options": [
+            {
+              "selected": true,
+              "text": "All",
+              "value": "$__all"
+            },
+            {
+              "selected": false,
+              "text": "DIAG0",
+              "value": "DIAG0"
+            }
+          ],
+          "query": "{appname=\"nosqlbench\"}",
+          "refresh": 0,
+          "regex": "/.*alias=\"(\\w+)\".*/",
+          "skipUrlSync": false,
+          "sort": 0,
+          "tagValuesQuery": "",
+          "tags": [],
+          "tagsQuery": "",
+          "type": "query",
+          "useTags": false
+        },
+        {
+          "allValue": null,
+          "current": {
+            "selected": true,
+            "text": "Script",
+            "value": "Script"
           },
           "error": null,
           "hide": 0,
@@ -1172,12 +1216,12 @@
               "value": "Scenario"
             },
             {
-              "selected": false,
+              "selected": true,
               "text": "Script",
               "value": "Script"
             },
             {
-              "selected": true,
+              "selected": false,
               "text": "Activity",
               "value": "Activity"
             },
@@ -1225,6 +1269,6 @@
     "timezone": "",
     "title": "NB4 Dashboard",
     "uid": "aIIX1f6Wz",
-    "version": 6
+    "version": 10
   }
 }
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 8dfc49c8d..1a0b4fde4 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -11,8 +11,6 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <javadoc.name>nosqlbench</javadoc.name>
 
-<!--    <java.target.version>11</java.target.version>-->
-
     <!-- properties for package versions -->
     <ascii.data.version>1.2.0</ascii.data.version>
     <commons.codec.version>1.14</commons.codec.version>
diff --git a/nb/build-bin.sh b/nb/build-bin.sh
index 3f8fce4d3..d0acc8183 100755
--- a/nb/build-bin.sh
+++ b/nb/build-bin.sh
@@ -29,28 +29,60 @@ fi
 
 rsync -av appimage/skel/ "${APPDIR}/"
 cp target/nb.jar "${APPDIR}/usr/bin/nb.jar"
-
-if [ ! -d "cache/jre15" ]
-then
-  printf "getting jre once into cache/jre15\n";
-  mkdir -p cache
-  (cd cache && (
-   if [ "$BUILD_OPENJ9" = "true" ]
-   then
-    wget -c wget -c https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2020-11-19-07-04/OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
-    tar -xf OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
-    mv jdk-15.0.1+9-jre jre15
-    rm OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
-   else
-    wget -c https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2020-11-19-07-04/OpenJDK15U-jre_x64_linux_hotspot_2020-11-19-07-04.tar.gz
-    tar xf OpenJDK15U-jre_x64_linux_hotspot_2020-11-19-07-04.tar.gz
-    mv jdk-15.0.1+9-jre jre15
-   fi
-  ))
-fi
+JAVA_VERSION="15"
 
 mkdir -p "${APPDIR}/usr/bin/jre"
-rsync -av cache/jre15/ "${APPDIR}/usr/bin/jre/"
+
+if [ "$JAVA_VERSION" == "15" ]
+then
+  if [ ! -d "cache/jre15" ] ; then
+    printf "getting jre once into cache/jre15\n";
+    mkdir -p cache
+    (cd cache && (
+     if [ "$BUILD_OPENJ9" = "true" ]
+     then
+      wget -c wget -c https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2020-11-19-07-04/OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
+      tar -xf OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
+      mv jdk-15.0.1+9-jre jre15
+      rm OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
+     else
+      wget -c https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2020-11-19-07-04/OpenJDK15U-jre_x64_linux_hotspot_2020-11-19-07-04.tar.gz
+      tar xf OpenJDK15U-jre_x64_linux_hotspot_2020-11-19-07-04.tar.gz
+      mv jdk-15.0.1+9-jre jre15
+     fi
+    ))
+  fi
+  rsync -av cache/jre15/ "${APPDIR}/usr/bin/jre/"
+# Java 14 should run binaries targeted to Java 11 bytecode
+elif [ "$JAVA_VERSION" == "14" ] ; then
+  if [ ! -d "cache/jre14" ] ; then
+    printf "getting jre once into cache/jre14\n";
+    mkdir -p cache
+    (cd cache && (
+     if [ "$BUILD_OPENJ9" = "true" ]
+     then
+      wget -c https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk14u-2020-04-27-07-27/OpenJDK14U-jre_x64_linux_openj9_linuxXL_2020-04-27-07-27.tar.gz
+      tar xf OpenJDK14U-jre_x64_linux_openj9_linuxXL_2020-04-27-07-27.tar.gz
+      mv jdk-14.0.1+7-jre jre14
+      rm OpenJDK14U-jre_x64_linux_openj9_linuxXL_2020-04-27-07-27.tar.gz
+     else
+      wget -c https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk14u-2020-04-27-07-27/OpenJDK14U-jre_x64_linux_hotspot_2020-04-27-07-27.tar.gz
+      tar xf OpenJDK14U-jre_x64_linux_hotspot_2020-04-27-07-27.tar.gz
+      mv jdk-14.0.1+7-jre jre14
+     fi
+    ))
+  fi
+  rsync -av cache/jre14/ "${APPDIR}/usr/bin/jre/"
+else
+  printf "Unknown java version indicated in $0"
+  exit 2
+   # wget -c https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.2%2B10/OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz
+   # tar xf OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz
+   # mv jdk-12.0.2+10-jre jre
+   # rm OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz
+fi
+
+
 
 if [ ! -f "${APPDIR}/AppRun" ]
   then

From 6d514cb644627e1524dbb2692f4c96a4fddd5a60 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Tue, 8 Dec 2020 13:16:33 -0600
Subject: [PATCH 136/164] bump middle version number to required java version
 '15'

---
 docsys/pom.xml                 |  6 +++---
 driver-cql-shaded/pom.xml      |  6 +++---
 driver-cqlverify/pom.xml       |  6 +++---
 driver-diag/pom.xml            |  6 +++---
 driver-dsegraph-shaded/pom.xml |  6 +++---
 driver-http/pom.xml            |  6 +++---
 driver-jmx/pom.xml             |  6 +++---
 driver-kafka/pom.xml           |  6 +++---
 driver-mongodb/pom.xml         |  6 +++---
 driver-stdout/pom.xml          |  6 +++---
 driver-tcp/pom.xml             |  8 ++++----
 driver-web/pom.xml             |  6 +++---
 drivers-api/pom.xml            |  6 +++---
 engine-api/pom.xml             | 10 +++++-----
 engine-cli/pom.xml             |  6 +++---
 engine-clients/pom.xml         |  4 ++--
 engine-core/pom.xml            |  8 ++++----
 engine-docker/pom.xml          |  4 ++--
 engine-docs/pom.xml            |  4 ++--
 engine-extensions/pom.xml      |  4 ++--
 engine-rest/pom.xml            |  4 ++--
 mvn-defaults/pom.xml           |  2 +-
 nb-annotations/pom.xml         |  2 +-
 nb-api/pom.xml                 |  4 ++--
 nb/pom.xml                     | 36 +++++++++++++++++-----------------
 pom.xml                        |  2 +-
 virtdata-api/pom.xml           |  6 +++---
 virtdata-lang/pom.xml          |  2 +-
 virtdata-lib-basics/pom.xml    |  4 ++--
 virtdata-lib-curves4/pom.xml   |  6 +++---
 virtdata-lib-random/pom.xml    |  6 +++---
 virtdata-lib-realer/pom.xml    |  4 ++--
 virtdata-realdata/pom.xml      |  4 ++--
 virtdata-userlibs/pom.xml      | 16 +++++++--------
 34 files changed, 109 insertions(+), 109 deletions(-)

diff --git a/docsys/pom.xml b/docsys/pom.xml
index fee955054..6cc1c6bf7 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index 9c8b6608a..8b67ea668 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+            <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+            <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index c6e966a26..060e25d1f 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.0.2-SNAPSHOT</version>
+    <version>4.15.3-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cql-shaded</artifactId>
-      <version>4.0.2-SNAPSHOT</version>
+      <version>4.15.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.0.2-SNAPSHOT</version>
+      <version>4.15.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index 048ef2c7b..ad34f43fc 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index afdb5776e..837013d64 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.0.2-SNAPSHOT</version>
+    <version>4.15.3-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -23,13 +23,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.0.2-SNAPSHOT</version>
+      <version>4.15.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.0.2-SNAPSHOT</version>
+      <version>4.15.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index 18e157ad5..6cef1456b 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index 1beda4170..50175afe6 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+            <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+            <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index a55b0971c..13c5702f8 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -44,13 +44,13 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-api</artifactId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>driver-stdout</artifactId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
       </dependency>
 
       <!--        <dependency>-->
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index 77f49c46e..aec776f45 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index e225acb49..87a13a112 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index a43f0dd6f..ec52ff3f2 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,19 +24,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+            <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+            <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+            <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index 98215a9c2..b9748d1bc 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index f63682b9d..2fddd31eb 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index beea8a7e1..4cf32e487 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,25 +23,25 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+            <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+            <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+            <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+            <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index 1cee2faed..5956e3794 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index 3b83838cc..24a77823e 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.0.2-SNAPSHOT</version>
+    <version>4.15.3-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.0.2-SNAPSHOT</version>
+      <version>4.15.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index 787577544..f3b816118 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-clients</artifactId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index 7d4bf67a6..402278839 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index 146886192..7b077293b 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.0.2-SNAPSHOT</version>
+    <version>4.15.3-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>docsys</artifactId>
-      <version>4.0.2-SNAPSHOT</version>
+      <version>4.15.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index 6028257b9..b62ef9a46 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index 2b2ee2ec8..6e335a978 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 1a0b4fde4..13598ce9a 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>io.nosqlbench</groupId>
   <artifactId>mvn-defaults</artifactId>
-  <version>4.0.2-SNAPSHOT</version>
+  <version>4.15.3-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index b8dd56050..1ac6f35aa 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 6bf769781..9d976f906 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.0.2-SNAPSHOT</version>
+    <version>4.15.3-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>nb-annotations</artifactId>
-      <version>4.0.2-SNAPSHOT</version>
+      <version>4.15.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/nb/pom.xml b/nb/pom.xml
index 0df2b392d..5d90c9956 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,31 +24,31 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-rest</artifactId>
-      <version>4.0.2-SNAPSHOT</version>
+      <version>4.15.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-cli</artifactId>
-      <version>4.0.2-SNAPSHOT</version>
+      <version>4.15.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-docs</artifactId>
-      <version>4.0.2-SNAPSHOT</version>
+      <version>4.15.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-core</artifactId>
-      <version>4.0.2-SNAPSHOT</version>
+      <version>4.15.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-extensions</artifactId>
-      <version>4.0.2-SNAPSHOT</version>
+      <version>4.15.3-SNAPSHOT</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -60,67 +60,67 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-web</artifactId>
-      <version>4.0.2-SNAPSHOT</version>
+      <version>4.15.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-kafka</artifactId>
-      <version>4.0.2-SNAPSHOT</version>
+      <version>4.15.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-stdout</artifactId>
-      <version>4.0.2-SNAPSHOT</version>
+      <version>4.15.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-diag</artifactId>
-      <version>4.0.2-SNAPSHOT</version>
+      <version>4.15.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-tcp</artifactId>
-      <version>4.0.2-SNAPSHOT</version>
+      <version>4.15.3-SNAPSHOT</version>
     </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-http</artifactId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-jmx</artifactId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-dsegraph-shaded</artifactId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cql-shaded</artifactId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cqlverify</artifactId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-mongodb</artifactId>
-      <version>4.0.2-SNAPSHOT</version>
+      <version>4.15.3-SNAPSHOT</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -257,7 +257,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-mongodb</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/pom.xml b/pom.xml
index 410cb8a3a..45a48fc3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index f42e96a01..7d511c9c9 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index 3e50176d3..9c826d104 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index d17408e13..cffc03a05 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+            <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index c6df6b7f1..2f2b2d6a0 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index 36dc325b2..712df08ba 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index fbf4ac8d1..c7c603ff5 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+            <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index 0cdbc62d9..a32e78f1a 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index 61ff4feb9..55ad7c811 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.15.3-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,36 +18,36 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+          <version>4.15.3-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

From 4dab9b89114676a88b4a9d86837ee7cc6c592eda Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Tue, 8 Dec 2020 13:17:21 -0600
Subject: [PATCH 137/164] move annotations enums to package

---
 .../src/main/java/io/nosqlbench/engine/cli/NBCLI.java     | 2 +-
 .../engine/core/lifecycle/ActivityExecutor.java           | 8 ++++----
 .../engine/core/lifecycle/ScenarioController.java         | 2 +-
 .../java/io/nosqlbench/engine/core/script/Scenario.java   | 2 +-
 .../java/io/nosqlbench/nb/api/annotations/Annotation.java | 2 --
 .../nosqlbench/nb/api/annotations/AnnotationBuilder.java  | 4 +---
 .../io/nosqlbench/nb/api/annotations/BuilderFacets.java   | 2 --
 .../io/nosqlbench/nb/api/{ => annotations}/Layer.java     | 8 ++++----
 .../nosqlbench/nb/api/annotations/MutableAnnotation.java  | 1 -
 .../nb/api/annotations/AnnotationBuilderTest.java         | 1 -
 10 files changed, 12 insertions(+), 20 deletions(-)
 rename nb-api/src/main/java/io/nosqlbench/nb/api/{ => annotations}/Layer.java (73%)

diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
index 895394dba..fe9b1cd57 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
@@ -21,7 +21,7 @@ import io.nosqlbench.engine.core.script.ScenariosExecutor;
 import io.nosqlbench.engine.core.script.ScriptParams;
 import io.nosqlbench.engine.docker.DockerMetricsManager;
 import io.nosqlbench.nb.api.annotations.Annotation;
-import io.nosqlbench.nb.api.Layer;
+import io.nosqlbench.nb.api.annotations.Layer;
 import io.nosqlbench.nb.api.content.Content;
 import io.nosqlbench.nb.api.content.NBIO;
 import io.nosqlbench.nb.api.errors.BasicError;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java
index 0cb03994f..eef48bf63 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java
@@ -19,7 +19,7 @@ import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.activityimpl.ParameterMap;
 import io.nosqlbench.engine.api.activityimpl.input.ProgressCapable;
 import io.nosqlbench.engine.core.annotation.Annotators;
-import io.nosqlbench.nb.api.Layer;
+import io.nosqlbench.nb.api.annotations.Layer;
 import io.nosqlbench.nb.api.annotations.Annotation;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
@@ -55,13 +55,13 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
     private final List<Motor<?>> motors = new ArrayList<>();
     private final Activity activity;
     private final ActivityDef activityDef;
-    private ExecutorService executorService;
+    private final ExecutorService executorService;
     private RuntimeException stoppingException;
 
     private final static int waitTime = 10000;
     private String sessionId = "";
     private long startedAt = 0L;
-    private long stoppedAt = 0L;
+    private final long stoppedAt = 0L;
     private String[] annotatedCommand;
 
 //    private RunState intendedState = RunState.Uninitialized;
@@ -255,7 +255,7 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
     public synchronized void handleParameterMapUpdate(ParameterMap parameterMap) {
 
         if (activity instanceof ActivityDefObserver) {
-            ((ActivityDefObserver) activity).onActivityDefUpdate(activityDef);
+            activity.onActivityDefUpdate(activityDef);
         }
 
         // An activity must be initialized before the motors and other components are
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java
index 1cdda63d3..e096e3cb7 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java
@@ -21,7 +21,7 @@ import io.nosqlbench.engine.api.activityimpl.ParameterMap;
 import io.nosqlbench.engine.api.activityimpl.ProgressAndStateMeter;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
 import io.nosqlbench.engine.core.annotation.Annotators;
-import io.nosqlbench.nb.api.Layer;
+import io.nosqlbench.nb.api.annotations.Layer;
 import io.nosqlbench.nb.api.annotations.Annotation;
 import io.nosqlbench.nb.api.errors.BasicError;
 import org.apache.logging.log4j.Logger;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
index 89b56dd23..4e5e84976 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
@@ -25,7 +25,7 @@ import io.nosqlbench.engine.core.lifecycle.ScenarioController;
 import io.nosqlbench.engine.core.lifecycle.ScenarioResult;
 import io.nosqlbench.engine.core.annotation.Annotators;
 import io.nosqlbench.engine.core.metrics.PolyglotMetricRegistryBindings;
-import io.nosqlbench.nb.api.Layer;
+import io.nosqlbench.nb.api.annotations.Layer;
 import io.nosqlbench.nb.api.annotations.Annotation;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotation.java b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotation.java
index 70209db61..728e20ada 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotation.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotation.java
@@ -1,7 +1,5 @@
 package io.nosqlbench.nb.api.annotations;
 
-import io.nosqlbench.nb.api.Layer;
-
 import java.util.Map;
 
 /**
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilder.java b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilder.java
index 90c43b068..fa8ecc510 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilder.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilder.java
@@ -1,7 +1,5 @@
 package io.nosqlbench.nb.api.annotations;
 
-import io.nosqlbench.nb.api.Layer;
-
 import java.time.ZoneId;
 import java.util.LinkedHashMap;
 import java.util.TimeZone;
@@ -13,7 +11,7 @@ public class AnnotationBuilder implements BuilderFacets.All {
     private final LinkedHashMap<String, String> labels = new LinkedHashMap<>();
     private final LinkedHashMap<String, String> details = new LinkedHashMap<>();
     private Layer layer;
-    private TimeZone timezone = TimeZone.getTimeZone(ZoneId.of("GMT"));
+    private final TimeZone timezone = TimeZone.getTimeZone(ZoneId.of("GMT"));
 
     @Override
     public AnnotationBuilder layer(Layer layer) {
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/BuilderFacets.java b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/BuilderFacets.java
index ebee085b0..466613ec6 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/BuilderFacets.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/BuilderFacets.java
@@ -1,7 +1,5 @@
 package io.nosqlbench.nb.api.annotations;
 
-import io.nosqlbench.nb.api.Layer;
-
 public interface BuilderFacets {
 
     interface All extends
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/Layer.java b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Layer.java
similarity index 73%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/Layer.java
rename to nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Layer.java
index 459358995..1264ac94d 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/Layer.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Layer.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.nb.api;
+package io.nosqlbench.nb.api.annotations;
 
 public enum Layer {
 
@@ -10,13 +10,13 @@ public enum Layer {
 
     /**
      * Events which describe scenario execution, such as parameters,
-     * lifecycle events, and critical errors
+     * lifecycle events, interruptions, and critical errors
      */
     Scenario,
 
     /**
-     * Events which describe scripting details, such as extensions,
-     * sending programmatic annotations, or critical errors
+     * Events which describe scripting details, such as commands,
+     * extension usages, sending programmatic annotations, or critical errors
      */
     Script,
 
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/MutableAnnotation.java b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/MutableAnnotation.java
index 57d3641b5..95f1a0df0 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/MutableAnnotation.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/MutableAnnotation.java
@@ -3,7 +3,6 @@ package io.nosqlbench.nb.api.annotations;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.Expose;
-import io.nosqlbench.nb.api.Layer;
 
 import java.time.Instant;
 import java.time.ZoneId;
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java
index 0f8f92881..de77b36fc 100644
--- a/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java
+++ b/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java
@@ -1,6 +1,5 @@
 package io.nosqlbench.nb.api.annotations;
 
-import io.nosqlbench.nb.api.Layer;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;

From 17ed4c1efc91d6612d2b7e33524162c8f12544b7 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Tue, 8 Dec 2020 15:46:33 -0600
Subject: [PATCH 138/164] annotator and dashboard fixes

---
 .../grafana/GrafanaMetricsAnnotator.java      |   59 +-
 .../engine/core/annotation/Annotators.java    |    8 +-
 .../core/lifecycle/ActivityExecutor.java      |    6 +-
 .../core/lifecycle/ScenarioController.java    |    3 +-
 .../engine/core/ActivityExecutorTest.java     |    6 +-
 .../dashboards/nb4-default-dashboard.json     | 1274 ----------------
 .../docker/dashboards/nb4-new-dashboard.json  | 1279 +++++++++++++++++
 .../docker/dashboards/new-nb-dashboard.json   | 1135 ---------------
 8 files changed, 1324 insertions(+), 2446 deletions(-)
 delete mode 100644 engine-docker/src/main/resources/docker/dashboards/nb4-default-dashboard.json
 create mode 100644 engine-docker/src/main/resources/docker/dashboards/nb4-new-dashboard.json
 delete mode 100644 engine-docker/src/main/resources/docker/dashboards/new-nb-dashboard.json

diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaMetricsAnnotator.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaMetricsAnnotator.java
index 86b46c0cd..8d23039b2 100644
--- a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaMetricsAnnotator.java
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaMetricsAnnotator.java
@@ -19,10 +19,10 @@ import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-@Service(value = Annotator.class, selector = "grafana" )
+@Service(value = Annotator.class, selector = "grafana")
 public class GrafanaMetricsAnnotator implements Annotator, ConfigAware {
 
-    private final static Logger logger = LogManager.getLogger("ANNOTATORS" );
+    private final static Logger logger = LogManager.getLogger("ANNOTATORS");
     //private final static Logger annotationsLog = LogManager.getLogger("ANNOTATIONS" );
     private OnError onError = OnError.Warn;
 
@@ -62,28 +62,28 @@ public class GrafanaMetricsAnnotator implements Annotator, ConfigAware {
 
 
             // Target
-            Optional.ofNullable(labels.get("type" ))
+            Optional.ofNullable(labels.get("type"))
                     .ifPresent(ga::setType);
 
-            Optional.ofNullable(labels.get("id" )).map(Integer::valueOf)
+            Optional.ofNullable(labels.get("id")).map(Integer::valueOf)
                     .ifPresent(ga::setId);
 
-            Optional.ofNullable(labels.get("alertId" )).map(Integer::valueOf)
+            Optional.ofNullable(labels.get("alertId")).map(Integer::valueOf)
                     .ifPresent(ga::setAlertId);
 
-            Optional.ofNullable(labels.get("dashboardId" )).map(Integer::valueOf)
+            Optional.ofNullable(labels.get("dashboardId")).map(Integer::valueOf)
                     .ifPresent(ga::setDashboardId);
 
-            Optional.ofNullable(labels.get("panelId" )).map(Integer::valueOf)
+            Optional.ofNullable(labels.get("panelId")).map(Integer::valueOf)
                     .ifPresent(ga::setPanelId);
 
-            Optional.ofNullable(labels.get("userId" )).map(Integer::valueOf)
+            Optional.ofNullable(labels.get("userId")).map(Integer::valueOf)
                     .ifPresent(ga::setUserId);
 
-            Optional.ofNullable(labels.get("userName" ))
+            Optional.ofNullable(labels.get("userName"))
                     .ifPresent(ga::setUserName);
 
-            Optional.ofNullable(labels.get("metric" ))
+            Optional.ofNullable(labels.get("metric"))
                     .ifPresent(ga::setMetric);
 
             // Details
@@ -115,35 +115,36 @@ public class GrafanaMetricsAnnotator implements Annotator, ConfigAware {
         GrafanaClientConfig gc = new GrafanaClientConfig();
         gc.setBaseUri(cfg.param("baseurl", String.class));
 
-        if (cfg.containsKey("tags" )) {
+        if (cfg.containsKey("tags")) {
             this.tags = ParamsParser.parse(cfg.param("tags", String.class), false);
         }
 
-        if (cfg.containsKey("username" )) {
-            if (cfg.containsKey("password" )) {
+        if (cfg.containsKey("username")) {
+            if (cfg.containsKey("password")) {
                 gc.basicAuth(
                         cfg.param("username", String.class),
                         cfg.param("password", String.class)
                 );
             } else {
-                gc.basicAuth(cfg.param("username", String.class), "" );
+                gc.basicAuth(cfg.param("username", String.class), "");
             }
         }
 
         Path keyfilePath = null;
-        if (cfg.containsKey("apikeyfile" )) {
+        if (cfg.containsKey("apikeyfile")) {
             String apikeyfile = cfg.paramEnv("apikeyfile", String.class);
             keyfilePath = Path.of(apikeyfile);
-        } else if (cfg.containsKey("apikey" )) {
+        } else if (cfg.containsKey("apikey")) {
             gc.addHeaderSource(() -> Map.of("Authorization", "Bearer " + cfg.param("apikey", String.class)));
         } else {
-            Optional<String> apikeyLocation = Environment.INSTANCE.interpolate("$NBSTATEDIR/grafana_apikey" );
+            Optional<String> apikeyLocation = Environment.INSTANCE
+                    .interpolate(cfg.paramEnv("apikeyfile", String.class));
             keyfilePath = apikeyLocation.map(Path::of).orElseThrow();
         }
 
         if (!Files.exists(keyfilePath)) {
-            logger.info("Auto-configuring grafana apikey." );
-            GrafanaClientConfig apiClientConf = gc.copy().basicAuth("admin", "admin" );
+            logger.info("Auto-configuring grafana apikey.");
+            GrafanaClientConfig apiClientConf = gc.copy().basicAuth("admin", "admin");
             GrafanaClient apiClient = new GrafanaClient(apiClientConf);
             try {
                 String nodeId = SystemId.getNodeId();
@@ -163,7 +164,7 @@ public class GrafanaMetricsAnnotator implements Annotator, ConfigAware {
         );
         gc.addHeaderSource(authHeaderSupplier);
 
-        this.onError = OnError.valueOfName(cfg.get("onerror" ).toString());
+        this.onError = OnError.valueOfName(cfg.get("onerror").toString());
 
         this.client = new GrafanaClient(gc);
 
@@ -174,22 +175,22 @@ public class GrafanaMetricsAnnotator implements Annotator, ConfigAware {
     public ConfigModel getConfigModel() {
         return new MutableConfigModel(this)
                 .required("baseurl", String.class,
-                        "The base url of the grafana node, like http://localhost:3000/" )
-                .defaultto("apikeyfile", "$NBSTATEDIR/grafana_apikey",
-                        "The file that contains the api key, supersedes apikey" )
+                        "The base url of the grafana node, like http://localhost:3000/")
+                .defaultto("apikeyfile", "$NBSTATEDIR/grafana/grafana_apikey",
+                        "The file that contains the api key, supersedes apikey")
                 .optional("apikey", String.class,
-                        "The api key to use, supersedes basic username and password" )
+                        "The api key to use, supersedes basic username and password")
                 .optional("username", String.class,
-                        "The username to use for basic auth" )
+                        "The username to use for basic auth")
                 .optional("password", String.class,
-                        "The password to use for basic auth" )
+                        "The password to use for basic auth")
                 .defaultto("tags", "source:nosqlbench",
-                        "The tags that identify the annotations, in k:v,... form" )
+                        "The tags that identify the annotations, in k:v,... form")
 //                .defaultto("onerror", OnError.Warn)
                 .defaultto("onerror", "warn",
-                        "What to do when an error occurs while posting an annotation" )
+                        "What to do when an error occurs while posting an annotation")
                 .defaultto("timeoutms", 5000,
-                        "connect and transport timeout for the HTTP client" )
+                        "connect and transport timeout for the HTTP client")
                 .asReadOnly();
     }
 
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/annotation/Annotators.java b/engine-core/src/main/java/io/nosqlbench/engine/core/annotation/Annotators.java
index 66a7cd042..053c0006d 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/annotation/Annotators.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/annotation/Annotators.java
@@ -97,8 +97,12 @@ public class Annotators {
 
     public static synchronized void recordAnnotation(Annotation annotation) {
         for (Annotator annotator : getAnnotators()) {
-            logger.trace("calling annotator " + annotator.getName());
-            annotator.recordAnnotation(annotation);
+            try {
+                logger.trace("calling annotator " + annotator.getName());
+                annotator.recordAnnotation(annotation);
+            } catch (Exception e) {
+                logger.error(e);
+            }
         }
     }
 
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java
index eef48bf63..7b5bc6577 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java
@@ -61,12 +61,12 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
     private final static int waitTime = 10000;
     private String sessionId = "";
     private long startedAt = 0L;
-    private final long stoppedAt = 0L;
+    private long stoppedAt = 0L;
     private String[] annotatedCommand;
 
 //    private RunState intendedState = RunState.Uninitialized;
 
-    public ActivityExecutor(Activity activity) {
+    public ActivityExecutor(Activity activity, String sessionId) {
         this.activity = activity;
         this.activityDef = activity.getActivityDef();
         executorService = new ThreadPoolExecutor(
@@ -77,6 +77,7 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
         );
         activity.getActivityDef().getParams().addListener(this);
         activity.setActivityController(this);
+        this.sessionId = sessionId;
     }
 
     public void setSessionId(String sessionId) {
@@ -235,6 +236,7 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
             logger.trace("closing auto-closeables");
             activity.closeAutoCloseables();
             activity.setRunState(RunState.Stopped);
+            this.stoppedAt=System.currentTimeMillis();
         }
 
         if (stoppingException != null) {
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java
index e096e3cb7..4be729481 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java
@@ -302,7 +302,8 @@ public class ScenarioController {
                 }
 
                 ActivityType<?> activityType = ActivityType.FINDER.getOrThrow(activityTypeName);
-                executor = new ActivityExecutor(activityType.getAssembledActivity(activityDef, getActivityMap()));
+                executor = new ActivityExecutor(activityType.getAssembledActivity(activityDef, getActivityMap()),
+                        this.sessionId);
                 activityExecutors.put(activityDef.getAlias(), executor);
             }
             return executor;
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java
index a0669beb4..d91c12497 100644
--- a/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java
+++ b/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java
@@ -52,7 +52,7 @@ public class ActivityExecutorTest {
         a.setInputDispenserDelegate(idisp);
         a.setMotorDispenserDelegate(mdisp);
 
-        ActivityExecutor ae = new ActivityExecutor(a);
+        ActivityExecutor ae = new ActivityExecutor(a, "test-restart");
         ad.setThreads(1);
         ae.startActivity();
         ae.stopActivity();
@@ -76,7 +76,7 @@ public class ActivityExecutorTest {
         a.setInputDispenserDelegate(idisp);
         a.setMotorDispenserDelegate(mdisp);
 
-        ActivityExecutor ae = new ActivityExecutor(a);
+        ActivityExecutor ae = new ActivityExecutor(a, "test-delayed-start");
         ad.setThreads(1);
         ae.startActivity();
         ae.awaitCompletion(15000);
@@ -101,7 +101,7 @@ public class ActivityExecutorTest {
         a.setInputDispenserDelegate(idisp);
         a.setMotorDispenserDelegate(mdisp);
 
-        ActivityExecutor ae = new ActivityExecutor(a);
+        ActivityExecutor ae = new ActivityExecutor(a, "test-new-executor");
         ad.setThreads(5);
         ae.startActivity();
 
diff --git a/engine-docker/src/main/resources/docker/dashboards/nb4-default-dashboard.json b/engine-docker/src/main/resources/docker/dashboards/nb4-default-dashboard.json
deleted file mode 100644
index 141fec10a..000000000
--- a/engine-docker/src/main/resources/docker/dashboards/nb4-default-dashboard.json
+++ /dev/null
@@ -1,1274 +0,0 @@
-{
-  "dashboard": {
-    "annotations": {
-      "list": [
-        {
-          "datasource": "-- Grafana --",
-          "enable": true,
-          "hide": true,
-          "iconColor": "#C0D8FF",
-          "limit": 100,
-          "name": "Annotation Focus",
-          "showIn": 0,
-          "tags": [
-            "appname:nosqlbench",
-            "layer:$Layer"
-          ],
-          "type": "tags"
-        },
-        {
-          "datasource": "-- Grafana --",
-          "enable": false,
-          "hide": false,
-          "iconColor": "#E0B400",
-          "limit": 2000,
-          "matchAny": true,
-          "name": "All Annotations",
-          "showIn": 0,
-          "tags": [
-            "appname",
-            "layer:$Layer"
-          ],
-          "type": "tags"
-        },
-        {
-          "builtIn": 1,
-          "datasource": "-- Grafana --",
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations & Alerts",
-          "type": "dashboard"
-        }
-      ]
-    },
-    "description": "Basic Dashboard with Annotations for NoSQLBench 4",
-    "editable": true,
-    "gnetId": null,
-    "graphTooltip": 1,
-    "id": null,
-    "iteration": 1607447891116,
-    "links": [],
-    "panels": [
-      {
-        "collapsed": true,
-        "datasource": null,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 0
-        },
-        "id": 115,
-        "panels": [
-          {
-            "datasource": null,
-            "fieldConfig": {
-              "defaults": {
-                "custom": {}
-              },
-              "overrides": []
-            },
-            "gridPos": {
-              "h": 2,
-              "w": 24,
-              "x": 0,
-              "y": 1
-            },
-            "id": 128,
-            "options": {
-              "content": "The descriptions below are in the same position as the metric they desscribe.\nYou can collapse this row when you no longer need the descriptions.\nSome of the descriptions have additional details if you scroll with\nyour mouse wheel.\n\n\n",
-              "mode": "markdown"
-            },
-            "pluginVersion": "7.3.4",
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "",
-            "transparent": true,
-            "type": "text"
-          },
-          {
-            "datasource": null,
-            "description": "",
-            "fieldConfig": {
-              "defaults": {
-                "custom": {}
-              },
-              "overrides": []
-            },
-            "gridPos": {
-              "h": 3,
-              "w": 6,
-              "x": 0,
-              "y": 3
-            },
-            "id": 117,
-            "options": {
-              "content": "These two metrics show the 1-minute averaged ops per second for all ops (successes and errors) and succesful ops (no errors during execution) separately.\n\nWhen there are no errors, these metrics should be the same. When there are errors, there will be a difference. In that case, you can look at the error metrics to learn more about what is happening.\n\nBy comparing these two metrics for any activity, you have a quick first-glance sanity check that your tests are configured properly and\nthat there are no serious configuration or resource issues. In addition, this is the primary throughput metric.\n\n\n\n\n\n",
-              "mode": "markdown"
-            },
-            "pluginVersion": "7.3.4",
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Ops and Successful Ops",
-            "transparent": true,
-            "type": "text"
-          },
-          {
-            "datasource": null,
-            "description": "",
-            "fieldConfig": {
-              "defaults": {
-                "custom": {}
-              },
-              "overrides": []
-            },
-            "gridPos": {
-              "h": 3,
-              "w": 6,
-              "x": 6,
-              "y": 3
-            },
-            "id": 118,
-            "options": {
-              "content": "When an exception is caught and counted in a scenario, a specially named metric is emited which includes a simplified name of the error type.\nEach of these metrics is created as needed in the NoSQLBench runtime.\n\nThese metrics are formated with a name pattern of `errorcounts.NAME` where NAME is the simple name\nof the exception class which was caught during the operation. For example, For an activity\nnamed foo (with alias=foo), you would expect an exception named 'FooTimeoutException' to be shown\nwith a metric name of ...`foo.errorcounts.FooTimeoutException`\n\n\n\n\n",
-              "mode": "markdown"
-            },
-            "pluginVersion": "7.3.4",
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Error Counts",
-            "transparent": true,
-            "type": "text"
-          },
-          {
-            "datasource": null,
-            "description": "",
-            "fieldConfig": {
-              "defaults": {
-                "custom": {}
-              },
-              "overrides": []
-            },
-            "gridPos": {
-              "h": 3,
-              "w": 6,
-              "x": 12,
-              "y": 3
-            },
-            "id": 119,
-            "options": {
-              "content": "The service time distribution is an HDR histogram that represents the time elapsed from when an operation is submitted for execution to when its result has been received.\n\nFrom the vantage point of the NoSQLBench runtime, this is a client-side metric. Thus, the service time captures the processing time that an application would see, including driver logic, wire time (transport), and server-side processing. \n\nThis metric does not include the waittime or the responsetime metrics. These metrics are only meaningful (and provided) when a `cyclerate=` is provided to an activity. When computing the responsetime metric, the servicetime is added to the waittime for a given operation.\n",
-              "mode": "markdown"
-            },
-            "pluginVersion": "7.3.4",
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Service Time Distribution",
-            "transparent": true,
-            "type": "text"
-          },
-          {
-            "datasource": null,
-            "description": "",
-            "fieldConfig": {
-              "defaults": {
-                "custom": {}
-              },
-              "overrides": []
-            },
-            "gridPos": {
-              "h": 3,
-              "w": 6,
-              "x": 18,
-              "y": 3
-            },
-            "id": 120,
-            "options": {
-              "content": "The tries distribution is an HDR histogram which represents how many times an operation was submitted. In a well balanced system,\ntries should be 1 across the board.\n\nEvery operation which is executed within NoSQLBench should have a `tries` metric. For example, with CQL, the number of times an operation is submitted\nbefore it is succesful is ideally 1. If you are overloading your target system, thus forcing resource contention, you may see operations timeout.\n\nBy default, NoSQLBench will try up to 10 times to submit operations before giving up and throwing an error for an operation.\n\nThe tries metric can be used as a low-noise indicator of system saturation. For example, if you are running a system marginally\nbeyond its capacity, the tries for operations will go above 1 at the higher percentiles such as P99. If you increase the load even further, more retries\nwill be needed and less work will be completed, thus showing higher retries at even lower percentiles, like P95, for example.\n\nAs such, you can use the tries metric as an indicator of relative saturation.",
-              "mode": "markdown"
-            },
-            "pluginVersion": "7.3.4",
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Op Tries Distribution",
-            "transparent": true,
-            "type": "text"
-          },
-          {
-            "datasource": null,
-            "description": "",
-            "fieldConfig": {
-              "defaults": {
-                "custom": {}
-              },
-              "overrides": []
-            },
-            "gridPos": {
-              "h": 3,
-              "w": 6,
-              "x": 0,
-              "y": 6
-            },
-            "id": 121,
-            "options": {
-              "content": "This panel shows the P75 service times for the internal stages of NoSQLBench processing. It provides a sanity check to ensure that the client processing time is low and predictable. \n\nIf there are spikes in this data, then you are likely trying to run your workloads on insufficient client hardware. In order to ensure high fidelity results in the other metrics, the client\nneeds to be capable of driving the workload without saturating or introducing signifcant local resource contention.\n\n- **read-input** - the time it takes for a worker thread to acquire a stride (range of cycles) for execution.\n- **bind** - the time it takes to convert a cycle value into a set of fields for us in an operation.\n- **execute** - the time it takes to submit work to a protocol-specific driver.",
-              "mode": "markdown"
-            },
-            "pluginVersion": "7.3.4",
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "P75 NB Internals",
-            "transparent": true,
-            "type": "text"
-          },
-          {
-            "datasource": null,
-            "description": "",
-            "fieldConfig": {
-              "defaults": {
-                "custom": {}
-              },
-              "overrides": []
-            },
-            "gridPos": {
-              "h": 3,
-              "w": 6,
-              "x": 6,
-              "y": 6
-            },
-            "id": 122,
-            "options": {
-              "content": "This panel shows the P99 service times for the internal stages of NoSQLBench processing. It provides a sanity check to ensure that the client processing time is low and predictable. \n\nIf there are spikes in this data, then you are likely trying to run your workloads on insufficient client hardware. In order to ensure high fidelity results in the other metrics, the client\nneeds to be capable of driving the workload without saturating or introducing signifcant local resource contention.\n\n- **read-input** - the time it takes for a worker thread to acquire a stride (range of cycles) for execution.\n- **bind** - the time it takes to convert a cycle value into a set of fields for us in an operation.\n- **execute** - the time it takes to submit work to a protocol-specific driver.",
-              "mode": "markdown"
-            },
-            "pluginVersion": "7.3.4",
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "P99 NB Internals",
-            "transparent": true,
-            "type": "text"
-          },
-          {
-            "datasource": null,
-            "description": "",
-            "fieldConfig": {
-              "defaults": {
-                "custom": {}
-              },
-              "overrides": []
-            },
-            "gridPos": {
-              "h": 3,
-              "w": 6,
-              "x": 12,
-              "y": 6
-            },
-            "id": 123,
-            "options": {
-              "content": "This panel simply breaks out the service time range in a simpler view. This is a good metric to look at when you want to know what the best and worse case value is for any given histogram interval.\n\nThese values come from a discrete HDR histogram reservoir. They are the actual best and worst service times, unaffected by time-decaying reservoir logic.\n",
-              "mode": "markdown"
-            },
-            "pluginVersion": "7.3.4",
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Service Time Range",
-            "transparent": true,
-            "type": "text"
-          },
-          {
-            "datasource": null,
-            "description": "",
-            "fieldConfig": {
-              "defaults": {
-                "custom": {}
-              },
-              "overrides": []
-            },
-            "gridPos": {
-              "h": 3,
-              "w": 6,
-              "x": 18,
-              "y": 6
-            },
-            "id": 124,
-            "options": {
-              "content": "This is a simple visual reference for the cycle count within each activity. This makes it easy to see the relative progress of an activity over time.",
-              "mode": "markdown"
-            },
-            "pluginVersion": "7.3.4",
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Cycle Count",
-            "transparent": true,
-            "type": "text"
-          }
-        ],
-        "title": "NoSQLBench Metrics Guide",
-        "type": "row"
-      },
-      {
-        "collapsed": false,
-        "datasource": null,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 1
-        },
-        "id": 91,
-        "panels": [],
-        "title": "NoSQLBench Metrics",
-        "type": "row"
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "description": "",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {},
-            "links": []
-          },
-          "overrides": []
-        },
-        "fill": 1,
-        "fillGradient": 0,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 0,
-          "y": 2
-        },
-        "hiddenSeries": false,
-        "id": 95,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": false,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "options": {
-          "alertThreshold": true
-        },
-        "percentage": false,
-        "pluginVersion": "7.3.4",
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "result{type=\"avg_rate\",avg_of=\"1m\",alias=\"$Alias\"}",
-            "interval": "",
-            "legendFormat": "{{alias}}-allops",
-            "refId": "C"
-          },
-          {
-            "expr": "result_success{type=\"avg_rate\",avg_of=\"1m\",alias=\"$Alias\"}",
-            "interval": "",
-            "legendFormat": "{{alias}}-okops",
-            "refId": "A"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "Ops and Successful Ops",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "transparent": true,
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {},
-            "links": []
-          },
-          "overrides": []
-        },
-        "fill": 1,
-        "fillGradient": 0,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 6,
-          "y": 2
-        },
-        "hiddenSeries": false,
-        "id": 93,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "connected",
-        "options": {
-          "alertThreshold": true
-        },
-        "percentage": false,
-        "pluginVersion": "7.3.4",
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "{__name__=~\"errorcounts.*\",alias=\"$Alias\"}",
-            "interval": "",
-            "legendFormat": "{{alias}}-{{error}}",
-            "refId": "B"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "Error Counts",
-        "tooltip": {
-          "shared": true,
-          "sort": 2,
-          "value_type": "individual"
-        },
-        "transparent": true,
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {},
-            "links": []
-          },
-          "overrides": []
-        },
-        "fill": 1,
-        "fillGradient": 0,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 12,
-          "y": 2
-        },
-        "hiddenSeries": false,
-        "id": 97,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "rightSide": false,
-          "show": false,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "options": {
-          "alertThreshold": true
-        },
-        "percentage": false,
-        "pluginVersion": "7.3.4",
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "result_success{type=\"pctile\",alias=\"$Alias\"}",
-            "hide": false,
-            "interval": "",
-            "legendFormat": "{{alias}}-p{{pctile}}",
-            "refId": "B"
-          },
-          {
-            "expr": "result_success{type=\"pctile\",alias=\"$Alias\"}",
-            "hide": false,
-            "interval": "",
-            "legendFormat": "{{alias}}-p{{pctile}}",
-            "refId": "C"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "service time distribution",
-        "tooltip": {
-          "shared": true,
-          "sort": 2,
-          "value_type": "individual"
-        },
-        "transparent": true,
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "ns",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {},
-            "links": []
-          },
-          "overrides": []
-        },
-        "fill": 1,
-        "fillGradient": 0,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 18,
-          "y": 2
-        },
-        "hiddenSeries": false,
-        "id": 98,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": false,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "options": {
-          "alertThreshold": true
-        },
-        "percentage": false,
-        "pluginVersion": "7.3.4",
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "tries{type=\"pctile\",alias=\"$Alias\"}",
-            "interval": "",
-            "legendFormat": "{{alias}}-p{{pctile}}",
-            "refId": "A"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "op tries distribution",
-        "tooltip": {
-          "shared": true,
-          "sort": 2,
-          "value_type": "individual"
-        },
-        "transparent": true,
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {},
-            "links": []
-          },
-          "overrides": []
-        },
-        "fill": 1,
-        "fillGradient": 0,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 0,
-          "y": 8
-        },
-        "hiddenSeries": false,
-        "id": 99,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": false,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "options": {
-          "alertThreshold": true
-        },
-        "percentage": false,
-        "pluginVersion": "7.3.4",
-        "pointradius": 1,
-        "points": true,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"75\",alias=\"$Alias\"}",
-            "interval": "",
-            "legendFormat": "{{alias}}-{{__name__}}-p{{pctile}}",
-            "refId": "A"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "p75 client overhead",
-        "tooltip": {
-          "shared": true,
-          "sort": 2,
-          "value_type": "individual"
-        },
-        "transparent": true,
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "decimals": null,
-            "format": "ns",
-            "label": null,
-            "logBase": 10,
-            "max": null,
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {},
-            "links": []
-          },
-          "overrides": []
-        },
-        "fill": 1,
-        "fillGradient": 0,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 6,
-          "y": 8
-        },
-        "hiddenSeries": false,
-        "id": 111,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": false,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "options": {
-          "alertThreshold": true
-        },
-        "percentage": false,
-        "pluginVersion": "7.3.4",
-        "pointradius": 1,
-        "points": true,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"99\",alias=\"$Alias\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "{{alias}}-{{__name__}}-p{{pctile}}",
-            "refId": "C"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "p99 client overhead",
-        "tooltip": {
-          "shared": true,
-          "sort": 2,
-          "value_type": "individual"
-        },
-        "transparent": true,
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "decimals": null,
-            "format": "ns",
-            "label": null,
-            "logBase": 10,
-            "max": null,
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "description": "",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {},
-            "links": []
-          },
-          "overrides": []
-        },
-        "fill": 2,
-        "fillGradient": 0,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 12,
-          "y": 8
-        },
-        "hiddenSeries": false,
-        "id": 109,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": false,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 2,
-        "links": [],
-        "nullPointMode": "null",
-        "options": {
-          "alertThreshold": true
-        },
-        "percentage": false,
-        "pluginVersion": "7.3.4",
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "result_success{type=\"pctile\",pctile=\"0\",alias=\"$Alias\"}",
-            "interval": "",
-            "legendFormat": "{{alias}}-min",
-            "refId": "B"
-          },
-          {
-            "expr": "result_success{type=\"pctile\",pctile=\"100\",alias=\"$Alias\"}",
-            "interval": "",
-            "legendFormat": "{{alias}}-max",
-            "refId": "A"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "service time range",
-        "tooltip": {
-          "shared": true,
-          "sort": 2,
-          "value_type": "individual"
-        },
-        "transparent": true,
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "ns",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {},
-            "links": []
-          },
-          "overrides": []
-        },
-        "fill": 1,
-        "fillGradient": 0,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 18,
-          "y": 8
-        },
-        "hiddenSeries": false,
-        "id": 113,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": false,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "options": {
-          "alertThreshold": true
-        },
-        "percentage": false,
-        "pluginVersion": "7.3.4",
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "cycles_servicetime{type=\"counter\",alias=\"$Alias\"}",
-            "interval": "",
-            "legendFormat": "{{alias}}-count",
-            "refId": "C"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "Cycle Count",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "transparent": true,
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      }
-    ],
-    "refresh": false,
-    "schemaVersion": 26,
-    "style": "dark",
-    "tags": [
-      "NoSQLBench"
-    ],
-    "templating": {
-      "list": [
-        {
-          "allValue": null,
-          "current": {
-            "selected": true,
-            "tags": [],
-            "text": [
-              "All"
-            ],
-            "value": [
-              "$__all"
-            ]
-          },
-          "datasource": "prometheus",
-          "definition": "{appname=\"nosqlbench\"}",
-          "error": null,
-          "hide": 0,
-          "includeAll": true,
-          "label": "Alias",
-          "multi": true,
-          "name": "Alias",
-          "options": [
-            {
-              "selected": true,
-              "text": "All",
-              "value": "$__all"
-            },
-            {
-              "selected": false,
-              "text": "DIAG0",
-              "value": "DIAG0"
-            }
-          ],
-          "query": "{appname=\"nosqlbench\"}",
-          "refresh": 0,
-          "regex": "/.*alias=\"(\\w+)\".*/",
-          "skipUrlSync": false,
-          "sort": 0,
-          "tagValuesQuery": "",
-          "tags": [],
-          "tagsQuery": "",
-          "type": "query",
-          "useTags": false
-        },
-        {
-          "allValue": null,
-          "current": {
-            "selected": true,
-            "text": "Script",
-            "value": "Script"
-          },
-          "error": null,
-          "hide": 0,
-          "includeAll": false,
-          "label": "Annotation Filter",
-          "multi": false,
-          "name": "Layer",
-          "options": [
-            {
-              "selected": false,
-              "text": "NONE",
-              "value": "NONE"
-            },
-            {
-              "selected": false,
-              "text": "CLI",
-              "value": "CLI"
-            },
-            {
-              "selected": false,
-              "text": "Scenario",
-              "value": "Scenario"
-            },
-            {
-              "selected": true,
-              "text": "Script",
-              "value": "Script"
-            },
-            {
-              "selected": false,
-              "text": "Activity",
-              "value": "Activity"
-            },
-            {
-              "selected": false,
-              "text": "Motor",
-              "value": "Motor"
-            }
-          ],
-          "query": "NONE,CLI,Scenario,Script,Activity,Motor",
-          "queryValue": "",
-          "skipUrlSync": false,
-          "type": "custom"
-        }
-      ]
-    },
-    "time": {
-      "from": "now-5m",
-      "to": "now"
-    },
-    "timepicker": {
-      "refresh_intervals": [
-        "10s",
-        "30s",
-        "1m",
-        "5m",
-        "15m",
-        "30m",
-        "1h",
-        "2h",
-        "1d"
-      ],
-      "time_options": [
-        "5m",
-        "15m",
-        "1h",
-        "6h",
-        "12h",
-        "24h",
-        "2d",
-        "7d",
-        "30d"
-      ]
-    },
-    "timezone": "",
-    "title": "NB4 Dashboard",
-    "uid": "aIIX1f6Wz",
-    "version": 10
-  }
-}
diff --git a/engine-docker/src/main/resources/docker/dashboards/nb4-new-dashboard.json b/engine-docker/src/main/resources/docker/dashboards/nb4-new-dashboard.json
new file mode 100644
index 000000000..a01ab9384
--- /dev/null
+++ b/engine-docker/src/main/resources/docker/dashboards/nb4-new-dashboard.json
@@ -0,0 +1,1279 @@
+{
+  "dashboard": {
+  "annotations": {
+    "list": [
+      {
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "#C0D8FF",
+        "limit": 100,
+        "name": "Annotation Focus",
+        "showIn": 0,
+        "tags": [
+          "appname:nosqlbench",
+          "layer:$Layer"
+        ],
+        "type": "tags"
+      },
+      {
+        "datasource": "-- Grafana --",
+        "enable": false,
+        "hide": false,
+        "iconColor": "#E0B400",
+        "limit": 2000,
+        "matchAny": true,
+        "name": "All Annotations",
+        "showIn": 0,
+        "tags": [
+          "appname",
+          "layer:$Layer"
+        ],
+        "type": "tags"
+      },
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "description": "Basic Dashboard with Annotations for NoSQLBench 4",
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 1,
+    "id": null,
+    "iteration": 1607447891116,
+  "links": [],
+  "panels": [
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 115,
+      "panels": [
+        {
+          "datasource": null,
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 2,
+            "w": 24,
+            "x": 0,
+            "y": 1
+          },
+          "id": 128,
+          "options": {
+            "content": "The descriptions below are in the same position as the metric they desscribe.\nYou can collapse this row when you no longer need the descriptions.\nSome of the descriptions have additional details if you scroll with\nyour mouse wheel.\n\n\n",
+            "mode": "markdown"
+          },
+          "pluginVersion": "7.3.4",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "",
+          "transparent": true,
+          "type": "text"
+        },
+        {
+          "datasource": null,
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 6,
+            "x": 0,
+            "y": 3
+          },
+          "id": 117,
+          "options": {
+            "content": "These two metrics show the 1-minute averaged ops per second for all ops (successes and errors) and succesful ops (no errors during execution) separately.\n\nWhen there are no errors, these metrics should be the same. When there are errors, there will be a difference. In that case, you can look at the error metrics to learn more about what is happening.\n\nBy comparing these two metrics for any activity, you have a quick first-glance sanity check that your tests are configured properly and\nthat there are no serious configuration or resource issues. In addition, this is the primary throughput metric.\n\n\n\n\n\n",
+            "mode": "markdown"
+          },
+          "pluginVersion": "7.3.4",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Ops and Successful Ops",
+          "transparent": true,
+          "type": "text"
+        },
+        {
+          "datasource": null,
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 6,
+            "x": 6,
+            "y": 3
+          },
+          "id": 118,
+          "options": {
+            "content": "When an exception is caught and counted in a scenario, a specially named metric is emited which includes a simplified name of the error type.\nEach of these metrics is created as needed in the NoSQLBench runtime.\n\nThese metrics are formated with a name pattern of `errorcounts.NAME` where NAME is the simple name\nof the exception class which was caught during the operation. For example, For an activity\nnamed foo (with alias=foo), you would expect an exception named 'FooTimeoutException' to be shown\nwith a metric name of ...`foo.errorcounts.FooTimeoutException`\n\n\n\n\n",
+            "mode": "markdown"
+          },
+          "pluginVersion": "7.3.4",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Error Counts",
+          "transparent": true,
+          "type": "text"
+        },
+        {
+          "datasource": null,
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 6,
+            "x": 12,
+            "y": 3
+          },
+          "id": 119,
+          "options": {
+            "content": "The service time distribution is an HDR histogram that represents the time elapsed from when an operation is submitted for execution to when its result has been received.\n\nFrom the vantage point of the NoSQLBench runtime, this is a client-side metric. Thus, the service time captures the processing time that an application would see, including driver logic, wire time (transport), and server-side processing. \n\nThis metric does not include the waittime or the responsetime metrics. These metrics are only meaningful (and provided) when a `cyclerate=` is provided to an activity. When computing the responsetime metric, the servicetime is added to the waittime for a given operation.\n",
+            "mode": "markdown"
+          },
+          "pluginVersion": "7.3.4",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Service Time Distribution",
+          "transparent": true,
+          "type": "text"
+        },
+        {
+          "datasource": null,
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 6,
+            "x": 18,
+            "y": 3
+          },
+          "id": 120,
+          "options": {
+            "content": "The tries distribution is an HDR histogram which represents how many times an operation was submitted. In a well balanced system,\ntries should be 1 across the board.\n\nEvery operation which is executed within NoSQLBench should have a `tries` metric. For example, with CQL, the number of times an operation is submitted\nbefore it is succesful is ideally 1. If you are overloading your target system, thus forcing resource contention, you may see operations timeout.\n\nBy default, NoSQLBench will try up to 10 times to submit operations before giving up and throwing an error for an operation.\n\nThe tries metric can be used as a low-noise indicator of system saturation. For example, if you are running a system marginally\nbeyond its capacity, the tries for operations will go above 1 at the higher percentiles such as P99. If you increase the load even further, more retries\nwill be needed and less work will be completed, thus showing higher retries at even lower percentiles, like P95, for example.\n\nAs such, you can use the tries metric as an indicator of relative saturation.",
+            "mode": "markdown"
+          },
+          "pluginVersion": "7.3.4",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Op Tries Distribution",
+          "transparent": true,
+          "type": "text"
+        },
+        {
+          "datasource": null,
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 6,
+            "x": 0,
+            "y": 6
+          },
+          "id": 121,
+          "options": {
+            "content": "This panel shows the P75 service times for the internal stages of NoSQLBench processing. It provides a sanity check to ensure that the client processing time is low and predictable. \n\nIf there are spikes in this data, then you are likely trying to run your workloads on insufficient client hardware. In order to ensure high fidelity results in the other metrics, the client\nneeds to be capable of driving the workload without saturating or introducing signifcant local resource contention.\n\n- **read-input** - the time it takes for a worker thread to acquire a stride (range of cycles) for execution.\n- **bind** - the time it takes to convert a cycle value into a set of fields for us in an operation.\n- **execute** - the time it takes to submit work to a protocol-specific driver.",
+            "mode": "markdown"
+          },
+          "pluginVersion": "7.3.4",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "P75 NB Internals",
+          "transparent": true,
+          "type": "text"
+        },
+        {
+          "datasource": null,
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 6,
+            "x": 6,
+            "y": 6
+          },
+          "id": 122,
+          "options": {
+            "content": "This panel shows the P99 service times for the internal stages of NoSQLBench processing. It provides a sanity check to ensure that the client processing time is low and predictable. \n\nIf there are spikes in this data, then you are likely trying to run your workloads on insufficient client hardware. In order to ensure high fidelity results in the other metrics, the client\nneeds to be capable of driving the workload without saturating or introducing signifcant local resource contention.\n\n- **read-input** - the time it takes for a worker thread to acquire a stride (range of cycles) for execution.\n- **bind** - the time it takes to convert a cycle value into a set of fields for us in an operation.\n- **execute** - the time it takes to submit work to a protocol-specific driver.",
+            "mode": "markdown"
+          },
+          "pluginVersion": "7.3.4",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "P99 NB Internals",
+          "transparent": true,
+          "type": "text"
+        },
+        {
+          "datasource": null,
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 6,
+            "x": 12,
+            "y": 6
+          },
+          "id": 123,
+          "options": {
+            "content": "This panel simply breaks out the service time range in a simpler view. This is a good metric to look at when you want to know what the best and worse case value is for any given histogram interval.\n\nThese values come from a discrete HDR histogram reservoir. They are the actual best and worst service times, unaffected by time-decaying reservoir logic.\n",
+            "mode": "markdown"
+          },
+          "pluginVersion": "7.3.4",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Service Time Range",
+          "transparent": true,
+          "type": "text"
+        },
+        {
+          "datasource": null,
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 6,
+            "x": 18,
+            "y": 6
+          },
+          "id": 124,
+          "options": {
+            "content": "This is a simple visual reference for the cycle count within each activity. This makes it easy to see the relative progress of an activity over time.",
+            "mode": "markdown"
+          },
+          "pluginVersion": "7.3.4",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Cycle Count",
+          "transparent": true,
+          "type": "text"
+        }
+      ],
+      "title": "NoSQLBench Metrics Guide",
+      "type": "row"
+    },
+    {
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 1
+      },
+      "id": 91,
+      "panels": [],
+      "title": "NoSQLBench Metrics",
+      "type": "row"
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "prometheus",
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 6,
+        "w": 6,
+        "x": 0,
+        "y": 2
+      },
+      "hiddenSeries": false,
+      "id": 95,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "7.3.4",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "result{type=\"avg_rate\",avg_of=\"1m\",alias=\"$Alias\"}",
+          "interval": "",
+          "legendFormat": "{{alias}}-allops",
+          "refId": "C"
+        },
+        {
+          "expr": "result_success{type=\"avg_rate\",avg_of=\"1m\",alias=\"$Alias\"}",
+          "interval": "",
+          "legendFormat": "{{alias}}-okops",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Ops and Successful Ops",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "transparent": true,
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 6,
+        "w": 6,
+        "x": 6,
+        "y": 2
+      },
+      "hiddenSeries": false,
+      "id": 93,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "connected",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "7.3.4",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "{__name__=~\"errorcounts.*\",alias=\"$Alias\"}",
+          "interval": "",
+          "legendFormat": "{{alias}}-{{error}}",
+          "refId": "B"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Error Counts",
+      "tooltip": {
+        "shared": true,
+        "sort": 2,
+        "value_type": "individual"
+      },
+      "transparent": true,
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 6,
+        "w": 6,
+        "x": 12,
+        "y": 2
+      },
+      "hiddenSeries": false,
+      "id": 97,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "rightSide": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "7.3.4",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "result_success{type=\"pctile\",alias=\"$Alias\"}",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "{{alias}}-p{{pctile}}",
+          "refId": "B"
+        },
+        {
+          "expr": "result_success{type=\"pctile\",alias=\"$Alias\"}",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "{{alias}}-p{{pctile}}",
+          "refId": "C"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "service time distribution",
+      "tooltip": {
+        "shared": true,
+        "sort": 2,
+        "value_type": "individual"
+      },
+      "transparent": true,
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "ns",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 6,
+        "w": 6,
+        "x": 18,
+        "y": 2
+      },
+      "hiddenSeries": false,
+      "id": 98,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "7.3.4",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "tries{type=\"pctile\",alias=\"$Alias\"}",
+          "interval": "",
+          "legendFormat": "{{alias}}-p{{pctile}}",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "op tries distribution",
+      "tooltip": {
+        "shared": true,
+        "sort": 2,
+        "value_type": "individual"
+      },
+      "transparent": true,
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 6,
+        "w": 6,
+        "x": 0,
+        "y": 8
+      },
+      "hiddenSeries": false,
+      "id": 99,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "7.3.4",
+      "pointradius": 1,
+      "points": true,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"75\",alias=\"$Alias\"}",
+          "interval": "",
+          "legendFormat": "{{alias}}-{{__name__}}-p{{pctile}}",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "p75 client overhead",
+      "tooltip": {
+        "shared": true,
+        "sort": 2,
+        "value_type": "individual"
+      },
+      "transparent": true,
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "decimals": null,
+          "format": "ns",
+          "label": null,
+          "logBase": 10,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 6,
+        "w": 6,
+        "x": 6,
+        "y": 8
+      },
+      "hiddenSeries": false,
+      "id": 111,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "7.3.4",
+      "pointradius": 1,
+      "points": true,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"99\",alias=\"$Alias\"}",
+          "format": "time_series",
+          "hide": false,
+          "instant": false,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "{{alias}}-{{__name__}}-p{{pctile}}",
+          "refId": "C"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "p99 client overhead",
+      "tooltip": {
+        "shared": true,
+        "sort": 2,
+        "value_type": "individual"
+      },
+      "transparent": true,
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "decimals": null,
+          "format": "ns",
+          "label": null,
+          "logBase": 10,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "prometheus",
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 2,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 6,
+        "w": 6,
+        "x": 12,
+        "y": 8
+      },
+      "hiddenSeries": false,
+      "id": 109,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 2,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "7.3.4",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "result_success{type=\"pctile\",pctile=\"0\",alias=\"$Alias\"}",
+          "interval": "",
+          "legendFormat": "{{alias}}-min",
+          "refId": "B"
+        },
+        {
+          "expr": "result_success{type=\"pctile\",pctile=\"100\",alias=\"$Alias\"}",
+          "interval": "",
+          "legendFormat": "{{alias}}-max",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "service time range",
+      "tooltip": {
+        "shared": true,
+        "sort": 2,
+        "value_type": "individual"
+      },
+      "transparent": true,
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "ns",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 6,
+        "w": 6,
+        "x": 18,
+        "y": 8
+      },
+      "hiddenSeries": false,
+      "id": 113,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "7.3.4",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "cycles_servicetime{type=\"counter\",alias=\"$Alias\"}",
+          "interval": "",
+          "legendFormat": "{{alias}}-count",
+          "refId": "C"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Cycle Count",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "transparent": true,
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    }
+  ],
+  "refresh": false,
+  "schemaVersion": 26,
+  "style": "dark",
+  "tags": [
+    "NoSQLBench"
+  ],
+  "templating": {
+    "list": [
+      {
+        "allValue": "",
+        "current": {
+          "selected": true,
+          "tags": [],
+          "text": [
+            "All"
+          ],
+          "value": [
+            "$__all"
+          ]
+        },
+        "datasource": "prometheus",
+        "definition": "{appname=\"nosqlbench\"}",
+        "error": null,
+        "hide": 0,
+        "includeAll": true,
+        "label": "Alias",
+        "multi": true,
+        "name": "Alias",
+        "options": [
+          {
+            "selected": true,
+            "text": "All",
+            "value": "$__all"
+          },
+          {
+            "selected": false,
+            "text": "DIAG0",
+            "value": "DIAG0"
+          }
+        ],
+        "query": "{appname=\"nosqlbench\"}",
+        "refresh": 0,
+        "regex": "/.*alias=\"(\\w+)\".*/",
+        "skipUrlSync": false,
+        "sort": 1,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
+      },
+      {
+        "allValue": " ",
+        "current": {
+          "selected": true,
+          "text": "Activity",
+          "value": "Activity"
+        },
+        "error": null,
+        "hide": 0,
+        "includeAll": true,
+        "label": "Annotation Filter",
+        "multi": false,
+        "name": "Layer",
+        "options": [
+          {
+            "selected": false,
+            "text": "All",
+            "value": "$__all"
+          },
+          {
+            "selected": false,
+            "text": "NONE",
+            "value": "NONE"
+          },
+          {
+            "selected": false,
+            "text": "CLI",
+            "value": "CLI"
+          },
+          {
+            "selected": false,
+            "text": "Scenario",
+            "value": "Scenario"
+          },
+          {
+            "selected": false,
+            "text": "Script",
+            "value": "Script"
+          },
+          {
+            "selected": true,
+            "text": "Activity",
+            "value": "Activity"
+          },
+          {
+            "selected": false,
+            "text": "Motor",
+            "value": "Motor"
+          }
+        ],
+        "query": "NONE,CLI,Scenario,Script,Activity,Motor",
+        "queryValue": "",
+        "skipUrlSync": false,
+        "type": "custom"
+      }
+    ]
+  },
+  "time": {
+      "from": "now-5m",
+      "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": [
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ],
+    "time_options": [
+      "5m",
+      "15m",
+      "1h",
+      "6h",
+      "12h",
+      "24h",
+      "2d",
+      "7d",
+      "30d"
+    ]
+  },
+  "timezone": "",
+  "title": "NB4 Dashboard",
+  "uid": "aIIX1f6Wz",
+    "version": 10
+}
+}
diff --git a/engine-docker/src/main/resources/docker/dashboards/new-nb-dashboard.json b/engine-docker/src/main/resources/docker/dashboards/new-nb-dashboard.json
deleted file mode 100644
index 22989c17e..000000000
--- a/engine-docker/src/main/resources/docker/dashboards/new-nb-dashboard.json
+++ /dev/null
@@ -1,1135 +0,0 @@
-{
-  "dashboard": {
-    "annotations": {
-      "list": [
-        {
-          "datasource": "-- Grafana --",
-          "enable": true,
-          "hide": true,
-          "iconColor": "#C0D8FF",
-          "limit": 100,
-          "name": "Annotation Focus",
-          "showIn": 0,
-          "tags": [
-            "appname:nosqlbench",
-            "layer:$Layer"
-          ],
-          "type": "tags"
-        },
-        {
-          "datasource": "-- Grafana --",
-          "enable": false,
-          "hide": false,
-          "iconColor": "#E0B400",
-          "limit": 2000,
-          "matchAny": true,
-          "name": "All Annotations",
-          "showIn": 0,
-          "tags": [
-            "appname",
-            "layer:$Layer"
-          ],
-          "type": "tags"
-        },
-        {
-          "builtIn": 1,
-          "datasource": "-- Grafana --",
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations & Alerts",
-          "type": "dashboard"
-        }
-      ]
-    },
-    "description": "Dashboard for NoSQLBench 3",
-    "editable": true,
-    "gnetId": null,
-    "graphTooltip": 1,
-    "id": null,
-    "links": [],
-    "panels": [
-      {
-        "collapsed": true,
-        "datasource": null,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 0
-        },
-        "id": 115,
-        "panels": [],
-        "title": "NoSQLBench Metrics Guide",
-        "type": "row"
-      },
-      {
-        "content": "The descriptions below are in the same position as the metric they desscribe.\nYou can collapse this row when you no longer need the descriptions.\nSome of the descriptions have additional details if you scroll with\nyour mouse wheel.\n\n\n",
-        "datasource": null,
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 2,
-          "w": 24,
-          "x": 0,
-          "y": 1
-        },
-        "id": 128,
-        "mode": "markdown",
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "",
-        "transparent": true,
-        "type": "text"
-      },
-      {
-        "content": "These two metrics show the 1-minute averaged ops per second for all ops (successes and errors) and succesful ops (no errors during execution) separately.\n\nWhen there are no errors, these metrics should be the same. When there are errors, there will be a difference. In that case, you can look at the error metrics to learn more about what is happening.\n\nBy comparing these two metrics for any activity, you have a quick first-glance sanity check that your tests are configured properly and\nthat there are no serious configuration or resource issues. In addition, this is the primary throughput metric.\n\n\n\n\n\n",
-        "datasource": null,
-        "description": "",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 3,
-          "w": 6,
-          "x": 0,
-          "y": 3
-        },
-        "id": 117,
-        "mode": "markdown",
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "Ops and Successful Ops",
-        "transparent": true,
-        "type": "text"
-      },
-      {
-        "content": "When an exception is caught and counted in a scenario, a specially named metric is emited which includes a simplified name of the error type.\nEach of these metrics is created as needed in the NoSQLBench runtime.\n\nThese metrics are formated with a name pattern of `errorcounts.NAME` where NAME is the simple name\nof the exception class which was caught during the operation. For example, For an activity\nnamed foo (with alias=foo), you would expect an exception named 'FooTimeoutException' to be shown\nwith a metric name of ...`foo.errorcounts.FooTimeoutException`\n\n\n\n\n",
-        "datasource": null,
-        "description": "",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 3,
-          "w": 6,
-          "x": 6,
-          "y": 3
-        },
-        "id": 118,
-        "mode": "markdown",
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "Error Counts",
-        "transparent": true,
-        "type": "text"
-      },
-      {
-        "content": "The service time distribution is an HDR histogram that represents the time elapsed from when an operation is submitted for execution to when its result has been received.\n\nFrom the vantage point of the NoSQLBench runtime, this is a client-side metric. Thus, the service time captures the processing time that an application would see, including driver logic, wire time (transport), and server-side processing. \n\nThis metric does not include the waittime or the responsetime metrics. These metrics are only meaningful (and provided) when a `cyclerate=` is provided to an activity. When computing the responsetime metric, the servicetime is added to the waittime for a given operation.\n",
-        "datasource": null,
-        "description": "",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 3,
-          "w": 6,
-          "x": 12,
-          "y": 3
-        },
-        "id": 119,
-        "mode": "markdown",
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "Service Time Distribution",
-        "transparent": true,
-        "type": "text"
-      },
-      {
-        "content": "The tries distribution is an HDR histogram which represents how many times an operation was submitted. In a well balanced system,\ntries should be 1 across the board.\n\nEvery operation which is executed within NoSQLBench should have a `tries` metric. For example, with CQL, the number of times an operation is submitted\nbefore it is succesful is ideally 1. If you are overloading your target system, thus forcing resource contention, you may see operations timeout.\n\nBy default, NoSQLBench will try up to 10 times to submit operations before giving up and throwing an error for an operation.\n\nThe tries metric can be used as a low-noise indicator of system saturation. For example, if you are running a system marginally\nbeyond its capacity, the tries for operations will go above 1 at the higher percentiles such as P99. If you increase the load even further, more retries\nwill be needed and less work will be completed, thus showing higher retries at even lower percentiles, like P95, for example.\n\nAs such, you can use the tries metric as an indicator of relative saturation.",
-        "datasource": null,
-        "description": "",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 3,
-          "w": 6,
-          "x": 18,
-          "y": 3
-        },
-        "id": 120,
-        "mode": "markdown",
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "Op Tries Distribution",
-        "transparent": true,
-        "type": "text"
-      },
-      {
-        "content": "This panel shows the P75 service times for the internal stages of NoSQLBench processing. It provides a sanity check to ensure that the client processing time is low and predictable. \n\nIf there are spikes in this data, then you are likely trying to run your workloads on insufficient client hardware. In order to ensure high fidelity results in the other metrics, the client\nneeds to be capable of driving the workload without saturating or introducing signifcant local resource contention.\n\n- **read-input** - the time it takes for a worker thread to acquire a stride (range of cycles) for execution.\n- **bind** - the time it takes to convert a cycle value into a set of fields for us in an operation.\n- **execute** - the time it takes to submit work to a protocol-specific driver.",
-        "datasource": null,
-        "description": "",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 3,
-          "w": 6,
-          "x": 0,
-          "y": 6
-        },
-        "id": 121,
-        "mode": "markdown",
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "P75 NB Internals",
-        "transparent": true,
-        "type": "text"
-      },
-      {
-        "content": "This panel shows the P99 service times for the internal stages of NoSQLBench processing. It provides a sanity check to ensure that the client processing time is low and predictable. \n\nIf there are spikes in this data, then you are likely trying to run your workloads on insufficient client hardware. In order to ensure high fidelity results in the other metrics, the client\nneeds to be capable of driving the workload without saturating or introducing signifcant local resource contention.\n\n- **read-input** - the time it takes for a worker thread to acquire a stride (range of cycles) for execution.\n- **bind** - the time it takes to convert a cycle value into a set of fields for us in an operation.\n- **execute** - the time it takes to submit work to a protocol-specific driver.",
-        "datasource": null,
-        "description": "",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 3,
-          "w": 6,
-          "x": 6,
-          "y": 6
-        },
-        "id": 122,
-        "mode": "markdown",
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "P99 NB Internals",
-        "transparent": true,
-        "type": "text"
-      },
-      {
-        "content": "This panel simply breaks out the service time range in a simpler view. This is a good metric to look at when you want to know what the best and worse case value is for any given histogram interval.\n\nThese values come from a discrete HDR histogram reservoir. They are the actual best and worst service times, unaffected by time-decaying reservoir logic.\n",
-        "datasource": null,
-        "description": "",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 3,
-          "w": 6,
-          "x": 12,
-          "y": 6
-        },
-        "id": 123,
-        "mode": "markdown",
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "Service Time Range",
-        "transparent": true,
-        "type": "text"
-      },
-      {
-        "content": "This is a simple visual reference for the cycle count within each activity. This makes it easy to see the relative progress of an activity over time.",
-        "datasource": null,
-        "description": "",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 3,
-          "w": 6,
-          "x": 18,
-          "y": 6
-        },
-        "id": 124,
-        "mode": "markdown",
-        "timeFrom": null,
-        "timeShift": null,
-        "title": "Cycle Count",
-        "transparent": true,
-        "type": "text"
-      },
-      {
-        "collapsed": false,
-        "datasource": null,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 9
-        },
-        "id": 91,
-        "panels": [],
-        "title": "NoSQLBench Metrics",
-        "type": "row"
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "description": "",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "fill": 1,
-        "fillGradient": 0,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 0,
-          "y": 10
-        },
-        "hiddenSeries": false,
-        "id": 95,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": false,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "options": {
-          "dataLinks": []
-        },
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "result{type=\"avg_rate\",avg_of=\"1m\"}",
-            "interval": "",
-            "legendFormat": "{{alias}}-allops",
-            "refId": "C"
-          },
-          {
-            "expr": "result_success{type=\"avg_rate\",avg_of=\"1m\"}",
-            "interval": "",
-            "legendFormat": "{{alias}}-okops",
-            "refId": "A"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "Ops and Successful Ops",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "transparent": true,
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "fill": 1,
-        "fillGradient": 0,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 6,
-          "y": 10
-        },
-        "hiddenSeries": false,
-        "id": 93,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "connected",
-        "options": {
-          "dataLinks": []
-        },
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "{__name__=~\"errorcounts.*\"}",
-            "interval": "",
-            "legendFormat": "{{alias}}-{{error}}",
-            "refId": "B"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "Error Counts",
-        "tooltip": {
-          "shared": true,
-          "sort": 2,
-          "value_type": "individual"
-        },
-        "transparent": true,
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "fill": 1,
-        "fillGradient": 0,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 12,
-          "y": 10
-        },
-        "hiddenSeries": false,
-        "id": 97,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "rightSide": false,
-          "show": false,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "options": {
-          "dataLinks": []
-        },
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "result_success{type=\"pctile\"}",
-            "hide": false,
-            "interval": "",
-            "legendFormat": "{{alias}}-p{{pctile}}",
-            "refId": "B"
-          },
-          {
-            "expr": "cycles_servicetime{type=\"pctile\"}",
-            "hide": true,
-            "interval": "",
-            "legendFormat": "{{alias}}-{{pctile}}",
-            "refId": "A"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "service time distribution",
-        "tooltip": {
-          "shared": true,
-          "sort": 2,
-          "value_type": "individual"
-        },
-        "transparent": true,
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "ns",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "fill": 1,
-        "fillGradient": 0,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 18,
-          "y": 10
-        },
-        "hiddenSeries": false,
-        "id": 98,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": false,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "options": {
-          "dataLinks": []
-        },
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "tries{type=\"pctile\"}",
-            "interval": "",
-            "legendFormat": "{{alias}}-p{{pctile}}",
-            "refId": "A"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "op tries distribution",
-        "tooltip": {
-          "shared": true,
-          "sort": 2,
-          "value_type": "individual"
-        },
-        "transparent": true,
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "fill": 1,
-        "fillGradient": 0,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 0,
-          "y": 16
-        },
-        "hiddenSeries": false,
-        "id": 99,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": false,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "options": {
-          "dataLinks": []
-        },
-        "percentage": false,
-        "pointradius": 1,
-        "points": true,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"75\"}",
-            "interval": "",
-            "legendFormat": "{{alias}}-{{__name__}}-p{{pctile}}",
-            "refId": "A"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "p75 client overhead",
-        "tooltip": {
-          "shared": true,
-          "sort": 2,
-          "value_type": "individual"
-        },
-        "transparent": true,
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "decimals": null,
-            "format": "ns",
-            "label": null,
-            "logBase": 10,
-            "max": null,
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "fill": 1,
-        "fillGradient": 0,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 6,
-          "y": 16
-        },
-        "hiddenSeries": false,
-        "id": 111,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": false,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "options": {
-          "dataLinks": []
-        },
-        "percentage": false,
-        "pointradius": 1,
-        "points": true,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"99\"}",
-            "format": "time_series",
-            "hide": false,
-            "instant": false,
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "{{alias}}-{{__name__}}-p{{pctile}}",
-            "refId": "C"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "p99 client overhead",
-        "tooltip": {
-          "shared": true,
-          "sort": 2,
-          "value_type": "individual"
-        },
-        "transparent": true,
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "decimals": null,
-            "format": "ns",
-            "label": null,
-            "logBase": 10,
-            "max": null,
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "description": "",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "fill": 2,
-        "fillGradient": 0,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 12,
-          "y": 16
-        },
-        "hiddenSeries": false,
-        "id": 109,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": false,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 2,
-        "links": [],
-        "nullPointMode": "null",
-        "options": {
-          "dataLinks": []
-        },
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "result_success{type=\"pctile\",pctile=\"0\"}",
-            "interval": "",
-            "legendFormat": "{{alias}}-min",
-            "refId": "B"
-          },
-          {
-            "expr": "result_success{type=\"pctile\",pctile=\"100\"}",
-            "interval": "",
-            "legendFormat": "{{alias}}-max",
-            "refId": "A"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "service time range",
-        "tooltip": {
-          "shared": true,
-          "sort": 2,
-          "value_type": "individual"
-        },
-        "transparent": true,
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "ns",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "prometheus",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "fill": 1,
-        "fillGradient": 0,
-        "gridPos": {
-          "h": 6,
-          "w": 6,
-          "x": 18,
-          "y": 16
-        },
-        "hiddenSeries": false,
-        "id": 113,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": false,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "options": {
-          "dataLinks": []
-        },
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "cycles_servicetime{type=\"counter\"}",
-            "interval": "",
-            "legendFormat": "{{alias}}-count",
-            "refId": "C"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "Cycle Count",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "transparent": true,
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      }
-    ],
-    "refresh": false,
-    "schemaVersion": 25,
-    "style": "dark",
-    "tags": [
-      "dse"
-    ],
-    "templating": {
-      "list": []
-    },
-    "time": {
-      "from": "now-5m",
-      "to": "now"
-    },
-    "timepicker": {
-      "refresh_intervals": [
-        "10s",
-        "30s",
-        "1m",
-        "5m",
-        "15m",
-        "30m",
-        "1h",
-        "2h",
-        "1d"
-      ],
-      "time_options": [
-        "5m",
-        "15m",
-        "1h",
-        "6h",
-        "12h",
-        "24h",
-        "2d",
-        "7d",
-        "30d"
-      ]
-    },
-    "timezone": "",
-    "title": "NoSQLBench",
-    "uid": "aIIX1f6Wz",
-    "version": 3
-  }
-}

From 3436ec615ec2beaa4bd928adbb7baf25f63d19d7 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Tue, 8 Dec 2020 15:47:11 -0600
Subject: [PATCH 139/164] trigger build

---
 RELEASENOTES.md          | 49 ++++------------------------------------
 scripts/release-notes.sh |  2 +-
 2 files changed, 5 insertions(+), 46 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index bf5af52e2..e8cdf9237 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,45 +1,4 @@
-- e4f325c4 (origin/main, main) disable test which is present in feature branch
-- 78463838 make main brain build cleanly again
-- 608d1f72 Update DOWNLOADS.md
-- 3d2ff55f auto create apikey
-- cfa92eab package organization
-- 2ab118f4 package organization
-- a23808b3 update appimage build script for j15
-- 7b0e37ab add metrics manifest to polyglot
-- 7e6aa1a2 bump source and target to Java 15
-- 2752fa50 bump major version to 4.0.0-SNAPSHOT
-- 7e880b91 experimental grammar
-- 3f65a054 console friendly metrics summary
-- 146686e0 simplify custom logging configuration
-- d0592454 typos, alignment, cruft
-- 45307081 backfill missing default
-- b7c24642 centralize log4j2 and slf4j stub config
-- 2215fc94 typos, alignment, cruft
-- 0ef26c82 update logger deps for dsegraph
-- 975ea40d merge fixups
-- ae419a26 logging annotator module
-- 6c0632fb grafana annotator module
-- 317ffab4 api for annotations
-- c2cec235 allow configurable delimiter in params parser
-- a09efbe9 consolidate to log4j2
-- 6a523dc4 remove slf4j
-- 67eefbbe fix activity run state bug
-- a88d0376 docker-metrics improvements
-- 667fbdba add log4j2 programmatic configuration
-- 60fa0529 add default log4j configs
-- a3e0739a add FixedValues for double
-- fa85704b add SPI impl selector field 'selector'
-- 4996d206 config API improvements
-- e0498ff2 docs updates
-- e9d2b489 environment API improvements
-- 897a8389 generalize log level to NB
-- a97db87f include JSON support in project API
-- 2c09b8ae typos, culling, and alignment
-- a3a51381 update inactive coords
-- 83136139 generalize op source
-- 089a29d8 grafana api tokens
-- e6e70f71 support DoubleToIntFunction in function matrix
-- 52b029f8 typos, culling, and alignment
-- 4d65dc62 update inactive coords
-- 55edec53 add ToByteBuffer binding function
-- 93e10e6a config model improvements
+- 17ed4c1e (HEAD -> nb4-rc1) annotator and dashboard fixes
+- 4dab9b89 move annotations enums to package
+- 6d514cb6 bump middle version number to required java version '15'
+- fa78e27f set NB4 to Java 15
diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh
index a1cdecd12..9614393b7 100755
--- a/scripts/release-notes.sh
+++ b/scripts/release-notes.sh
@@ -2,7 +2,7 @@
 set -e
 #RELEASE_NOTES_FILE=${RELEASE_NOTES_FILE:?RELEASE_NOTES_FILE must be provided}
 
-git log --oneline --decorate --max-count=1000 main > /tmp/gitlog_main
+git log --oneline --decorate --max-count=1000 nb4-rc1 > /tmp/gitlog_main
 
 readarray lines < /tmp/gitlog_main
 for line in "${lines[@]}"

From af87ef9c548031cfa1479a54a15a70dd70e487ab Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Tue, 8 Dec 2020 17:05:44 -0600
Subject: [PATCH 140/164] relaxed requirement for finicky test

---
 .../engine/core/script/AsyncScriptIntegrationTests.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java b/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
index 5662373dd..8ab46e3ea 100644
--- a/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
+++ b/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
@@ -175,7 +175,7 @@ public class AsyncScriptIntegrationTests {
                 "logs/histostats.csv"));
         String logdata = strings.stream().collect(Collectors.joining("\n"));
         assertThat(logdata).contains("min,p25,p50,p75,p90,p95,");
-        assertThat(logdata.split("Tag=testhistostatslogger.cycles.servicetime,").length).isGreaterThanOrEqualTo(3);
+        assertThat(logdata.split("Tag=testhistostatslogger.cycles.servicetime,").length).isGreaterThanOrEqualTo(2);
     }
 
     @Test

From b4ec4c9aad0bc4ea6d8832163b21123a776c6899 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Tue, 8 Dec 2020 17:06:05 -0600
Subject: [PATCH 141/164] trigger build

---
 RELEASENOTES.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index e8cdf9237..7bcdf2c4a 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,4 +1,6 @@
-- 17ed4c1e (HEAD -> nb4-rc1) annotator and dashboard fixes
+- af87ef9c (HEAD -> nb4-rc1) relaxed requirement for finicky test
+- 3436ec61 (origin/nb4-rc1) trigger build
+- 17ed4c1e annotator and dashboard fixes
 - 4dab9b89 move annotations enums to package
 - 6d514cb6 bump middle version number to required java version '15'
 - fa78e27f set NB4 to Java 15

From 89c84dd2f8aee9e68810a059c13a81b5c3aab92e Mon Sep 17 00:00:00 2001
From: nb-droid <nosqlbenchdroid@gmail.com>
Date: Wed, 9 Dec 2020 00:05:08 +0000
Subject: [PATCH 142/164] [maven-release-plugin] prepare release
 nosqlbench-4.15.3

---
 docsys/pom.xml                 |  6 +++---
 driver-cql-shaded/pom.xml      |  6 +++---
 driver-cqlverify/pom.xml       |  6 +++---
 driver-diag/pom.xml            |  6 +++---
 driver-dsegraph-shaded/pom.xml |  6 +++---
 driver-http/pom.xml            |  6 +++---
 driver-jmx/pom.xml             |  6 +++---
 driver-kafka/pom.xml           |  6 +++---
 driver-mongodb/pom.xml         |  6 +++---
 driver-stdout/pom.xml          |  6 +++---
 driver-tcp/pom.xml             |  8 ++++----
 driver-web/pom.xml             |  6 +++---
 drivers-api/pom.xml            |  6 +++---
 engine-api/pom.xml             | 10 +++++-----
 engine-cli/pom.xml             |  6 +++---
 engine-clients/pom.xml         |  4 ++--
 engine-core/pom.xml            |  8 ++++----
 engine-docker/pom.xml          |  4 ++--
 engine-docs/pom.xml            |  4 ++--
 engine-extensions/pom.xml      |  4 ++--
 engine-rest/pom.xml            |  4 ++--
 mvn-defaults/pom.xml           |  4 ++--
 nb-annotations/pom.xml         |  2 +-
 nb-api/pom.xml                 |  4 ++--
 nb/pom.xml                     | 36 +++++++++++++++++-----------------
 pom.xml                        |  4 ++--
 virtdata-api/pom.xml           |  6 +++---
 virtdata-lang/pom.xml          |  2 +-
 virtdata-lib-basics/pom.xml    |  4 ++--
 virtdata-lib-curves4/pom.xml   |  6 +++---
 virtdata-lib-random/pom.xml    |  6 +++---
 virtdata-lib-realer/pom.xml    |  4 ++--
 virtdata-realdata/pom.xml      |  4 ++--
 virtdata-userlibs/pom.xml      | 16 +++++++--------
 34 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/docsys/pom.xml b/docsys/pom.xml
index 6cc1c6bf7..b2a948d87 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index 8b67ea668..c11f373f3 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.15.3-SNAPSHOT</version>
+            <version>4.15.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.15.3-SNAPSHOT</version>
+            <version>4.15.3</version>
         </dependency>
 
         <dependency>
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index 060e25d1f..8ba305333 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.15.3-SNAPSHOT</version>
+    <version>4.15.3</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cql-shaded</artifactId>
-      <version>4.15.3-SNAPSHOT</version>
+      <version>4.15.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.15.3-SNAPSHOT</version>
+      <version>4.15.3</version>
     </dependency>
 
   </dependencies>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index ad34f43fc..296d6f8dc 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index 837013d64..2db038864 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.15.3-SNAPSHOT</version>
+    <version>4.15.3</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -23,13 +23,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.15.3-SNAPSHOT</version>
+      <version>4.15.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.15.3-SNAPSHOT</version>
+      <version>4.15.3</version>
     </dependency>
 
     <dependency>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index 6cef1456b..c7df1f32d 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index 50175afe6..6708cffad 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.15.3-SNAPSHOT</version>
+            <version>4.15.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.15.3-SNAPSHOT</version>
+            <version>4.15.3</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index 13c5702f8..eb5095c68 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -44,13 +44,13 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-api</artifactId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>driver-stdout</artifactId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
       </dependency>
 
       <!--        <dependency>-->
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index aec776f45..d2d588096 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
         <dependency>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index 87a13a112..625e9c71e 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index ec52ff3f2..eca33d787 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,19 +24,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.15.3-SNAPSHOT</version>
+            <version>4.15.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.15.3-SNAPSHOT</version>
+            <version>4.15.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-            <version>4.15.3-SNAPSHOT</version>
+            <version>4.15.3</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index b9748d1bc..01f049106 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
         <dependency>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index 2fddd31eb..6033b1951 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index 4cf32e487..ff74844d4 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,25 +23,25 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>4.15.3-SNAPSHOT</version>
+            <version>4.15.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.15.3-SNAPSHOT</version>
+            <version>4.15.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>4.15.3-SNAPSHOT</version>
+            <version>4.15.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>4.15.3-SNAPSHOT</version>
+            <version>4.15.3</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index 5956e3794..e1fbce5e0 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index 24a77823e..502102ed6 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.15.3-SNAPSHOT</version>
+    <version>4.15.3</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.15.3-SNAPSHOT</version>
+      <version>4.15.3</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index f3b816118..e8d421812 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-clients</artifactId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index 402278839..9064b2d51 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index 7b077293b..e3e387be0 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.15.3-SNAPSHOT</version>
+    <version>4.15.3</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>docsys</artifactId>
-      <version>4.15.3-SNAPSHOT</version>
+      <version>4.15.3</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index b62ef9a46..ccd0d846b 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index 6e335a978..dd89ca4e3 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
     </dependencies>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 13598ce9a..8915e7def 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>io.nosqlbench</groupId>
   <artifactId>mvn-defaults</artifactId>
-  <version>4.15.3-SNAPSHOT</version>
+  <version>4.15.3</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -90,7 +90,7 @@
   <scm>
     <url>scm:git:https://github.com/nosqlbench/nosqlbench.git</url>
     <!--        <tag>nosqlbench-2.0.102-SNAPSHOT</tag>-->
-    <tag>HEAD</tag>
+    <tag>nosqlbench-4.15.3</tag>
   </scm>
 
   <dependencyManagement>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index 1ac6f35aa..faa6a9674 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 9d976f906..d6d50093f 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.15.3-SNAPSHOT</version>
+    <version>4.15.3</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>nb-annotations</artifactId>
-      <version>4.15.3-SNAPSHOT</version>
+      <version>4.15.3</version>
     </dependency>
 
     <dependency>
diff --git a/nb/pom.xml b/nb/pom.xml
index 5d90c9956..b3341157c 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,31 +24,31 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-rest</artifactId>
-      <version>4.15.3-SNAPSHOT</version>
+      <version>4.15.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-cli</artifactId>
-      <version>4.15.3-SNAPSHOT</version>
+      <version>4.15.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-docs</artifactId>
-      <version>4.15.3-SNAPSHOT</version>
+      <version>4.15.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-core</artifactId>
-      <version>4.15.3-SNAPSHOT</version>
+      <version>4.15.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-extensions</artifactId>
-      <version>4.15.3-SNAPSHOT</version>
+      <version>4.15.3</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -60,67 +60,67 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-web</artifactId>
-      <version>4.15.3-SNAPSHOT</version>
+      <version>4.15.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-kafka</artifactId>
-      <version>4.15.3-SNAPSHOT</version>
+      <version>4.15.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-stdout</artifactId>
-      <version>4.15.3-SNAPSHOT</version>
+      <version>4.15.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-diag</artifactId>
-      <version>4.15.3-SNAPSHOT</version>
+      <version>4.15.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-tcp</artifactId>
-      <version>4.15.3-SNAPSHOT</version>
+      <version>4.15.3</version>
     </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-http</artifactId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-jmx</artifactId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-dsegraph-shaded</artifactId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cql-shaded</artifactId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cqlverify</artifactId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-mongodb</artifactId>
-      <version>4.15.3-SNAPSHOT</version>
+      <version>4.15.3</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -257,7 +257,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-mongodb</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/pom.xml b/pom.xml
index 45a48fc3d..752332a31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
@@ -145,7 +145,7 @@
             scm:git:https://github.com/nosqlbench/nosqlbench.git
         </developerConnection>
         <url>scm:git:git@github.com:nosqlbench/nosqlbench.git</url>
-        <tag>HEAD</tag>
+        <tag>nosqlbench-4.15.3</tag>
     </scm>
 
     <distributionManagement>
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index 7d511c9c9..a1ffdf8fa 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index 9c826d104..d8e099cbb 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index cffc03a05..7adac1d0b 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.15.3-SNAPSHOT</version>
+            <version>4.15.3</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index 2f2b2d6a0..dcd54e586 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index 712df08ba..b81b6c7d4 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index c7c603ff5..ff9cf3547 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>4.15.3-SNAPSHOT</version>
+            <version>4.15.3</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index a32e78f1a..8ad70e485 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index 55ad7c811..cf564f994 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3-SNAPSHOT</version>
+        <version>4.15.3</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,36 +18,36 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-          <version>4.15.3-SNAPSHOT</version>
+          <version>4.15.3</version>
         </dependency>
 
     </dependencies>

From 33bbcd7512d6ea71aefca4c82cedd2013ff52bcd Mon Sep 17 00:00:00 2001
From: nb-droid <nosqlbenchdroid@gmail.com>
Date: Wed, 9 Dec 2020 00:05:16 +0000
Subject: [PATCH 143/164] [maven-release-plugin] prepare for next development
 iteration

---
 docsys/pom.xml                 |  6 +++---
 driver-cql-shaded/pom.xml      |  6 +++---
 driver-cqlverify/pom.xml       |  6 +++---
 driver-diag/pom.xml            |  6 +++---
 driver-dsegraph-shaded/pom.xml |  6 +++---
 driver-http/pom.xml            |  6 +++---
 driver-jmx/pom.xml             |  6 +++---
 driver-kafka/pom.xml           |  6 +++---
 driver-mongodb/pom.xml         |  6 +++---
 driver-stdout/pom.xml          |  6 +++---
 driver-tcp/pom.xml             |  8 ++++----
 driver-web/pom.xml             |  6 +++---
 drivers-api/pom.xml            |  6 +++---
 engine-api/pom.xml             | 10 +++++-----
 engine-cli/pom.xml             |  6 +++---
 engine-clients/pom.xml         |  4 ++--
 engine-core/pom.xml            |  8 ++++----
 engine-docker/pom.xml          |  4 ++--
 engine-docs/pom.xml            |  4 ++--
 engine-extensions/pom.xml      |  4 ++--
 engine-rest/pom.xml            |  4 ++--
 mvn-defaults/pom.xml           |  4 ++--
 nb-annotations/pom.xml         |  2 +-
 nb-api/pom.xml                 |  4 ++--
 nb/pom.xml                     | 36 +++++++++++++++++-----------------
 pom.xml                        |  4 ++--
 virtdata-api/pom.xml           |  6 +++---
 virtdata-lang/pom.xml          |  2 +-
 virtdata-lib-basics/pom.xml    |  4 ++--
 virtdata-lib-curves4/pom.xml   |  6 +++---
 virtdata-lib-random/pom.xml    |  6 +++---
 virtdata-lib-realer/pom.xml    |  4 ++--
 virtdata-realdata/pom.xml      |  4 ++--
 virtdata-userlibs/pom.xml      | 16 +++++++--------
 34 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/docsys/pom.xml b/docsys/pom.xml
index b2a948d87..005065cae 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index c11f373f3..9ecebdbe0 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.15.3</version>
+            <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.15.3</version>
+            <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index 8ba305333..b539857cd 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.15.3</version>
+    <version>4.15.4-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cql-shaded</artifactId>
-      <version>4.15.3</version>
+      <version>4.15.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.15.3</version>
+      <version>4.15.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index 296d6f8dc..9852b7fc1 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index 2db038864..4ec303d37 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.15.3</version>
+    <version>4.15.4-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -23,13 +23,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.15.3</version>
+      <version>4.15.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.15.3</version>
+      <version>4.15.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index c7df1f32d..b120076f2 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index 6708cffad..2668ac4c1 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.15.3</version>
+            <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.15.3</version>
+            <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index eb5095c68..009eb54cf 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -44,13 +44,13 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-api</artifactId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>driver-stdout</artifactId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
       </dependency>
 
       <!--        <dependency>-->
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index d2d588096..8cff06072 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index 625e9c71e..fc584b8fb 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index eca33d787..0400eb8ca 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,19 +24,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.15.3</version>
+            <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.15.3</version>
+            <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-            <version>4.15.3</version>
+            <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index 01f049106..797a84318 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index 6033b1951..95f8bce69 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index ff74844d4..b9f2a5811 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,25 +23,25 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>4.15.3</version>
+            <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.15.3</version>
+            <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>4.15.3</version>
+            <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>4.15.3</version>
+            <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index e1fbce5e0..a5b969986 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index 502102ed6..6b4e44160 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.15.3</version>
+    <version>4.15.4-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.15.3</version>
+      <version>4.15.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index e8d421812..b96f5133b 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-clients</artifactId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index 9064b2d51..ffa085810 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index e3e387be0..732c2261d 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.15.3</version>
+    <version>4.15.4-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>docsys</artifactId>
-      <version>4.15.3</version>
+      <version>4.15.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index ccd0d846b..874e85044 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index dd89ca4e3..7b0f6b202 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 8915e7def..3e8c42f19 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>io.nosqlbench</groupId>
   <artifactId>mvn-defaults</artifactId>
-  <version>4.15.3</version>
+  <version>4.15.4-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -90,7 +90,7 @@
   <scm>
     <url>scm:git:https://github.com/nosqlbench/nosqlbench.git</url>
     <!--        <tag>nosqlbench-2.0.102-SNAPSHOT</tag>-->
-    <tag>nosqlbench-4.15.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencyManagement>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index faa6a9674..c95f77b26 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index d6d50093f..57093f9fe 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.15.3</version>
+    <version>4.15.4-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>nb-annotations</artifactId>
-      <version>4.15.3</version>
+      <version>4.15.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/nb/pom.xml b/nb/pom.xml
index b3341157c..b172883a8 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,31 +24,31 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-rest</artifactId>
-      <version>4.15.3</version>
+      <version>4.15.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-cli</artifactId>
-      <version>4.15.3</version>
+      <version>4.15.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-docs</artifactId>
-      <version>4.15.3</version>
+      <version>4.15.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-core</artifactId>
-      <version>4.15.3</version>
+      <version>4.15.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-extensions</artifactId>
-      <version>4.15.3</version>
+      <version>4.15.4-SNAPSHOT</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -60,67 +60,67 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-web</artifactId>
-      <version>4.15.3</version>
+      <version>4.15.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-kafka</artifactId>
-      <version>4.15.3</version>
+      <version>4.15.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-stdout</artifactId>
-      <version>4.15.3</version>
+      <version>4.15.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-diag</artifactId>
-      <version>4.15.3</version>
+      <version>4.15.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-tcp</artifactId>
-      <version>4.15.3</version>
+      <version>4.15.4-SNAPSHOT</version>
     </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-http</artifactId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-jmx</artifactId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-dsegraph-shaded</artifactId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cql-shaded</artifactId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cqlverify</artifactId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-mongodb</artifactId>
-      <version>4.15.3</version>
+      <version>4.15.4-SNAPSHOT</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -257,7 +257,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-mongodb</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/pom.xml b/pom.xml
index 752332a31..b476f1d26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
@@ -145,7 +145,7 @@
             scm:git:https://github.com/nosqlbench/nosqlbench.git
         </developerConnection>
         <url>scm:git:git@github.com:nosqlbench/nosqlbench.git</url>
-        <tag>nosqlbench-4.15.3</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index a1ffdf8fa..cf7e82e5b 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index d8e099cbb..28031f5e7 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index 7adac1d0b..6d8ba27a7 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.15.3</version>
+            <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index dcd54e586..b07875b1d 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index b81b6c7d4..5c79b6994 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index ff9cf3547..abfd24a5d 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>4.15.3</version>
+            <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index 8ad70e485..d2a13b525 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index cf564f994..5e9b97830 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.3</version>
+        <version>4.15.4-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,36 +18,36 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-          <version>4.15.3</version>
+          <version>4.15.4-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

From 526d09cd62643109b180607cf6e2d90c8a99f3e2 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Tue, 8 Dec 2020 19:44:12 -0600
Subject: [PATCH 144/164] auto create dirs for grafana_apikey

---
 .../engine/clients/grafana/GrafanaMetricsAnnotator.java        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaMetricsAnnotator.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaMetricsAnnotator.java
index 8d23039b2..bd2b1502a 100644
--- a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaMetricsAnnotator.java
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaMetricsAnnotator.java
@@ -13,6 +13,7 @@ import org.apache.logging.log4j.Logger;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.attribute.PosixFilePermissions;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -151,6 +152,8 @@ public class GrafanaMetricsAnnotator implements Annotator, ConfigAware {
 
                 String keyName = "nosqlbench-" + nodeId + "-" + System.currentTimeMillis();
                 ApiToken apiToken = apiClient.createApiToken(keyName, "Admin", Long.MAX_VALUE);
+                Files.createDirectories(keyfilePath.getParent(),
+                        PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwxrwx---")));
                 Files.writeString(keyfilePath, apiToken.getKey());
             } catch (Exception e) {
                 throw new RuntimeException(e);

From bd41039af299128c8f17f9d9ad8be7c10d1958aa Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Tue, 8 Dec 2020 19:44:38 -0600
Subject: [PATCH 145/164] trigger release

---
 RELEASENOTES.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 7bcdf2c4a..4adc2f46d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,5 +1,7 @@
-- af87ef9c (HEAD -> nb4-rc1) relaxed requirement for finicky test
-- 3436ec61 (origin/nb4-rc1) trigger build
+- 526d09cd (HEAD -> nb4-rc1) auto create dirs for grafana_apikey
+- b4ec4c9a (origin/nb4-rc1) trigger build
+- af87ef9c relaxed requirement for finicky test
+- 3436ec61 trigger build
 - 17ed4c1e annotator and dashboard fixes
 - 4dab9b89 move annotations enums to package
 - 6d514cb6 bump middle version number to required java version '15'

From 4520817de3878ffe8040115fa4904d9b91ab323e Mon Sep 17 00:00:00 2001
From: nb-droid <nosqlbenchdroid@gmail.com>
Date: Wed, 9 Dec 2020 01:53:28 +0000
Subject: [PATCH 146/164] [maven-release-plugin] prepare release
 nosqlbench-4.15.4

---
 docsys/pom.xml                 |  6 +++---
 driver-cql-shaded/pom.xml      |  6 +++---
 driver-cqlverify/pom.xml       |  6 +++---
 driver-diag/pom.xml            |  6 +++---
 driver-dsegraph-shaded/pom.xml |  6 +++---
 driver-http/pom.xml            |  6 +++---
 driver-jmx/pom.xml             |  6 +++---
 driver-kafka/pom.xml           |  6 +++---
 driver-mongodb/pom.xml         |  6 +++---
 driver-stdout/pom.xml          |  6 +++---
 driver-tcp/pom.xml             |  8 ++++----
 driver-web/pom.xml             |  6 +++---
 drivers-api/pom.xml            |  6 +++---
 engine-api/pom.xml             | 10 +++++-----
 engine-cli/pom.xml             |  6 +++---
 engine-clients/pom.xml         |  4 ++--
 engine-core/pom.xml            |  8 ++++----
 engine-docker/pom.xml          |  4 ++--
 engine-docs/pom.xml            |  4 ++--
 engine-extensions/pom.xml      |  4 ++--
 engine-rest/pom.xml            |  4 ++--
 mvn-defaults/pom.xml           |  4 ++--
 nb-annotations/pom.xml         |  2 +-
 nb-api/pom.xml                 |  4 ++--
 nb/pom.xml                     | 36 +++++++++++++++++-----------------
 pom.xml                        |  4 ++--
 virtdata-api/pom.xml           |  6 +++---
 virtdata-lang/pom.xml          |  2 +-
 virtdata-lib-basics/pom.xml    |  4 ++--
 virtdata-lib-curves4/pom.xml   |  6 +++---
 virtdata-lib-random/pom.xml    |  6 +++---
 virtdata-lib-realer/pom.xml    |  4 ++--
 virtdata-realdata/pom.xml      |  4 ++--
 virtdata-userlibs/pom.xml      | 16 +++++++--------
 34 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/docsys/pom.xml b/docsys/pom.xml
index 005065cae..f37f0f78e 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index 9ecebdbe0..c7630ff6d 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.15.4-SNAPSHOT</version>
+            <version>4.15.4</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.15.4-SNAPSHOT</version>
+            <version>4.15.4</version>
         </dependency>
 
         <dependency>
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index b539857cd..d0c6f0b80 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.15.4-SNAPSHOT</version>
+    <version>4.15.4</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cql-shaded</artifactId>
-      <version>4.15.4-SNAPSHOT</version>
+      <version>4.15.4</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.15.4-SNAPSHOT</version>
+      <version>4.15.4</version>
     </dependency>
 
   </dependencies>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index 9852b7fc1..97418e6a8 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index 4ec303d37..409d1a013 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.15.4-SNAPSHOT</version>
+    <version>4.15.4</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -23,13 +23,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.15.4-SNAPSHOT</version>
+      <version>4.15.4</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.15.4-SNAPSHOT</version>
+      <version>4.15.4</version>
     </dependency>
 
     <dependency>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index b120076f2..ba38adfd7 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index 2668ac4c1..683b1e24e 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.15.4-SNAPSHOT</version>
+            <version>4.15.4</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.15.4-SNAPSHOT</version>
+            <version>4.15.4</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index 009eb54cf..65104c15e 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -44,13 +44,13 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-api</artifactId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
       </dependency>
 
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>driver-stdout</artifactId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
       </dependency>
 
       <!--        <dependency>-->
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index 8cff06072..51bc1b838 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
         <dependency>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index fc584b8fb..b1fb39d5f 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index 0400eb8ca..2720c39a5 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,19 +24,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.15.4-SNAPSHOT</version>
+            <version>4.15.4</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.15.4-SNAPSHOT</version>
+            <version>4.15.4</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-            <version>4.15.4-SNAPSHOT</version>
+            <version>4.15.4</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index 797a84318..5ef482d94 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
         <dependency>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index 95f8bce69..7efb6c2cc 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index b9f2a5811..c4f56f0af 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,25 +23,25 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>4.15.4-SNAPSHOT</version>
+            <version>4.15.4</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.15.4-SNAPSHOT</version>
+            <version>4.15.4</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>4.15.4-SNAPSHOT</version>
+            <version>4.15.4</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>4.15.4-SNAPSHOT</version>
+            <version>4.15.4</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index a5b969986..09ff0a41e 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index 6b4e44160..2af5b9544 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.15.4-SNAPSHOT</version>
+    <version>4.15.4</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.15.4-SNAPSHOT</version>
+      <version>4.15.4</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index b96f5133b..cf7b9f913 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-clients</artifactId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index ffa085810..c29492429 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index 732c2261d..8b1bd5364 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.15.4-SNAPSHOT</version>
+    <version>4.15.4</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>docsys</artifactId>
-      <version>4.15.4-SNAPSHOT</version>
+      <version>4.15.4</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index 874e85044..612c8263e 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index 7b0f6b202..c9dfb6489 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
     </dependencies>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 3e8c42f19..501ce1405 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>io.nosqlbench</groupId>
   <artifactId>mvn-defaults</artifactId>
-  <version>4.15.4-SNAPSHOT</version>
+  <version>4.15.4</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -90,7 +90,7 @@
   <scm>
     <url>scm:git:https://github.com/nosqlbench/nosqlbench.git</url>
     <!--        <tag>nosqlbench-2.0.102-SNAPSHOT</tag>-->
-    <tag>HEAD</tag>
+    <tag>nosqlbench-4.15.4</tag>
   </scm>
 
   <dependencyManagement>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index c95f77b26..de1c67c5a 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 57093f9fe..05b389780 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.15.4-SNAPSHOT</version>
+    <version>4.15.4</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>nb-annotations</artifactId>
-      <version>4.15.4-SNAPSHOT</version>
+      <version>4.15.4</version>
     </dependency>
 
     <dependency>
diff --git a/nb/pom.xml b/nb/pom.xml
index b172883a8..e1a58a788 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,31 +24,31 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-rest</artifactId>
-      <version>4.15.4-SNAPSHOT</version>
+      <version>4.15.4</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-cli</artifactId>
-      <version>4.15.4-SNAPSHOT</version>
+      <version>4.15.4</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-docs</artifactId>
-      <version>4.15.4-SNAPSHOT</version>
+      <version>4.15.4</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-core</artifactId>
-      <version>4.15.4-SNAPSHOT</version>
+      <version>4.15.4</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-extensions</artifactId>
-      <version>4.15.4-SNAPSHOT</version>
+      <version>4.15.4</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -60,67 +60,67 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-web</artifactId>
-      <version>4.15.4-SNAPSHOT</version>
+      <version>4.15.4</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-kafka</artifactId>
-      <version>4.15.4-SNAPSHOT</version>
+      <version>4.15.4</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-stdout</artifactId>
-      <version>4.15.4-SNAPSHOT</version>
+      <version>4.15.4</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-diag</artifactId>
-      <version>4.15.4-SNAPSHOT</version>
+      <version>4.15.4</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-tcp</artifactId>
-      <version>4.15.4-SNAPSHOT</version>
+      <version>4.15.4</version>
     </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-http</artifactId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-jmx</artifactId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-dsegraph-shaded</artifactId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cql-shaded</artifactId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cqlverify</artifactId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-mongodb</artifactId>
-      <version>4.15.4-SNAPSHOT</version>
+      <version>4.15.4</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -257,7 +257,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-mongodb</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/pom.xml b/pom.xml
index b476f1d26..74f4a61fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
@@ -145,7 +145,7 @@
             scm:git:https://github.com/nosqlbench/nosqlbench.git
         </developerConnection>
         <url>scm:git:git@github.com:nosqlbench/nosqlbench.git</url>
-        <tag>HEAD</tag>
+        <tag>nosqlbench-4.15.4</tag>
     </scm>
 
     <distributionManagement>
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index cf7e82e5b..1b3dcc5d6 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index 28031f5e7..7432a9397 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index 6d8ba27a7..6e85d44eb 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.15.4-SNAPSHOT</version>
+            <version>4.15.4</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index b07875b1d..ec1aef29b 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index 5c79b6994..2e97e443a 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index abfd24a5d..33b7505d5 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>4.15.4-SNAPSHOT</version>
+            <version>4.15.4</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index d2a13b525..2a9dc3567 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index 5e9b97830..148053274 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4-SNAPSHOT</version>
+        <version>4.15.4</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,36 +18,36 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-          <version>4.15.4-SNAPSHOT</version>
+          <version>4.15.4</version>
         </dependency>
 
     </dependencies>

From f34930912c996289215a9a99e4dcf3680cf61b29 Mon Sep 17 00:00:00 2001
From: nb-droid <nosqlbenchdroid@gmail.com>
Date: Wed, 9 Dec 2020 01:53:34 +0000
Subject: [PATCH 147/164] [maven-release-plugin] prepare for next development
 iteration

---
 docsys/pom.xml                 |  6 +++---
 driver-cql-shaded/pom.xml      |  6 +++---
 driver-cqlverify/pom.xml       |  6 +++---
 driver-diag/pom.xml            |  6 +++---
 driver-dsegraph-shaded/pom.xml |  6 +++---
 driver-http/pom.xml            |  6 +++---
 driver-jmx/pom.xml             |  6 +++---
 driver-kafka/pom.xml           |  6 +++---
 driver-mongodb/pom.xml         |  6 +++---
 driver-stdout/pom.xml          |  6 +++---
 driver-tcp/pom.xml             |  8 ++++----
 driver-web/pom.xml             |  6 +++---
 drivers-api/pom.xml            |  6 +++---
 engine-api/pom.xml             | 10 +++++-----
 engine-cli/pom.xml             |  6 +++---
 engine-clients/pom.xml         |  4 ++--
 engine-core/pom.xml            |  8 ++++----
 engine-docker/pom.xml          |  4 ++--
 engine-docs/pom.xml            |  4 ++--
 engine-extensions/pom.xml      |  4 ++--
 engine-rest/pom.xml            |  4 ++--
 mvn-defaults/pom.xml           |  4 ++--
 nb-annotations/pom.xml         |  2 +-
 nb-api/pom.xml                 |  4 ++--
 nb/pom.xml                     | 36 +++++++++++++++++-----------------
 pom.xml                        |  4 ++--
 virtdata-api/pom.xml           |  6 +++---
 virtdata-lang/pom.xml          |  2 +-
 virtdata-lib-basics/pom.xml    |  4 ++--
 virtdata-lib-curves4/pom.xml   |  6 +++---
 virtdata-lib-random/pom.xml    |  6 +++---
 virtdata-lib-realer/pom.xml    |  4 ++--
 virtdata-realdata/pom.xml      |  4 ++--
 virtdata-userlibs/pom.xml      | 16 +++++++--------
 34 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/docsys/pom.xml b/docsys/pom.xml
index f37f0f78e..281fb1882 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index c7630ff6d..2daae02d5 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.15.4</version>
+            <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.15.4</version>
+            <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index d0c6f0b80..8fa57456b 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.15.4</version>
+    <version>4.15.5-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cql-shaded</artifactId>
-      <version>4.15.4</version>
+      <version>4.15.5-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.15.4</version>
+      <version>4.15.5-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index 97418e6a8..593ddcde3 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index 409d1a013..b445ca375 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.15.4</version>
+    <version>4.15.5-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -23,13 +23,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.15.4</version>
+      <version>4.15.5-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.15.4</version>
+      <version>4.15.5-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index ba38adfd7..070b676ae 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index 683b1e24e..8bcd896f4 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.15.4</version>
+            <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.15.4</version>
+            <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index 65104c15e..4a330b5a0 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -44,13 +44,13 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-api</artifactId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>driver-stdout</artifactId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
       </dependency>
 
       <!--        <dependency>-->
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index 51bc1b838..b8ec87e7f 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index b1fb39d5f..d4745c9a9 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index 2720c39a5..01f02bedc 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,19 +24,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.15.4</version>
+            <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.15.4</version>
+            <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-            <version>4.15.4</version>
+            <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index 5ef482d94..2ff90a4a1 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index 7efb6c2cc..c295faa1a 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index c4f56f0af..1274f8ecd 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,25 +23,25 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>4.15.4</version>
+            <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-            <version>4.15.4</version>
+            <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>4.15.4</version>
+            <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>4.15.4</version>
+            <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index 09ff0a41e..6bcc5e654 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index 2af5b9544..6a5061cd8 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.15.4</version>
+    <version>4.15.5-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.15.4</version>
+      <version>4.15.5-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index cf7b9f913..cad9a9018 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-clients</artifactId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index c29492429..028e5a0da 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index 8b1bd5364..69eb64fda 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.15.4</version>
+    <version>4.15.5-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>docsys</artifactId>
-      <version>4.15.4</version>
+      <version>4.15.5-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index 612c8263e..d0bbe0dfe 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index c9dfb6489..a916876d5 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 501ce1405..813c07559 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>io.nosqlbench</groupId>
   <artifactId>mvn-defaults</artifactId>
-  <version>4.15.4</version>
+  <version>4.15.5-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -90,7 +90,7 @@
   <scm>
     <url>scm:git:https://github.com/nosqlbench/nosqlbench.git</url>
     <!--        <tag>nosqlbench-2.0.102-SNAPSHOT</tag>-->
-    <tag>nosqlbench-4.15.4</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencyManagement>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index de1c67c5a..878b6d3a6 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 05b389780..e6ffe3f7b 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.15.4</version>
+    <version>4.15.5-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>nb-annotations</artifactId>
-      <version>4.15.4</version>
+      <version>4.15.5-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/nb/pom.xml b/nb/pom.xml
index e1a58a788..21eec7188 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,31 +24,31 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-rest</artifactId>
-      <version>4.15.4</version>
+      <version>4.15.5-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-cli</artifactId>
-      <version>4.15.4</version>
+      <version>4.15.5-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-docs</artifactId>
-      <version>4.15.4</version>
+      <version>4.15.5-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-core</artifactId>
-      <version>4.15.4</version>
+      <version>4.15.5-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-extensions</artifactId>
-      <version>4.15.4</version>
+      <version>4.15.5-SNAPSHOT</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -60,67 +60,67 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-web</artifactId>
-      <version>4.15.4</version>
+      <version>4.15.5-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-kafka</artifactId>
-      <version>4.15.4</version>
+      <version>4.15.5-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-stdout</artifactId>
-      <version>4.15.4</version>
+      <version>4.15.5-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-diag</artifactId>
-      <version>4.15.4</version>
+      <version>4.15.5-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-tcp</artifactId>
-      <version>4.15.4</version>
+      <version>4.15.5-SNAPSHOT</version>
     </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-http</artifactId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-jmx</artifactId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-dsegraph-shaded</artifactId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cql-shaded</artifactId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cqlverify</artifactId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-mongodb</artifactId>
-      <version>4.15.4</version>
+      <version>4.15.5-SNAPSHOT</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -257,7 +257,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-mongodb</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/pom.xml b/pom.xml
index 74f4a61fa..4c7b02813 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
@@ -145,7 +145,7 @@
             scm:git:https://github.com/nosqlbench/nosqlbench.git
         </developerConnection>
         <url>scm:git:git@github.com:nosqlbench/nosqlbench.git</url>
-        <tag>nosqlbench-4.15.4</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index 1b3dcc5d6..2afa2fac9 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index 7432a9397..d97c18851 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index 6e85d44eb..40f87b931 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.15.4</version>
+            <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index ec1aef29b..ad6b1a345 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index 2e97e443a..856b8a00f 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index 33b7505d5..607578b50 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>4.15.4</version>
+            <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index 2a9dc3567..73352bfe9 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index 148053274..2ee6cd470 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.4</version>
+        <version>4.15.5-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,36 +18,36 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-          <version>4.15.4</version>
+          <version>4.15.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

From 1d107d87541f20630c2602c052120ac4970c037c Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Wed, 9 Dec 2020 16:25:23 -0600
Subject: [PATCH 148/164] update nb4 dashboard def

---
 .../docker/dashboards/nb4-new-dashboard.json  | 2621 +++++++++--------
 1 file changed, 1375 insertions(+), 1246 deletions(-)

diff --git a/engine-docker/src/main/resources/docker/dashboards/nb4-new-dashboard.json b/engine-docker/src/main/resources/docker/dashboards/nb4-new-dashboard.json
index a01ab9384..6be25578f 100644
--- a/engine-docker/src/main/resources/docker/dashboards/nb4-new-dashboard.json
+++ b/engine-docker/src/main/resources/docker/dashboards/nb4-new-dashboard.json
@@ -1,1279 +1,1408 @@
 {
   "dashboard": {
-  "annotations": {
-    "list": [
-      {
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "#C0D8FF",
-        "limit": 100,
-        "name": "Annotation Focus",
-        "showIn": 0,
-        "tags": [
-          "appname:nosqlbench",
-          "layer:$Layer"
-        ],
-        "type": "tags"
-      },
-      {
-        "datasource": "-- Grafana --",
-        "enable": false,
-        "hide": false,
-        "iconColor": "#E0B400",
-        "limit": 2000,
-        "matchAny": true,
-        "name": "All Annotations",
-        "showIn": 0,
-        "tags": [
-          "appname",
-          "layer:$Layer"
-        ],
-        "type": "tags"
-      },
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "description": "Basic Dashboard with Annotations for NoSQLBench 4",
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 1,
-    "id": null,
-    "iteration": 1607447891116,
-  "links": [],
-  "panels": [
-    {
-      "collapsed": true,
-      "datasource": null,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "id": 115,
-      "panels": [
+    "annotations": {
+      "list": [
         {
-          "datasource": null,
-          "fieldConfig": {
-            "defaults": {
-              "custom": {}
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 2,
-            "w": 24,
-            "x": 0,
-            "y": 1
-          },
-          "id": 128,
-          "options": {
-            "content": "The descriptions below are in the same position as the metric they desscribe.\nYou can collapse this row when you no longer need the descriptions.\nSome of the descriptions have additional details if you scroll with\nyour mouse wheel.\n\n\n",
-            "mode": "markdown"
-          },
-          "pluginVersion": "7.3.4",
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "",
-          "transparent": true,
-          "type": "text"
-        },
-        {
-          "datasource": null,
-          "description": "",
-          "fieldConfig": {
-            "defaults": {
-              "custom": {}
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 3,
-            "w": 6,
-            "x": 0,
-            "y": 3
-          },
-          "id": 117,
-          "options": {
-            "content": "These two metrics show the 1-minute averaged ops per second for all ops (successes and errors) and succesful ops (no errors during execution) separately.\n\nWhen there are no errors, these metrics should be the same. When there are errors, there will be a difference. In that case, you can look at the error metrics to learn more about what is happening.\n\nBy comparing these two metrics for any activity, you have a quick first-glance sanity check that your tests are configured properly and\nthat there are no serious configuration or resource issues. In addition, this is the primary throughput metric.\n\n\n\n\n\n",
-            "mode": "markdown"
-          },
-          "pluginVersion": "7.3.4",
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "Ops and Successful Ops",
-          "transparent": true,
-          "type": "text"
-        },
-        {
-          "datasource": null,
-          "description": "",
-          "fieldConfig": {
-            "defaults": {
-              "custom": {}
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 3,
-            "w": 6,
-            "x": 6,
-            "y": 3
-          },
-          "id": 118,
-          "options": {
-            "content": "When an exception is caught and counted in a scenario, a specially named metric is emited which includes a simplified name of the error type.\nEach of these metrics is created as needed in the NoSQLBench runtime.\n\nThese metrics are formated with a name pattern of `errorcounts.NAME` where NAME is the simple name\nof the exception class which was caught during the operation. For example, For an activity\nnamed foo (with alias=foo), you would expect an exception named 'FooTimeoutException' to be shown\nwith a metric name of ...`foo.errorcounts.FooTimeoutException`\n\n\n\n\n",
-            "mode": "markdown"
-          },
-          "pluginVersion": "7.3.4",
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "Error Counts",
-          "transparent": true,
-          "type": "text"
-        },
-        {
-          "datasource": null,
-          "description": "",
-          "fieldConfig": {
-            "defaults": {
-              "custom": {}
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 3,
-            "w": 6,
-            "x": 12,
-            "y": 3
-          },
-          "id": 119,
-          "options": {
-            "content": "The service time distribution is an HDR histogram that represents the time elapsed from when an operation is submitted for execution to when its result has been received.\n\nFrom the vantage point of the NoSQLBench runtime, this is a client-side metric. Thus, the service time captures the processing time that an application would see, including driver logic, wire time (transport), and server-side processing. \n\nThis metric does not include the waittime or the responsetime metrics. These metrics are only meaningful (and provided) when a `cyclerate=` is provided to an activity. When computing the responsetime metric, the servicetime is added to the waittime for a given operation.\n",
-            "mode": "markdown"
-          },
-          "pluginVersion": "7.3.4",
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "Service Time Distribution",
-          "transparent": true,
-          "type": "text"
-        },
-        {
-          "datasource": null,
-          "description": "",
-          "fieldConfig": {
-            "defaults": {
-              "custom": {}
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 3,
-            "w": 6,
-            "x": 18,
-            "y": 3
-          },
-          "id": 120,
-          "options": {
-            "content": "The tries distribution is an HDR histogram which represents how many times an operation was submitted. In a well balanced system,\ntries should be 1 across the board.\n\nEvery operation which is executed within NoSQLBench should have a `tries` metric. For example, with CQL, the number of times an operation is submitted\nbefore it is succesful is ideally 1. If you are overloading your target system, thus forcing resource contention, you may see operations timeout.\n\nBy default, NoSQLBench will try up to 10 times to submit operations before giving up and throwing an error for an operation.\n\nThe tries metric can be used as a low-noise indicator of system saturation. For example, if you are running a system marginally\nbeyond its capacity, the tries for operations will go above 1 at the higher percentiles such as P99. If you increase the load even further, more retries\nwill be needed and less work will be completed, thus showing higher retries at even lower percentiles, like P95, for example.\n\nAs such, you can use the tries metric as an indicator of relative saturation.",
-            "mode": "markdown"
-          },
-          "pluginVersion": "7.3.4",
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "Op Tries Distribution",
-          "transparent": true,
-          "type": "text"
-        },
-        {
-          "datasource": null,
-          "description": "",
-          "fieldConfig": {
-            "defaults": {
-              "custom": {}
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 3,
-            "w": 6,
-            "x": 0,
-            "y": 6
-          },
-          "id": 121,
-          "options": {
-            "content": "This panel shows the P75 service times for the internal stages of NoSQLBench processing. It provides a sanity check to ensure that the client processing time is low and predictable. \n\nIf there are spikes in this data, then you are likely trying to run your workloads on insufficient client hardware. In order to ensure high fidelity results in the other metrics, the client\nneeds to be capable of driving the workload without saturating or introducing signifcant local resource contention.\n\n- **read-input** - the time it takes for a worker thread to acquire a stride (range of cycles) for execution.\n- **bind** - the time it takes to convert a cycle value into a set of fields for us in an operation.\n- **execute** - the time it takes to submit work to a protocol-specific driver.",
-            "mode": "markdown"
-          },
-          "pluginVersion": "7.3.4",
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "P75 NB Internals",
-          "transparent": true,
-          "type": "text"
-        },
-        {
-          "datasource": null,
-          "description": "",
-          "fieldConfig": {
-            "defaults": {
-              "custom": {}
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 3,
-            "w": 6,
-            "x": 6,
-            "y": 6
-          },
-          "id": 122,
-          "options": {
-            "content": "This panel shows the P99 service times for the internal stages of NoSQLBench processing. It provides a sanity check to ensure that the client processing time is low and predictable. \n\nIf there are spikes in this data, then you are likely trying to run your workloads on insufficient client hardware. In order to ensure high fidelity results in the other metrics, the client\nneeds to be capable of driving the workload without saturating or introducing signifcant local resource contention.\n\n- **read-input** - the time it takes for a worker thread to acquire a stride (range of cycles) for execution.\n- **bind** - the time it takes to convert a cycle value into a set of fields for us in an operation.\n- **execute** - the time it takes to submit work to a protocol-specific driver.",
-            "mode": "markdown"
-          },
-          "pluginVersion": "7.3.4",
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "P99 NB Internals",
-          "transparent": true,
-          "type": "text"
-        },
-        {
-          "datasource": null,
-          "description": "",
-          "fieldConfig": {
-            "defaults": {
-              "custom": {}
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 3,
-            "w": 6,
-            "x": 12,
-            "y": 6
-          },
-          "id": 123,
-          "options": {
-            "content": "This panel simply breaks out the service time range in a simpler view. This is a good metric to look at when you want to know what the best and worse case value is for any given histogram interval.\n\nThese values come from a discrete HDR histogram reservoir. They are the actual best and worst service times, unaffected by time-decaying reservoir logic.\n",
-            "mode": "markdown"
-          },
-          "pluginVersion": "7.3.4",
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "Service Time Range",
-          "transparent": true,
-          "type": "text"
-        },
-        {
-          "datasource": null,
-          "description": "",
-          "fieldConfig": {
-            "defaults": {
-              "custom": {}
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 3,
-            "w": 6,
-            "x": 18,
-            "y": 6
-          },
-          "id": 124,
-          "options": {
-            "content": "This is a simple visual reference for the cycle count within each activity. This makes it easy to see the relative progress of an activity over time.",
-            "mode": "markdown"
-          },
-          "pluginVersion": "7.3.4",
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "Cycle Count",
-          "transparent": true,
-          "type": "text"
-        }
-      ],
-      "title": "NoSQLBench Metrics Guide",
-      "type": "row"
-    },
-    {
-      "collapsed": false,
-      "datasource": null,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 1
-      },
-      "id": 91,
-      "panels": [],
-      "title": "NoSQLBench Metrics",
-      "type": "row"
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "prometheus",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "links": []
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 0,
-        "y": 2
-      },
-      "hiddenSeries": false,
-      "id": 95,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "7.3.4",
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "result{type=\"avg_rate\",avg_of=\"1m\",alias=\"$Alias\"}",
-          "interval": "",
-          "legendFormat": "{{alias}}-allops",
-          "refId": "C"
-        },
-        {
-          "expr": "result_success{type=\"avg_rate\",avg_of=\"1m\",alias=\"$Alias\"}",
-          "interval": "",
-          "legendFormat": "{{alias}}-okops",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Ops and Successful Ops",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "transparent": true,
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "prometheus",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "links": []
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 6,
-        "y": 2
-      },
-      "hiddenSeries": false,
-      "id": 93,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "connected",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "7.3.4",
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "{__name__=~\"errorcounts.*\",alias=\"$Alias\"}",
-          "interval": "",
-          "legendFormat": "{{alias}}-{{error}}",
-          "refId": "B"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Error Counts",
-      "tooltip": {
-        "shared": true,
-        "sort": 2,
-        "value_type": "individual"
-      },
-      "transparent": true,
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "prometheus",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "links": []
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 12,
-        "y": 2
-      },
-      "hiddenSeries": false,
-      "id": 97,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "rightSide": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "7.3.4",
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "result_success{type=\"pctile\",alias=\"$Alias\"}",
+          "datasource": "-- Grafana --",
+          "enable": true,
           "hide": false,
-          "interval": "",
-          "legendFormat": "{{alias}}-p{{pctile}}",
-          "refId": "B"
-        },
-        {
-          "expr": "result_success{type=\"pctile\",alias=\"$Alias\"}",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "{{alias}}-p{{pctile}}",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "service time distribution",
-      "tooltip": {
-        "shared": true,
-        "sort": 2,
-        "value_type": "individual"
-      },
-      "transparent": true,
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "ns",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "prometheus",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "links": []
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 18,
-        "y": 2
-      },
-      "hiddenSeries": false,
-      "id": 98,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "7.3.4",
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "tries{type=\"pctile\",alias=\"$Alias\"}",
-          "interval": "",
-          "legendFormat": "{{alias}}-p{{pctile}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "op tries distribution",
-      "tooltip": {
-        "shared": true,
-        "sort": 2,
-        "value_type": "individual"
-      },
-      "transparent": true,
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "prometheus",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "links": []
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 0,
-        "y": 8
-      },
-      "hiddenSeries": false,
-      "id": 99,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "7.3.4",
-      "pointradius": 1,
-      "points": true,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"75\",alias=\"$Alias\"}",
-          "interval": "",
-          "legendFormat": "{{alias}}-{{__name__}}-p{{pctile}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "p75 client overhead",
-      "tooltip": {
-        "shared": true,
-        "sort": 2,
-        "value_type": "individual"
-      },
-      "transparent": true,
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": null,
-          "format": "ns",
-          "label": null,
-          "logBase": 10,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "prometheus",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "links": []
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 6,
-        "y": 8
-      },
-      "hiddenSeries": false,
-      "id": 111,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "7.3.4",
-      "pointradius": 1,
-      "points": true,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"99\",alias=\"$Alias\"}",
-          "format": "time_series",
-          "hide": false,
-          "instant": false,
-          "interval": "",
-          "intervalFactor": 1,
-          "legendFormat": "{{alias}}-{{__name__}}-p{{pctile}}",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "p99 client overhead",
-      "tooltip": {
-        "shared": true,
-        "sort": 2,
-        "value_type": "individual"
-      },
-      "transparent": true,
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": null,
-          "format": "ns",
-          "label": null,
-          "logBase": 10,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "prometheus",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "links": []
-        },
-        "overrides": []
-      },
-      "fill": 2,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 12,
-        "y": 8
-      },
-      "hiddenSeries": false,
-      "id": 109,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "7.3.4",
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "result_success{type=\"pctile\",pctile=\"0\",alias=\"$Alias\"}",
-          "interval": "",
-          "legendFormat": "{{alias}}-min",
-          "refId": "B"
-        },
-        {
-          "expr": "result_success{type=\"pctile\",pctile=\"100\",alias=\"$Alias\"}",
-          "interval": "",
-          "legendFormat": "{{alias}}-max",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "service time range",
-      "tooltip": {
-        "shared": true,
-        "sort": 2,
-        "value_type": "individual"
-      },
-      "transparent": true,
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "ns",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "prometheus",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "links": []
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 18,
-        "y": 8
-      },
-      "hiddenSeries": false,
-      "id": 113,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "7.3.4",
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "cycles_servicetime{type=\"counter\",alias=\"$Alias\"}",
-          "interval": "",
-          "legendFormat": "{{alias}}-count",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Cycle Count",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "transparent": true,
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    }
-  ],
-  "refresh": false,
-  "schemaVersion": 26,
-  "style": "dark",
-  "tags": [
-    "NoSQLBench"
-  ],
-  "templating": {
-    "list": [
-      {
-        "allValue": "",
-        "current": {
-          "selected": true,
-          "tags": [],
-          "text": [
-            "All"
+          "iconColor": "#96D98D",
+          "limit": 1000,
+          "name": "ShowMatching",
+          "showIn": 0,
+          "tags": [
+            "appname:nosqlbench",
+            "span:$span",
+            "layer:$layer"
           ],
-          "value": [
-            "$__all"
-          ]
+          "type": "tags"
         },
-        "datasource": "prometheus",
-        "definition": "{appname=\"nosqlbench\"}",
-        "error": null,
-        "hide": 0,
-        "includeAll": true,
-        "label": "Alias",
-        "multi": true,
-        "name": "Alias",
-        "options": [
+        {
+          "builtIn": 1,
+          "datasource": "-- Grafana --",
+          "enable": true,
+          "hide": true,
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "limit": 100,
+          "name": "Annotations & Alerts",
+          "showIn": 0,
+          "type": "dashboard"
+        },
+        {
+          "datasource": "-- Grafana --",
+          "enable": false,
+          "hide": false,
+          "iconColor": "rgba(255, 96, 96, 1)",
+          "limit": 1000,
+          "matchAny": true,
+          "name": "ShowAll",
+          "showIn": 0,
+          "tags": [
+            "appname:nosqlbench"
+          ],
+          "type": "tags"
+        }
+      ]
+    },
+    "description": "Basic Dashboard with Annotations for NoSQLBench 4",
+    "editable": true,
+    "gnetId": null,
+    "graphTooltip": 1,
+    "id": null,
+    "iteration": 1607542677976,
+    "links": [],
+    "panels": [
+      {
+        "collapsed": true,
+        "datasource": null,
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 0
+        },
+        "id": 130,
+        "panels": [
           {
-            "selected": true,
-            "text": "All",
-            "value": "$__all"
+            "datasource": null,
+            "description": "",
+            "fieldConfig": {
+              "defaults": {
+                "custom": {}
+              },
+              "overrides": []
+            },
+            "gridPos": {
+              "h": 4,
+              "w": 4,
+              "x": 0,
+              "y": 1
+            },
+            "id": 132,
+            "options": {
+              "content": "This selects the specific NoSQLBench alias, which includes workload, named scenario, and step components.\n",
+              "mode": "markdown"
+            },
+            "pluginVersion": "7.3.4",
+            "targets": [
+              {
+                "queryType": "randomWalk",
+                "refId": "A"
+              }
+            ],
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "Alias",
+            "type": "text"
           },
           {
-            "selected": false,
-            "text": "DIAG0",
-            "value": "DIAG0"
+            "datasource": null,
+            "fieldConfig": {
+              "defaults": {
+                "custom": {}
+              },
+              "overrides": []
+            },
+            "gridPos": {
+              "h": 4,
+              "w": 4,
+              "x": 4,
+              "y": 1
+            },
+            "id": 133,
+            "options": {
+              "content": "This chooses an Annotation Layer to focus on. Each layer is a different shell of execution within NoSQLBench.   \n",
+              "mode": "markdown"
+            },
+            "pluginVersion": "7.3.4",
+            "targets": [
+              {
+                "queryType": "randomWalk",
+                "refId": "A"
+              }
+            ],
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "AnLayer",
+            "type": "text"
+          },
+          {
+            "datasource": null,
+            "fieldConfig": {
+              "defaults": {
+                "custom": {}
+              },
+              "overrides": []
+            },
+            "gridPos": {
+              "h": 4,
+              "w": 4,
+              "x": 8,
+              "y": 1
+            },
+            "id": 134,
+            "options": {
+              "content": "This chooses an Annotation Layer to focus on. An instant is a point in time. An Interval is defined by two instants representing start and end times.",
+              "mode": "markdown"
+            },
+            "pluginVersion": "7.3.4",
+            "targets": [
+              {
+                "queryType": "randomWalk",
+                "refId": "A"
+              }
+            ],
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "AnSpan",
+            "type": "text"
           }
         ],
-        "query": "{appname=\"nosqlbench\"}",
-        "refresh": 0,
-        "regex": "/.*alias=\"(\\w+)\".*/",
-        "skipUrlSync": false,
-        "sort": 1,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
+        "title": "NoSQLBench Controls Guide",
+        "type": "row"
       },
       {
-        "allValue": " ",
-        "current": {
-          "selected": true,
-          "text": "Activity",
-          "value": "Activity"
+        "collapsed": true,
+        "datasource": null,
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 1
         },
-        "error": null,
-        "hide": 0,
-        "includeAll": true,
-        "label": "Annotation Filter",
-        "multi": false,
-        "name": "Layer",
-        "options": [
+        "id": 115,
+        "panels": [
           {
-            "selected": false,
-            "text": "All",
-            "value": "$__all"
+            "datasource": null,
+            "fieldConfig": {
+              "defaults": {
+                "custom": {}
+              },
+              "overrides": []
+            },
+            "gridPos": {
+              "h": 2,
+              "w": 24,
+              "x": 0,
+              "y": 2
+            },
+            "id": 128,
+            "options": {
+              "content": "The descriptions below are in the same position as the metric they desscribe.\nYou can collapse this row when you no longer need the descriptions.\nSome of the descriptions have additional details if you scroll with\nyour mouse wheel.\n\n\n",
+              "mode": "markdown"
+            },
+            "pluginVersion": "7.3.4",
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "",
+            "transparent": true,
+            "type": "text"
           },
           {
-            "selected": false,
-            "text": "NONE",
-            "value": "NONE"
+            "datasource": null,
+            "description": "",
+            "fieldConfig": {
+              "defaults": {
+                "custom": {}
+              },
+              "overrides": []
+            },
+            "gridPos": {
+              "h": 3,
+              "w": 6,
+              "x": 0,
+              "y": 4
+            },
+            "id": 117,
+            "options": {
+              "content": "These two metrics show the 1-minute averaged ops per second for all ops (successes and errors) and succesful ops (no errors during execution) separately.\n\nWhen there are no errors, these metrics should be the same. When there are errors, there will be a difference. In that case, you can look at the error metrics to learn more about what is happening.\n\nBy comparing these two metrics for any activity, you have a quick first-glance sanity check that your tests are configured properly and\nthat there are no serious configuration or resource issues. In addition, this is the primary throughput metric.\n\n\n\n\n\n",
+              "mode": "markdown"
+            },
+            "pluginVersion": "7.3.4",
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "Ops and Successful Ops",
+            "transparent": true,
+            "type": "text"
           },
           {
-            "selected": false,
-            "text": "CLI",
-            "value": "CLI"
+            "datasource": null,
+            "description": "",
+            "fieldConfig": {
+              "defaults": {
+                "custom": {}
+              },
+              "overrides": []
+            },
+            "gridPos": {
+              "h": 3,
+              "w": 6,
+              "x": 6,
+              "y": 4
+            },
+            "id": 118,
+            "options": {
+              "content": "When an exception is caught and counted in a scenario, a specially named metric is emited which includes a simplified name of the error type.\nEach of these metrics is created as needed in the NoSQLBench runtime.\n\nThese metrics are formated with a name pattern of `errorcounts.NAME` where NAME is the simple name\nof the exception class which was caught during the operation. For example, For an activity\nnamed foo (with alias=foo), you would expect an exception named 'FooTimeoutException' to be shown\nwith a metric name of ...`foo.errorcounts.FooTimeoutException`\n\n\n\n\n",
+              "mode": "markdown"
+            },
+            "pluginVersion": "7.3.4",
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "Error Counts",
+            "transparent": true,
+            "type": "text"
           },
           {
-            "selected": false,
-            "text": "Scenario",
-            "value": "Scenario"
+            "datasource": null,
+            "description": "",
+            "fieldConfig": {
+              "defaults": {
+                "custom": {}
+              },
+              "overrides": []
+            },
+            "gridPos": {
+              "h": 3,
+              "w": 6,
+              "x": 12,
+              "y": 4
+            },
+            "id": 119,
+            "options": {
+              "content": "The service time distribution is an HDR histogram that represents the time elapsed from when an operation is submitted for execution to when its result has been received.\n\nFrom the vantage point of the NoSQLBench runtime, this is a client-side metric. Thus, the service time captures the processing time that an application would see, including driver logic, wire time (transport), and server-side processing. \n\nThis metric does not include the waittime or the responsetime metrics. These metrics are only meaningful (and provided) when a `cyclerate=` is provided to an activity. When computing the responsetime metric, the servicetime is added to the waittime for a given operation.\n",
+              "mode": "markdown"
+            },
+            "pluginVersion": "7.3.4",
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "Service Time Distribution",
+            "transparent": true,
+            "type": "text"
           },
           {
-            "selected": false,
-            "text": "Script",
-            "value": "Script"
+            "datasource": null,
+            "description": "",
+            "fieldConfig": {
+              "defaults": {
+                "custom": {}
+              },
+              "overrides": []
+            },
+            "gridPos": {
+              "h": 3,
+              "w": 6,
+              "x": 18,
+              "y": 4
+            },
+            "id": 120,
+            "options": {
+              "content": "The tries distribution is an HDR histogram which represents how many times an operation was submitted. In a well balanced system,\ntries should be 1 across the board.\n\nEvery operation which is executed within NoSQLBench should have a `tries` metric. For example, with CQL, the number of times an operation is submitted\nbefore it is succesful is ideally 1. If you are overloading your target system, thus forcing resource contention, you may see operations timeout.\n\nBy default, NoSQLBench will try up to 10 times to submit operations before giving up and throwing an error for an operation.\n\nThe tries metric can be used as a low-noise indicator of system saturation. For example, if you are running a system marginally\nbeyond its capacity, the tries for operations will go above 1 at the higher percentiles such as P99. If you increase the load even further, more retries\nwill be needed and less work will be completed, thus showing higher retries at even lower percentiles, like P95, for example.\n\nAs such, you can use the tries metric as an indicator of relative saturation.",
+              "mode": "markdown"
+            },
+            "pluginVersion": "7.3.4",
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "Op Tries Distribution",
+            "transparent": true,
+            "type": "text"
           },
           {
+            "datasource": null,
+            "description": "",
+            "fieldConfig": {
+              "defaults": {
+                "custom": {}
+              },
+              "overrides": []
+            },
+            "gridPos": {
+              "h": 3,
+              "w": 6,
+              "x": 0,
+              "y": 7
+            },
+            "id": 121,
+            "options": {
+              "content": "This panel shows the P75 service times for the internal stages of NoSQLBench processing. It provides a sanity check to ensure that the client processing time is low and predictable. \n\nIf there are spikes in this data, then you are likely trying to run your workloads on insufficient client hardware. In order to ensure high fidelity results in the other metrics, the client\nneeds to be capable of driving the workload without saturating or introducing signifcant local resource contention.\n\n- **read-input** - the time it takes for a worker thread to acquire a stride (range of cycles) for execution.\n- **bind** - the time it takes to convert a cycle value into a set of fields for us in an operation.\n- **execute** - the time it takes to submit work to a protocol-specific driver.",
+              "mode": "markdown"
+            },
+            "pluginVersion": "7.3.4",
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "P75 NB Internals",
+            "transparent": true,
+            "type": "text"
+          },
+          {
+            "datasource": null,
+            "description": "",
+            "fieldConfig": {
+              "defaults": {
+                "custom": {}
+              },
+              "overrides": []
+            },
+            "gridPos": {
+              "h": 3,
+              "w": 6,
+              "x": 6,
+              "y": 7
+            },
+            "id": 122,
+            "options": {
+              "content": "This panel shows the P99 service times for the internal stages of NoSQLBench processing. It provides a sanity check to ensure that the client processing time is low and predictable. \n\nIf there are spikes in this data, then you are likely trying to run your workloads on insufficient client hardware. In order to ensure high fidelity results in the other metrics, the client\nneeds to be capable of driving the workload without saturating or introducing signifcant local resource contention.\n\n- **read-input** - the time it takes for a worker thread to acquire a stride (range of cycles) for execution.\n- **bind** - the time it takes to convert a cycle value into a set of fields for us in an operation.\n- **execute** - the time it takes to submit work to a protocol-specific driver.",
+              "mode": "markdown"
+            },
+            "pluginVersion": "7.3.4",
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "P99 NB Internals",
+            "transparent": true,
+            "type": "text"
+          },
+          {
+            "datasource": null,
+            "description": "",
+            "fieldConfig": {
+              "defaults": {
+                "custom": {}
+              },
+              "overrides": []
+            },
+            "gridPos": {
+              "h": 3,
+              "w": 6,
+              "x": 12,
+              "y": 7
+            },
+            "id": 123,
+            "options": {
+              "content": "This panel simply breaks out the service time range in a simpler view. This is a good metric to look at when you want to know what the best and worse case value is for any given histogram interval.\n\nThese values come from a discrete HDR histogram reservoir. They are the actual best and worst service times, unaffected by time-decaying reservoir logic.\n",
+              "mode": "markdown"
+            },
+            "pluginVersion": "7.3.4",
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "Service Time Range",
+            "transparent": true,
+            "type": "text"
+          },
+          {
+            "datasource": null,
+            "description": "",
+            "fieldConfig": {
+              "defaults": {
+                "custom": {}
+              },
+              "overrides": []
+            },
+            "gridPos": {
+              "h": 3,
+              "w": 6,
+              "x": 18,
+              "y": 7
+            },
+            "id": 124,
+            "options": {
+              "content": "This is a simple visual reference for the cycle count within each activity. This makes it easy to see the relative progress of an activity over time.",
+              "mode": "markdown"
+            },
+            "pluginVersion": "7.3.4",
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "Cycle Count",
+            "transparent": true,
+            "type": "text"
+          }
+        ],
+        "title": "NoSQLBench Metrics Guide",
+        "type": "row"
+      },
+      {
+        "collapsed": false,
+        "datasource": null,
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 2
+        },
+        "id": 91,
+        "panels": [],
+        "title": "NoSQLBench Metrics",
+        "type": "row"
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "description": "",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {},
+            "links": []
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 0,
+          "y": 3
+        },
+        "hiddenSeries": false,
+        "id": 95,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "7.3.4",
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "result{type=\"avg_rate\",avg_of=\"1m\",alias=~\"$alias\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-allops",
+            "refId": "C"
+          },
+          {
+            "expr": "result{type=\"avg_rate\",avg_of=\"1m\",alias=~\"$alias\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-allops",
+            "refId": "B"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Ops and Successful Ops",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {},
+            "links": []
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 6,
+          "y": 3
+        },
+        "hiddenSeries": false,
+        "id": 93,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": true,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "connected",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "7.3.4",
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "{__name__=~\"errorcounts.*\",alias=~\"$alias\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-{{error}}",
+            "refId": "B"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Error Counts",
+        "tooltip": {
+          "shared": true,
+          "sort": 2,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {},
+            "links": []
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 12,
+          "y": 3
+        },
+        "hiddenSeries": false,
+        "id": 97,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "rightSide": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "7.3.4",
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "result_success{type=\"pctile\",alias=~\"$Alias\"}",
+            "hide": false,
+            "interval": "",
+            "legendFormat": "{{alias}}-p{{pctile}}",
+            "refId": "B"
+          },
+          {
+            "expr": "result_success{type=\"pctile\",alias=~\"$alias\"}",
+            "hide": false,
+            "interval": "",
+            "legendFormat": "{{alias}}-p{{pctile}}",
+            "refId": "C"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "service time distribution",
+        "tooltip": {
+          "shared": true,
+          "sort": 2,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "ns",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {},
+            "links": []
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 18,
+          "y": 3
+        },
+        "hiddenSeries": false,
+        "id": 98,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "7.3.4",
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "tries{type=\"pctile\",alias=~\"$alias\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-p{{pctile}}",
+            "refId": "A"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "op tries distribution",
+        "tooltip": {
+          "shared": true,
+          "sort": 2,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {},
+            "links": []
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 0,
+          "y": 9
+        },
+        "hiddenSeries": false,
+        "id": 99,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "7.3.4",
+        "pointradius": 1,
+        "points": true,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"75\",alias=~\"$alias\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-{{__name__}}-p{{pctile}}",
+            "refId": "B"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "p75 client overhead",
+        "tooltip": {
+          "shared": true,
+          "sort": 2,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "decimals": null,
+            "format": "ns",
+            "label": null,
+            "logBase": 10,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {},
+            "links": []
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 6,
+          "y": 9
+        },
+        "hiddenSeries": false,
+        "id": 111,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "7.3.4",
+        "pointradius": 1,
+        "points": true,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"99\",alias=~\"$alias\"}",
+            "format": "time_series",
+            "hide": false,
+            "instant": false,
+            "interval": "",
+            "intervalFactor": 1,
+            "legendFormat": "{{alias}}-{{__name__}}-p{{pctile}}",
+            "refId": "C"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "p99 client overhead",
+        "tooltip": {
+          "shared": true,
+          "sort": 2,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "decimals": null,
+            "format": "ns",
+            "label": null,
+            "logBase": 10,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "description": "",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {},
+            "links": []
+          },
+          "overrides": []
+        },
+        "fill": 2,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 12,
+          "y": 9
+        },
+        "hiddenSeries": false,
+        "id": 109,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 2,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "7.3.4",
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "result_success{type=\"pctile\",pctile=\"0\",alias=~\"$alias\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-min",
+            "refId": "B"
+          },
+          {
+            "expr": "result_success{type=\"pctile\",pctile=\"100\",alias=~\"$alias\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-max",
+            "refId": "A"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "service time range",
+        "tooltip": {
+          "shared": true,
+          "sort": 2,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "ns",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "prometheus",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {},
+            "links": []
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 6,
+          "w": 6,
+          "x": 18,
+          "y": 9
+        },
+        "hiddenSeries": false,
+        "id": 113,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "7.3.4",
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "cycles_servicetime{type=\"counter\",alias=~\"$alias\"}",
+            "interval": "",
+            "legendFormat": "{{alias}}-count",
+            "refId": "C"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Cycle Count",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "transparent": true,
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      }
+    ],
+    "refresh": "1m",
+    "schemaVersion": 26,
+    "style": "dark",
+    "tags": [
+      "NoSQLBench"
+    ],
+    "templating": {
+      "list": [
+        {
+          "allValue": ".*",
+          "current": {
+            "selected": true,
+            "text": [
+              "All"
+            ],
+            "value": [
+              "$__all"
+            ]
+          },
+          "datasource": "prometheus",
+          "definition": "{appname=\"nosqlbench\"}",
+          "error": null,
+          "hide": 0,
+          "includeAll": true,
+          "label": "Alias",
+          "multi": true,
+          "name": "alias",
+          "options": [],
+          "query": "{appname=\"nosqlbench\"}",
+          "refresh": 2,
+          "regex": "/.*alias=\"([^\"]+)\".*/",
+          "skipUrlSync": false,
+          "sort": 1,
+          "tagValuesQuery": "",
+          "tags": [],
+          "tagsQuery": "",
+          "type": "query",
+          "useTags": false
+        },
+        {
+          "allValue": " ",
+          "current": {
             "selected": true,
             "text": "Activity",
             "value": "Activity"
           },
-          {
+          "error": null,
+          "hide": 0,
+          "includeAll": true,
+          "label": "AnLayer",
+          "multi": false,
+          "name": "layer",
+          "options": [
+            {
+              "selected": false,
+              "text": "All",
+              "value": "$__all"
+            },
+            {
+              "selected": false,
+              "text": "NONE",
+              "value": "NONE"
+            },
+            {
+              "selected": false,
+              "text": "CLI",
+              "value": "CLI"
+            },
+            {
+              "selected": true,
+              "text": "Scenario",
+              "value": "Scenario"
+            },
+            {
+              "selected": false,
+              "text": "Script",
+              "value": "Script"
+            },
+            {
+              "selected": false,
+              "text": "Activity",
+              "value": "Activity"
+            }
+          ],
+          "query": "NONE,CLI,Scenario,Script,Activity",
+          "queryValue": "",
+          "skipUrlSync": false,
+          "type": "custom"
+        },
+        {
+          "allValue": null,
+          "current": {
             "selected": false,
-            "text": "Motor",
-            "value": "Motor"
-          }
-        ],
-        "query": "NONE,CLI,Scenario,Script,Activity,Motor",
-        "queryValue": "",
-        "skipUrlSync": false,
-        "type": "custom"
-      }
-    ]
-  },
-  "time": {
+            "text": "interval",
+            "value": "interval"
+          },
+          "error": null,
+          "hide": 0,
+          "includeAll": false,
+          "label": "AnSpan",
+          "multi": false,
+          "name": "span",
+          "options": [
+            {
+              "selected": false,
+              "text": "NONE",
+              "value": "NONE"
+            },
+            {
+              "selected": false,
+              "text": "interval",
+              "value": "interval"
+            },
+            {
+              "selected": true,
+              "text": "instant",
+              "value": "instant"
+            }
+          ],
+          "query": "NONE,interval,instant",
+          "queryValue": "",
+          "skipUrlSync": false,
+          "type": "custom"
+        }
+      ]
+    },
+    "time": {
       "from": "now-5m",
       "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": [
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ],
-    "time_options": [
-      "5m",
-      "15m",
-      "1h",
-      "6h",
-      "12h",
-      "24h",
-      "2d",
-      "7d",
-      "30d"
-    ]
-  },
-  "timezone": "",
-  "title": "NB4 Dashboard",
-  "uid": "aIIX1f6Wz",
-    "version": 10
-}
+    },
+    "timepicker": {
+      "refresh_intervals": [
+        "10s",
+        "30s",
+        "1m",
+        "5m",
+        "15m",
+        "30m",
+        "1h",
+        "2h",
+        "1d"
+      ],
+      "time_options": [
+        "5m",
+        "15m",
+        "1h",
+        "6h",
+        "12h",
+        "24h",
+        "2d",
+        "7d",
+        "30d"
+      ]
+    },
+    "timezone": "",
+    "title": "NB4 Dashboard",
+    "uid": "aIIX1f6Wz",
+    "version": 8
+  }
 }

From c83f4d87dab9439fce4e8501a2e4d7e8f9ba9657 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Wed, 9 Dec 2020 16:25:30 -0600
Subject: [PATCH 149/164] prototype metrics summarizer

---
 .../analyzer/GrafanaRegionAnalyzer.java       | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzer.java

diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzer.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzer.java
new file mode 100644
index 000000000..70a061c0c
--- /dev/null
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzer.java
@@ -0,0 +1,42 @@
+package io.nosqlbench.engine.clients.grafana.analyzer;
+
+import io.nosqlbench.engine.clients.grafana.By;
+import io.nosqlbench.engine.clients.grafana.GrafanaClient;
+import io.nosqlbench.engine.clients.grafana.GrafanaClientConfig;
+import io.nosqlbench.engine.clients.grafana.transfer.Annotations;
+import io.nosqlbench.engine.clients.grafana.transfer.DashboardResponse;
+import io.nosqlbench.engine.clients.grafana.transfer.GrafanaAnnotation;
+import io.nosqlbench.nb.api.SystemId;
+
+import java.nio.file.Path;
+import java.util.Comparator;
+import java.util.List;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+public class GrafanaRegionAnalyzer {
+
+    public static void main(String[] args) {
+
+        GrafanaClientConfig ccfg = new GrafanaClientConfig();
+        ccfg.setBaseUri("http://18.191.247.162:3000/");
+        GrafanaClient gclient = new GrafanaClient(ccfg);
+        Supplier<String> namer = () -> "nosqlbench-" + SystemId.getNodeId() + "-" + System.currentTimeMillis();
+        gclient.cacheApiToken(namer, "Admin", Long.MAX_VALUE, Path.of("grafana_apikey"), "admin", "admin");
+
+
+        DashboardResponse dashboardResponse = gclient.getDashboardByUid("aIIX1f6Wz");
+
+
+        Annotations annotations = gclient.findAnnotations(By.tag("appname:nosqlbench,layer:Activity"));
+        List<GrafanaAnnotation> mainActivities = annotations.stream()
+                .filter(s -> s.getTagMap().getOrDefault("alias", "").contains("main"))
+                .sorted(Comparator.comparing(t -> t.getTime()))
+                .collect(Collectors.toList());
+        System.out.println("end");
+        GrafanaAnnotation last = mainActivities.get(mainActivities.size() - 1);
+        long start = last.getTime();
+        long end = last.getTimeEnd();
+
+    }
+}

From bb0884e21fdeb3544c8a0971ae67c4f13f233232 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Wed, 9 Dec 2020 16:26:12 -0600
Subject: [PATCH 150/164] grafana client improvements

---
 .../nosqlbench/engine/clients/grafana/By.java | 17 +++--
 .../engine/clients/grafana/GrafanaClient.java | 73 ++++++++++++++++++-
 .../clients/grafana/transfer/Dashboard.java   | 28 +++++++
 .../transfer/DashboardAnnotations.java        |  8 ++
 .../grafana/transfer/DashboardResponse.java   |  9 +++
 .../grafana/transfer/GrafanaAnnotation.java   |  9 +++
 .../clients/grafana/transfer/PanelDef.java    | 24 ++++++
 7 files changed, 159 insertions(+), 9 deletions(-)
 create mode 100644 engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/Dashboard.java
 create mode 100644 engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/DashboardAnnotations.java
 create mode 100644 engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/DashboardResponse.java
 create mode 100644 engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/PanelDef.java

diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/By.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/By.java
index 110b251de..ab5e056b3 100644
--- a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/By.java
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/By.java
@@ -1,6 +1,7 @@
 package io.nosqlbench.engine.clients.grafana;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class By {
@@ -57,8 +58,11 @@ public class By {
         return new By("type", "alert");
     }
 
-    public static By tags(String tag) {
-        return new By("tags", tag);
+    /**
+     * Add one tag at a time, in either "tag" or "tag:value" form.
+     */
+    public static By tag(String tag) {
+        return new By("tag", tag);
     }
 
     public static By id(int id) {
@@ -69,11 +73,12 @@ public class By {
         List<String> tags = new ArrayList<>();
         StringBuilder sb = new StringBuilder();
         for (By by : bys) {
-            if (by.key.equals("tags")) {
-                tags.add(by.value.toString());
+            if (by.key.equals("tag")) {
+                tags.addAll(Arrays.asList(by.value.toString().split(",")));
+            } else {
+                sb.append(by.key).append("=").append(by.value);
+                sb.append("&");
             }
-            sb.append(by.key).append("=").append(by.value);
-            sb.append("&");
         }
         for (String tag : tags) {
             sb.append("tags=").append(tag).append("&");
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClient.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClient.java
index 597977f81..419b5f0f1 100644
--- a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClient.java
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClient.java
@@ -2,13 +2,19 @@ package io.nosqlbench.engine.clients.grafana;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import io.nosqlbench.engine.clients.grafana.transfer.GrafanaAnnotation;
 import io.nosqlbench.engine.clients.grafana.transfer.Annotations;
 import io.nosqlbench.engine.clients.grafana.transfer.ApiTokenRequest;
+import io.nosqlbench.engine.clients.grafana.transfer.DashboardResponse;
+import io.nosqlbench.engine.clients.grafana.transfer.GrafanaAnnotation;
 
+import java.io.File;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.PosixFilePermissions;
+import java.util.function.Supplier;
 
 /**
  * @see <a href="https://grafana.com/docs/grafana/latest/http_api/annotations/">Grafana Annotations API Docs</a>
@@ -179,6 +185,27 @@ public class GrafanaClient {
         return savedGrafanaAnnotation;
     }
 
+    public DashboardResponse getDashboardByUid(String uid) {
+        HttpClient client = config.newClient();
+        HttpRequest.Builder rqb = config.newRequest("api/dashboards/uid/" + uid);
+        rqb = rqb.GET();
+
+        HttpResponse<String> response = null;
+        try {
+            response = client.send(rqb.build(), HttpResponse.BodyHandlers.ofString());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        if (response.statusCode() < 200 || response.statusCode() >= 300) {
+            throw new RuntimeException("Getting dashboard by uid (" + uid + ") failed with status code " + response.statusCode() +
+                    " at baseuri " + config.getBaseUri() + ": " + response.body());
+        }
+        String body = response.body();
+
+        DashboardResponse dashboardResponse = gson.fromJson(body, DashboardResponse.class);
+        return dashboardResponse;
+    }
+
     /**
      * <pre>{@code
      * POST /api/annotations/graphite
@@ -302,13 +329,52 @@ public class GrafanaClient {
         throw new RuntimeException("unimplemented");
     }
 
+    /**
+     * This can be called to create an api token and store it for later use as long as you
+     * have the admin credentials for basic auth. This is preferred to continuing to
+     * passing basic auth for admin privileges. The permissions can now be narrowed or managed
+     * in a modular way.
+     *
+     * @param namer       the principal name for the privelege
+     * @param role        the Grafana role
+     * @param ttl         Length of validity for the granted api token
+     * @param keyfilePath The path of the token. If it is present it will simply be used.
+     * @param un          The basic auth username for the Admin role
+     * @param pw          The basic auth password for the Admin role
+     */
+    public void cacheApiToken(Supplier<String> namer, String role, long ttl, Path keyfilePath, String un, String pw) {
+        if (!Files.exists(keyfilePath)) {
+            GrafanaClientConfig basicClientConfig = config.copy();
+            basicClientConfig = basicClientConfig.basicAuth(un, pw);
+            GrafanaClient apiClient = new GrafanaClient(basicClientConfig);
+            String keyName = namer.get();
+            ApiToken apiToken = apiClient.createApiToken(keyName, role, ttl);
+            try {
+                if (keyfilePath.toString().contains(File.separator)) {
+                    Files.createDirectories(keyfilePath.getParent(),
+                            PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwxrwx---")));
+                }
+                Files.writeString(keyfilePath, apiToken.getKey());
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        GrafanaMetricsAnnotator.AuthWrapper authHeaderSupplier = new GrafanaMetricsAnnotator.AuthWrapper(
+                "Authorization",
+                new GrafanaKeyFileReader(keyfilePath),
+                s -> "Bearer " + s
+        );
+        config.addHeaderSource(authHeaderSupplier);
+    }
+
     public ApiToken createApiToken(String name, String role, long ttl) {
         ApiTokenRequest r = new ApiTokenRequest(name, role, ttl);
-        ApiToken token = postToGrafana(r, ApiToken.class, "gen api token");
+        ApiToken token = postApiTokenRequest(r, ApiToken.class, "gen api token");
         return token;
     }
 
-    private <T> T postToGrafana(Object request, Class<? extends T> clazz, String desc) {
+    private <T> T postApiTokenRequest(Object request, Class<? extends T> clazz, String desc) {
         HttpRequest rq = config.newJsonPOST("api/auth/keys", request);
         HttpClient client = config.newClient();
 
@@ -331,4 +397,5 @@ public class GrafanaClient {
         T result = gson.fromJson(body, clazz);
         return result;
     }
+
 }
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/Dashboard.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/Dashboard.java
new file mode 100644
index 000000000..10c9bfe25
--- /dev/null
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/Dashboard.java
@@ -0,0 +1,28 @@
+package io.nosqlbench.engine.clients.grafana.transfer;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class Dashboard {
+    Map<String, Object> annotations = new HashMap<>();
+    String description;
+    boolean editable;
+    long graphToolTip;
+    long id;
+    long iteration;
+    List<Object> links;
+    List<PanelDef> panels;
+    String refresh;
+    long schemaVersion;
+    String style;
+    List<Object> tags;
+    Map<String, Object> templating;
+    Map<String, Object> time;
+    Map<String, List<String>> timepicker;
+    String timezone;
+    String title;
+    String uid;
+    long version;
+
+}
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/DashboardAnnotations.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/DashboardAnnotations.java
new file mode 100644
index 000000000..242f62ba4
--- /dev/null
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/DashboardAnnotations.java
@@ -0,0 +1,8 @@
+package io.nosqlbench.engine.clients.grafana.transfer;
+
+import java.util.List;
+import java.util.Map;
+
+public class DashboardAnnotations {
+    List<Map<String, Object>> list;
+}
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/DashboardResponse.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/DashboardResponse.java
new file mode 100644
index 000000000..06f0132b9
--- /dev/null
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/DashboardResponse.java
@@ -0,0 +1,9 @@
+package io.nosqlbench.engine.clients.grafana.transfer;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DashboardResponse {
+    Map<String, String> meta = new HashMap<>();
+    Dashboard dashboard;
+}
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GrafanaAnnotation.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GrafanaAnnotation.java
index 058abdca9..f03a2d279 100644
--- a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GrafanaAnnotation.java
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GrafanaAnnotation.java
@@ -171,4 +171,13 @@ public class GrafanaAnnotation {
                 ", data=" + data +
                 '}';
     }
+
+    public LinkedHashMap<String, String> getTagMap() {
+        LinkedHashMap<String, String> map = new LinkedHashMap<>();
+        for (String tag : this.getTags()) {
+            String[] split = tag.split(":", 2);
+            map.put(split[0], (split.length == 2 ? split[1] : null));
+        }
+        return map;
+    }
 }
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/PanelDef.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/PanelDef.java
new file mode 100644
index 000000000..fcefc648c
--- /dev/null
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/PanelDef.java
@@ -0,0 +1,24 @@
+package io.nosqlbench.engine.clients.grafana.transfer;
+
+import java.util.List;
+import java.util.Map;
+
+public class PanelDef {
+    boolean collapsed;
+    Map<String, String> gridPos;
+    long id;
+    List<PanelDef> panels;
+    String description;
+    Map<String, Object> fieldConfig;
+    Map<String, String> options;
+    String pluginVersion;
+    List<Map<String, String>> targets;
+    String title;
+    String type;
+    String datasource;
+
+
+    public String toString() {
+        return id + ":'" + title + "'";
+    }
+}

From 8052e64ead8c0919617889402a74fd99f42ad57b Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Wed, 9 Dec 2020 16:26:35 -0600
Subject: [PATCH 151/164] make docker prom tag configurable

---
 .../main/java/io/nosqlbench/engine/cli/NBCLI.java   |  3 ++-
 .../java/io/nosqlbench/engine/cli/NBCLIOptions.java | 13 +++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
index fe9b1cd57..44930bc46 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
@@ -134,7 +134,8 @@ public class NBCLI {
             logger.info("Docker metrics is enabled. Docker must be installed for this to work");
             DockerMetricsManager dmh = new DockerMetricsManager();
             Map<String, String> dashboardOptions = Map.of(
-                    DockerMetricsManager.GRAFANA_TAG, globalOptions.getDockerGrafanaTag()
+                    DockerMetricsManager.GRAFANA_TAG, globalOptions.getDockerGrafanaTag(),
+                    DockerMetricsManager.PROM_TAG, globalOptions.getDockerPromTag()
             );
             dmh.startMetrics(dashboardOptions);
             String warn = "Docker Containers are started, for grafana and prometheus, hit" +
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
index ac1f55f42..6dda818f0 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
@@ -35,7 +35,6 @@ public class NBCLIOptions {
 
     private static final String METRICS_PREFIX = "--metrics-prefix";
 
-    //    private static final String ANNOTATE_TO_GRAFANA = "--grafana-baseurl";
     private static final String ANNOTATE_EVENTS = "--annotate";
     private static final String ANNOTATORS_CONFIG = "--annotators";
     private static final String DEFAULT_ANNOTATORS = "all";
@@ -86,11 +85,12 @@ public class NBCLIOptions {
     private final static String ENABLE_CHART = "--enable-chart";
     private final static String DOCKER_METRICS = "--docker-metrics";
     private final static String DOCKER_METRICS_AT = "--docker-metrics-at";
+    private static final String DOCKER_GRAFANA_TAG = "--docker-grafana-tag";
+    private static final String DOCKER_PROM_TAG = "--docker-prom-tag";
 
     private static final String GRAALJS_ENGINE = "--graaljs";
     private static final String NASHORN_ENGINE = "--nashorn";
     private static final String GRAALJS_COMPAT = "--graaljs-compat";
-    private static final String DOCKER_GRAFANA_TAG = "--docker-grafana-tag";
 
     private static final String DEFAULT_CONSOLE_LOGGING_PATTERN = "%7r %-5level [%t] %-12logger{0} %msg%n%throwable";
 
@@ -136,6 +136,7 @@ public class NBCLIOptions {
     private boolean graaljs_compat = false;
     private int hdr_digits = 3;
     private String docker_grafana_tag = "7.3.4";
+    private String docker_prom_tag = "latest";
     private boolean showStackTraces = false;
     private boolean compileScript = false;
     private String scriptFile = null;
@@ -283,6 +284,10 @@ public class NBCLIOptions {
                     arglist.removeFirst();
                     workspacesDirectory = readWordOrThrow(arglist, "a workspaces directory");
                     break;
+                case DOCKER_PROM_TAG:
+                    arglist.removeFirst();
+                    docker_prom_tag = readWordOrThrow(arglist, "prometheus docker tag");
+                    break;
                 case DOCKER_GRAFANA_TAG:
                     arglist.removeFirst();
                     docker_grafana_tag = readWordOrThrow(arglist, "grafana docker tag");
@@ -764,6 +769,10 @@ public class NBCLIOptions {
         return docker_grafana_tag;
     }
 
+    public String getDockerPromTag() {
+        return docker_prom_tag;
+    }
+
     public static class LoggerConfigData {
         public String file;
         public String pattern = ".*";

From 12acd07f4c2c5558c19ea6b149162ae7907b79bd Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Wed, 9 Dec 2020 16:27:25 -0600
Subject: [PATCH 152/164] parameterize docker prom tag

---
 .../engine/docker/DockerMetricsManager.java         | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java
index bf9262255..7208b6985 100644
--- a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java
+++ b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java
@@ -29,6 +29,7 @@ import static io.nosqlbench.engine.docker.RestHelper.post;
 public class DockerMetricsManager {
 
     public static final String GRAFANA_TAG = "grafana_tag";
+    public static final String PROM_TAG = "prom_tag";
 
     private final DockerHelper dh;
 
@@ -44,7 +45,7 @@ public class DockerMetricsManager {
 
         String ip = startGraphite();
 
-        startPrometheus(ip);
+        startPrometheus(ip, options.get(PROM_TAG));
 
         startGrafana(ip, options.get(GRAFANA_TAG));
 
@@ -71,9 +72,9 @@ public class DockerMetricsManager {
         );
         List<String> envList = Arrays.asList(
                 "GF_SECURITY_ADMIN_PASSWORD=admin",
-                "GF_AUTH_ANONYMOUS_ENABLED=\"true\"",
-                "GF_SNAPSHOTS_EXTERNAL_SNAPSHOT_URL=https://assethub.datastax.com:3001",
-                "GF_SNAPSHOTS_EXTERNAL_SNAPSHOT_NAME=\"Upload to DataStax\""
+                "GF_AUTH_ANONYMOUS_ENABLED=\"true\""
+//                , "GF_SNAPSHOTS_EXTERNAL_SNAPSHOT_URL=https://assethub.datastax.com:3001",
+//                "GF_SNAPSHOTS_EXTERNAL_SNAPSHOT_NAME=\"Upload to DataStax\""
         );
 
         String reload = null;
@@ -93,12 +94,10 @@ public class DockerMetricsManager {
         }
     }
 
-    private void startPrometheus(String ip) {
+    private void startPrometheus(String ip, String tag) {
 
         logger.info("preparing to start docker metrics");
         String PROMETHEUS_IMG = "prom/prometheus";
-        String tag = "latest";
-//        String tag = "v2.20.1";
         String name = "prom";
         List<Integer> port = Arrays.asList(9090);
 

From 0780005958e74666f5621cc983f5f03a362f6f8f Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Wed, 9 Dec 2020 16:27:31 -0600
Subject: [PATCH 153/164] move grafana auto-key to grafana client

---
 .../grafana/GrafanaMetricsAnnotator.java      | 50 ++++++++++---------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaMetricsAnnotator.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaMetricsAnnotator.java
index bd2b1502a..c93bb1e48 100644
--- a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaMetricsAnnotator.java
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaMetricsAnnotator.java
@@ -11,9 +11,7 @@ import io.nosqlbench.nb.api.config.*;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.attribute.PosixFilePermissions;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -143,34 +141,38 @@ public class GrafanaMetricsAnnotator implements Annotator, ConfigAware {
             keyfilePath = apikeyLocation.map(Path::of).orElseThrow();
         }
 
-        if (!Files.exists(keyfilePath)) {
-            logger.info("Auto-configuring grafana apikey.");
-            GrafanaClientConfig apiClientConf = gc.copy().basicAuth("admin", "admin");
-            GrafanaClient apiClient = new GrafanaClient(apiClientConf);
-            try {
-                String nodeId = SystemId.getNodeId();
 
-                String keyName = "nosqlbench-" + nodeId + "-" + System.currentTimeMillis();
-                ApiToken apiToken = apiClient.createApiToken(keyName, "Admin", Long.MAX_VALUE);
-                Files.createDirectories(keyfilePath.getParent(),
-                        PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwxrwx---")));
-                Files.writeString(keyfilePath, apiToken.getKey());
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        AuthWrapper authHeaderSupplier = new AuthWrapper(
-                "Authorization",
-                new GrafanaKeyFileReader(keyfilePath),
-                s -> "Bearer " + s
-        );
-        gc.addHeaderSource(authHeaderSupplier);
+//        if (!Files.exists(keyfilePath)) {
+//            logger.info("Auto-configuring grafana apikey.");
+//            GrafanaClientConfig apiClientConf = gc.copy().basicAuth("admin", "admin");
+//            GrafanaClient apiClient = new GrafanaClient(apiClientConf);
+//            try {
+//                String nodeId = SystemId.getNodeId();
+//
+//                String keyName = "nosqlbench-" + nodeId + "-" + System.currentTimeMillis();
+//                ApiToken apiToken = apiClient.createApiToken(keyName, "Admin", Long.MAX_VALUE);
+//                Files.createDirectories(keyfilePath.getParent(),
+//                        PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwxrwx---")));
+//                Files.writeString(keyfilePath, apiToken.getKey());
+//            } catch (Exception e) {
+//                throw new RuntimeException(e);
+//            }
+//        }
+//
+//        AuthWrapper authHeaderSupplier = new AuthWrapper(
+//                "Authorization",
+//                new GrafanaKeyFileReader(keyfilePath),
+//                s -> "Bearer " + s
+//        );
+//        gc.addHeaderSource(authHeaderSupplier);
 
         this.onError = OnError.valueOfName(cfg.get("onerror").toString());
 
         this.client = new GrafanaClient(gc);
 
+        String keyName = "nosqlbench-" + SystemId.getNodeId() + "-" + System.currentTimeMillis();
+        Supplier<String> namer = () -> "nosqlbench-" + SystemId.getNodeId() + "-" + System.currentTimeMillis();
+        this.client.cacheApiToken(namer, "Admin", Long.MAX_VALUE, keyfilePath, "admin", "admin");
 
     }
 

From 832da1854845a6326db13d878d55641fb2d6e79e Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Fri, 11 Dec 2020 15:17:03 -0600
Subject: [PATCH 154/164] qualify docker image search with tags

---
 .../engine/docker/DockerHelper.java           | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java
index dd1bd4e46..1901a372a 100644
--- a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java
+++ b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java
@@ -50,43 +50,28 @@ public class DockerHelper {
 
         boolean existingContainer = removeExitedContainers(name);
 
-        /*
-        if(startStoppedContainer(name)){
-            return null;
-        };
-         */
-
         Container containerId = searchContainer(name, reload, tag);
         if (containerId != null) {
             logger.debug("container is already up with the id: " + containerId.getId());
             return null;
         }
 
-        Info info = dockerClient.infoCmd().exec();
-        dockerClient.buildImageCmd();
+        boolean found;
 
-//        String term = IMG+":"+tag;
-
-//        String term = IMG.split("/")[1];
-        //List<SearchItem> dockerSearch = dockerClient.searchImagesCmd(term).exec();
-        List<Image> dockerList = dockerClient
-                .listImagesCmd()
-                .withImageNameFilter(IMG + ":" + tag)
-                .exec();
-        if (dockerList.size() == 0) {
+        List<Image> images = dockerClient.listImagesCmd().withImageNameFilter(IMG).exec();
+        if (!found(images, IMG, List.of(tag))) {
             dockerClient.pullImageCmd(IMG)
                     .withTag(tag)
                     .exec(new PullImageResultCallback()).awaitSuccess();
 
-            dockerList = dockerClient.listImagesCmd().withImageNameFilter(IMG + ":" + tag).exec();
-            if (dockerList.size() == 0) {
+            images = dockerClient.listImagesCmd().withImageNameFilter(IMG).exec();
+            if (!found(images, IMG, List.of(tag))) {
                 logger.error(String.format("Image %s not found, unable to automatically pull image." +
                                 " Check `docker images`",
                         IMG));
                 System.exit(1);
             }
         }
-        logger.info("Search returned" + dockerList.toString());
 
 
         List<ExposedPort> tcpPorts = new ArrayList<>();
@@ -112,7 +97,7 @@ public class DockerHelper {
 
         List<Link> links = linkNames.stream().map(x -> new Link(x, x)).collect(Collectors.toList());
         CreateContainerCmd builder = dockerClient.createContainerCmd(IMG + ":" + tag);
-        if (cmdList!=null) {
+        if (cmdList != null) {
             builder = builder.withCmd(cmdList);
         }
 
@@ -124,7 +109,7 @@ public class DockerHelper {
                 .withBinds(volumeBindList));
         builder = builder.withName(name);
         builder = builder.withLinks(links);
-        if (envList!=null) {
+        if (envList != null) {
             builder = builder.withEnv(envList);
         }
         CreateContainerResponse containerResponse = builder.exec();
@@ -238,4 +223,20 @@ public class DockerHelper {
         }
 
     }
+
+    private boolean found(List<Image> images, String label, List<String> tags) {
+        List<String> validRepoTags = tags.stream().map(s -> label + ":" + s).collect(Collectors.toList());
+        for (Image image : images) {
+            String[] foundRepoTags = image.getRepoTags();
+            for (String foundRepoTag : foundRepoTags) {
+                for (String validRepoTag : validRepoTags) {
+                    if (foundRepoTag.equals(validRepoTag)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
 }

From bd97680ce8b2e3b9c9ac4cd2aca71cdc17218b48 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 14 Dec 2020 10:42:50 -0600
Subject: [PATCH 155/164] allow prereleases from main for nb4

---
 .github/workflows/release.yml | 4 ++--
 scripts/release-perform.sh    | 3 ++-
 scripts/release-prepare.sh    | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ad11d6740..57f59ceff 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -108,8 +108,8 @@ jobs:
       - name: prepare Maven release
         run: scripts/release-prepare.sh
         env:
-          RELEASE_BRANCH_NAME: "main"
-          PRERELEASE_BRANCH_PATTERN: "-rc"
+          RELEASE_BRANCH_PATTERN: "release"
+          PRERELEASE_BRANCH_PATTERN: "main"
           GIT_RELEASE_BOT_NAME: "nb-droid"
           GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }}
           ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }}
diff --git a/scripts/release-perform.sh b/scripts/release-perform.sh
index 2ae4aae49..c21914fd5 100755
--- a/scripts/release-perform.sh
+++ b/scripts/release-perform.sh
@@ -22,8 +22,9 @@ fi
 PRERELEASE_BRANCH_PATTERN=${PRERELEASE_BRANCH_PATTERN:?PRERELEASE_BRANCH_PATTERN must be provided}
 # Filter the branch to execute the release on
 readonly local current_branch=$(git rev-parse --abbrev-ref HEAD)
+
 echo "Current branch: ${branch}"
-if [[ -n "$RELEASE_BRANCH_NAME" && "${current_branch}" = "$RELEASE_BRANCH_NAME" ]]; then
+if   [[ -n "${current_branch}" && "${current_branch}" == *"${RELEASE_BRANCH_PATTERN}"* ]]; then
     echo "Building for release branch $RELEASE_BRANCH_NAME"
 elif [[ -n "${current_branch}" && "${current_branch}" == *"${PRERELEASE_BRANCH_PATTERN}"* ]]; then
     echo "Building prerelease for branch $RELEASE_BRANCH_NAME"
diff --git a/scripts/release-prepare.sh b/scripts/release-prepare.sh
index ea84d7ea8..58f5fbde9 100755
--- a/scripts/release-prepare.sh
+++ b/scripts/release-prepare.sh
@@ -13,7 +13,8 @@ PRERELEASE_BRANCH_PATTERN=${PRERELEASE_BRANCH_PATTERN:?PRERELEASE_BRANCH_PATTERN
 # Filter the branch to execute the release on
 readonly local current_branch=$(git rev-parse --abbrev-ref HEAD)
 echo "Current branch: ${current_branch}"
-if [[ -n "$RELEASE_BRANCH_NAME" && "${current_branch}" = "$RELEASE_BRANCH_NAME" ]]; then
+
+if   [[ -n "${current_branch}" && "${current_branch}" == *"${RELEASE_BRANCH_PATTERN}"* ]]; then
     echo "Building for release branch $RELEASE_BRANCH_NAME"
 elif [[ -n "${current_branch}" && "${current_branch}" == *"${PRERELEASE_BRANCH_PATTERN}"* ]]; then
     echo "Building prerelease for branch $RELEASE_BRANCH_NAME"

From 402ca1a9be171464601e620d729709d96b1a2f3d Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 14 Dec 2020 10:44:22 -0600
Subject: [PATCH 156/164] trigger release

---
 RELEASENOTES.md                                    | 14 ++++++--------
 .../grafana/transfer/DashboardSnapshot.java        |  4 ++++
 2 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/DashboardSnapshot.java

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 4adc2f46d..290735dfb 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,8 +1,6 @@
-- 526d09cd (HEAD -> nb4-rc1) auto create dirs for grafana_apikey
-- b4ec4c9a (origin/nb4-rc1) trigger build
-- af87ef9c relaxed requirement for finicky test
-- 3436ec61 trigger build
-- 17ed4c1e annotator and dashboard fixes
-- 4dab9b89 move annotations enums to package
-- 6d514cb6 bump middle version number to required java version '15'
-- fa78e27f set NB4 to Java 15
+- 07800059 move grafana auto-key to grafana client
+- 12acd07f parameterize docker prom tag
+- 8052e64e make docker prom tag configurable
+- bb0884e2 grafana client improvements
+- c83f4d87 prototype metrics summarizer
+- 1d107d87 update nb4 dashboard def
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/DashboardSnapshot.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/DashboardSnapshot.java
new file mode 100644
index 000000000..5e9d173d4
--- /dev/null
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/DashboardSnapshot.java
@@ -0,0 +1,4 @@
+package io.nosqlbench.engine.clients.grafana.transfer;
+
+public class DashboardSnapshot {
+}

From f8b7767c8cfed92fde13163f45b24133b8e55acb Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 14 Dec 2020 10:50:27 -0600
Subject: [PATCH 157/164] build fix

---
 .github/workflows/release.yml                          |  2 +-
 .../engine/clients/grafana/GrafanaClient.java          | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 57f59ceff..8f8af2451 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
       - name: setup java
         uses: actions/setup-java@v1
         with:
-        java-version: '15'
+          java-version: '15'
           java-package: jdk
           architecture: x64
 
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClient.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClient.java
index 419b5f0f1..e1363a1f0 100644
--- a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClient.java
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClient.java
@@ -2,10 +2,7 @@ package io.nosqlbench.engine.clients.grafana;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import io.nosqlbench.engine.clients.grafana.transfer.Annotations;
-import io.nosqlbench.engine.clients.grafana.transfer.ApiTokenRequest;
-import io.nosqlbench.engine.clients.grafana.transfer.DashboardResponse;
-import io.nosqlbench.engine.clients.grafana.transfer.GrafanaAnnotation;
+import io.nosqlbench.engine.clients.grafana.transfer.*;
 
 import java.io.File;
 import java.net.http.HttpClient;
@@ -185,6 +182,7 @@ public class GrafanaClient {
         return savedGrafanaAnnotation;
     }
 
+
     public DashboardResponse getDashboardByUid(String uid) {
         HttpClient client = config.newClient();
         HttpRequest.Builder rqb = config.newRequest("api/dashboards/uid/" + uid);
@@ -206,6 +204,10 @@ public class GrafanaClient {
         return dashboardResponse;
     }
 
+    public DashboardSnapshot createSnapshot() {
+
+    }
+
     /**
      * <pre>{@code
      * POST /api/annotations/graphite

From cf1de73261b3575a9bbbf69b2f6eea9a0a7700b9 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 14 Dec 2020 10:52:01 -0600
Subject: [PATCH 158/164] trigger release

---
 RELEASENOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 290735dfb..9cd57bbc6 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -4,3 +4,4 @@
 - bb0884e2 grafana client improvements
 - c83f4d87 prototype metrics summarizer
 - 1d107d87 update nb4 dashboard def
+- release testing

From 9f2e48a1a68a6ca0f3c9a9ce287eaf156aacdfc0 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 14 Dec 2020 11:02:49 -0600
Subject: [PATCH 159/164] fix build scripts

---
 scripts/release-perform.sh | 5 +++--
 scripts/release-prepare.sh | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/release-perform.sh b/scripts/release-perform.sh
index c21914fd5..dc7c40b37 100755
--- a/scripts/release-perform.sh
+++ b/scripts/release-perform.sh
@@ -5,7 +5,9 @@ set -x
 GIT_RELEASE_BOT_NAME=${GIT_RELEASE_BOT_NAME:?GIT_RELEASE_BOT_NAME must be provided}
 GITHUB_SHA=${GITHUB_SHA:?GITHUB_SHA must be provided}
 GITHUB_REF=${GITHUB_REF:?GITHUB_REF must be provided}
-RELEASE_BRANCH_NAME=${RELEASE_BRANCH_NAME:?RELEASE_BRANCH_NAME must be provided}
+RELEASE_BRANCH_PATTERN=${RELEASE_BRANCH_PATTERN:?RELEASE_BRANCH_PATTERN must be provided}
+PRERELEASE_BRANCH_PATTERN=${PRERELEASE_BRANCH_PATTERN:?PRERELEASE_BRANCH_PATTERN must be provided}
+
 #MAVEN_LOCAL_REPO_PATH=${MAVEN_LOCAL_REPO_PATH:?MAVEN_LOCAL_REPO_PATH must be provided}
 #MAVEN_REPO_LOCAL=${MAVEN_REPO_LOCAL:?MAVEN_REPO_LOCAL must be provided}
 #MAVEN_ARGS=${MAVEN_ARGS:?MAVEN_ARGS must be provided}
@@ -19,7 +21,6 @@ if [[ "${last_release_commit_hash}" = "${GITHUB_SHA}" ]]; then
      exit 0
 fi
 
-PRERELEASE_BRANCH_PATTERN=${PRERELEASE_BRANCH_PATTERN:?PRERELEASE_BRANCH_PATTERN must be provided}
 # Filter the branch to execute the release on
 readonly local current_branch=$(git rev-parse --abbrev-ref HEAD)
 
diff --git a/scripts/release-prepare.sh b/scripts/release-prepare.sh
index 58f5fbde9..cac045fd6 100755
--- a/scripts/release-prepare.sh
+++ b/scripts/release-prepare.sh
@@ -5,7 +5,7 @@ set -x
 GIT_RELEASE_BOT_NAME=${GIT_RELEASE_BOT_NAME:?GIT_RELEASE_BOT_NAME must be provided}
 GITHUB_SHA=${GITHUB_SHA:?GITHUB_SHA must be provided}
 GITHUB_REF=${GITHUB_REF:?GITHUB_REF must be provided}
-RELEASE_BRANCH_NAME=${RELEASE_BRANCH_NAME:?RELEASE_BRANCH_NAME must be provided}
+RELEASE_BRANCH_PATTERN=${RELEASE_BRANCH_PATTERN:?RELEASE_BRANCH_PATTERN must be provided}
 PRERELEASE_BRANCH_PATTERN=${PRERELEASE_BRANCH_PATTERN:?PRERELEASE_BRANCH_PATTERN must be provided}
 
 #git rev-parse --abbrev-ref HEAD

From 77954b14dac312b4515a20a04006b92499e089ca Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 14 Dec 2020 11:03:05 -0600
Subject: [PATCH 160/164] trigger release

---
 RELEASENOTES.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 9cd57bbc6..290735dfb 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -4,4 +4,3 @@
 - bb0884e2 grafana client improvements
 - c83f4d87 prototype metrics summarizer
 - 1d107d87 update nb4 dashboard def
-- release testing

From 774e91eda8d5a94a6d5b8f8f5f1ed81bcb64ed3d Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 14 Dec 2020 11:13:25 -0600
Subject: [PATCH 161/164] fix build

---
 .../io/nosqlbench/engine/clients/grafana/GrafanaClient.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClient.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClient.java
index e1363a1f0..078bb9bda 100644
--- a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClient.java
+++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClient.java
@@ -205,7 +205,7 @@ public class GrafanaClient {
     }
 
     public DashboardSnapshot createSnapshot() {
-
+        return null;
     }
 
     /**

From 39f0759c8c0dda3830c4015b45d2e43b728f9b36 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 14 Dec 2020 11:21:45 -0600
Subject: [PATCH 162/164] trigger release

---
 RELEASENOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 290735dfb..af8b5a871 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -4,3 +4,4 @@
 - bb0884e2 grafana client improvements
 - c83f4d87 prototype metrics summarizer
 - 1d107d87 update nb4 dashboard def
+- trigger release

From c3dafed7e9f55d810b0b4dc0cb940ec0c5880d46 Mon Sep 17 00:00:00 2001
From: nb-droid <nosqlbenchdroid@gmail.com>
Date: Mon, 14 Dec 2020 18:56:57 +0000
Subject: [PATCH 163/164] [maven-release-plugin] prepare release
 nosqlbench-4.15.5

---
 docsys/pom.xml                 |  6 +++---
 driver-cql-shaded/pom.xml      |  6 +++---
 driver-cqlverify/pom.xml       |  6 +++---
 driver-diag/pom.xml            |  6 +++---
 driver-dsegraph-shaded/pom.xml |  6 +++---
 driver-http/pom.xml            |  6 +++---
 driver-jmx/pom.xml             |  6 +++---
 driver-kafka/pom.xml           |  6 +++---
 driver-mongodb/pom.xml         |  6 +++---
 driver-stdout/pom.xml          |  6 +++---
 driver-tcp/pom.xml             |  8 ++++----
 driver-web/pom.xml             |  6 +++---
 drivers-api/pom.xml            |  6 +++---
 engine-api/pom.xml             | 10 +++++-----
 engine-cli/pom.xml             |  6 +++---
 engine-clients/pom.xml         |  4 ++--
 engine-core/pom.xml            |  8 ++++----
 engine-docker/pom.xml          |  4 ++--
 engine-docs/pom.xml            |  4 ++--
 engine-extensions/pom.xml      |  4 ++--
 engine-rest/pom.xml            |  4 ++--
 mvn-defaults/pom.xml           |  4 ++--
 nb-annotations/pom.xml         |  2 +-
 nb-api/pom.xml                 |  4 ++--
 nb/pom.xml                     | 36 +++++++++++++++++-----------------
 pom.xml                        |  4 ++--
 virtdata-api/pom.xml           |  6 +++---
 virtdata-lang/pom.xml          |  2 +-
 virtdata-lib-basics/pom.xml    |  4 ++--
 virtdata-lib-curves4/pom.xml   |  6 +++---
 virtdata-lib-random/pom.xml    |  6 +++---
 virtdata-lib-realer/pom.xml    |  4 ++--
 virtdata-realdata/pom.xml      |  4 ++--
 virtdata-userlibs/pom.xml      | 16 +++++++--------
 34 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/docsys/pom.xml b/docsys/pom.xml
index 281fb1882..fbf5932b7 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index e1680a6aa..a2e47a44c 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index 8fa57456b..6af8c80fe 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.15.5-SNAPSHOT</version>
+    <version>4.15.5</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cql-shaded</artifactId>
-      <version>4.15.5-SNAPSHOT</version>
+      <version>4.15.5</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.15.5-SNAPSHOT</version>
+      <version>4.15.5</version>
     </dependency>
 
   </dependencies>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index 593ddcde3..bb806cb6b 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index b445ca375..9df551bd8 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.15.5-SNAPSHOT</version>
+    <version>4.15.5</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -23,13 +23,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.15.5-SNAPSHOT</version>
+      <version>4.15.5</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.15.5-SNAPSHOT</version>
+      <version>4.15.5</version>
     </dependency>
 
     <dependency>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index 070b676ae..b717c7613 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index a8c0bb1b1..6f688523d 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index 4a330b5a0..55c3a102f 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -44,13 +44,13 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-api</artifactId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
       </dependency>
 
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>driver-stdout</artifactId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
       </dependency>
 
       <!--        <dependency>-->
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index b8ec87e7f..44aadc90d 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index d4745c9a9..ef39aa75e 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index 0c0282353..ba55a1b1a 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,19 +24,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index 2ff90a4a1..6d1e65dfb 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index c295faa1a..70d1e51de 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index fa7c94a4d..b48ae38c3 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,25 +23,25 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index 6bcc5e654..60a4aed1d 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index 6a5061cd8..60d6e69c0 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.15.5-SNAPSHOT</version>
+    <version>4.15.5</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.15.5-SNAPSHOT</version>
+      <version>4.15.5</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index cad9a9018..6b009145c 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-clients</artifactId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index 028e5a0da..3b4108e4c 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index 69eb64fda..bf1e51830 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.15.5-SNAPSHOT</version>
+    <version>4.15.5</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>docsys</artifactId>
-      <version>4.15.5-SNAPSHOT</version>
+      <version>4.15.5</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index d0bbe0dfe..f85c090a5 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index a916876d5..ec5b73341 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
     </dependencies>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 813c07559..f63744359 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>io.nosqlbench</groupId>
   <artifactId>mvn-defaults</artifactId>
-  <version>4.15.5-SNAPSHOT</version>
+  <version>4.15.5</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -90,7 +90,7 @@
   <scm>
     <url>scm:git:https://github.com/nosqlbench/nosqlbench.git</url>
     <!--        <tag>nosqlbench-2.0.102-SNAPSHOT</tag>-->
-    <tag>HEAD</tag>
+    <tag>nosqlbench-4.15.5</tag>
   </scm>
 
   <dependencyManagement>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index 878b6d3a6..940900fba 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index e6ffe3f7b..a37cc134c 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.15.5-SNAPSHOT</version>
+    <version>4.15.5</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>nb-annotations</artifactId>
-      <version>4.15.5-SNAPSHOT</version>
+      <version>4.15.5</version>
     </dependency>
 
     <dependency>
diff --git a/nb/pom.xml b/nb/pom.xml
index 21eec7188..f81f3d977 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,31 +24,31 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-rest</artifactId>
-      <version>4.15.5-SNAPSHOT</version>
+      <version>4.15.5</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-cli</artifactId>
-      <version>4.15.5-SNAPSHOT</version>
+      <version>4.15.5</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-docs</artifactId>
-      <version>4.15.5-SNAPSHOT</version>
+      <version>4.15.5</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-core</artifactId>
-      <version>4.15.5-SNAPSHOT</version>
+      <version>4.15.5</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-extensions</artifactId>
-      <version>4.15.5-SNAPSHOT</version>
+      <version>4.15.5</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -60,67 +60,67 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-web</artifactId>
-      <version>4.15.5-SNAPSHOT</version>
+      <version>4.15.5</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-kafka</artifactId>
-      <version>4.15.5-SNAPSHOT</version>
+      <version>4.15.5</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-stdout</artifactId>
-      <version>4.15.5-SNAPSHOT</version>
+      <version>4.15.5</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-diag</artifactId>
-      <version>4.15.5-SNAPSHOT</version>
+      <version>4.15.5</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-tcp</artifactId>
-      <version>4.15.5-SNAPSHOT</version>
+      <version>4.15.5</version>
     </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-http</artifactId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-jmx</artifactId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-dsegraph-shaded</artifactId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cql-shaded</artifactId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cqlverify</artifactId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-mongodb</artifactId>
-      <version>4.15.5-SNAPSHOT</version>
+      <version>4.15.5</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -257,7 +257,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-mongodb</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/pom.xml b/pom.xml
index 4c7b02813..8aa5d762d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
@@ -145,7 +145,7 @@
             scm:git:https://github.com/nosqlbench/nosqlbench.git
         </developerConnection>
         <url>scm:git:git@github.com:nosqlbench/nosqlbench.git</url>
-        <tag>HEAD</tag>
+        <tag>nosqlbench-4.15.5</tag>
     </scm>
 
     <distributionManagement>
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index 2afa2fac9..6ff1a0eaa 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index d97c18851..466cf21c5 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index a42659aee..ec73726e1 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index ad6b1a345..5226203d2 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index 856b8a00f..7409b8912 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index 17e46c584..ceb57d801 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index 73352bfe9..a8699e18c 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index 2ee6cd470..363540ecb 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5-SNAPSHOT</version>
+        <version>4.15.5</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,36 +18,36 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-          <version>4.15.5-SNAPSHOT</version>
+          <version>4.15.5</version>
         </dependency>
 
     </dependencies>

From 4a06f226c9137416d9ac7cfd4073d1ce25a18730 Mon Sep 17 00:00:00 2001
From: nb-droid <nosqlbenchdroid@gmail.com>
Date: Mon, 14 Dec 2020 18:57:03 +0000
Subject: [PATCH 164/164] [maven-release-plugin] prepare for next development
 iteration

---
 docsys/pom.xml                 |  6 +++---
 driver-cql-shaded/pom.xml      |  6 +++---
 driver-cqlverify/pom.xml       |  6 +++---
 driver-diag/pom.xml            |  6 +++---
 driver-dsegraph-shaded/pom.xml |  6 +++---
 driver-http/pom.xml            |  6 +++---
 driver-jmx/pom.xml             |  6 +++---
 driver-kafka/pom.xml           |  6 +++---
 driver-mongodb/pom.xml         |  6 +++---
 driver-stdout/pom.xml          |  6 +++---
 driver-tcp/pom.xml             |  8 ++++----
 driver-web/pom.xml             |  6 +++---
 drivers-api/pom.xml            |  6 +++---
 engine-api/pom.xml             | 10 +++++-----
 engine-cli/pom.xml             |  6 +++---
 engine-clients/pom.xml         |  4 ++--
 engine-core/pom.xml            |  8 ++++----
 engine-docker/pom.xml          |  4 ++--
 engine-docs/pom.xml            |  4 ++--
 engine-extensions/pom.xml      |  4 ++--
 engine-rest/pom.xml            |  4 ++--
 mvn-defaults/pom.xml           |  4 ++--
 nb-annotations/pom.xml         |  2 +-
 nb-api/pom.xml                 |  4 ++--
 nb/pom.xml                     | 36 +++++++++++++++++-----------------
 pom.xml                        |  4 ++--
 virtdata-api/pom.xml           |  6 +++---
 virtdata-lang/pom.xml          |  2 +-
 virtdata-lib-basics/pom.xml    |  4 ++--
 virtdata-lib-curves4/pom.xml   |  6 +++---
 virtdata-lib-random/pom.xml    |  6 +++---
 virtdata-lib-realer/pom.xml    |  4 ++--
 virtdata-realdata/pom.xml      |  4 ++--
 virtdata-userlibs/pom.xml      | 16 +++++++--------
 34 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/docsys/pom.xml b/docsys/pom.xml
index fbf5932b7..f76467b3b 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index a2e47a44c..1d634819b 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index 6af8c80fe..d9bd30f68 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.15.5</version>
+    <version>4.15.6-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cql-shaded</artifactId>
-      <version>4.15.5</version>
+      <version>4.15.6-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.15.5</version>
+      <version>4.15.6-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index bb806cb6b..d572cd8b9 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml
index 9df551bd8..d440dd3fa 100644
--- a/driver-dsegraph-shaded/pom.xml
+++ b/driver-dsegraph-shaded/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.15.5</version>
+    <version>4.15.6-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -23,13 +23,13 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.15.5</version>
+      <version>4.15.6-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>drivers-api</artifactId>
-      <version>4.15.5</version>
+      <version>4.15.6-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index b717c7613..08f1c723c 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index 6f688523d..3104ea8bb 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index 55c3a102f..d1e42170a 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -44,13 +44,13 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-api</artifactId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>driver-stdout</artifactId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
       </dependency>
 
       <!--        <dependency>-->
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index 44aadc90d..ec5394cc3 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index ef39aa75e..037656717 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index ba55a1b1a..55bc546b3 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -24,19 +24,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>driver-stdout</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index 6d1e65dfb..06abebc0c 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index 70d1e51de..c76f33819 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index b48ae38c3..3762df0b9 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,25 +23,25 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index 60a4aed1d..114cfa0d6 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index 60d6e69c0..d87990cad 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.15.5</version>
+    <version>4.15.6-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-api</artifactId>
-      <version>4.15.5</version>
+      <version>4.15.6-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index 6b009145c..aa547f345 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>drivers-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
       <dependency>
         <groupId>io.nosqlbench</groupId>
         <artifactId>engine-clients</artifactId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index 3b4108e4c..fde76778e 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index bf1e51830..0f4d88018 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.15.5</version>
+    <version>4.15.6-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>docsys</artifactId>
-      <version>4.15.5</version>
+      <version>4.15.6-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index f85c090a5..0ae07be69 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index ec5b73341..7508cf23c 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index f63744359..f84dd5f53 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>io.nosqlbench</groupId>
   <artifactId>mvn-defaults</artifactId>
-  <version>4.15.5</version>
+  <version>4.15.6-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -90,7 +90,7 @@
   <scm>
     <url>scm:git:https://github.com/nosqlbench/nosqlbench.git</url>
     <!--        <tag>nosqlbench-2.0.102-SNAPSHOT</tag>-->
-    <tag>nosqlbench-4.15.5</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencyManagement>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index 940900fba..c3689c268 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index a37cc134c..4beab0e06 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-    <version>4.15.5</version>
+    <version>4.15.6-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>nb-annotations</artifactId>
-      <version>4.15.5</version>
+      <version>4.15.6-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/nb/pom.xml b/nb/pom.xml
index f81f3d977..255f15f0c 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mvn-defaults</artifactId>
     <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
     <relativePath>../mvn-defaults</relativePath>
   </parent>
 
@@ -24,31 +24,31 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-rest</artifactId>
-      <version>4.15.5</version>
+      <version>4.15.6-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-cli</artifactId>
-      <version>4.15.5</version>
+      <version>4.15.6-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-docs</artifactId>
-      <version>4.15.5</version>
+      <version>4.15.6-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-core</artifactId>
-      <version>4.15.5</version>
+      <version>4.15.6-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>engine-extensions</artifactId>
-      <version>4.15.5</version>
+      <version>4.15.6-SNAPSHOT</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -60,67 +60,67 @@
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-web</artifactId>
-      <version>4.15.5</version>
+      <version>4.15.6-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-kafka</artifactId>
-      <version>4.15.5</version>
+      <version>4.15.6-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-stdout</artifactId>
-      <version>4.15.5</version>
+      <version>4.15.6-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-diag</artifactId>
-      <version>4.15.5</version>
+      <version>4.15.6-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-tcp</artifactId>
-      <version>4.15.5</version>
+      <version>4.15.6-SNAPSHOT</version>
     </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-http</artifactId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-jmx</artifactId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-dsegraph-shaded</artifactId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-cql-shaded</artifactId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
       </dependency>
 
       <dependency>
           <groupId>io.nosqlbench</groupId>
       <artifactId>driver-cqlverify</artifactId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.nosqlbench</groupId>
       <artifactId>driver-mongodb</artifactId>
-      <version>4.15.5</version>
+      <version>4.15.6-SNAPSHOT</version>
     </dependency>
 
     <!--        <dependency>-->
@@ -257,7 +257,7 @@
         <dependency>
           <groupId>io.nosqlbench</groupId>
           <artifactId>driver-mongodb</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/pom.xml b/pom.xml
index 8aa5d762d..7da7a912c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
@@ -145,7 +145,7 @@
             scm:git:https://github.com/nosqlbench/nosqlbench.git
         </developerConnection>
         <url>scm:git:git@github.com:nosqlbench/nosqlbench.git</url>
-        <tag>nosqlbench-4.15.5</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index 6ff1a0eaa..29f8e484a 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index 466cf21c5..ff41a809f 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index ec73726e1..42f699e11 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index 5226203d2..72925fc87 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index 7409b8912..19c107e98 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index ceb57d801..9fe976f72 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index a8699e18c..badc5da9e 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index 363540ecb..c232a2180 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.15.5</version>
+        <version>4.15.6-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,36 +18,36 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-          <version>4.15.5</version>
+          <version>4.15.6-SNAPSHOT</version>
         </dependency>
 
     </dependencies>