fixups and package structure updates

2025-02-25 18:55:28 -06:00 · 2023-09-11 13:20:52 -05:00
parent 087240f4c7
commit 112ad332cd
116 changed files with 226 additions and 195 deletions
--- a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/util/AmqpAdapterMetrics.java
+++ b/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/util/AmqpAdapterMetrics.java
@@ -20,8 +20,8 @@ import com.codahale.metrics.Counter;
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.Timer;
 import io.nosqlbench.adapter.amqp.dispensers.AmqpBaseOpDispenser;
-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.engine.metrics.ActivityMetrics;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
--- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/NamingFolio.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/NamingFolio.java
@@ -16,12 +16,12 @@

 package io.nosqlbench.cqlgen.binders;

-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.cqlgen.model.CqlColumnBase;
 import io.nosqlbench.cqlgen.model.CqlModel;
 import io.nosqlbench.cqlgen.model.CqlTable;
 import io.nosqlbench.cqlgen.core.CGElementNamer;
-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;

 import java.util.*;

--- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingSpec.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingSpec.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.cqlgen.bindspecs;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;

 public interface BindingSpec {

--- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingSpecImpl.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingSpecImpl.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.cqlgen.bindspecs;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;

 public class BindingSpecImpl implements BindingSpec {
    private NBLabeledElement target;
--- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGElementNamer.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGElementNamer.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.cqlgen.core;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;

 import java.util.ArrayList;
 import java.util.LinkedHashMap;
--- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlColumnBase.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlColumnBase.java
@@ -16,11 +16,9 @@

 package io.nosqlbench.cqlgen.model;

-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.config.NBNamedElement;
-import io.nosqlbench.api.config.NBLabeledElement;
-
-import java.util.Map;
+import io.nosqlbench.api.labels.NBLabeledElement;

 public abstract class CqlColumnBase implements NBNamedElement, NBLabeledElement {

--- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlKeyspaceDef.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlKeyspaceDef.java
@@ -17,9 +17,9 @@
 package io.nosqlbench.cqlgen.model;

 import com.datastax.oss.driver.internal.core.util.Strings;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.config.NBNamedElement;
-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.cqlgen.core.CGKeyspaceStats;

 import java.util.*;
--- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTable.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTable.java
@@ -16,9 +16,9 @@

 package io.nosqlbench.cqlgen.model;

-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.config.NBNamedElement;
-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.cqlgen.core.CGTableStats;
 import io.nosqlbench.cqlgen.transformers.ComputedTableStats;

--- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTableColumn.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTableColumn.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.cqlgen.model;

-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabels;

 public class CqlTableColumn extends CqlColumnBase {

--- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlType.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlType.java
@@ -16,8 +16,8 @@

 package io.nosqlbench.cqlgen.model;

-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.config.NBNamedElement;

 import java.util.ArrayList;
--- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTypeColumn.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTypeColumn.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.cqlgen.model;

-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabels;

 public class CqlTypeColumn extends CqlColumnBase {

--- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGCachingNameRemapper.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGCachingNameRemapper.java
@@ -16,8 +16,8 @@

 package io.nosqlbench.cqlgen.transformers;

-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.Combinations;

 import java.util.HashMap;
--- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedColumn.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedColumn.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.cqlgen.transformers.namecache;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;

 import java.util.Map;
 import java.util.function.Function;
--- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedKeyspace.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedKeyspace.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.cqlgen.transformers.namecache;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;

 import java.util.Collection;
 import java.util.LinkedHashMap;
--- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedTable.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedTable.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.cqlgen.transformers.namecache;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;

 import java.util.Collection;
 import java.util.LinkedHashMap;
--- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedType.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedType.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.cqlgen.transformers.namecache;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;

 import java.util.ArrayList;
 import java.util.LinkedHashMap;
--- a/adapter-cqld4/src/main/resources/activities/baselines/astra_vectors_live.yaml
+++ b/adapter-cqld4/src/main/resources/activities/baselines/astra_vectors_live.yaml
@@ -34,8 +34,6 @@ scenarios:
 params:
  driver: cqld4
  instrument: true
-  labels:
-    k:

 bindings:
  id: ToString()
@@ -78,13 +76,7 @@ blocks:
  search_and_index:
    ops:
      select_ann_limit_borked:
-        raw: |
-          SELECT (nonextant) FROM TEMPLATE(keyspace,baselines).TEMPLATE(table,vectors)
-          ORDER BY value ANN OF {test_floatlist} LIMIT TEMPLATE(select_limit,100);
-        tags:
-          optype: select
      select_ann_limit:
-        ratio: 99
        prepared: |
          SELECT * FROM TEMPLATE(keyspace,baselines).TEMPLATE(table,vectors)
          ORDER BY value ANN OF {test_floatlist} LIMIT TEMPLATE(select_limit,100);
@@ -92,12 +84,19 @@ blocks:
          optype: select
        verifier-init: |
          relevancy=scriptingmetrics.newRelevancyMeasures(_parsed_op,"group","relevancy");
-          for (int k in List.of(1,2,3,5,10,25,50,75,100)) {
+          for (int k in List.of(100)) {
            relevancy.addFunction(io.nosqlbench.engine.extensions.computefunctions.RelevancyFunctions.recall("recall",k));
            relevancy.addFunction(io.nosqlbench.engine.extensions.computefunctions.RelevancyFunctions.precision("precision",k));
+            relevancy.addFunction(io.nosqlbench.engine.extensions.computefunctions.RelevancyFunctions.F1("F1",k));
            relevancy.addFunction(io.nosqlbench.engine.extensions.computefunctions.RelevancyFunctions.reciprocal_rank("RR",k));
            relevancy.addFunction(io.nosqlbench.engine.extensions.computefunctions.RelevancyFunctions.average_precision("AP",k));
-            relevancy.addFunction(io.nosqlbench.engine.extensions.computefunctions.RelevancyFunctions.F1("F1",k));
+          }
+          for (int k in List.of(1,2,3,5,10,25,50,75)) {
+            relevancy.addFunction(io.nosqlbench.engine.extensions.computefunctions.RelevancyFunctions.recall("s_recall",k));
+            relevancy.addFunction(io.nosqlbench.engine.extensions.computefunctions.RelevancyFunctions.precision("s_precision",k));
+            relevancy.addFunction(io.nosqlbench.engine.extensions.computefunctions.RelevancyFunctions.F1("s_F1",k));
+            relevancy.addFunction(io.nosqlbench.engine.extensions.computefunctions.RelevancyFunctions.reciprocal_rank("s_RR",k));
+            relevancy.addFunction(io.nosqlbench.engine.extensions.computefunctions.RelevancyFunctions.average_precision("s_AP",k));
          }
        verifier: |
          // driver-specific function
--- a/adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/exporters/CGElementNamerTest.java
+++ b/adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/exporters/CGElementNamerTest.java
@@ -16,8 +16,8 @@

 package io.nosqlbench.converters.cql.exporters;

-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.cqlgen.core.CGElementNamer;
 import org.junit.jupiter.api.Test;

--- a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/BaseDiagTask.java
+++ b/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/BaseDiagTask.java
@@ -16,8 +16,8 @@

 package io.nosqlbench.adapter.diag.optasks;

-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;

 import java.util.Map;

--- a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask.java
+++ b/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.adapter.diag.optasks;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.config.standard.NBConfigurable;
 import io.nosqlbench.api.config.standard.NBReconfigurable;

--- a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_gauge.java
+++ b/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_gauge.java
@@ -17,7 +17,7 @@
 package io.nosqlbench.adapter.diag.optasks;

 import com.codahale.metrics.Gauge;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.config.standard.*;
 import io.nosqlbench.api.engine.metrics.ActivityMetrics;
 import io.nosqlbench.nb.annotations.Service;
--- a/adapter-diag/src/test/java/io/nosqlbench/adapter/diag/optasks/DiagTask_gaugeTest.java
+++ b/adapter-diag/src/test/java/io/nosqlbench/adapter/diag/optasks/DiagTask_gaugeTest.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.adapter.diag.optasks;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.config.standard.NBConfiguration;
 import org.assertj.core.data.Offset;
 import org.junit.jupiter.api.Test;
--- a/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpMetrics.java
+++ b/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpMetrics.java
@@ -17,8 +17,8 @@
 package io.nosqlbench.adapter.http.core;

 import com.codahale.metrics.Histogram;
-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.engine.metrics.ActivityMetrics;

 public class HttpMetrics implements NBLabeledElement {
--- a/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpSpace.java
+++ b/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpSpace.java
@@ -16,8 +16,8 @@

 package io.nosqlbench.adapter.http.core;

-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.config.standard.ConfigModel;
 import io.nosqlbench.api.config.standard.NBConfigModel;
 import io.nosqlbench.api.config.standard.NBConfiguration;
--- a/adapter-http/src/test/java/io/nosqlbench/adapter/http/HttpOpMapperTest.java
+++ b/adapter-http/src/test/java/io/nosqlbench/adapter/http/HttpOpMapperTest.java
@@ -18,7 +18,7 @@ package io.nosqlbench.adapter.http;

 import io.nosqlbench.adapter.http.core.HttpOpMapper;
 import io.nosqlbench.adapter.http.core.HttpSpace;
-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.config.standard.NBConfiguration;
 import io.nosqlbench.adapters.api.activityconfig.OpsLoader;
 import io.nosqlbench.adapters.api.activityconfig.yaml.OpTemplate;
--- a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/util/KafkaAdapterMetrics.java
+++ b/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/util/KafkaAdapterMetrics.java
@@ -20,8 +20,8 @@ import com.codahale.metrics.Counter;
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.Timer;
 import io.nosqlbench.adapter.kafka.dispensers.KafkaBaseOpDispenser;
-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.engine.metrics.ActivityMetrics;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
--- a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/BaseOpDispenser.java
+++ b/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/BaseOpDispenser.java
@@ -23,8 +23,8 @@ import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.Op;
 import io.nosqlbench.adapters.api.evalcontext.*;
 import io.nosqlbench.adapters.api.metrics.ThreadLocalNamedTimers;
 import io.nosqlbench.adapters.api.templating.ParsedOp;
-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.engine.metrics.ActivityMetrics;
 import io.nosqlbench.api.errors.OpConfigError;
 import io.nosqlbench.virtdata.core.templates.ParsedTemplateString;
--- a/adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/ParsedOp.java
+++ b/adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/ParsedOp.java
@@ -17,9 +17,9 @@
 package io.nosqlbench.adapters.api.templating;

 import io.nosqlbench.adapters.api.activityconfig.yaml.OpTemplate;
-import io.nosqlbench.api.config.NBLabelSpec;
-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabelSpec;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.config.fieldreaders.DynamicFieldReader;
 import io.nosqlbench.api.config.fieldreaders.StaticFieldReader;
 import io.nosqlbench.api.config.standard.NBConfigError;
--- a/adapters-api/src/test/java/io/nosqlbench/adapters/api/templating/ParsedOpTest.java
+++ b/adapters-api/src/test/java/io/nosqlbench/adapters/api/templating/ParsedOpTest.java
@@ -18,7 +18,7 @@ package io.nosqlbench.adapters.api.templating;

 import io.nosqlbench.adapters.api.activityconfig.OpsLoader;
 import io.nosqlbench.adapters.api.activityconfig.yaml.OpTemplate;
-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.adapters.api.activityconfig.yaml.OpData;
 import io.nosqlbench.adapters.api.activityconfig.yaml.OpTemplateFormat;
 import io.nosqlbench.adapters.api.activityconfig.yaml.OpsDocList;
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java
@@ -24,7 +24,7 @@ import io.nosqlbench.engine.api.activityapi.errorhandling.ErrorMetrics;
 import io.nosqlbench.engine.api.activityapi.output.OutputDispenser;
 import io.nosqlbench.engine.api.activityimpl.SimpleActivity;
 import io.nosqlbench.engine.api.activityimpl.motor.RunStateTally;
-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.engine.activityimpl.ActivityDef;
 import io.nosqlbench.api.engine.activityimpl.ParameterMap;
 import io.nosqlbench.engine.api.activityapi.input.InputDispenser;
--- 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
@@ -21,7 +21,7 @@ import io.nosqlbench.engine.api.activityimpl.CoreServices;
 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.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.engine.api.activityapi.input.InputDispenser;
 import io.nosqlbench.api.engine.activityimpl.ActivityDef;

--- 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
@@ -16,8 +16,8 @@

 package io.nosqlbench.engine.api.activityapi.cyclelog.inputs.cyclelog;

-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment;
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegment;
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegmentBuffer;
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/ErrorMetrics.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/ErrorMetrics.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.api.activityapi.errorhandling;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.engine.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.metrics.ExceptionCountMetrics;
 import io.nosqlbench.engine.api.metrics.ExceptionExpectedResultVerificationMetrics;
--- 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
@@ -17,7 +17,7 @@
 package io.nosqlbench.engine.api.activityapi.ratelimits;

 import com.codahale.metrics.Gauge;
-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.engine.metrics.ActivityMetrics;
 import io.nosqlbench.nb.annotations.Service;
 import org.apache.logging.log4j.LogManager;
--- 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
@@ -18,7 +18,7 @@ package io.nosqlbench.engine.api.activityapi.ratelimits;

 import com.codahale.metrics.Timer;
 import io.nosqlbench.engine.api.util.Colors;
-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.engine.activityimpl.ActivityDef;
 import io.nosqlbench.api.engine.metrics.ActivityMetrics;
 import org.apache.logging.log4j.LogManager;
--- 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
@@ -17,7 +17,7 @@
 package io.nosqlbench.engine.api.activityapi.ratelimits;

 import com.codahale.metrics.Gauge;
-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

--- 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
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.api.activityapi.ratelimits;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.nb.annotations.Service;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
--- 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
@@ -17,7 +17,7 @@
 package io.nosqlbench.engine.api.activityapi.ratelimits;

 import com.codahale.metrics.Timer;
-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.engine.metrics.ActivityMetrics;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
--- 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
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.api.activityapi.ratelimits;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;

 public interface TokenPool {

--- 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
@@ -17,7 +17,7 @@
 package io.nosqlbench.engine.api.activityimpl;

 import com.codahale.metrics.Timer;
-import io.nosqlbench.api.config.NBLabelSpec;
+import io.nosqlbench.api.labels.NBLabelSpec;
 import io.nosqlbench.engine.api.activityapi.core.*;
 import io.nosqlbench.engine.api.activityapi.core.progress.ActivityMetricProgressMeter;
 import io.nosqlbench.engine.api.activityapi.core.progress.ProgressMeterDisplay;
@@ -29,8 +29,8 @@ import io.nosqlbench.engine.api.activityapi.ratelimits.RateLimiters;
 import io.nosqlbench.engine.api.activityapi.ratelimits.RateSpec;
 import io.nosqlbench.adapters.api.activityimpl.OpDispenser;
 import io.nosqlbench.adapters.api.activityimpl.OpMapper;
-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.config.standard.NBConfiguration;
 import io.nosqlbench.api.engine.activityimpl.ActivityDef;
 import io.nosqlbench.api.engine.metrics.ActivityMetrics;
--- 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
@@ -16,8 +16,8 @@
 package io.nosqlbench.engine.api.activityimpl.input;

 import com.codahale.metrics.Gauge;
-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.engine.activityimpl.ActivityDef;
 import io.nosqlbench.api.engine.activityimpl.CyclesSpec;
 import io.nosqlbench.api.engine.metrics.ActivityMetrics;
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java
@@ -27,8 +27,8 @@ import io.nosqlbench.adapters.api.activityimpl.uniform.decorators.SyntheticOpTem
 import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.Op;
 import io.nosqlbench.adapters.api.templating.ParsedOp;
 import io.nosqlbench.api.Shutdownable;
-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.config.standard.*;
 import io.nosqlbench.api.engine.activityimpl.ActivityDef;
 import io.nosqlbench.api.engine.metrics.ActivityMetrics;
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java
@@ -17,7 +17,7 @@
 package io.nosqlbench.engine.api.activityimpl.uniform;

 import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter;
-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.config.standard.NBConfigModel;
 import io.nosqlbench.api.config.standard.NBConfiguration;
 import io.nosqlbench.api.config.standard.NBReconfigurable;
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionCountMetrics.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionCountMetrics.java
@@ -17,7 +17,7 @@
 package io.nosqlbench.engine.api.metrics;

 import com.codahale.metrics.Counter;
-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.engine.metrics.ActivityMetrics;

 import java.util.ArrayList;
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionExpectedResultVerificationMetrics.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionExpectedResultVerificationMetrics.java
@@ -17,7 +17,7 @@
 package io.nosqlbench.engine.api.metrics;

 import com.codahale.metrics.Counter;
-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.engine.metrics.ActivityMetrics;


--- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionHistoMetrics.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionHistoMetrics.java
@@ -17,7 +17,7 @@
 package io.nosqlbench.engine.api.metrics;

 import com.codahale.metrics.Histogram;
-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.engine.activityimpl.ActivityDef;
 import io.nosqlbench.api.engine.metrics.ActivityMetrics;

--- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionMeterMetrics.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionMeterMetrics.java
@@ -17,7 +17,7 @@
 package io.nosqlbench.engine.api.metrics;

 import com.codahale.metrics.Meter;
-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.engine.metrics.ActivityMetrics;

 import java.util.ArrayList;
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionTimerMetrics.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionTimerMetrics.java
@@ -17,7 +17,7 @@
 package io.nosqlbench.engine.api.metrics;

 import com.codahale.metrics.Timer;
-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.engine.activityimpl.ActivityDef;
 import io.nosqlbench.api.engine.metrics.ActivityMetrics;

--- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandlerTest.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandlerTest.java
@@ -24,7 +24,7 @@ import io.nosqlbench.api.errors.ResultMismatchError;
 import io.nosqlbench.engine.api.activityapi.errorhandling.ErrorMetrics;
 import io.nosqlbench.engine.api.activityapi.errorhandling.modular.handlers.CountErrorHandler;
 import io.nosqlbench.engine.api.activityapi.errorhandling.modular.handlers.CounterErrorHandler;
-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.util.NBMock;
 import io.nosqlbench.util.NBMock.LogAppender;
 import org.apache.logging.log4j.Level;
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateLimiterPerfTestMethods.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateLimiterPerfTestMethods.java
@@ -17,7 +17,7 @@
 package io.nosqlbench.engine.api.activityapi.ratelimits;

 import io.nosqlbench.engine.api.util.Colors;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.engine.metrics.DeltaHdrHistogramReservoir;
 import io.nosqlbench.api.testutils.Bounds;
 import io.nosqlbench.api.testutils.Perf;
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestHybridRateLimiterPerf.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestHybridRateLimiterPerf.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.api.activityapi.ratelimits;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.testutils.Perf;
 import io.nosqlbench.api.testutils.Result;
 import org.junit.jupiter.api.Disabled;
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E7.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E7.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.api.activityapi.ratelimits;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.testutils.Perf;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E8.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E8.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.api.activityapi.ratelimits;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.testutils.Perf;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerfSingle.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerfSingle.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.api.activityapi.ratelimits;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.testutils.Result;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestableHybridRateLimiter.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestableHybridRateLimiter.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.api.activityapi.ratelimits;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;

 import java.util.concurrent.atomic.AtomicLong;

--- 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
@@ -16,8 +16,8 @@

 package io.nosqlbench.engine.api.activityapi.ratelimits;

-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.engine.activityimpl.ActivityDef;
 import io.nosqlbench.api.engine.activityimpl.ParameterMap;
 import org.junit.jupiter.api.Test;
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInputTest.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInputTest.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.api.activityimpl.input;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.engine.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegment;
 import org.junit.jupiter.api.Test;
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/HistoIntervalLoggerTest.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/HistoIntervalLoggerTest.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.api.metrics;

-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.engine.metrics.DeltaHdrHistogramReservoir;
 import io.nosqlbench.api.engine.metrics.HistoIntervalLogger;
 import io.nosqlbench.api.engine.metrics.instruments.NBMetricHistogram;
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/NBMetricHistogramTest.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/NBMetricHistogramTest.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.api.metrics;

-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.engine.metrics.ConvenientSnapshot;
 import io.nosqlbench.api.engine.metrics.DeltaHdrHistogramReservoir;
 import io.nosqlbench.api.engine.metrics.instruments.NBMetricHistogram;
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/TestHistoTypes.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/TestHistoTypes.java
@@ -18,7 +18,7 @@ package io.nosqlbench.engine.api.metrics;

 import com.codahale.metrics.ExponentiallyDecayingReservoir;
 import com.codahale.metrics.Snapshot;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.engine.metrics.DeltaHdrHistogramReservoir;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
@@ -20,8 +20,8 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import io.nosqlbench.api.annotations.Annotation;
 import io.nosqlbench.api.annotations.Layer;
-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.content.Content;
 import io.nosqlbench.api.content.NBIO;
 import io.nosqlbench.api.engine.metrics.ActivityMetrics;
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
@@ -16,8 +16,8 @@

 package io.nosqlbench.engine.cli;

-import io.nosqlbench.api.config.NBLabelSpec;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabelSpec;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.engine.util.Unit;
 import io.nosqlbench.api.errors.BasicError;
 import io.nosqlbench.api.logging.NBLogLevel;
--- a/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/annotator/GrafanaMetricsAnnotatorTest.java
+++ b/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/annotator/GrafanaMetricsAnnotatorTest.java
@@ -18,8 +18,8 @@ package io.nosqlbench.engine.clients.grafana.annotator;

 import io.nosqlbench.api.annotations.Annotation;
 import io.nosqlbench.api.annotations.Layer;
-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.system.NBStatePath;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
--- 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
@@ -19,6 +19,8 @@ package io.nosqlbench.engine.core.annotation;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import io.nosqlbench.api.config.standard.*;
+import io.nosqlbench.api.labels.NBLabelsFilter;
+import io.nosqlbench.api.labels.NBLabelsValidator;
 import io.nosqlbench.nb.annotations.Service;
 import io.nosqlbench.api.annotations.Annotation;
 import io.nosqlbench.api.annotations.Annotator;
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutor.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutor.java
@@ -15,8 +15,8 @@
 */
 package io.nosqlbench.engine.core.lifecycle.activity;

-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.engine.api.activityapi.core.*;
 import io.nosqlbench.engine.api.activityimpl.MotorState;
 import io.nosqlbench.api.annotations.Annotation;
@@ -30,7 +30,6 @@ import io.nosqlbench.engine.api.activityimpl.motor.RunStateTally;
 import io.nosqlbench.engine.core.annotation.Annotators;
 import io.nosqlbench.engine.core.lifecycle.ExecutionResult;
 import io.nosqlbench.engine.core.lifecycle.IndexedThreadFactory;
-import io.nosqlbench.engine.core.lifecycle.scenario.Scenario;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

--- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityLoader.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityLoader.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.core.lifecycle.activity;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.engine.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.activityapi.core.Activity;
 import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivityType;
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityTypeLoader.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityTypeLoader.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.core.lifecycle.activity;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.engine.api.activityapi.core.ActivityType;
 import io.nosqlbench.api.engine.activityimpl.ActivityDef;
 import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter;
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/Scenario.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/Scenario.java
@@ -19,8 +19,8 @@ import com.codahale.metrics.MetricRegistry;
 import com.oracle.truffle.js.scriptengine.GraalJSScriptEngine;
 import io.nosqlbench.api.annotations.Annotation;
 import io.nosqlbench.api.annotations.Layer;
-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.engine.metrics.ActivityMetrics;
 import io.nosqlbench.api.metadata.ScenarioMetadata;
 import io.nosqlbench.api.metadata.ScenarioMetadataAware;
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/ScenarioController.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/ScenarioController.java
@@ -15,8 +15,8 @@
 */
 package io.nosqlbench.engine.core.lifecycle.scenario;

-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.engine.activityimpl.ActivityDef;
 import io.nosqlbench.api.engine.activityimpl.ParameterMap;
 import io.nosqlbench.api.engine.metrics.ActivityMetrics;
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/MetricsMapper.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/MetricsMapper.java
@@ -16,7 +16,7 @@
 package io.nosqlbench.engine.core.lifecycle.scenario.script;

 import com.codahale.metrics.*;
-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.engine.api.activityapi.core.Activity;
 import io.nosqlbench.engine.api.activityapi.core.ActivityType;
 import io.nosqlbench.api.engine.activityimpl.ActivityDef;
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/ScenarioContext.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/ScenarioContext.java
@@ -16,7 +16,7 @@
 package io.nosqlbench.engine.core.lifecycle.scenario.script;

 import io.nosqlbench.api.config.LabeledScenarioContext;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.engine.api.scripting.ScriptEnvBuffer;
 import io.nosqlbench.engine.core.lifecycle.scenario.ScenarioController;

--- a/engine-core/src/main/java/io/nosqlbench/engine/core/metadata/MarkdownFinder.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/metadata/MarkdownFinder.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.core.metadata;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.engine.api.activityapi.core.ActivityType;
 import io.nosqlbench.api.engine.activityimpl.ActivityDef;
 import io.nosqlbench.engine.core.lifecycle.activity.ActivityTypeLoader;
--- a/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java
+++ b/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.core;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.engine.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.activityapi.core.*;
 import io.nosqlbench.engine.api.activityapi.input.Input;
--- a/engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java
+++ b/engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.core;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.engine.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.activityapi.core.Action;
 import io.nosqlbench.engine.api.activityapi.core.Activity;
--- a/engine-core/src/test/java/io/nosqlbench/engine/core/metrics/NBMetricsSummaryTest.java
+++ b/engine-core/src/test/java/io/nosqlbench/engine/core/metrics/NBMetricsSummaryTest.java
@@ -17,7 +17,7 @@
 package io.nosqlbench.engine.core.metrics;

 import com.codahale.metrics.Timer;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.engine.metrics.DeltaHdrHistogramReservoir;
 import org.junit.jupiter.api.Test;

--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/RelevancyFunctions.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/RelevancyFunctions.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.extensions.computefunctions;

-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.engine.extensions.computefunctions.relavency.*;

 import java.util.Map;
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/AveragePrecision.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/AveragePrecision.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.extensions.computefunctions.relavency;

-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.engine.extensions.computefunctions.ComputeFunctions;

 import java.util.Map;
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/BaseRelevancyFunction.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/BaseRelevancyFunction.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.extensions.computefunctions.relavency;

-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.engine.metrics.wrappers.RelevancyFunction;

 public abstract class BaseRelevancyFunction implements RelevancyFunction {
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/F1.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/F1.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.extensions.computefunctions.relavency;

-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.engine.extensions.computefunctions.ComputeFunctions;

 import java.util.Map;
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/Precision.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/Precision.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.extensions.computefunctions.relavency;

-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.engine.extensions.computefunctions.ComputeFunctions;

 import java.util.Map;
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/Recall.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/Recall.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.extensions.computefunctions.relavency;

-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.engine.extensions.computefunctions.ComputeFunctions;

 import java.util.Map;
--- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/ReciprocalRank.java
+++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/ReciprocalRank.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.engine.extensions.computefunctions.relavency;

-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.engine.extensions.computefunctions.ComputeFunctions;

 import java.util.Map;
--- 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
@@ -18,7 +18,7 @@ package io.nosqlbench.engine.extensions.scriptingmetrics;

 import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.api.config.LabeledScenarioContext;
-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.engine.metrics.ActivityMetrics;
 import io.nosqlbench.api.engine.metrics.DoubleSummaryGauge;
 import io.nosqlbench.api.engine.metrics.wrappers.RelevancyMeasures;
--- a/nb-api/src/main/java/io/nosqlbench/api/annotations/Annotation.java
+++ b/nb-api/src/main/java/io/nosqlbench/api/annotations/Annotation.java
@@ -16,8 +16,8 @@

 package io.nosqlbench.api.annotations;

-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;

 import java.util.Map;
 import java.util.function.Function;
--- a/nb-api/src/main/java/io/nosqlbench/api/annotations/AnnotationBuilder.java
+++ b/nb-api/src/main/java/io/nosqlbench/api/annotations/AnnotationBuilder.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.api.annotations;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;

 import java.time.ZoneId;
 import java.util.LinkedHashMap;
--- a/nb-api/src/main/java/io/nosqlbench/api/annotations/AnnotationBuilderFacets.java
+++ b/nb-api/src/main/java/io/nosqlbench/api/annotations/AnnotationBuilderFacets.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.api.annotations;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;

 public interface AnnotationBuilderFacets {

--- a/nb-api/src/main/java/io/nosqlbench/api/annotations/MutableAnnotation.java
+++ b/nb-api/src/main/java/io/nosqlbench/api/annotations/MutableAnnotation.java
@@ -19,8 +19,8 @@ package io.nosqlbench.api.annotations;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.Expose;
-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;

 import java.time.Instant;
 import java.time.ZoneId;
--- a/nb-api/src/main/java/io/nosqlbench/api/config/LabeledScenarioContext.java
+++ b/nb-api/src/main/java/io/nosqlbench/api/config/LabeledScenarioContext.java
@@ -16,6 +16,8 @@

 package io.nosqlbench.api.config;

+import io.nosqlbench.api.labels.NBLabeledElement;
+
 import javax.script.ScriptContext;

 public interface LabeledScenarioContext extends ScriptContext, NBLabeledElement {
--- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/ActivityMetrics.java
+++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/ActivityMetrics.java
@@ -17,10 +17,10 @@
 package io.nosqlbench.api.engine.metrics;

 import com.codahale.metrics.*;
-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.config.NBNamedElement;
-import io.nosqlbench.api.config.standard.NBLabelsFilter;
+import io.nosqlbench.api.labels.NBLabelsFilter;
 import io.nosqlbench.api.engine.activityapi.core.MetricRegistryService;
 import io.nosqlbench.api.engine.metrics.instruments.*;
 import io.nosqlbench.api.engine.util.Unit;
--- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/DeltaHdrHistogramReservoir.java
+++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/DeltaHdrHistogramReservoir.java
@@ -18,8 +18,8 @@ package io.nosqlbench.api.engine.metrics;

 import com.codahale.metrics.Reservoir;
 import com.codahale.metrics.Snapshot;
-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import org.HdrHistogram.Histogram;
 import org.HdrHistogram.HistogramLogWriter;
 import org.HdrHistogram.Recorder;
--- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/DoubleSummaryGauge.java
+++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/DoubleSummaryGauge.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.api.engine.metrics;

-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.engine.metrics.instruments.NBMetricGauge;

 import java.util.DoubleSummaryStatistics;
--- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBFunctionGauge.java
+++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBFunctionGauge.java
@@ -16,8 +16,8 @@

 package io.nosqlbench.api.engine.metrics.instruments;

-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;

 import java.util.function.Supplier;

--- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricCounter.java
+++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricCounter.java
@@ -17,8 +17,8 @@
 package io.nosqlbench.api.engine.metrics.instruments;

 import com.codahale.metrics.Counter;
-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;

 public class NBMetricCounter extends Counter implements NBLabeledElement {

--- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricGauge.java
+++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricGauge.java
@@ -17,7 +17,7 @@
 package io.nosqlbench.api.engine.metrics.instruments;

 import com.codahale.metrics.Gauge;
-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;

 public interface NBMetricGauge<T> extends Gauge<T>, NBLabeledElement {

--- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricGaugeWrapper.java
+++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricGaugeWrapper.java
@@ -17,7 +17,7 @@
 package io.nosqlbench.api.engine.metrics.instruments;

 import com.codahale.metrics.Gauge;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabels;

 public class NBMetricGaugeWrapper<T> implements NBMetricGauge<T> {

--- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricHistogram.java
+++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricHistogram.java
@@ -17,8 +17,8 @@
 package io.nosqlbench.api.engine.metrics.instruments;

 import com.codahale.metrics.Histogram;
-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.engine.metrics.*;

 import java.util.List;
--- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricMeter.java
+++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricMeter.java
@@ -17,8 +17,8 @@
 package io.nosqlbench.api.engine.metrics.instruments;

 import com.codahale.metrics.Meter;
-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;

 public class NBMetricMeter extends Meter implements NBLabeledElement {

--- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricTimer.java
+++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricTimer.java
@@ -17,8 +17,8 @@
 package io.nosqlbench.api.engine.metrics.instruments;

 import com.codahale.metrics.Timer;
-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.engine.metrics.*;
 import org.HdrHistogram.Histogram;

--- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/reporters/PromExpositionFormat.java
+++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/reporters/PromExpositionFormat.java
@@ -17,8 +17,8 @@
 package io.nosqlbench.api.engine.metrics.reporters;

 import com.codahale.metrics.*;
-import io.nosqlbench.api.config.NBLabeledElement;
-import io.nosqlbench.api.config.NBLabels;
+import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabels;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

--- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/wrappers/RelevancyFunction.java
+++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/wrappers/RelevancyFunction.java
@@ -16,7 +16,7 @@

 package io.nosqlbench.api.engine.metrics.wrappers;

-import io.nosqlbench.api.config.NBLabeledElement;
+import io.nosqlbench.api.labels.NBLabeledElement;

 public interface RelevancyFunction extends NBLabeledElement {
    double apply(int[] relevant, int[] actual);
--- a/Show More
+++ b/Show More