Merge branch 'main' into dev-main-mqtt

# Conflicts:
#	arex-instrumentation-foundation/src/main/java/io/arex/foundation/serializer/JacksonSerializer.java
#	arex-instrumentation/servlet/arex-httpservlet/src/main/java/io/arex/inst/httpservlet/ServletExtractor.java

Author: MentosL

.gitignore

@@ -27,6 +27,7 @@ yarn-error.log*
 
 temp
 
+.flattened-pom.xml
 dependency-reduced-pom.xml
 *.versionsBackup
 MANIFEST.MF

arex-agent-bootstrap/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.arex</groupId>
         <artifactId>arex-agent-parent</artifactId>
-        <version>0.2.0</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

arex-agent-bootstrap/src/main/java/io/arex/agent/bootstrap/AgentClassLoader.java

@@ -185,7 +185,7 @@ private URL getJarEntryUrl(JarEntryInfo jarInfo) {
         if (jarInfo != null && jarInfo.getJarEntry() != null) {
             try {
                 return new URL(
-                    "jar:file:" + jarInfo.getJarInfo().sourceFile.getAbsolutePath() + "!/" + jarInfo.getJarEntry()
+                    "jar:" + jarInfo.getJarInfo().getSourceFile().toURI().toURL() + "!/" + jarInfo.getJarEntry()
                         .getName());
             } catch (MalformedURLException e) {
                 throw new IllegalStateException(jarInfo.getJarEntry().getName(), e);

arex-agent-bootstrap/src/main/java/io/arex/agent/bootstrap/AgentInitializer.java

@@ -15,7 +15,7 @@ public static void initialize(Instrumentation inst, File agentFile, String agent
             return;
         }
 
-        System.setProperty("arex-agent-jar-file-path", agentFile.getAbsolutePath());
+        System.setProperty("arex.agent.jar.file.path", agentFile.getAbsolutePath());
         File[] extensionFiles = getExtensionJarFiles(agentFile);
         classLoader = createAgentClassLoader(agentFile, extensionFiles);
         InstrumentationHolder.setAgentClassLoader(classLoader);

arex-agent-bootstrap/src/main/java/io/arex/agent/bootstrap/ctx/ArexThreadLocal.java

@@ -12,7 +12,7 @@
  * 3. transmittable-thread-local not work in nio.reactor.Worker（@see AbstractMultiworkerIOReactor）
  * 4. Change from InheritableThreadLocal to ThreadLocal，avoid collect unexpected data
  */
-public class ArexThreadLocal<T> extends InheritableThreadLocal<T> {
+public class ArexThreadLocal<T> extends ThreadLocal<T> {
 
     public ArexThreadLocal() {
     }
@@ -75,28 +75,34 @@ private void removeThisFromHolder() {
     public static class Transmitter {
 
         public static Object capture() {
-            return new Snapshot(captureValues());
+            HashMap<ArexThreadLocal<Object>, Object> values = captureValues();
+            return values == null ? null : new Snapshot(captureValues());
         }
 
         private static HashMap<ArexThreadLocal<Object>, Object> captureValues() {
-            HashMap<ArexThreadLocal<Object>, Object> values = new HashMap<>();
+            HashMap<ArexThreadLocal<Object>, Object> values = null;
             for (ArexThreadLocal<Object> threadLocal : holder.get().keySet()) {
+                if (null == values) {
+                    values = new HashMap<>();
+                }
                 values.put(threadLocal, threadLocal.copyValue());
             }
             return values;
         }
 
         public static Object replay(Object captured) {
+            if (captured == null) {
+                return null;
+            }
+
             final Snapshot capturedSnapshot = (Snapshot) captured;
             return new Snapshot(replayValues(capturedSnapshot.values));
         }
 
         private static HashMap<ArexThreadLocal<Object>, Object> replayValues(HashMap<ArexThreadLocal<Object>, Object> captured) {
             HashMap<ArexThreadLocal<Object>, Object> backup = new HashMap<>();
-
             for (final Iterator<ArexThreadLocal<Object>> iterator = holder.get().keySet().iterator(); iterator.hasNext(); ) {
                 ArexThreadLocal<Object> threadLocal = iterator.next();
-
                 backup.put(threadLocal, threadLocal.get());
                 if (!captured.containsKey(threadLocal)) {
                     iterator.remove();
@@ -109,14 +115,17 @@ private static HashMap<ArexThreadLocal<Object>, Object> replayValues(HashMap<Are
         }
 
         public static void restore(Object backup) {
+            if (backup == null) {
+                return;
+            }
+
             final Snapshot backupSnapshot = (Snapshot) backup;
             restoreValues(backupSnapshot.values);
         }
 
         private static void restoreValues(HashMap<ArexThreadLocal<Object>, Object> backup) {
             for (final Iterator<ArexThreadLocal<Object>> iterator = holder.get().keySet().iterator(); iterator.hasNext(); ) {
                 ArexThreadLocal<Object> threadLocal = iterator.next();
-
                 if (!backup.containsKey(threadLocal)) {
                     iterator.remove();
                     threadLocal.superRemove();

arex-agent-bootstrap/src/main/java/io/arex/agent/bootstrap/ctx/CallableWrapper.java

@@ -3,6 +3,7 @@
 import io.arex.agent.bootstrap.TraceContextManager;
 
 import java.util.concurrent.Callable;
+import java.util.concurrent.ForkJoinTask;
 
 
 public class CallableWrapper<V> implements Callable<V> {
@@ -47,8 +48,8 @@ public static <T> Callable<T> get(Callable<T> callable) {
             return callable;
         }
 
-        if (callable instanceof CallableWrapper) {
-            return (CallableWrapper<T>) callable;
+        if (callable instanceof CallableWrapper || callable instanceof ForkJoinTask) {
+            return callable;
         }
         return new CallableWrapper<T>(callable);
     }

arex-agent-bootstrap/src/main/java/io/arex/agent/bootstrap/ctx/RunnableWrapper.java

@@ -2,6 +2,8 @@
 
 import io.arex.agent.bootstrap.TraceContextManager;
 
+import java.util.concurrent.ForkJoinTask;
+
 
 public class RunnableWrapper implements Runnable {
     private final Runnable runnable;
@@ -43,7 +45,7 @@ public static Runnable get(Runnable runnable) {
             return runnable;
         }
 
-        if (runnable instanceof RunnableWrapper) {
+        if (runnable instanceof RunnableWrapper || runnable instanceof ForkJoinTask) {
             return runnable;
         }
         return new RunnableWrapper(runnable);

arex-agent-bootstrap/src/main/java/io/arex/agent/bootstrap/ctx/TraceTransmitter.java

@@ -8,7 +8,12 @@ public class TraceTransmitter implements AutoCloseable {
     private AtomicReference<Object> backupRef;
 
     private TraceTransmitter() {
-        this.captureRef = new AtomicReference<>(ArexThreadLocal.Transmitter.capture());
+        this.captureRef = null;
+        this.backupRef = null;
+    }
+
+    private TraceTransmitter(Object capture) {
+        this.captureRef = new AtomicReference<>(capture);
         this.backupRef = new AtomicReference<>();
     }
 
@@ -29,6 +34,23 @@ public void close() {
     }
 
     public static TraceTransmitter create() {
-        return new TraceTransmitter();
+        Object capture = ArexThreadLocal.Transmitter.capture();
+        if (capture == null) {
+            return DoNothingTransmitter.INSTANCE;
+        }
+        return new TraceTransmitter(capture);
+    }
+
+    static class DoNothingTransmitter extends TraceTransmitter {
+        static final TraceTransmitter INSTANCE = new DoNothingTransmitter();
+
+        @Override
+        public TraceTransmitter transmit() {
+            return this;
+        }
+
+        @Override
+        public void close() {
+        }
     }
  }

arex-agent-bootstrap/src/main/java/io/arex/agent/bootstrap/model/Mocker.java

@@ -1,5 +1,6 @@
 package io.arex.agent.bootstrap.model;
 
+import io.arex.agent.bootstrap.util.StringUtil;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
@@ -90,4 +91,21 @@ public void setType(String type) {
             this.type = type;
         }
     }
+
+    default StringBuilder logBuilder() {
+        StringBuilder builder = new StringBuilder("[arex]");
+        boolean isReplay = StringUtil.isNotEmpty(getReplayId());
+        if (isReplay) {
+            builder.append("replay");
+        } else {
+            builder.append("record");
+        }
+        builder.append(" category: ").append(getCategoryType().getName());
+        builder.append(", operation: ").append(getOperationName());
+        builder.append(", recordId: ").append(getRecordId());
+        if (isReplay) {
+            builder.append(", replayId: ").append(getReplayId());
+        }
+        return builder;
+    }
 }

arex-agent-bootstrap/src/main/java/io/arex/agent/bootstrap/util/StringUtil.java

@@ -43,7 +43,7 @@ public static String join(final Iterable<?> iterable, final String separator) {
         Iterator<?> iterator = iterable.iterator();
 
         if (!iterator.hasNext()) {
-            return null;
+            return EMPTY;
         }
 
         final Object first = iterator.next();
@@ -182,6 +182,17 @@ public static String[] splitByWholeSeparator(String str, String separator) {
         }
     }
 
+    public static String[] splitByFirstSeparator(String str, char separator) {
+        if (str == null) {
+            return new String[0];
+        }
+        int index = str.indexOf(separator);
+        if (index == -1) {
+            return new String[]{str};
+        }
+        return new String[]{str.substring(0, index), str.substring(index + 1)};
+    }
+
     public static int encodeAndHash(String str){
         if (isBlank(str)) {
             return 0;