#8 Auto filter logic

remora-core/src/main/java/com/jkoolcloud/remora/AdviceRegistry.java

@@ -21,14 +21,24 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import com.jkoolcloud.remora.advices.BaseTransformers;
 import com.jkoolcloud.remora.advices.RemoraAdvice;
+import com.jkoolcloud.remora.filters.AdviceFilter;
+import com.jkoolcloud.remora.filters.FilterManager;
+import com.jkoolcloud.remora.filters.LimitingFilter;
 
 public enum AdviceRegistry {
 	INSTANCE;
 
+	public static final String AUTO_LIMITING_FILTER = "AUTO_LIMITING_FILTER";
+	public static final int FILTER_ADVANCE = 2;
+	public static final int INITIAL_FILTER_EVERY_N_TH = 256;
+	public static final int RELEASE_TIME_SEC = 60;
 	private List<RemoraAdvice> adviceList = new ArrayList<>(50);
 	private Map<String, RemoraAdvice> adviceMap = new HashMap<>(50);
 
@@ -60,4 +70,32 @@ public BaseTransformers getBaseTransformerByName(String name) throws ClassNotFou
 		}
 	}
 
+	public static void limit() {
+		LimitingFilter limitingFilter = (LimitingFilter) FilterManager.INSTANCE.get(AUTO_LIMITING_FILTER);
+		if (limitingFilter == null) {
+
+			limitingFilter = new LimitingFilter();
+			limitingFilter.everyNth = INITIAL_FILTER_EVERY_N_TH * FILTER_ADVANCE;
+			FilterManager.INSTANCE.add(AUTO_LIMITING_FILTER, limitingFilter);
+		}
+		AdviceFilter filter = FilterManager.INSTANCE.get(AUTO_LIMITING_FILTER);
+		AdviceRegistry.INSTANCE.adviceList.stream()
+				.filter(advice -> !((BaseTransformers) advice).filters.contains(filter))
+				.forEach(advice -> ((BaseTransformers) advice).filters.add(filter));
+
+		((LimitingFilter) limitingFilter).everyNth /= FILTER_ADVANCE;
+		ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
+
+		executorService.scheduleAtFixedRate(AdviceRegistry::release, 0, RELEASE_TIME_SEC, TimeUnit.SECONDS);
+	}
+
+	public static void release() {
+		LimitingFilter limitingFilter = (LimitingFilter) FilterManager.INSTANCE.get(AUTO_LIMITING_FILTER);
+		limitingFilter.everyNth *= FILTER_ADVANCE;
+		if (limitingFilter.everyNth > INITIAL_FILTER_EVERY_N_TH) {
+			AdviceRegistry.INSTANCE.adviceList.stream().map(advice -> (BaseTransformers) advice)
+					.forEach(advice -> advice.filters.remove(limitingFilter));
+		}
+	}
+
 }

remora-core/src/main/java/com/jkoolcloud/remora/advices/BaseTransformers.java

@@ -29,8 +29,8 @@
 import com.jkoolcloud.remora.AdviceRegistry;
 import com.jkoolcloud.remora.RemoraConfig;
 import com.jkoolcloud.remora.core.CallStack;
+import com.jkoolcloud.remora.core.EmptyStack;
 import com.jkoolcloud.remora.core.EntryDefinition;
-import com.jkoolcloud.remora.core.FilteredOutEntryStack;
 import com.jkoolcloud.remora.core.output.OutputManager;
 import com.jkoolcloud.remora.filters.AdviceFilter;
 
@@ -150,7 +150,7 @@ public static void fillDefaultValuesAfter(EntryDefinition entryDefinition, long
 				entryDefinition.addProperty("PARENT", lastEntryDefinition.getId());
 			}
 		}
-		if (!entryDefinition.isTransparent() && !(stackThreadLocal.get() instanceof FilteredOutEntryStack)) {
+		if (!entryDefinition.isTransparent() && !(stackThreadLocal.get() instanceof EmptyStack)) {
 			OutputManager.send(entryDefinition);
 		}
 	}
@@ -167,7 +167,6 @@ public static void handleInstrumentedMethodException(EntryDefinition entryDefini
 
 	public static long fillDefaultValuesBefore(EntryDefinition entryDefinition,
 			ThreadLocal<CallStack<EntryDefinition>> stackThreadLocal, Object thiz, Method method, TaggedLogger logger) {
-		invokeOnIntercept(entryDefinition.getAdviceClassClass(), thiz, method);
 		if (entryDefinition.isChained()) {
 			return 0;
 		}
@@ -201,7 +200,7 @@ public static long fillDefaultValuesBefore(EntryDefinition entryDefinition,
 			if (getAdviceInstance(entryDefinition.getAdviceClassClass()).sendStackTrace) {
 				entryDefinition.setStackTrace(getStackTrace());
 			}
-			if (!entryDefinition.isTransparent() || !(stackThreadLocal.get() instanceof FilteredOutEntryStack)) {
+			if (!entryDefinition.isTransparent() || !(stackThreadLocal.get() instanceof EmptyStack)) {
 				OutputManager.send(entryDefinition);
 			}
 		} catch (Throwable t) {
@@ -395,14 +394,18 @@ private static <T extends BaseTransformers> T getAdviceInstance(Class<T> tClass)
 
 	public static boolean intercept(Class<? extends BaseTransformers> tClass, Object thiz, Method method,
 			TaggedLogger logger, Object... arguments) {
+		invokeOnIntercept(tClass, thiz, method);
+		if (stackThreadLocal.get() instanceof EmptyStack) {
+			return false;
+		}
 		if (!getAdviceInstance(tClass).enabled) {
 			return false;
 		}
 		for (AdviceFilter filter : getAdviceInstance(tClass).filters) {
 			if (!filter.intercept(thiz, method, arguments)) {
 				if (filter.excludeWholeStack()) {
 					if (stackThreadLocal.get() == null || stackThreadLocal.get().isEmpty()) {
-						stackThreadLocal.set(new FilteredOutEntryStack(logger, callStackLimit));
+						stackThreadLocal.set(new EmptyStack(logger, callStackLimit));
 					}
 				}
 				return false;

remora-core/src/main/java/com/jkoolcloud/remora/core/FilteredOutEntryStack.java → remora-core/src/main/java/com/jkoolcloud/remora/core/EmptyStack.java

@@ -18,8 +18,8 @@
 
 import org.tinylog.TaggedLogger;
 
-public class FilteredOutEntryStack extends CallStack {
-	public FilteredOutEntryStack(TaggedLogger logger, int limit) {
+public class EmptyStack extends CallStack {
+	public EmptyStack(TaggedLogger logger, int limit) {
 		super(logger, limit);
 		push(new EntryDefinition.DummyEntryDefinition());
 	}

remora-core/src/main/java/com/jkoolcloud/remora/core/output/ChronicleOutput.java

@@ -27,6 +27,7 @@
 import org.tinylog.Logger;
 import org.tinylog.TaggedLogger;
 
+import com.jkoolcloud.remora.AdviceRegistry;
 import com.jkoolcloud.remora.Remora;
 import com.jkoolcloud.remora.RemoraConfig;
 import com.jkoolcloud.remora.core.EntryDefinition;
@@ -123,8 +124,11 @@ public void onReleased(int cycle, File file) {
 		}
 
 		queueWorkers = new ThreadPoolExecutor(workerSize, workerSize, 0, TimeUnit.MILLISECONDS,
-				new ArrayBlockingQueue<>(intermediateQueueSize), threadFactory,
-				(r, executor) -> ScheduledQueueErrorReporter.intermediateQueueFailCount.incrementAndGet());
+				new ArrayBlockingQueue<>(intermediateQueueSize), threadFactory, (r, executor) -> {
+					ScheduledQueueErrorReporter.intermediateQueueFailCount.incrementAndGet();
+					logger.warn("Limiting advices, Overfilled queue");
+					AdviceRegistry.limit();
+				});
 
 	}
 
@@ -165,7 +169,7 @@ public ExcerptAppender getAppender() {
 		public ChronicleAppenderThread(Runnable r, ExcerptAppender appender) {
 			super(r);
 
-            threadAppender = appender;
+			threadAppender = appender;
 		}
 	}
 }

remora-core/src/main/java/com/jkoolcloud/remora/filters/FilterManager.java

@@ -35,6 +35,12 @@ public void add(String filterName, StatisticEnabledFilter filter) {
 		filters.put(filterName, filter);
 	}
 
+	public void add(String filterName, AdviceFilter filter) {
+		if (filter instanceof StatisticEnabledFilter) {
+            add(filterName, filter);
+        }
+	}
+
 	public AdviceFilter get(String filterName) {
 		return filters.get(filterName);
 	}

remora-websphere/pom.xml

@@ -37,11 +37,11 @@
     <url>https://github.com/Nastel/</url>
 
     <properties>
-        <ibm.thinclient>${websphere.install.dir}//lib//com.ibm.jaxws.thinclient_8.5.0.jar</ibm.thinclient>
-        <ibm.runtimes>${websphere.install.dir}//lib//com.ibm.ws.runtime.jar</ibm.runtimes>
-        <ibm.webcontainer>${websphere.install.dir}//lib//com.ibm.ws.webcontainer.jar</ibm.webcontainer>
-        <ibm.rsaHelpers>${websphere.install.dir}//lib//rsahelpers.jar</ibm.rsaHelpers>
-        <ibm.adminService>${websphere.install.dir}//lib//com.ibm.ws.admin.core.jar</ibm.adminService>
+        <ibm.thinclient>${websphere.install.dir}\runtimes\com.ibm.jaxws.thinclient_8.5.0.jar</ibm.thinclient>
+        <ibm.runtimes>${websphere.install.dir}\plugins\com.ibm.ws.runtime.jar</ibm.runtimes>
+        <ibm.webcontainer>${websphere.install.dir}\plugins\com.ibm.ws.webcontainer.jar</ibm.webcontainer>
+        <ibm.rsaHelpers>${websphere.install.dir}\lib\rsahelpers.jar</ibm.rsaHelpers>
+        <ibm.adminService>${websphere.install.dir}\plugins\com.ibm.ws.admin.core.jar</ibm.adminService>
     </properties>
 
     <dependencies>