cheb0 · cheb0 · Dec 2, 2024 · Dec 1, 2024 · Dec 1, 2024 · Dec 1, 2024
diff --git a/ulyp-agent-core/src/main/java/com/ulyp/agent/RecorderContext.java b/ulyp-agent-core/src/main/java/com/ulyp/agent/RecorderContext.java
@@ -4,6 +4,7 @@
 import com.ulyp.core.recorders.ObjectRecorderRegistry;
 import com.ulyp.core.recorders.PrintingRecorder;
 import com.ulyp.core.recorders.arrays.ByteArrayRecorder;
+import com.ulyp.core.recorders.arrays.IntArrayRecorder;
 import com.ulyp.core.recorders.arrays.ObjectArrayRecorder;
 import com.ulyp.core.recorders.collections.*;
 
@@ -29,11 +30,14 @@ private void configurePrintingRecorder() {
     private void configureArrayRecorders() {
         ByteArrayRecorder byteArrayRecorder = (ByteArrayRecorder) ObjectRecorderRegistry.BYTE_ARRAY_RECORDER.getInstance();
         ObjectArrayRecorder objectArrayRecorder = (ObjectArrayRecorder) ObjectRecorderRegistry.OBJECT_ARRAY_RECORDER.getInstance();
+        IntArrayRecorder intArrayRecorder = (IntArrayRecorder) ObjectRecorderRegistry.INT_ARRAY_RECORDER.getInstance();
         if (options.getArraysRecordingOption().get()) {
             objectArrayRecorder.setEnabled(true);
             byteArrayRecorder.setEnabled(true);
+            intArrayRecorder.setEnabled(true);
         }
         objectArrayRecorder.setMaxItemsToRecord(options.getMaxItemsArrayRecordingOption().get());
+        intArrayRecorder.setMaxItemsToRecord(options.getMaxItemsArrayRecordingOption().get());
     }
 
     private void configureCollectionRecorders() {

diff --git a/ulyp-agent-tests/build.gradle b/ulyp-agent-tests/build.gradle
@@ -8,6 +8,9 @@ buildscript {
 
 plugins {
     id 'java'
+    id 'org.jetbrains.kotlin.jvm' version '1.6.21'
+    id 'org.jetbrains.kotlin.plugin.lombok' version '1.6.21'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '1.6.21'
     id "io.freefair.lombok" version "6.0.0-m2"
 }
 

diff --git a/ulyp-agent-tests/src/main/java/com/agent/tests/util/RecordingMatchers.java b/ulyp-agent-tests/src/main/java/com/agent/tests/util/RecordingMatchers.java
@@ -1,8 +1,11 @@
 package com.agent.tests.util;
 
 import com.ulyp.core.Method;
+import com.ulyp.core.recorders.IdentityObjectRecord;
+import com.ulyp.core.recorders.basic.NullObjectRecord;
+import com.ulyp.core.recorders.numeric.IntegralRecord;
 import com.ulyp.core.recorders.ObjectRecord;
-import com.ulyp.core.recorders.StringObjectRecord;
+import com.ulyp.core.recorders.basic.StringObjectRecord;
 import com.ulyp.storage.tree.CallRecord;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
@@ -25,6 +28,62 @@ public void describeTo(Description description) {
         };
     }
 
+    public static Matcher<ObjectRecord> isIdentity(String expectedType) {
+        return new TypeSafeMatcher<ObjectRecord>() {
+            @Override
+            protected boolean matchesSafely(ObjectRecord item) {
+                return item instanceof IdentityObjectRecord && item.getType().getName().equals(expectedType);
+            }
+
+            @Override
+            public void describeTo(Description description) {
+                description.appendText("is recorded identity with type ").appendValue(expectedType);
+            }
+        };
+    }
+
+    public static Matcher<ObjectRecord> isIdentity() {
+        return new TypeSafeMatcher<ObjectRecord>() {
+            @Override
+            protected boolean matchesSafely(ObjectRecord item) {
+                return item instanceof IdentityObjectRecord;
+            }
+
+            @Override
+            public void describeTo(Description description) {
+                description.appendText("is recorded identity with any type");
+            }
+        };
+    }
+
+    public static Matcher<ObjectRecord> isIntegral(long expectedValue) {
+        return new TypeSafeMatcher<ObjectRecord>() {
+            @Override
+            protected boolean matchesSafely(ObjectRecord item) {
+                return item instanceof IntegralRecord && ((IntegralRecord) item).getValue() == expectedValue;
+            }
+
+            @Override
+            public void describeTo(Description description) {
+                description.appendText("is recorded integral value with type ").appendValue(expectedValue);
+            }
+        };
+    }
+
+    public static Matcher<ObjectRecord> isNull() {
+        return new TypeSafeMatcher<ObjectRecord>() {
+            @Override
+            protected boolean matchesSafely(ObjectRecord item) {
+                return item instanceof NullObjectRecord;
+            }
+
+            @Override
+            public void describeTo(Description description) {
+                description.appendText("is null");
+            }
+        };
+    }
+
     public static Matcher<Method> hasName(String name) {
         return new TypeSafeMatcher<Method>() {
             @Override

diff --git a/ulyp-agent-tests/src/test/java/com/agent/tests/concurrent/ConcurrentInstrumentationTest.java b/ulyp-agent-tests/src/test/java/com/agent/tests/concurrent/ConcurrentInstrumentationTest.java
@@ -23,7 +23,7 @@ class ConcurrentInstrumentationTest extends AbstractInstrumentationTest {
     void shouldInstrumentConcurrently() {
         RecordingResult recordingResult = runSubprocess(
                 new ForkProcessBuilder()
-                        .withMainClassName(TestRunner.class)
+                        .withMain(TestRunner.class)
                         .withMethodToRecord(MethodMatcher.parse("**.zxczxc.*"))
                         .withLogLevel("OFF")
         );

diff --git a/...-agent-tests/src/test/java/com/agent/tests/concurrent/ConcurrentMidSizeRecordingTest.java b/...-agent-tests/src/test/java/com/agent/tests/concurrent/ConcurrentMidSizeRecordingTest.java
@@ -23,7 +23,7 @@ class ConcurrentMidSizeRecordingTest extends AbstractInstrumentationTest {
     void shouldRecordInConcurrentMode() {
         RecordingResult recordingResult = runSubprocess(
                 new ForkProcessBuilder()
-                        .withMainClassName(MultithreadedExample.class)
+                        .withMain(MultithreadedExample.class)
                         .withMethodToRecord(MethodMatcher.parse("**.RecordedRunner.run"))
                         .withLogLevel("OFF")
         );

diff --git a/ulyp-agent-tests/src/test/java/com/agent/tests/concurrent/ConcurrentRecordingTest.java b/ulyp-agent-tests/src/test/java/com/agent/tests/concurrent/ConcurrentRecordingTest.java
@@ -16,7 +16,7 @@ class ConcurrentRecordingTest extends AbstractInstrumentationTest {
     void shouldRecordInConcurrentMode() {
         RecordingResult recordingResult = runSubprocess(
                 new ForkProcessBuilder()
-                        .withMainClassName(MultithreadedExample.class)
+                        .withMain(MultithreadedExample.class)
                         .withMethodToRecord(MethodMatcher.parse("*.*"))
                         .withLogLevel("OFF")
         );

diff --git a/ulyp-agent-tests/src/test/java/com/agent/tests/general/DirectMemLeakTest.java b/ulyp-agent-tests/src/test/java/com/agent/tests/general/DirectMemLeakTest.java
@@ -14,7 +14,7 @@ class DirectMemLeakTest extends AbstractInstrumentationTest {
     void shouldWithstandLongRecording() {
         RecordingResult recordingResult = runSubprocess(
                 new ForkProcessBuilder()
-                        .withMainClassName(FibonacciTestCase.class)
+                        .withMain(FibonacciTestCase.class)
                         .withMethodToRecord("compute")
         );
 

diff --git a/...-agent-tests/src/test/java/com/agent/tests/general/ExcludeClassesInstrumentationTest.java b/...-agent-tests/src/test/java/com/agent/tests/general/ExcludeClassesInstrumentationTest.java
@@ -19,7 +19,7 @@ class ExcludeClassesInstrumentationTest extends AbstractInstrumentationTest {
     void shouldNotExcludeAnyClassesIfOptionIsNotSet() {
         CallRecord root = runSubprocessAndReadFile(
                 new ForkProcessBuilder()
-                        .withMainClassName(A.class)
+                        .withMain(A.class)
         );
 
 
@@ -32,7 +32,7 @@ void shouldNotExcludeAnyClassesIfOptionIsNotSet() {
     void shouldExcludeFromInstrumentationOneClass() {
         CallRecord root = runSubprocessAndReadFile(
                 new ForkProcessBuilder()
-                        .withMainClassName(A.class)
+                        .withMain(A.class)
                         .withExcludeClassesProperty("com.agent.tests.general.a.b.B")
         );
 
@@ -46,7 +46,7 @@ void shouldExcludeFromInstrumentationOneClass() {
     void shouldExcludeFromInstrumentationOneClassByInterface() {
         CallRecord root = runSubprocessAndReadFile(
                 new ForkProcessBuilder()
-                        .withMainClassName(A.class)
+                        .withMain(A.class)
                         .withExcludeClassesProperty("**.BInterface")
         );
 
@@ -59,7 +59,7 @@ void shouldExcludeFromInstrumentationOneClassByInterface() {
     void shouldExcludeTwoClassesFromInstrumentation() {
         CallRecord root = runSubprocessAndReadFile(
                 new ForkProcessBuilder()
-                        .withMainClassName(A.class)
+                        .withMain(A.class)
                         .withExcludeClassesProperty("com.agent.tests.general.a.b.B, com.agent.tests.general.a.c.C")
         );
 
@@ -71,7 +71,7 @@ void shouldExcludeTwoClassesFromInstrumentation() {
     void shouldExcludeOneClassFromInstrumentationByAntPattern() {
         CallRecord root = runSubprocessAndReadFile(
                 new ForkProcessBuilder()
-                        .withMainClassName(A.class)
+                        .withMain(A.class)
                         .withExcludeClassesProperty("com.agent.tests.general.a.b.**")
         );
 
@@ -83,7 +83,7 @@ void shouldExcludeOneClassFromInstrumentationByAntPattern() {
     void shouldExcludeTwoClassesFromInstrumentationByAntPattern() {
         CallRecord root = runSubprocessAndReadFile(
                 new ForkProcessBuilder()
-                        .withMainClassName(A.class)
+                        .withMain(A.class)
                         .withExcludeClassesProperty("com.agent.tests.general.a.b.**, com.agent.tests.general.a.c.**")
         );
 

diff --git a/...ent-tests/src/test/java/com/agent/tests/general/ExcludeMethodsFromStartRecordingTest.java b/...ent-tests/src/test/java/com/agent/tests/general/ExcludeMethodsFromStartRecordingTest.java
@@ -29,7 +29,7 @@ public static void main(String[] args) {
     void shouldRecordNormalCase() {
         RecordingResult recordingResult = runSubprocess(
             new ForkProcessBuilder()
-                .withMainClassName(A.class)
+                .withMain(A.class)
                 .withMethodToRecord(MethodMatcher.parse("**.A.main"))
         );
 
@@ -40,7 +40,7 @@ void shouldRecordNormalCase() {
     void shouldNotStartRecordingIfMethodExcluded() {
         RecordingResult recordingResult = runSubprocess(
             new ForkProcessBuilder()
-                .withMainClassName(A.class)
+                .withMain(A.class)
                 .withMethodToRecord(MethodMatcher.parse("**.A.foo,**.A.bar,-**.A.foo"))
         );
 
@@ -51,7 +51,7 @@ void shouldNotStartRecordingIfMethodExcluded() {
     void shouldNotStartRecordingIfMethodExcluded2() {
         RecordingResult recordingResult = runSubprocess(
             new ForkProcessBuilder()
-                .withMainClassName(A.class)
+                .withMain(A.class)
                 .withMethodToRecord(MethodMatcher.parse("**.A.*,-**.A.main"))
         );
 

diff --git a/ulyp-agent-tests/src/test/java/com/agent/tests/general/MultipleCallsInstrumentationTest.java b/ulyp-agent-tests/src/test/java/com/agent/tests/general/MultipleCallsInstrumentationTest.java
@@ -17,7 +17,7 @@ class MultipleCallsInstrumentationTest extends AbstractInstrumentationTest {
     void shouldMake1000Calls() {
         CallRecord root = runSubprocessAndReadFile(
                 new ForkProcessBuilder()
-                        .withMainClassName(TestCase.class)
+                        .withMain(TestCase.class)
                         .withMethodToRecord("make1000CallsInLoop")
         );
 
@@ -28,7 +28,7 @@ void shouldMake1000Calls() {
     void shouldHaveCompleteTree() {
         CallRecord root = runSubprocessAndReadFile(
                 new ForkProcessBuilder()
-                        .withMainClassName(TestCase.class)
+                        .withMain(TestCase.class)
                         .withMethodToRecord("level0")
         );
 

diff --git a/ulyp-agent-tests/src/test/java/com/agent/tests/general/PackageFilterInstrumentationTest.java b/ulyp-agent-tests/src/test/java/com/agent/tests/general/PackageFilterInstrumentationTest.java
@@ -17,7 +17,7 @@ class PackageFilterInstrumentationTest extends AbstractInstrumentationTest {
     void shouldInstrumentAndTraceAllClasses() {
         CallRecord root = runSubprocessAndReadFile(
                 new ForkProcessBuilder()
-                        .withMainClassName(A.class)
+                        .withMain(A.class)
                         .withInstrumentedPackages("com.agent.tests.general.a")
         );
 
@@ -30,7 +30,7 @@ void shouldInstrumentAndTraceAllClasses() {
     void shouldExcludeInstrumentationPackage() {
         CallRecord root = runSubprocessAndReadFile(
                 new ForkProcessBuilder()
-                        .withMainClassName(A.class)
+                        .withMain(A.class)
                         .withInstrumentedPackages("com.agent.tests.general.a")
                         .withExcludedFromInstrumentationPackages("com.agent.tests.general.a.b")
         );
@@ -49,7 +49,7 @@ void shouldExcludeInstrumentationPackage() {
     void shouldExcludeTwoPackages() {
         CallRecord root = runSubprocessAndReadFile(
                 new ForkProcessBuilder()
-                        .withMainClassName(A.class)
+                        .withMain(A.class)
                         .withInstrumentedPackages("com.agent.tests.general.a")
                         .withExcludedFromInstrumentationPackages("com.agent.tests.general.a.b", "com.agent.tests.general.a.c")
                         .withLogLevel("INFO")

diff --git a/ulyp-agent-tests/src/test/java/com/agent/tests/general/RecordAllTest.java b/ulyp-agent-tests/src/test/java/com/agent/tests/general/RecordAllTest.java
@@ -12,7 +12,7 @@ class RecordAllTest extends AbstractInstrumentationTest {
     void shouldRecordAllMethods() {
         RecordingResult recordingResult = runSubprocess(
                 new ForkProcessBuilder()
-                        .withMainClassName(MultithreadedExample.class)
+                        .withMain(MultithreadedExample.class)
                         .withMethodToRecord(MethodMatcher.parse("*.*"))
         );
 

diff --git a/ulyp-agent-tests/src/test/java/com/agent/tests/general/RecordNestedCallsTest.java b/ulyp-agent-tests/src/test/java/com/agent/tests/general/RecordNestedCallsTest.java
@@ -3,8 +3,8 @@
 import com.agent.tests.util.AbstractInstrumentationTest;
 import com.agent.tests.util.ForkProcessBuilder;
 import com.agent.tests.util.RecordingResult;
-import com.ulyp.core.recorders.NumberRecord;
-import com.ulyp.core.recorders.StringObjectRecord;
+import com.ulyp.core.recorders.basic.StringObjectRecord;
+import com.ulyp.core.recorders.numeric.IntegralRecord;
 import com.ulyp.core.util.MethodMatcher;
 import com.ulyp.storage.tree.CallRecord;
 import org.hamcrest.Matchers;
@@ -19,7 +19,7 @@ class RecordNestedCallsTest extends AbstractInstrumentationTest {
     void shouldRecordAllMethods() {
         RecordingResult recordingResult = runSubprocess(
                 new ForkProcessBuilder()
-                        .withMainClassName(TestCase.class)
+                        .withMain(TestCase.class)
                         .withMethodToRecord(MethodMatcher.parse("**.TestCase.startRecordingFoo"))
         );
 
@@ -33,15 +33,15 @@ void shouldRecordAllMethods() {
         assertThat(nestedCallRecord2.getArgs(), Matchers.hasSize(2));
         assertThat(nestedCallRecord2.getArgs(), allOf(
                 hasItem(instanceOf(StringObjectRecord.class)),
-                hasItem(instanceOf(NumberRecord.class)))
+                hasItem(instanceOf(IntegralRecord.class)))
         );
 
         CallRecord nestedCallRecord3 = nestedCallRecord2.getChildren().get(0);
         assertThat(nestedCallRecord3.getArgs(), Matchers.hasSize(3));
         assertThat(nestedCallRecord3.getArgs(), allOf(
                 hasItem(instanceOf(StringObjectRecord.class)),
-                hasItem(instanceOf(NumberRecord.class)),
-                hasItem(instanceOf(NumberRecord.class)))
+                hasItem(instanceOf(IntegralRecord.class)),
+                hasItem(instanceOf(IntegralRecord.class)))
         );
     }