Support multiple clojure.storm.instrumentOnlyPrefixes.* and clojure.storm.instrumentSkipPrefixes.* that will get merged

Author: jpmonettas

Diff for: CHANGELOG.md

@@ -3,6 +3,8 @@
 ## master (unreleased)
 
 ### New Features
+
+    - Support multiple clojure.storm.instrumentOnlyPrefixes.* and clojure.storm.instrumentSkipPrefixes.* that will get merged
 
 ### Changes
                     

Diff for: src/jvm/clojure/storm/Emitter.java

@@ -69,31 +69,19 @@ public class Emitter {
                 {                
                 // This is kind of hacky because ClojureStorm shouldn't have anything related to
                 // flow-storm, but we want to be sure that we never automatically instrument flow-storm root
-                if(!autoPrefix.equals("flow-storm")) {
+                if(!autoPrefix.equals("flow-storm") && !autoPrefix.equals("clojure")) {
                     System.out.println("ClojureStorm adding instrumentation auto prefix " + autoPrefix);
                     addInstrumentationOnlyPrefix(autoPrefix);
                 }
 
                 }
             }
 
-        String onlyPrefixesProp = System.getProperty("clojure.storm.instrumentOnlyPrefixes");
-		if(onlyPrefixesProp != null && !onlyPrefixesProp.isBlank())
-			{
-                String[] prefixes = onlyPrefixesProp.split(",");
-				for(String p : prefixes)
-					addInstrumentationOnlyPrefix(p);
-					
-			}
+        for(String p : Utils.prefixesForPropStartingWith("clojure.storm.instrumentOnlyPrefixes"))
+            addInstrumentationOnlyPrefix(p);
 
-        String skipPrefixesProp = System.getProperty("clojure.storm.instrumentSkipPrefixes"); 
-		if(skipPrefixesProp != null && !skipPrefixesProp.isBlank())
-			{
-				String[] prefixes = skipPrefixesProp.split(",");
-				for(String p : prefixes)
-					addInstrumentationSkipPrefix(p);
-					
-			}
+        for(String p : Utils.prefixesForPropStartingWith("clojure.storm.instrumentSkipPrefixes"))
+            addInstrumentationSkipPrefix(p);
 
         String skipRegexProp = System.getProperty("clojure.storm.instrumentSkipRegex"); 
 		if(skipRegexProp != null)

Diff for: src/jvm/clojure/storm/Utils.java

@@ -28,6 +28,8 @@
 import java.util.ArrayList;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.Map;
+import java.util.Properties;
 import java.io.File;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -335,4 +337,24 @@ public static boolean isAnnoyingLeinNreplForm(Object form) {
         return false;
     }
 
+    public static List<String> prefixesForPropStartingWith(String propPrefix) {
+        List foundPrefixes = new ArrayList<String>();
+
+        Properties properties = System.getProperties();
+        for(Map.Entry<Object, Object> propEntry : properties.entrySet()) {
+            String propKey = (String)propEntry.getKey();
+            if (propKey.startsWith(propPrefix)) {
+                String propVal = (String)propEntry.getValue();
+
+                if(propVal != null && !propVal.isBlank()) {
+                    String[] prefixes = propVal.split(",");
+                    for(String p : prefixes)
+                        foundPrefixes.add(p);					
+                    }        
+                }
+            }
+        
+        return foundPrefixes;
+    }
+
 	}