Merge pull request #114 from newrelic/fix/CTE_IOStreamHelper

Fix ClassNotFoundException for IOStreamHelper
newrelic · Oct 5, 2023 · 2bb58e9 · 2bb58e9
2 parents 15a9367 + 90490ec
commit 2bb58e9
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 5 deletions.
diff --git a/...ntation-security/java-io-stream/src/main/java/java/io/BufferedReader_Instrumentation.java b/...ntation-security/java-io-stream/src/main/java/java/io/BufferedReader_Instrumentation.java
@@ -13,7 +13,7 @@
 import com.newrelic.api.agent.weaver.Weave;
 import com.newrelic.api.agent.weaver.WeaveAllConstructors;
 import com.newrelic.api.agent.weaver.Weaver;
-import com.newrelic.agent.security.instrumentation.inputstream.IOStreamHelper;
+import com.newrelic.api.agent.security.instrumentation.helpers.IOStreamHelper;
 
 @Weave(type = MatchType.BaseClass, originalName = "java.io.BufferedReader")
 public abstract class BufferedReader_Instrumentation {

diff --git a/...mentation-security/java-io-stream/src/main/java/java/io/OutputStream_Instrumentation.java b/...mentation-security/java-io-stream/src/main/java/java/io/OutputStream_Instrumentation.java
@@ -11,7 +11,7 @@
 import com.newrelic.api.agent.weaver.MatchType;
 import com.newrelic.api.agent.weaver.Weave;
 import com.newrelic.api.agent.weaver.Weaver;
-import com.newrelic.agent.security.instrumentation.inputstream.IOStreamHelper;
+import com.newrelic.api.agent.security.instrumentation.helpers.IOStreamHelper;
 
 @Weave(type = MatchType.BaseClass, originalName = "java.io.OutputStream")
 public abstract class OutputStream_Instrumentation {

diff --git a/...umentation-security/java-io-stream/src/main/java/java/io/PrintWriter_Instrumentation.java b/...umentation-security/java-io-stream/src/main/java/java/io/PrintWriter_Instrumentation.java
@@ -10,7 +10,7 @@
 import com.newrelic.api.agent.security.NewRelicSecurity;
 import com.newrelic.api.agent.security.instrumentation.helpers.GenericHelper;
 import com.newrelic.api.agent.weaver.*;
-import com.newrelic.agent.security.instrumentation.inputstream.IOStreamHelper;
+import com.newrelic.api.agent.security.instrumentation.helpers.IOStreamHelper;
 
 import java.util.Locale;
 

diff --git a/instrumentation-security/java-io-stream/src/main/java/java/io/Reader_Instrumentation.java b/instrumentation-security/java-io-stream/src/main/java/java/io/Reader_Instrumentation.java
@@ -12,7 +12,7 @@
 import com.newrelic.api.agent.weaver.MatchType;
 import com.newrelic.api.agent.weaver.Weave;
 import com.newrelic.api.agent.weaver.Weaver;
-import com.newrelic.agent.security.instrumentation.inputstream.IOStreamHelper;
+import com.newrelic.api.agent.security.instrumentation.helpers.IOStreamHelper;
 
 @Weave(type = MatchType.BaseClass, originalName = "java.io.Reader")
 public abstract class Reader_Instrumentation {

diff --git a/...nt/src/main/java/com/newrelic/agent/security/intcodeagent/schedulers/SchedulerHelper.java b/...nt/src/main/java/com/newrelic/agent/security/intcodeagent/schedulers/SchedulerHelper.java
@@ -1,7 +1,11 @@
 package com.newrelic.agent.security.intcodeagent.schedulers;
 
 import com.newrelic.agent.security.intcodeagent.filelogging.FileLoggerThreadPool;
+import com.newrelic.agent.security.intcodeagent.filelogging.LogFileHelper;
+import com.newrelic.agent.security.intcodeagent.filelogging.LogLevel;
 import com.newrelic.agent.security.intcodeagent.logging.IAgentConstants;
+import com.newrelic.agent.security.util.IUtilConstants;
+import com.newrelic.api.agent.NewRelic;
 
 import java.util.Map;
 import java.util.concurrent.*;
@@ -63,4 +67,15 @@ public ScheduledFuture<?> scheduleLowSeverityFilterCleanup(Runnable command,
         return future;
     }
 
+    public ScheduledFuture<?> scheduleDailyLogRollover(Runnable command) {
+        logger.log(LogLevel.INFO, "Start ", SchedulerHelper.class.getName());
+        if(LogFileHelper.isDailyRollover()) {
+            int period = NewRelic.getAgent().getConfig().getValue(IUtilConstants.NR_LOG_DAILY_ROLLOVER_PERIOD, 24);
+            ScheduledFuture<?> future = commonExecutor.scheduleWithFixedDelay(command, period, period, TimeUnit.HOURS);
+            scheduledFutureMap.put("daily-log-rollover", future);
+            return future;
+        }
+        return null;
+    }
+
 }
diff --git a/...mentation/inputstream/IOStreamHelper.java → ...strumentation/helpers/IOStreamHelper.java b/...mentation/inputstream/IOStreamHelper.java → ...strumentation/helpers/IOStreamHelper.java
@@ -1,4 +1,4 @@
-package com.newrelic.agent.security.instrumentation.inputstream;
+package com.newrelic.api.agent.security.instrumentation.helpers;
 
 import com.newrelic.api.agent.security.NewRelicSecurity;
 import com.newrelic.api.agent.security.instrumentation.helpers.GenericHelper;