diff --git a/rasp/jvm/JVMAgent/build.gradle b/rasp/jvm/JVMAgent/build.gradle index c13848fe1..5ad6eda9a 100644 --- a/rasp/jvm/JVMAgent/build.gradle +++ b/rasp/jvm/JVMAgent/build.gradle @@ -33,8 +33,8 @@ jar { } shadowJar { - relocate 'io.netty', 'agent.io.netty' - relocate 'org.apache.commons', 'agent.org.apache.commons' + relocate 'io.netty', 'rasp.io.netty' + relocate 'org.apache.commons', 'rasp.org.apache.commons' relocate 'META-INF/native/libnetty', 'META-INF/native/librasp_netty' } diff --git a/rasp/jvm/JVMAgent/src/main/java/com/security/smithloader/SmithAgent.java b/rasp/jvm/JVMAgent/src/main/java/com/security/smithloader/SmithAgent.java index 7a225d973..2e750d8dc 100644 --- a/rasp/jvm/JVMAgent/src/main/java/com/security/smithloader/SmithAgent.java +++ b/rasp/jvm/JVMAgent/src/main/java/com/security/smithloader/SmithAgent.java @@ -101,7 +101,7 @@ public static Object ExceptionProxy(Object MethodNameObj,int classID, int method return obj; } - public static void RecordProxy(int classID, int methodID, Long t1, Long t2) { + public static void RecordProxy(int classID, int methodID, long t1, long t2) { if (isBenchMark) { try { if (checkRecursive != null && checkRecursive.get() == true) { @@ -111,7 +111,7 @@ public static void RecordProxy(int classID, int methodID, Long t1, Long t2) { checkRecursive.set(true); } if(SmithProberObj != null) { - Class[] argType = new Class[]{int.class,int.class, Long.class, Long.class}; + Class[] argType = new Class[]{int.class,int.class, long.class, long.class}; Reflection.invokeMethod(SmithProberObj,"record",argType,classID,methodID,t1,t2); } if (checkRecursive != null && checkRecursive.get() == true) { diff --git a/rasp/jvm/JVMProbe/src/main/java/com/security/smith/SmithProbe.java b/rasp/jvm/JVMProbe/src/main/java/com/security/smith/SmithProbe.java index 188c2d6ea..6ec12b19f 100644 --- a/rasp/jvm/JVMProbe/src/main/java/com/security/smith/SmithProbe.java +++ b/rasp/jvm/JVMProbe/src/main/java/com/security/smith/SmithProbe.java @@ -682,7 +682,7 @@ public void show() { } public void record(int classID, int methodID, long time,long totaltime) { - SmithLogger.logger.info("record: " + classID + " " + methodID + " " + time); + // SmithLogger.logger.info("record: " + classID + " " + methodID + " " + time); synchronized (records) { records.computeIfAbsent(new ImmutablePair<>(classID, methodID), k -> new ArrayList<>()).add(time); }