diff --git a/remora-apacheHttpClient/src/main/java/com/jkoolcloud/remora/advices/ApacheHttpClientAdvice.java b/remora-apacheHttpClient/src/main/java/com/jkoolcloud/remora/advices/ApacheHttpClientAdvice.java index 952057e..a1bcc63 100644 --- a/remora-apacheHttpClient/src/main/java/com/jkoolcloud/remora/advices/ApacheHttpClientAdvice.java +++ b/remora-apacheHttpClient/src/main/java/com/jkoolcloud/remora/advices/ApacheHttpClientAdvice.java @@ -109,7 +109,7 @@ public static void before(@Advice.This Object thiz, // @Advice.Local("ed") EntryDefinition ed, // @Advice.Local("startTime") long startTime) { try { - if (!intercept(ApacheHttpClientAdvice.class, thiz, method, route, request)) { + if (!intercept(ApacheHttpClientAdvice.class, thiz, method, logging ? logger : null, route, request)) { return; } ed = getEntryDefinition(ed, ApacheHttpClientAdvice.class, logging ? logger : null); @@ -189,7 +189,7 @@ public static void after(@Advice.This Object obj, // @Advice.Local("startTime") long startTime) { boolean doFinally = true; try { - if (!intercept(ApacheHttpClientAdvice.class, obj, method, arguments)) { + if (!intercept(ApacheHttpClientAdvice.class, obj, method, logging ? logger : null, arguments)) { return; } if (ed == null) { // ed expected to be null if not created by entry, that's for duplicates diff --git a/remora-apacheHttpClient/src/main/java/com/jkoolcloud/remora/advices/ApacheLegacyHttpClientAdvice.java b/remora-apacheHttpClient/src/main/java/com/jkoolcloud/remora/advices/ApacheLegacyHttpClientAdvice.java index ce240e2..5462fef 100644 --- a/remora-apacheHttpClient/src/main/java/com/jkoolcloud/remora/advices/ApacheLegacyHttpClientAdvice.java +++ b/remora-apacheHttpClient/src/main/java/com/jkoolcloud/remora/advices/ApacheLegacyHttpClientAdvice.java @@ -101,7 +101,7 @@ public static void before(@Advice.This Object thiz, // @Advice.Local("ed") EntryDefinition ed, // @Advice.Local("startTime") long startTime) { try { - if (!intercept(ApacheLegacyHttpClientAdvice.class, thiz, method, route, request)) { + if (!intercept(ApacheLegacyHttpClientAdvice.class, thiz, method, logging ? logger : null, route, request)) { return; } ed = getEntryDefinition(ed, ApacheHttpClientAdvice.class, logging ? logger : null); @@ -149,7 +149,7 @@ public static void after(@Advice.This Object obj, // @Advice.Local("startTime") long startTime) { boolean doFinally = true; try { - if (!intercept(ApacheLegacyHttpClientAdvice.class, obj, method, arguments)) { + if (!intercept(ApacheLegacyHttpClientAdvice.class, obj, method, logging ? logger : null, arguments)) { return; } if (ed == null) { // ed expected to be null if not created by entry, that's for duplicates diff --git a/remora-archetype/src/main/resources/archetype-resources/src/main/java/advices/__adviceClassName__Advice.java b/remora-archetype/src/main/resources/archetype-resources/src/main/java/advices/__adviceClassName__Advice.java index 93c0926..4818199 100644 --- a/remora-archetype/src/main/resources/archetype-resources/src/main/java/advices/__adviceClassName__Advice.java +++ b/remora-archetype/src/main/resources/archetype-resources/src/main/java/advices/__adviceClassName__Advice.java @@ -101,7 +101,7 @@ public static void before(@Advice.This Object thiz, // @Advice.Local("ed") EntryDefinition ed, // @Advice.Local("startTime") long startTime) { try { - if (!intercept(${adviceClassName}Advice.class, thiz, method, arguments)) { + if (!intercept(${adviceClassName}Advice.class, thiz, method, logging ? logger : null, arguments)) { return; } ed = getEntryDefinition(ed, ${adviceClassName}Advice.class, logging ? logger : null);; @@ -138,7 +138,7 @@ public static void after(@Advice.This Object obj, // @Advice.Local("startTime") long startTime) { boolean doFinally = true; try { - if (!intercept(${adviceClassName}Advice.class, thiz, method, arguments)) { + if (!intercept(${adviceClassName}Advice.class, thiz, method, logging ? logger : null, arguments)) { return; } if (ed == null) { // ed expected to be null if not created by entry, that's for duplicates diff --git a/remora-core/src/main/java/com/jkoolcloud/remora/advices/BaseTransformers.java b/remora-core/src/main/java/com/jkoolcloud/remora/advices/BaseTransformers.java index 684678b..ba7e299 100644 --- a/remora-core/src/main/java/com/jkoolcloud/remora/advices/BaseTransformers.java +++ b/remora-core/src/main/java/com/jkoolcloud/remora/advices/BaseTransformers.java @@ -30,6 +30,7 @@ import com.jkoolcloud.remora.RemoraConfig; import com.jkoolcloud.remora.core.CallStack; 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; @@ -149,7 +150,7 @@ public static void fillDefaultValuesAfter(EntryDefinition entryDefinition, long entryDefinition.addProperty("PARENT", lastEntryDefinition.getId()); } } - if (!entryDefinition.isTransparent()) { + if (!entryDefinition.isTransparent() && !(stackThreadLocal.get() instanceof FilteredOutEntryStack)) { OutputManager.send(entryDefinition); } } @@ -200,7 +201,7 @@ public static long fillDefaultValuesBefore(EntryDefinition entryDefinition, if (getAdviceInstance(entryDefinition.getAdviceClassClass()).sendStackTrace) { entryDefinition.setStackTrace(getStackTrace()); } - if (!entryDefinition.isTransparent()) { + if (!entryDefinition.isTransparent() || !(stackThreadLocal.get() instanceof FilteredOutEntryStack)) { OutputManager.send(entryDefinition); } } catch (Throwable t) { @@ -393,12 +394,17 @@ private static T getAdviceInstance(Class tClass) } public static boolean intercept(Class tClass, Object thiz, Method method, - Object... arguments) { + TaggedLogger logger, Object... arguments) { 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)); + } + } return false; } } diff --git a/remora-core/src/main/java/com/jkoolcloud/remora/core/CallStack.java b/remora-core/src/main/java/com/jkoolcloud/remora/core/CallStack.java index d34c3a0..cbd813a 100644 --- a/remora-core/src/main/java/com/jkoolcloud/remora/core/CallStack.java +++ b/remora-core/src/main/java/com/jkoolcloud/remora/core/CallStack.java @@ -92,4 +92,5 @@ public void setServer(String server) { entryDefinition.setServer(server); } } + } diff --git a/remora-core/src/main/java/com/jkoolcloud/remora/core/EntryDefinition.java b/remora-core/src/main/java/com/jkoolcloud/remora/core/EntryDefinition.java index cc2ba79..f3aa3c4 100644 --- a/remora-core/src/main/java/com/jkoolcloud/remora/core/EntryDefinition.java +++ b/remora-core/src/main/java/com/jkoolcloud/remora/core/EntryDefinition.java @@ -317,4 +317,11 @@ public enum Mode { public enum ResourceType { GENERIC, USER, APPL, PROCESS, APPSERVER, SERVER, RUNTIME, VIRTUAL, NETWORK, DEVICE, NETADDR, GEOADDR, DATACENTER, DATASTORE, CACHE, SERVICE, QUEUE, FILE, TOPIC, DATABASE, HTTP } + + public static class DummyEntryDefinition extends EntryDefinition { + + public DummyEntryDefinition() { + super(BaseTransformers.class, false); + } + } } diff --git a/remora-core/src/main/java/com/jkoolcloud/remora/core/FilteredOutEntryStack.java b/remora-core/src/main/java/com/jkoolcloud/remora/core/FilteredOutEntryStack.java new file mode 100644 index 0000000..e7ea836 --- /dev/null +++ b/remora-core/src/main/java/com/jkoolcloud/remora/core/FilteredOutEntryStack.java @@ -0,0 +1,27 @@ +/* + * Copyright 2019-2020 NASTEL TECHNOLOGIES, INC. + * + * 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 com.jkoolcloud.remora.core; + +import org.tinylog.TaggedLogger; + +public class FilteredOutEntryStack extends CallStack { + public FilteredOutEntryStack(TaggedLogger logger, int limit) { + super(logger, limit); + push(new EntryDefinition.DummyEntryDefinition()); + } + +} diff --git a/remora-core/src/main/java/com/jkoolcloud/remora/filters/AdviceFilter.java b/remora-core/src/main/java/com/jkoolcloud/remora/filters/AdviceFilter.java index 5540f53..fa04673 100644 --- a/remora-core/src/main/java/com/jkoolcloud/remora/filters/AdviceFilter.java +++ b/remora-core/src/main/java/com/jkoolcloud/remora/filters/AdviceFilter.java @@ -24,6 +24,8 @@ public interface AdviceFilter { void countInvoked(); + boolean excludeWholeStack(); + boolean maches(Object thiz, Method method, Object... arguments); Mode getMode(); diff --git a/remora-core/src/main/java/com/jkoolcloud/remora/filters/ClassNameFilter.java b/remora-core/src/main/java/com/jkoolcloud/remora/filters/ClassNameFilter.java index 1b1fafd..2e246bb 100644 --- a/remora-core/src/main/java/com/jkoolcloud/remora/filters/ClassNameFilter.java +++ b/remora-core/src/main/java/com/jkoolcloud/remora/filters/ClassNameFilter.java @@ -31,6 +31,11 @@ public class ClassNameFilter extends StatisticEnabledFilter { @RemoraConfig.Configurable public boolean regex = false; + @Override + public boolean excludeWholeStack() { + return false; + } + @Override public boolean maches(Object thiz, Method method, Object... arguments) { if (regex) { diff --git a/remora-core/src/main/java/com/jkoolcloud/remora/filters/LimitingFilter.java b/remora-core/src/main/java/com/jkoolcloud/remora/filters/LimitingFilter.java index a4b49e0..4ae69bf 100644 --- a/remora-core/src/main/java/com/jkoolcloud/remora/filters/LimitingFilter.java +++ b/remora-core/src/main/java/com/jkoolcloud/remora/filters/LimitingFilter.java @@ -27,6 +27,14 @@ public class LimitingFilter extends StatisticEnabledFilter { @RemoraConfig.Configurable public Mode mode = Mode.EXCLUDE; + @RemoraConfig.Configurable + public boolean shouldExcludeWholeStack = true; + + @Override + public boolean excludeWholeStack() { + return shouldExcludeWholeStack; + } + @Override public boolean maches(Object thiz, Method method, Object... arguments) { if (everyNth <= 1) { diff --git a/remora-ejb3/src/main/java/com/jkoolcloud/remora/advices/EjbRemoteAdvice.java b/remora-ejb3/src/main/java/com/jkoolcloud/remora/advices/EjbRemoteAdvice.java index f249a38..48ae4f1 100644 --- a/remora-ejb3/src/main/java/com/jkoolcloud/remora/advices/EjbRemoteAdvice.java +++ b/remora-ejb3/src/main/java/com/jkoolcloud/remora/advices/EjbRemoteAdvice.java @@ -98,7 +98,7 @@ public static void before(@Advice.This Object thiz, // @Advice.Local("ed") EntryDefinition ed, // @Advice.Local("startTime") long startTime) { try { - if (!intercept(EjbRemoteAdvice.class, thiz, method, arguments)) { + if (!intercept(EjbRemoteAdvice.class, thiz, method, logging ? logger : null, arguments)) { return; } ed = getEntryDefinition(ed, EjbRemoteAdvice.class, logging ? logger : null); @@ -149,7 +149,7 @@ public static void after(@Advice.This Object obj, // @Advice.Local("startTime") long startTime) { boolean doFinally = true; try { - if (!intercept(EjbRemoteAdvice.class, obj, method, arguments)) { + if (!intercept(EjbRemoteAdvice.class, obj, method, logging ? logger : null, arguments)) { return; } if (ed == null) { // ed expected to be null if not created by entry, that's for duplicates diff --git a/remora-httpUrlConnection/src/main/java/com/jkoolcloud/remora/advices/HttpUrlConnectionAdvice.java b/remora-httpUrlConnection/src/main/java/com/jkoolcloud/remora/advices/HttpUrlConnectionAdvice.java index 9f042bd..de3b499 100644 --- a/remora-httpUrlConnection/src/main/java/com/jkoolcloud/remora/advices/HttpUrlConnectionAdvice.java +++ b/remora-httpUrlConnection/src/main/java/com/jkoolcloud/remora/advices/HttpUrlConnectionAdvice.java @@ -98,7 +98,7 @@ public static void before(@Advice.This HttpURLConnection thiz, // @Advice.Local("ed") EntryDefinition ed, // @Advice.Local("startTime") long startTime) { try { - if (!intercept(HttpUrlConnectionAdvice.class, thiz, method, arguments)) { + if (!intercept(HttpUrlConnectionAdvice.class, thiz, method, logging ? logger : null, arguments)) { return; } ed = getEntryDefinition(ed, HttpUrlConnectionAdvice.class, logging ? logger : null); @@ -141,7 +141,7 @@ public static void after(@Advice.This HttpURLConnection obj, // @Advice.Local("startTime") long startTime) { boolean doFinally = true; try { - if (!intercept(HttpUrlConnectionAdvice.class, obj, method, arguments)) { + if (!intercept(HttpUrlConnectionAdvice.class, obj, method, logging ? logger : null, arguments)) { return; } if (ed == null) { // ed expected to be null if not created by entry, that's for duplicates diff --git a/remora-io/src/main/java/com/jkoolcloud/remora/advices/InputStreamCloseAdvice.java b/remora-io/src/main/java/com/jkoolcloud/remora/advices/InputStreamCloseAdvice.java index 5db281c..d6cedff 100644 --- a/remora-io/src/main/java/com/jkoolcloud/remora/advices/InputStreamCloseAdvice.java +++ b/remora-io/src/main/java/com/jkoolcloud/remora/advices/InputStreamCloseAdvice.java @@ -85,7 +85,7 @@ public AgentBuilder.Transformer getAdvice() { public static void after(@Advice.This InputStream thiz, // @Advice.Origin Method method // ) { - if (!intercept(InputStreamCloseAdvice.class, thiz, method)) { + if (!intercept(InputStreamCloseAdvice.class, thiz, method, logging ? logger : null)) { return; } if (logging) { diff --git a/remora-io/src/main/java/com/jkoolcloud/remora/advices/InputStreamReadAdvice.java b/remora-io/src/main/java/com/jkoolcloud/remora/advices/InputStreamReadAdvice.java index 69fca1d..9dfa962 100644 --- a/remora-io/src/main/java/com/jkoolcloud/remora/advices/InputStreamReadAdvice.java +++ b/remora-io/src/main/java/com/jkoolcloud/remora/advices/InputStreamReadAdvice.java @@ -90,7 +90,7 @@ public static void before(@Advice.This InputStream thiz, // @Advice.Origin Method method// ) { try { - if (!intercept(InputStreamReadAdvice.class, thiz, method, arguments)) { + if (!intercept(InputStreamReadAdvice.class, thiz, method, logging ? logger : null, arguments)) { return; } StreamStats streamStats = StreamsManager.INSTANCE.get(thiz, logging ? logger : null, method); diff --git a/remora-io/src/main/java/com/jkoolcloud/remora/advices/OutputStreamCloseAdvice.java b/remora-io/src/main/java/com/jkoolcloud/remora/advices/OutputStreamCloseAdvice.java index e9514da..e013140 100644 --- a/remora-io/src/main/java/com/jkoolcloud/remora/advices/OutputStreamCloseAdvice.java +++ b/remora-io/src/main/java/com/jkoolcloud/remora/advices/OutputStreamCloseAdvice.java @@ -84,7 +84,7 @@ public AgentBuilder.Transformer getAdvice() { public static void after(@Advice.This OutputStream thiz, // @Advice.Origin Method method // ) { - if (!intercept(OutputStreamCloseAdvice.class, thiz, method)) { + if (!intercept(OutputStreamCloseAdvice.class, thiz, method, logging ? logger : null)) { return; } if (logging) { diff --git a/remora-io/src/main/java/com/jkoolcloud/remora/advices/OutputStreamWriteAdvice.java b/remora-io/src/main/java/com/jkoolcloud/remora/advices/OutputStreamWriteAdvice.java index 8c0a911..55864d4 100644 --- a/remora-io/src/main/java/com/jkoolcloud/remora/advices/OutputStreamWriteAdvice.java +++ b/remora-io/src/main/java/com/jkoolcloud/remora/advices/OutputStreamWriteAdvice.java @@ -88,7 +88,7 @@ public static void before(@Advice.This OutputStream thiz, // @Advice.Origin Method method// ) { try { - if (!intercept(OutputStreamWriteAdvice.class, thiz, method, arguments)) { + if (!intercept(OutputStreamWriteAdvice.class, thiz, method, logging ? logger : null, arguments)) { return; } StreamsManager.INSTANCE.get(thiz, logging ? logger : null, method).advanceCount(); diff --git a/remora-javaxServlet/src/main/java/com/jkoolcloud/remora/advices/JavaxServletAdvice.java b/remora-javaxServlet/src/main/java/com/jkoolcloud/remora/advices/JavaxServletAdvice.java index 79db9ae..ce2223d 100644 --- a/remora-javaxServlet/src/main/java/com/jkoolcloud/remora/advices/JavaxServletAdvice.java +++ b/remora-javaxServlet/src/main/java/com/jkoolcloud/remora/advices/JavaxServletAdvice.java @@ -110,7 +110,7 @@ public static void before(@Advice.This Object thiz, // // @Advice.Local("remoraLogger") Logger logger) // { try { - if (!intercept(JavaxServletAdvice.class, thiz, method, req, resp)) { + if (!intercept(JavaxServletAdvice.class, thiz, method, logging ? logger : null, req, resp)) { return; } if (logging) { @@ -232,7 +232,7 @@ public static void after(@Advice.This Object obj, // { boolean doFinally = true; try { - if (!intercept(JavaxServletAdvice.class, obj, method, req, resp)) { + if (!intercept(JavaxServletAdvice.class, obj, method, logging ? logger : null, req, resp)) { return; } if (ed == null) { // ed expected to be null if not created by entry, that's for duplicates diff --git a/remora-jboss/src/main/java/com/jkoolcloud/remora/advices/JBossAdvice.java b/remora-jboss/src/main/java/com/jkoolcloud/remora/advices/JBossAdvice.java index 002400f..5a7581d 100644 --- a/remora-jboss/src/main/java/com/jkoolcloud/remora/advices/JBossAdvice.java +++ b/remora-jboss/src/main/java/com/jkoolcloud/remora/advices/JBossAdvice.java @@ -86,7 +86,7 @@ public static void before(@Advice.This Object thiz, // @Advice.Local("ed") EntryDefinition ed, // @Advice.Local("startTime") long startTime) { try { - if (!intercept(JBossAdvice.class, thiz, method, arguments)) { + if (!intercept(JBossAdvice.class, thiz, method, logging ? logger : null, arguments)) { return; } ed = getEntryDefinition(ed, JBossAdvice.class, logging ? logger : null); @@ -141,7 +141,7 @@ public static void after(@Advice.This Object obj, // @Advice.Local("startTime") long startTime) { boolean doFinally = true; try { - if (!intercept(JBossAdvice.class, obj, method, req, resp)) { + if (!intercept(JBossAdvice.class, obj, method, logging ? logger : null, req, resp)) { return; } if (ed == null) { // ed expected to be null if not created by entry, that's for duplicates diff --git a/remora-jboss/src/main/java/com/jkoolcloud/remora/advices/JBossServletAdvice.java b/remora-jboss/src/main/java/com/jkoolcloud/remora/advices/JBossServletAdvice.java index 793ca9f..41a61d6 100644 --- a/remora-jboss/src/main/java/com/jkoolcloud/remora/advices/JBossServletAdvice.java +++ b/remora-jboss/src/main/java/com/jkoolcloud/remora/advices/JBossServletAdvice.java @@ -80,7 +80,7 @@ public static void before(@Advice.This Object thiz, // @Advice.Local("ed") EntryDefinition ed, // @Advice.Local("startTime") long startTime) { try { - if (!intercept(JBossServletAdvice.class, thiz, method, arguments)) { + if (!intercept(JBossServletAdvice.class, thiz, method, logging ? logger : null, arguments)) { return; } ed = getEntryDefinition(ed, JBossServletAdvice.class, logging ? logger : null); @@ -125,7 +125,7 @@ public static void after(@Advice.This Object obj, // @Advice.Local("startTime") long startTime) { boolean doFinally = true; try { - if (!intercept(JBossServletAdvice.class, obj, method, arguments)) { + if (!intercept(JBossServletAdvice.class, obj, method, logging ? logger : null, arguments)) { return; } if (ed == null) { // ed expected to be null if not created by entry, that's for duplicates diff --git a/remora-jdbc/src/main/java/com/jkoolcloud/remora/advices/JDBCCallableStatementAdvice.java b/remora-jdbc/src/main/java/com/jkoolcloud/remora/advices/JDBCCallableStatementAdvice.java index e30d404..419119f 100644 --- a/remora-jdbc/src/main/java/com/jkoolcloud/remora/advices/JDBCCallableStatementAdvice.java +++ b/remora-jdbc/src/main/java/com/jkoolcloud/remora/advices/JDBCCallableStatementAdvice.java @@ -99,7 +99,8 @@ public static void before(@Advice.This Statement thiz, // @Advice.Local("ed") EntryDefinition ed, // @Advice.Local("startTime") long startTime) { try { - if (!intercept(JDBCCallableStatementAdvice.class, thiz, method, parameterName, parameterValue)) { + if (!intercept(JDBCCallableStatementAdvice.class, thiz, method, logging ? logger : null, parameterName, + parameterValue)) { return; } if (logging) { @@ -141,7 +142,7 @@ public static void after(@Advice.This Statement thiz, // @Advice.Thrown Throwable exception, @Advice.Local("ed") EntryDefinition ed, // @Advice.Local("startTime") long startTime) { try { - if (!intercept(JDBCCallableStatementAdvice.class, thiz, method)) { + if (!intercept(JDBCCallableStatementAdvice.class, thiz, method, logging ? logger : null)) { return; } stackThreadLocal.get().pop(); diff --git a/remora-jdbc/src/main/java/com/jkoolcloud/remora/advices/JDBCStatementAdvice.java b/remora-jdbc/src/main/java/com/jkoolcloud/remora/advices/JDBCStatementAdvice.java index ad62ef5..440938c 100644 --- a/remora-jdbc/src/main/java/com/jkoolcloud/remora/advices/JDBCStatementAdvice.java +++ b/remora-jdbc/src/main/java/com/jkoolcloud/remora/advices/JDBCStatementAdvice.java @@ -100,7 +100,7 @@ public static void before(@Advice.This Statement thiz, // // if (isChainedClassInterception(JDBCStatementAdvice.class, logging ? logger : null)) { // return; // } - if (!intercept(JDBCStatementAdvice.class, thiz, method, arguments)) { + if (!intercept(JDBCStatementAdvice.class, thiz, method, logging ? logger : null, arguments)) { return; } ed = getEntryDefinition(ed, JDBCStatementAdvice.class, logging ? logger : null); @@ -174,7 +174,7 @@ public static void after(@Advice.This Statement thiz, // @Advice.Local("startTime") long startTime) { boolean doFinally = true; try { - if (!intercept(JDBCStatementAdvice.class, thiz, method)) { + if (!intercept(JDBCStatementAdvice.class, thiz, method, logging ? logger : null)) { return; } if (ed == null) { // ed expected to be null if not created by entry, that's for duplicates diff --git a/remora-jms/src/main/java/com/jkoolcloud/remora/advices/JMSCreateConnectionAdvice.java b/remora-jms/src/main/java/com/jkoolcloud/remora/advices/JMSCreateConnectionAdvice.java index 92bf726..7b57d4d 100644 --- a/remora-jms/src/main/java/com/jkoolcloud/remora/advices/JMSCreateConnectionAdvice.java +++ b/remora-jms/src/main/java/com/jkoolcloud/remora/advices/JMSCreateConnectionAdvice.java @@ -102,7 +102,7 @@ public static void before(@Advice.This ConnectionFactory thiz, // // @Advice.Local("remoraLogger") Logger logger) // { try { - if (!intercept(JMSCreateConnectionAdvice.class, thiz, method, arguments)) { + if (!intercept(JMSCreateConnectionAdvice.class, thiz, method, logging ? logger : null, arguments)) { return; } if (logging) { @@ -157,7 +157,7 @@ public static void after(@Advice.This ConnectionFactory obj, // { boolean doFinally = true; try { - if (!intercept(JMSCreateConnectionAdvice.class, obj, method, arguments)) { + if (!intercept(JMSCreateConnectionAdvice.class, obj, method, logging ? logger : null, arguments)) { return; } if (ed == null) { // ed expected to be null if not created by entry, that's for duplicates diff --git a/remora-jms/src/main/java/com/jkoolcloud/remora/advices/JMSReceiveAdvice.java b/remora-jms/src/main/java/com/jkoolcloud/remora/advices/JMSReceiveAdvice.java index 31dd0c0..5df7c70 100644 --- a/remora-jms/src/main/java/com/jkoolcloud/remora/advices/JMSReceiveAdvice.java +++ b/remora-jms/src/main/java/com/jkoolcloud/remora/advices/JMSReceiveAdvice.java @@ -103,7 +103,7 @@ public static void before(@Advice.This MessageConsumer thiz, // // @Advice.Local("remoraLogger") Logger logger) // ) // { try { - if (!intercept(JMSReceiveAdvice.class, thiz, method, arguments)) { + if (!intercept(JMSReceiveAdvice.class, thiz, method, logging ? logger : null, arguments)) { return; } if (logging) { @@ -159,7 +159,7 @@ public static void after(@Advice.This MessageConsumer obj, // { boolean doFinnaly = true; try { - if (!intercept(JMSReceiveAdvice.class, obj, method, arguments)) { + if (!intercept(JMSReceiveAdvice.class, obj, method, logging ? logger : null, arguments)) { return; } if (logging) { diff --git a/remora-jms/src/main/java/com/jkoolcloud/remora/advices/JMSSendAdvice.java b/remora-jms/src/main/java/com/jkoolcloud/remora/advices/JMSSendAdvice.java index 582440c..eda9af5 100644 --- a/remora-jms/src/main/java/com/jkoolcloud/remora/advices/JMSSendAdvice.java +++ b/remora-jms/src/main/java/com/jkoolcloud/remora/advices/JMSSendAdvice.java @@ -87,7 +87,7 @@ public static void before(@Advice.This MessageProducer thiz, // // @Advice.Local("remoraLogger") Logger logger) // { try { - if (!intercept(JMSSendAdvice.class, thiz, method, arguments)) { + if (!intercept(JMSSendAdvice.class, thiz, method, logging ? logger : null, arguments)) { return; } if (logging) { @@ -147,7 +147,7 @@ public static void after(@Advice.This MessageProducer obj, // ) { boolean doFinally = true; try { - if (!intercept(JMSSendAdvice.class, obj, method, arguments)) { + if (!intercept(JMSSendAdvice.class, obj, method, logging ? logger : null, arguments)) { return; } if (ed == null) // noinspection Duplicates diff --git a/remora-kafka/src/main/java/com/jkoolcloud/remora/advices/KafkaConsumerAdvice.java b/remora-kafka/src/main/java/com/jkoolcloud/remora/advices/KafkaConsumerAdvice.java index ba6e0f4..3769227 100644 --- a/remora-kafka/src/main/java/com/jkoolcloud/remora/advices/KafkaConsumerAdvice.java +++ b/remora-kafka/src/main/java/com/jkoolcloud/remora/advices/KafkaConsumerAdvice.java @@ -99,7 +99,7 @@ public static void before(@Advice.This Object thiz, // // { try { - if (!intercept(KafkaConsumerAdvice.class, thiz, method, arguments)) { + if (!intercept(KafkaConsumerAdvice.class, thiz, method, logging ? logger : null, arguments)) { return; } ed = getEntryDefinition(ed, KafkaConsumerAdvice.class, logging ? logger : null); @@ -149,7 +149,7 @@ public static void after(@Advice.This Object thiz, // try { - if (!intercept(KafkaConsumerAdvice.class, thiz, method, arguments)) { + if (!intercept(KafkaConsumerAdvice.class, thiz, method, logging ? logger : null, arguments)) { return; } if (logging) { diff --git a/remora-kafka/src/main/java/com/jkoolcloud/remora/advices/KafkaConsumerClientAdvice.java b/remora-kafka/src/main/java/com/jkoolcloud/remora/advices/KafkaConsumerClientAdvice.java index 5df4bf1..ee2e783 100644 --- a/remora-kafka/src/main/java/com/jkoolcloud/remora/advices/KafkaConsumerClientAdvice.java +++ b/remora-kafka/src/main/java/com/jkoolcloud/remora/advices/KafkaConsumerClientAdvice.java @@ -80,7 +80,7 @@ public static void before(@Advice.This Consumer thiz, // @Advice.Local("ed") EntryDefinition ed, // @Advice.Local("startTime") long startTime) { try { - if (!intercept(KafkaConsumerClientAdvice.class, thiz, method)) { + if (!intercept(KafkaConsumerClientAdvice.class, thiz, method, logging ? logger : null)) { return; } ed = getEntryDefinition(ed, KafkaConsumerClientAdvice.class, logging ? logger : null); @@ -130,7 +130,7 @@ public static void after(@Advice.This Consumer producer, // @Advice.Local("startTime") long startTime) { boolean doFinally = true; try { - if (!intercept(KafkaConsumerClientAdvice.class, producer, method)) { + if (!intercept(KafkaConsumerClientAdvice.class, producer, method, logging ? logger : null)) { return; } if (ed == null) { // ed expected to be null if not created by entry, that's for duplicates diff --git a/remora-kafka/src/main/java/com/jkoolcloud/remora/advices/KafkaProducerAdvice.java b/remora-kafka/src/main/java/com/jkoolcloud/remora/advices/KafkaProducerAdvice.java index 6fa5c3d..bfb9e66 100644 --- a/remora-kafka/src/main/java/com/jkoolcloud/remora/advices/KafkaProducerAdvice.java +++ b/remora-kafka/src/main/java/com/jkoolcloud/remora/advices/KafkaProducerAdvice.java @@ -83,7 +83,7 @@ public static void before(@Advice.This KafkaProducer thiz, // @Advice.Local("ed") EntryDefinition ed, // @Advice.Local("startTime") long startTime) { try { - if (!intercept(KafkaProducerAdvice.class, thiz, method, record)) { + if (!intercept(KafkaProducerAdvice.class, thiz, method, logging ? logger : null, record)) { return; } ed = getEntryDefinition(ed, KafkaProducerAdvice.class, logging ? logger : null); @@ -143,7 +143,7 @@ public static void after(@Advice.This KafkaProducer producer, // @Advice.Local("startTime") long startTime) { boolean doFinally = true; try { - if (!intercept(KafkaProducerAdvice.class, producer, method, arguments)) { + if (!intercept(KafkaProducerAdvice.class, producer, method, logging ? logger : null, arguments)) { return; } if (ed == null) { // ed expected to be null if not created by entry, that's for duplicates diff --git a/remora-simple-test/src/main/java/com/jkoolcloud/remora/advices/SimpleTest.java b/remora-simple-test/src/main/java/com/jkoolcloud/remora/advices/SimpleTest.java index 2193270..ae57955 100644 --- a/remora-simple-test/src/main/java/com/jkoolcloud/remora/advices/SimpleTest.java +++ b/remora-simple-test/src/main/java/com/jkoolcloud/remora/advices/SimpleTest.java @@ -72,7 +72,7 @@ public static void before(@Advice.This Object thiz, // @Advice.Local("starttime") long starttime) // { try { - if (!intercept(SimpleTest.class, thiz, method, arguments)) { + if (!intercept(SimpleTest.class, thiz, method, logging ? logger : null, arguments)) { return; } @@ -96,7 +96,7 @@ public static void after(@Advice.This Object obj, // @Advice.Local("ed") EntryDefinition ed, // @Advice.Local("starttime") long starttime) { try { - if (!intercept(SimpleTest.class, obj, method)) { + if (!intercept(SimpleTest.class, obj, method, logging ? logger : null)) { return; } System.out.println("###AFTER METHOD CALL"); diff --git a/remora-simple-test/src/main/java/com/jkoolcloud/remora/advices/SimpleTestConstructor.java b/remora-simple-test/src/main/java/com/jkoolcloud/remora/advices/SimpleTestConstructor.java index 7a503aa..756681e 100644 --- a/remora-simple-test/src/main/java/com/jkoolcloud/remora/advices/SimpleTestConstructor.java +++ b/remora-simple-test/src/main/java/com/jkoolcloud/remora/advices/SimpleTestConstructor.java @@ -75,7 +75,7 @@ public static void before(@Advice.AllArguments Object[] args, // @Advice.Local("startTime") long starttime) // { try { - if (!intercept(SimpleTestConstructor.class, thiz, method, args)) { + if (!intercept(SimpleTestConstructor.class, thiz, method, logging ? logger : null, args)) { return; } System.out.println("BEFORE METHOD CALL"); @@ -117,7 +117,7 @@ public static void after(@Advice.This Object obj, // @Advice.Local("startTime") long startTime) { boolean doFinally = true; try { - if (!intercept(SimpleTestConstructor.class, obj, method, arguments)) { + if (!intercept(SimpleTestConstructor.class, obj, method, logging ? logger : null, arguments)) { return; } if (ed == null) { // ed expected to be null if not created by entry, that's for duplicates diff --git a/remora-socket/src/main/java/com/jkoolcloud/remora/advices/SocketAdvice.java b/remora-socket/src/main/java/com/jkoolcloud/remora/advices/SocketAdvice.java index 7885dc0..50a8201 100644 --- a/remora-socket/src/main/java/com/jkoolcloud/remora/advices/SocketAdvice.java +++ b/remora-socket/src/main/java/com/jkoolcloud/remora/advices/SocketAdvice.java @@ -82,7 +82,7 @@ public static void before(@Advice.This Socket thiz, // @Advice.Local("ed") EntryDefinition ed, // @Advice.Local("startTime") long startTime) { try { - if (!intercept(SocketAdvice.class, thiz, method, socketAddress, timeout)) { + if (!intercept(SocketAdvice.class, thiz, method, logging ? logger : null, socketAddress, timeout)) { return; } ed = getEntryDefinition(ed, SocketAdvice.class, logging ? logger : null); @@ -136,7 +136,7 @@ public static void after(@Advice.This Object obj, // @Advice.Local("startTime") long startTime) { boolean doFinally = true; try { - if (!intercept(SocketAdvice.class, obj, method, socketAddress, timeout)) { + if (!intercept(SocketAdvice.class, obj, method, logging ? logger : null, socketAddress, timeout)) { return; } if (ed == null) { // ed expected to be null if not created by entry, that's for duplicates diff --git a/remora-spring/src/main/java/com/jkoolcloud/remora/advices/SpringExceptionAdvice.java b/remora-spring/src/main/java/com/jkoolcloud/remora/advices/SpringExceptionAdvice.java index d3cc5c9..913aafc 100644 --- a/remora-spring/src/main/java/com/jkoolcloud/remora/advices/SpringExceptionAdvice.java +++ b/remora-spring/src/main/java/com/jkoolcloud/remora/advices/SpringExceptionAdvice.java @@ -95,7 +95,7 @@ public static void before(@Advice.This Object thiz, // @Advice.Local("ed") EntryDefinition ed, // @Advice.Local("startTime") long startTime) { try { - if (!intercept(SpringExceptionAdvice.class, thiz, method, exception)) { + if (!intercept(SpringExceptionAdvice.class, thiz, method, logging ? logger : null, exception)) { return; } ed = getEntryDefinition(ed, SpringExceptionAdvice.class, logging ? logger : null); @@ -135,7 +135,7 @@ public static void after(@Advice.This Object obj, // @Advice.Local("startTime") long startTime) { boolean doFinally = true; try { - if (!intercept(SpringExceptionAdvice.class, obj, method, arguments)) { + if (!intercept(SpringExceptionAdvice.class, obj, method, logging ? logger : null, arguments)) { return; } if (ed == null) { // ed expected to be null if not created by entry, that's for duplicates diff --git a/remora-spring/src/main/java/com/jkoolcloud/remora/advices/SpringServiceAdvice.java b/remora-spring/src/main/java/com/jkoolcloud/remora/advices/SpringServiceAdvice.java index 9e888b5..0f4a746 100644 --- a/remora-spring/src/main/java/com/jkoolcloud/remora/advices/SpringServiceAdvice.java +++ b/remora-spring/src/main/java/com/jkoolcloud/remora/advices/SpringServiceAdvice.java @@ -94,7 +94,7 @@ public static void before(@Advice.This Object thiz, // @Advice.Local("ed") EntryDefinition ed, // @Advice.Local("startTime") long startTime) { try { - if (!intercept(SpringServiceAdvice.class, thiz, method, arguments)) { + if (!intercept(SpringServiceAdvice.class, thiz, method, logging ? logger : null, arguments)) { return; } ed = getEntryDefinition(ed, SpringServiceAdvice.class, logging ? logger : null); @@ -133,7 +133,7 @@ public static void after(@Advice.This Object obj, // @Advice.Local("startTime") long startTime) { boolean doFinally = true; try { - if (!intercept(SpringServiceAdvice.class, obj, method, arguments)) { + if (!intercept(SpringServiceAdvice.class, obj, method, logging ? logger : null, arguments)) { return; } if (ed == null) { // ed expected to be null if not created by entry, that's for duplicates diff --git a/remora-spring/src/main/java/com/jkoolcloud/remora/advices/SpringTransactionAdvice.java b/remora-spring/src/main/java/com/jkoolcloud/remora/advices/SpringTransactionAdvice.java index 92dd7da..5fbf129 100644 --- a/remora-spring/src/main/java/com/jkoolcloud/remora/advices/SpringTransactionAdvice.java +++ b/remora-spring/src/main/java/com/jkoolcloud/remora/advices/SpringTransactionAdvice.java @@ -98,7 +98,7 @@ public static void before(@Advice.This Object thiz, // @Advice.Local("ed") EntryDefinition ed, // @Advice.Local("startTime") long startTime) { try { - if (!intercept(SpringTransactionAdvice.class, thiz, method, arguments)) { + if (!intercept(SpringTransactionAdvice.class, thiz, method, logging ? logger : null, arguments)) { return; } ed = getEntryDefinition(ed, SpringTransactionAdvice.class, logging ? logger : null); @@ -137,7 +137,7 @@ public static void after(@Advice.This Object obj, // @Advice.Local("startTime") long startTime) { boolean doFinally = true; try { - if (!intercept(SpringTransactionAdvice.class, obj, method, arguments)) { + if (!intercept(SpringTransactionAdvice.class, obj, method, logging ? logger : null, arguments)) { return; } if (ed == null) { // ed expected to be null if not created by entry, that's for duplicates diff --git a/remora-stream/config/tnt4j-streams.properties b/remora-stream/config/tnt4j-streams.properties index 61de8ad..b88d13c 100644 --- a/remora-stream/config/tnt4j-streams.properties +++ b/remora-stream/config/tnt4j-streams.properties @@ -63,7 +63,7 @@ event.sink.factory.EventSinkFactory.prod: com.jkoolcloud.jesl.tnt4j.sink.JKCloud ##### NOTE: logger name should match log4j.properties defined logger name mapped to use 'activities_prod_log' appender ##### event.sink.factory.EventSinkFactory.prod.LogSink: slf4j:com.jkoolcloud.tnt4j.streams.activities_prod_log event.sink.factory.EventSinkFactory.prod.Url: https://data.jkoolcloud.com/ -event.sink.factory.EventSinkFactory.prod.Token: remoraj-prod-access-token +event.sink.factory.EventSinkFactory.prod.Token: df677e04-7ce5-4039-976c-0440ca931055 #### jKoolCloud 'prod' event sink factory configuration end #### ; QA environment (event sink for QA) diff --git a/remora-weblogic/src/main/java/com/jkoolcloud/remora/advices/WebLogicAdvice.java b/remora-weblogic/src/main/java/com/jkoolcloud/remora/advices/WebLogicAdvice.java index 92276c6..4083091 100644 --- a/remora-weblogic/src/main/java/com/jkoolcloud/remora/advices/WebLogicAdvice.java +++ b/remora-weblogic/src/main/java/com/jkoolcloud/remora/advices/WebLogicAdvice.java @@ -98,7 +98,7 @@ public static void before(@Advice.This Object thiz, // @Advice.Local("ed") EntryDefinition ed, // @Advice.Local("startTime") long startTime) { try { - if (!intercept(WebLogicAdvice.class, thiz, method, arguments)) { + if (!intercept(WebLogicAdvice.class, thiz, method, logging ? logger : null, arguments)) { return; } if (logging) { @@ -155,7 +155,7 @@ public static void after(@Advice.This Object obj, // @Advice.Local("startTime") long startTime) { boolean doFinally = true; try { - if (!intercept(WebLogicAdvice.class, obj, method, arguments)) { + if (!intercept(WebLogicAdvice.class, obj, method, logging ? logger : null, arguments)) { return; } if (ed == null) { // ed expected to be null if not created by entry, that's for duplicates diff --git a/remora-websocket/src/main/java/com/jkoolcloud/remora/advices/WebsocketEndpointAdvice.java b/remora-websocket/src/main/java/com/jkoolcloud/remora/advices/WebsocketEndpointAdvice.java index f3931f2..449a12b 100644 --- a/remora-websocket/src/main/java/com/jkoolcloud/remora/advices/WebsocketEndpointAdvice.java +++ b/remora-websocket/src/main/java/com/jkoolcloud/remora/advices/WebsocketEndpointAdvice.java @@ -82,7 +82,7 @@ public static void before(@Advice.This Object thiz, // @Advice.Local("ed") EntryDefinition ed, // @Advice.Local("startTime") long startTime) { try { - if (!intercept(WebsocketEndpointAdvice.class, thiz, method, args)) { + if (!intercept(WebsocketEndpointAdvice.class, thiz, method, logging ? logger : null, args)) { return; } ed = getEntryDefinition(ed, WebsocketEndpointAdvice.class, logging ? logger : null); @@ -172,7 +172,7 @@ public static void after(@Advice.This Object obj, // @Advice.Local("startTime") long startTime) { boolean doFinally = true; try { - if (!intercept(WebsocketEndpointAdvice.class, obj, method, arguments)) { + if (!intercept(WebsocketEndpointAdvice.class, obj, method, logging ? logger : null, arguments)) { return; } if (ed == null) { // ed expected to be null if not created by entry, that's for duplicates diff --git a/remora-websocket/src/main/java/com/jkoolcloud/remora/advices/WebsocketReceiveAdvice.java b/remora-websocket/src/main/java/com/jkoolcloud/remora/advices/WebsocketReceiveAdvice.java index b9072ca..f794d84 100644 --- a/remora-websocket/src/main/java/com/jkoolcloud/remora/advices/WebsocketReceiveAdvice.java +++ b/remora-websocket/src/main/java/com/jkoolcloud/remora/advices/WebsocketReceiveAdvice.java @@ -98,7 +98,7 @@ public static void before(@Advice.This Object thiz, // @Advice.Local("ed") EntryDefinition ed, // @Advice.Local("startTime") long startTime) { try { - if (!intercept(WebsocketReceiveAdvice.class, thiz, method, message)) { + if (!intercept(WebsocketReceiveAdvice.class, thiz, method, logging ? logger : null, message)) { return; } ed = getEntryDefinition(ed, WebsocketReceiveAdvice.class, logging ? logger : null); @@ -167,7 +167,7 @@ public static void after(@Advice.This Object obj, // @Advice.Local("startTime") long startTime) { boolean doFinally = true; try { - if (!intercept(WebsocketReceiveAdvice.class, obj, method, arguments)) { + if (!intercept(WebsocketReceiveAdvice.class, obj, method, logging ? logger : null, arguments)) { return; } if (ed == null) { // ed expected to be null if not created by entry, that's for duplicates diff --git a/remora-websocket/src/main/java/com/jkoolcloud/remora/advices/WebsocketSendAdvice.java b/remora-websocket/src/main/java/com/jkoolcloud/remora/advices/WebsocketSendAdvice.java index 99d25d2..dd81819 100644 --- a/remora-websocket/src/main/java/com/jkoolcloud/remora/advices/WebsocketSendAdvice.java +++ b/remora-websocket/src/main/java/com/jkoolcloud/remora/advices/WebsocketSendAdvice.java @@ -101,7 +101,7 @@ public static void before(@Advice.This RemoteEndpoint thiz, // @Advice.Local("ed") EntryDefinition ed, // @Advice.Local("startTime") long startTime) { try { - if (!intercept(WebsocketSendAdvice.class, thiz, method, arguments)) { + if (!intercept(WebsocketSendAdvice.class, thiz, method, logging ? logger : null, arguments)) { return; } ed = getEntryDefinition(ed, WebsocketSendAdvice.class, logging ? logger : null); @@ -175,7 +175,7 @@ public static void after(@Advice.This Object obj, // @Advice.Local("startTime") long startTime) { boolean doFinally = true; try { - if (!intercept(WebsocketSendAdvice.class, obj, method, arguments)) { + if (!intercept(WebsocketSendAdvice.class, obj, method, logging ? logger : null, arguments)) { return; } if (ed == null) { // ed expected to be null if not created by entry, that's for duplicates diff --git a/remora-websocket/src/main/java/com/jkoolcloud/remora/advices/WebsocketSessionAdvice.java b/remora-websocket/src/main/java/com/jkoolcloud/remora/advices/WebsocketSessionAdvice.java index f85e72e..54ae873 100644 --- a/remora-websocket/src/main/java/com/jkoolcloud/remora/advices/WebsocketSessionAdvice.java +++ b/remora-websocket/src/main/java/com/jkoolcloud/remora/advices/WebsocketSessionAdvice.java @@ -102,7 +102,7 @@ public static void before(@Advice.This Session thiz, // @Advice.Local("ed") EntryDefinition ed, // @Advice.Local("startTime") long startTime) { try { - if (!intercept(WebsocketSessionAdvice.class, thiz, method, args)) { + if (!intercept(WebsocketSessionAdvice.class, thiz, method, logging ? logger : null, args)) { return; } MessageHandler handler = null; @@ -131,7 +131,7 @@ public static void before(@Advice.This Session thiz, // @Advice.OnMethodExit(onThrowable = Throwable.class) public static void after(@Advice.This Object obj, // @Advice.Origin Method method) { - if (!intercept(WebsocketSessionAdvice.class, obj, method)) { + if (!intercept(WebsocketSessionAdvice.class, obj, method, logging ? logger : null)) { return; } } diff --git a/remora-websphere/src/main/java/com/jkoolcloud/remora/advices/IBMAdapterRSA.java b/remora-websphere/src/main/java/com/jkoolcloud/remora/advices/IBMAdapterRSA.java index 04d10cb..70b9c65 100644 --- a/remora-websphere/src/main/java/com/jkoolcloud/remora/advices/IBMAdapterRSA.java +++ b/remora-websphere/src/main/java/com/jkoolcloud/remora/advices/IBMAdapterRSA.java @@ -100,7 +100,7 @@ public static void before(@Advice.This WSJdbcStatement thiz, // ) { try { - if (!intercept(IBMAdapterRSA.class, thiz, method, arguments)) { + if (!intercept(IBMAdapterRSA.class, thiz, method, logging ? logger : null, arguments)) { return; } if (logging) { @@ -152,7 +152,7 @@ public static void after(@Advice.This Object obj, // ) { boolean doFinally = true; try { - if (!intercept(IBMAdapterRSA.class, obj, method, arguments)) { + if (!intercept(IBMAdapterRSA.class, obj, method, logging ? logger : null, arguments)) { return; } if (ed == null) { // ed expected to be null if not created by entry, that's for duplicates diff --git a/remora-websphere/src/main/java/com/jkoolcloud/remora/advices/WASAdvice.java b/remora-websphere/src/main/java/com/jkoolcloud/remora/advices/WASAdvice.java index 4454f49..8f08f6d 100644 --- a/remora-websphere/src/main/java/com/jkoolcloud/remora/advices/WASAdvice.java +++ b/remora-websphere/src/main/java/com/jkoolcloud/remora/advices/WASAdvice.java @@ -105,7 +105,7 @@ public static void before(@Advice.This Object thiz, // // @Advice.Local("remoraLogger") Logger logger) { try { - if (!intercept(WASAdvice.class, thiz, method, new Object[] { req, resp })) { + if (!intercept(WASAdvice.class, thiz, method, logging ? logger : null, new Object[] { req, resp })) { return; } if (logging) { @@ -176,7 +176,7 @@ public static void after(@Advice.This Object obj, // @Advice.Local("startTime") long startTime) // // @Advice.Local("remoraLogger") Logger logger) { - if (!intercept(WASAdvice.class, obj, method, new Object[] { req, resp })) { + if (!intercept(WASAdvice.class, obj, method, logging ? logger : null, new Object[] { req, resp })) { return; } boolean doFinally = true;