METRON-532 capture runtime changes in global config, per cestella's suggestion. Also fixed a couple default misuses.

Author: mattf-apache

metron-analytics/metron-profiler-client/src/main/java/org/apache/metron/profiler/client/stellar/GetProfile.java

@@ -127,6 +127,16 @@ public class GetProfile implements StellarFunction {
    */
   public static final String PROFILER_SALT_DIVISOR = "profiler.client.salt.divisor";
 
+  /**
+   * The default Profile HBase table name should none be defined in the global properties.
+   */
+  public static final String PROFILER_HBASE_TABLE_DEFAULT = "profiler";
+
+  /**
+   * The default Profile column family name should none be defined in the global properties.
+   */
+  public static final String PROFILER_COLUMN_FAMILY_DEFAULT = "P";
+
   /**
    * The default Profile period duration should none be defined in the global properties.
    */
@@ -144,33 +154,26 @@ public class GetProfile implements StellarFunction {
 
   private static final Logger LOG = LoggerFactory.getLogger(GetProfile.class);
 
-
-  // Global configuration from client context, used to help create profiler client.
-  private Map<String, Object> global;
-
   // Cached client that can retrieve profile values.
   private ProfilerClient client;
 
-  // Cached value of config override map used to construct the previously cached client.
-  private Map cachedConfigOverrideMap = null;
+  // Cached value of config map actually used to construct the previously cached client.
+  private Map<String, Object> cachedConfigMap = new HashMap<String, Object>(6);
 
   /**
-   * Initialization.
+   * Initialization.  No longer need to do anything in initialization,
+   * as all setup is done lazily and cached.
    */
   @Override
   public void initialize(Context context) {
-    // ensure the required capabilities are defined
-    Context.Capabilities[] required = { GLOBAL_CONFIG };
-    validateCapabilities(context, required);
-    global = (Map<String, Object>) context.getCapability(GLOBAL_CONFIG).get();
   }
 
   /**
    * Is the function initialized?
    */
   @Override
   public boolean isInitialized() {
-    return global != null;
+    return true;
   }
 
   /**
@@ -199,44 +202,60 @@ public Object apply(List<Object> args, Context context) throws ParseException {
       groups = getGroupsArg(4, args);
     }
 
+    Map<String, Object> effectiveConfig = getEffectiveConfig(context, configOverrideMap);
+
     //lazily create new profiler client if needed
-    if (client == null
-            || (cachedConfigOverrideMap == null && configOverrideMap != null)
-            || (cachedConfigOverrideMap != null && !cachedConfigOverrideMap.equals(configOverrideMap))) {
-      Map<String, Object> configWithOverrides = mergeOverrides(global, configOverrideMap);
-      RowKeyBuilder rowKeyBuilder = getRowKeyBuilder(configWithOverrides);
-      ColumnBuilder columnBuilder = getColumnBuilder(configWithOverrides);
-      HTableInterface table = getTable(configWithOverrides);
+    if (client == null || !cachedConfigMap.equals(effectiveConfig)) {
+      RowKeyBuilder rowKeyBuilder = getRowKeyBuilder(effectiveConfig);
+      ColumnBuilder columnBuilder = getColumnBuilder(effectiveConfig);
+      HTableInterface table = getTable(effectiveConfig);
       client = new HBaseProfilerClient(table, rowKeyBuilder, columnBuilder);
-      cachedConfigOverrideMap = configOverrideMap;
+      cachedConfigMap = effectiveConfig;
     }
 
     return client.fetch(Object.class, profile, entity, groups, durationAgo, units);
   }
 
   /**
    * Merge the configuration parameter override Map into the config from global context,
-   * and return the result.
+   * and return the result.  This has to be done on each call, because either may have changed.
    *
-   * Only the six recognized profiler client config parameters may be overridden,
-   * all other key-value pairs in the Map will be ignored.
+   * Only the six recognized profiler client config parameters may be set,
+   * all other key-value pairs in either Map will be ignored.
    *
    * Type violations cause a Stellar ParseException.
    *
-   * @param global - a context global config Map.
-   * @param configOverrideMap - Map as described above.
-   * @return config Map with overrides applied.
+   * @param context - from which we get the global config Map.
+   * @param configOverrideMap - Map of overrides as described above.
+   * @return effective config Map with overrides applied.
    * @throws ParseException - if any override values are of wrong type.
    */
-  private Map<String, Object> mergeOverrides(
-              Map<String, Object> global
+  private Map<String, Object> getEffectiveConfig(
+              Context context
               , Map configOverrideMap
   ) throws ParseException {
 
-    if (configOverrideMap == null) return global;
+    final String[] KEYLIST = {
+            PROFILER_HBASE_TABLE, PROFILER_COLUMN_FAMILY,
+            PROFILER_HBASE_TABLE_PROVIDER, PROFILER_PERIOD,
+            PROFILER_PERIOD_UNITS, PROFILER_SALT_DIVISOR};
 
-    Map<String, Object> result = new HashMap<String, Object>(global);
+    // ensure the required capabilities are defined
+    final Context.Capabilities[] required = { GLOBAL_CONFIG };
+    validateCapabilities(context, required);
+    Map<String, Object> global = (Map<String, Object>) context.getCapability(GLOBAL_CONFIG).get();
+
+    Map<String, Object> result = new HashMap<String, Object>(6);
     Object v;
+
+    // extract the relevant parameters from global
+    for (String k : KEYLIST) {
+      v = global.get(k);
+      if (v != null) result.put(k, v);
+    }
+    if (configOverrideMap == null) return result;
+
+    // extract override values, typechecking as we go
     try {
       for (Object key : configOverrideMap.keySet()) {
         if (!(key instanceof String)) {
@@ -333,16 +352,10 @@ private <T> T getArg(int index, Class<T> clazz, List<Object> args) {
    * @param global The global configuration.
    */
   private ColumnBuilder getColumnBuilder(Map<String, Object> global) {
-    // the builder is not currently configurable - but should be made so
     ColumnBuilder columnBuilder;
 
-    if(global.containsKey(PROFILER_COLUMN_FAMILY)) {
-      String columnFamily = (String) global.get(PROFILER_COLUMN_FAMILY);
-      columnBuilder = new ValueOnlyColumnBuilder(columnFamily);
-
-    } else {
-      columnBuilder = new ValueOnlyColumnBuilder();
-    }
+    String columnFamily = (String) global.getOrDefault(PROFILER_COLUMN_FAMILY, PROFILER_COLUMN_FAMILY_DEFAULT);
+    columnBuilder = new ValueOnlyColumnBuilder(columnFamily);
 
     return columnBuilder;
   }
@@ -378,7 +391,7 @@ private RowKeyBuilder getRowKeyBuilder(Map<String, Object> global) {
    */
   private HTableInterface getTable(Map<String, Object> global) {
 
-    String tableName = (String) global.getOrDefault(PROFILER_HBASE_TABLE, "profiler");
+    String tableName = (String) global.getOrDefault(PROFILER_HBASE_TABLE, PROFILER_HBASE_TABLE_DEFAULT);
     TableProvider provider = getTableProvider(global);
 
     try {