Added BobyqaOptimizer and CsvOutputWriter as builders and removed them from plugins

engine-extensions/src/main/java/io/nosqlbench/engine/extensions/conversions/ConversionUtilsPluginInfo.java

@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2023 nosqlbench
- *
- * 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.extensions.conversions;
-
-import io.nosqlbench.api.config.LabeledScenarioContext;
-import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo;
-import io.nosqlbench.components.NBComponent;
-import io.nosqlbench.nb.annotations.Service;
-import org.apache.logging.log4j.Logger;
-
-import java.util.List;
-
-@Service(value = ScriptingExtensionPluginInfo.class,selector = "convert")
-public class ConversionUtilsPluginInfo implements ScriptingExtensionPluginInfo<ConverterUtils> {
-    @Override
-    public String getDescription() {
-        return "Utilities to convert between common basic data types";
-    }
-
-    @Override
-    public ConverterUtils getExtensionObject(Logger logger, NBComponent baseComponent) {
-        return new ConverterUtils();
-    }
-
-    @Override
-    public List<Class<?>> autoImportStaticMethodClasses() {
-        return List.of(ConverterUtils.class);
-    }
-}

engine-extensions/src/main/java/io/nosqlbench/engine/extensions/csvoutput/CsvOutputPluginData.java

@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2022-2023 nosqlbench
- *
- * 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.extensions.csvoutput;
-
-import io.nosqlbench.api.config.LabeledScenarioContext;
-import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo;
-import io.nosqlbench.components.NBComponent;
-import io.nosqlbench.nb.annotations.Service;
-import org.apache.logging.log4j.Logger;
-
-@Service(value = ScriptingExtensionPluginInfo.class,selector = "csvoutput")
-public class CsvOutputPluginData implements ScriptingExtensionPluginInfo<CsvOutputPluginInstance> {
-
-    @Override
-    public String getDescription() {
-        return "Write CSV output to a named file";
-    }
-
-    @Override
-    public CsvOutputPluginInstance getExtensionObject(final Logger logger, final NBComponent baseComponent) {
-        return new CsvOutputPluginInstance();
-    }
-}

engine-extensions/src/main/java/io/nosqlbench/engine/extensions/csvoutput/CsvOutputPluginInstance.java

@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2022 nosqlbench
- *
- * 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.extensions.csvoutput;
-
-public class CsvOutputPluginInstance {
-
-    public CsvOutputPluginWriter open(String filename, String... headers) {
-        return new CsvOutputPluginWriter(filename, headers);
-    }
-}

engine-extensions/src/main/java/io/nosqlbench/engine/extensions/csvoutput/csvoutput.md

@@ -1,13 +0,0 @@
-csvoutput extension
-===================
-
-This extension makes it easy to start writing CSV data to a file,
-using a defined set of headers.
-
-### Examples
-
-Open a writer and write a row:
-
-    var out=csvoutput.open('output.csv','time','value');
-    out.write({'time':23,'value':23});
-

engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerPlugin.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2022 nosqlbench
- *
- * 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.extensions.optimizers;
-
-import io.nosqlbench.components.NBBaseComponent;
-import io.nosqlbench.components.NBComponent;
-import org.apache.logging.log4j.Logger;
-
-import javax.script.ScriptContext;
-
-public class BobyqaOptimizerPlugin {
-
-    private final Logger logger;
-    private final NBComponent baseComponent;
-
-    public BobyqaOptimizerPlugin(Logger logger, NBComponent baseComponent) {
-        this.logger = logger;
-        this.baseComponent = baseComponent;
-    }
-
-    public BobyqaOptimizerInstance init() {
-        return new BobyqaOptimizerInstance(logger,baseComponent);
-    }
-
-
-}

engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerPluginData.java

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2022-2023 nosqlbench
- *
- * 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.extensions.optimizers;
-
-import io.nosqlbench.api.config.LabeledScenarioContext;
-import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo;
-import io.nosqlbench.components.NBBaseComponent;
-import io.nosqlbench.components.NBComponent;
-import io.nosqlbench.nb.annotations.Service;
-import org.apache.logging.log4j.Logger;
-
-@Service(value = ScriptingExtensionPluginInfo.class, selector = "optimos")
-public class BobyqaOptimizerPluginData implements ScriptingExtensionPluginInfo<BobyqaOptimizerPlugin> {
-
-    @Override
-    public String getDescription() {
-        return "Allows use of the BOBYQA optimizer in scripts.";
-    }
-
-    @Override
-    public BobyqaOptimizerPlugin getExtensionObject(final Logger logger, final NBComponent baseComponent) {
-        return new BobyqaOptimizerPlugin(logger, baseComponent);
-    }
-
-}

engine-extensions/src/test/java/io/nosqlbench/engine/extensions/csvoutput/CsvOutputPluginWriterTest.java

@@ -16,6 +16,8 @@
 
 package io.nosqlbench.engine.extensions.csvoutput;
 
+import io.nosqlbench.api.csvoutput.CsvOutputPluginWriter;
+import io.nosqlbench.components.NBBaseComponent;
 import org.assertj.core.util.Files;
 import org.graalvm.polyglot.Value;
 import org.junit.jupiter.api.Test;
@@ -30,7 +32,7 @@ public class CsvOutputPluginWriterTest {
         File tmpfile = Files.newTemporaryFile();
         tmpfile.deleteOnExit();
         System.out.println("tmpfile="+ tmpfile.getPath());
-        CsvOutputPluginWriter out = new CsvOutputPluginWriter(tmpfile.getPath(), "one", "two");
+        CsvOutputPluginWriter out = new CsvOutputPluginWriter(new NBBaseComponent(null), tmpfile.getPath(), "one", "two");
         out.write(Value.asValue(Map.of("one","one_","two","two_")));
     }
 

nb-api/src/main/java/io/nosqlbench/api/csvoutput/CsvOutputPluginWriter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,10 +12,13 @@
  * 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.extensions.csvoutput;
+package io.nosqlbench.api.csvoutput;
 
+import io.nosqlbench.components.NBBaseComponent;
+import io.nosqlbench.components.NBComponent;
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVPrinter;
 import org.graalvm.polyglot.Value;
@@ -27,14 +30,15 @@ import java.nio.file.Path;
 import java.nio.file.attribute.PosixFilePermissions;
 import java.util.*;
 
-public class CsvOutputPluginWriter {
+public class CsvOutputPluginWriter extends NBBaseComponent {
 
     private final CSVPrinter printer;
     private final FileWriter filewriter;
     private final LinkedHashSet<String> headerKeys;
     private final String filename;
 
-    public CsvOutputPluginWriter(String filename, String... headers) {
+    public CsvOutputPluginWriter(NBComponent component, String filename, String... headers) {
+        super(component);
         try {
             this.filename = filename;
             Path filepath = Path.of(filename);

nb-api/src/main/java/io/nosqlbench/api/engine/conversions/ConverterUtils.java

@@ -12,9 +12,10 @@
  * 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.extensions.conversions;
+package io.nosqlbench.api.engine.conversions;
 
 public class ConverterUtils {
     public static int[] toIntArray(String[] strings) {

nb-api/src/main/java/io/nosqlbench/api/engine/optimizers/BobyqaOptimizerInstance.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,9 +12,10 @@
  * 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.extensions.optimizers;
+package io.nosqlbench.api.engine.optimizers;
 
 import io.nosqlbench.components.NBBaseComponent;
 import io.nosqlbench.components.NBComponent;
@@ -23,16 +24,16 @@ 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.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import javax.script.ScriptContext;
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;
 
-public class BobyqaOptimizerInstance {
+public class BobyqaOptimizerInstance extends NBBaseComponent {
 
-    private final Logger logger;
+    private static final Logger logger = LogManager.getLogger(BobyqaOptimizerInstance.class);
     private final NBComponent baseComponent;
 
     private int interpolations = 0;
@@ -49,8 +50,8 @@ public class BobyqaOptimizerInstance {
     private MVLogger mvLogger;
     private double guessSlew = 0.25d;
 
-    public BobyqaOptimizerInstance(Logger logger, NBComponent baseComponent) {
-        this.logger = logger;
+    public BobyqaOptimizerInstance(NBComponent baseComponent) {
+        super(baseComponent);
         this.baseComponent = baseComponent;
     }
 

nb-api/src/main/java/io/nosqlbench/api/engine/optimizers/MVLogger.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,9 +12,10 @@
  * 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.extensions.optimizers;
+package io.nosqlbench.api.engine.optimizers;
 
 import org.apache.commons.math3.analysis.MultivariateFunction;
 

nb-api/src/main/java/io/nosqlbench/api/engine/optimizers/MVParams.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,9 +12,10 @@
  * 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.extensions.optimizers;
+package io.nosqlbench.api.engine.optimizers;
 
 import java.util.ArrayList;
 import java.util.Iterator;

nb-api/src/main/java/io/nosqlbench/api/engine/optimizers/MVResult.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,9 +12,10 @@
  * 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.extensions.optimizers;
+package io.nosqlbench.api.engine.optimizers;
 
 import java.util.HashMap;
 import java.util.Map;

nb-api/src/main/java/io/nosqlbench/api/engine/optimizers/PolyglotMultivariateObjectScript.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,9 +12,10 @@
  * 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.extensions.optimizers;
+package io.nosqlbench.api.engine.optimizers;
 
 import org.apache.commons.math3.analysis.MultivariateFunction;
 import org.graalvm.polyglot.proxy.ProxyObject;

nb-api/src/main/java/io/nosqlbench/components/NBBuilders.java

@@ -16,6 +16,7 @@
 
 package io.nosqlbench.components;
 
+import io.nosqlbench.api.csvoutput.CsvOutputPluginWriter;
 import com.codahale.metrics.Meter;
 import io.nosqlbench.api.engine.metrics.DeltaHdrHistogramReservoir;
 import io.nosqlbench.api.engine.metrics.DoubleSummaryGauge;
@@ -27,6 +28,7 @@ import io.nosqlbench.api.engine.metrics.reporters.CsvReporter;
 import io.nosqlbench.api.engine.metrics.instruments.*;
 import io.nosqlbench.api.engine.metrics.reporters.MetricInstanceFilter;
 import io.nosqlbench.api.engine.metrics.reporters.PromPushReporterComponent;
+import io.nosqlbench.api.engine.optimizers.BobyqaOptimizerInstance;
 import io.nosqlbench.api.labels.NBLabels;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -124,33 +126,56 @@ public class NBBuilders {
 //        return new ExamplePlugin(component);
 //    }
 
-    public static class csvReporterBuilder {
+    public BobyqaOptimizerInstance bobyqaOptimizer(final NBComponent component) {
+        return new BobyqaOptimizerInstance(component);
+    }
+
+    public static class CsvOutputWriterBuilder {
+        //CsvOutputPluginWriter(NBComponent component, String filename, String... headers) {
+        private final NBComponent component;
+        private final String filename;
+        private String[] headers;
+
+        public CsvOutputWriterBuilder(NBComponent component, String filename) {
+            this.component = component;
+            this.filename = filename;
+        }
+        public CsvOutputWriterBuilder headers(String... headers) {
+            this.headers = headers;
+            return this;
+        }
+        public CsvOutputPluginWriter build() {
+            return new CsvOutputPluginWriter(component, filename, headers);
+        }
+    }
+
+    public static class CsvReporterBuilder {
         private final NBComponent component;
         private Path reportTo = Path.of("metrics.csv");
         private int interval = 1;
         private MetricInstanceFilter filter = new MetricInstanceFilter();
         private NBLabels labels = null;
 
-        public csvReporterBuilder(NBComponent component) {
+        public CsvReporterBuilder(NBComponent component) {
             this.component = component;
         }
-        public csvReporterBuilder labels(NBLabels labels) {
+        public CsvReporterBuilder labels(NBLabels labels) {
             this.labels = labels;
             return this;
         }
-        public csvReporterBuilder path(Path reportTo) {
+        public CsvReporterBuilder path(Path reportTo) {
             this.reportTo = reportTo;
             return this;
         }
-        public csvReporterBuilder path(String reportTo) {
+        public CsvReporterBuilder path(String reportTo) {
             this.reportTo = Path.of(reportTo);
             return this;
         }
-        public csvReporterBuilder interval(int interval) {
+        public CsvReporterBuilder interval(int interval) {
             this.interval = interval;
             return this;
         }
-        public csvReporterBuilder filter(MetricInstanceFilter filter) {
+        public CsvReporterBuilder filter(MetricInstanceFilter filter) {
             this.filter = filter;
             return this;
         }