Upgrade async-profiler to v4

Author: lucko

spark-common/build.gradle

@@ -12,7 +12,7 @@ license {
 
 dependencies {
     api project(':spark-api')
-    implementation 'tools.profiler:async-profiler:3.0' // spark native version: 3cf733d
+    implementation 'tools.profiler:async-profiler:4.0' // spark native version: 87b7b42 (v4.0)
     implementation 'org.ow2.asm:asm:9.7'
     implementation 'net.bytebuddy:byte-buddy-agent:1.14.17'
     implementation 'com.google.protobuf:protobuf-javalite:4.28.2'

spark-common/src/main/java/me/lucko/spark/common/sampler/AbstractSampler.java

@@ -193,6 +193,11 @@ protected void writeMetadataToProto(SamplerData.Builder proto, SparkPlatform pla
             metadata.setComment(comment);
         }
 
+        String libraryVersion = getLibraryVersion();
+        if (libraryVersion != null) {
+            metadata.setSamplerEngineVersion(libraryVersion);
+        }
+
         int totalTicks = this.windowStatisticsCollector.getTotalTicks();
         if (totalTicks != -1) {
             metadata.setNumberOfTicks(totalTicks);

spark-common/src/main/java/me/lucko/spark/common/sampler/Sampler.java

@@ -91,6 +91,13 @@ public interface Sampler {
      */
     SamplerType getType();
 
+    /**
+     * Gets the version of the sampler.
+     *
+     * @return the library version if known, else null
+     */
+    String getLibraryVersion();
+
     /**
      * Gets the sampler mode.
      *

spark-common/src/main/java/me/lucko/spark/common/sampler/async/AsyncProfilerAccess.java

@@ -27,17 +27,14 @@
 import one.profiler.AsyncProfiler;
 import one.profiler.Events;
 
-import java.io.BufferedReader;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.logging.Level;
-import java.util.stream.Collectors;
 
 /**
  * Provides a bridge between spark and async-profiler.
@@ -138,6 +135,10 @@ public boolean checkAllocationProfilingSupported(SparkPlatform platform) {
         return supported;
     }
 
+    public String getVersion() {
+        return this.profiler.getVersion();
+    }
+
     private static AsyncProfiler load(SparkPlatform platform) throws Exception {
         // check compatibility
         String os = System.getProperty("os.name").toLowerCase(Locale.ROOT).replace(" ", "");

spark-common/src/main/java/me/lucko/spark/common/sampler/async/AsyncSampler.java

@@ -234,6 +234,11 @@ public SamplerType getType() {
         return SamplerType.ASYNC;
     }
 
+    @Override
+    public String getLibraryVersion() {
+        return this.profilerAccess.getVersion();
+    }
+
     @Override
     public SamplerMode getMode() {
         return this.sampleCollector.getMode();

spark-common/src/main/java/me/lucko/spark/common/sampler/java/JavaSampler.java

@@ -208,6 +208,11 @@ public SamplerType getType() {
         return SamplerType.JAVA;
     }
 
+    @Override
+    public String getLibraryVersion() {
+        return null;
+    }
+
     @Override
     public SamplerMode getMode() {
         return SamplerMode.EXECUTION;

spark-common/src/main/proto/spark/spark_sampler.proto

@@ -35,6 +35,7 @@ message SamplerMetadata {
   map<string, string> extra_platform_metadata = 14;
   SamplerMode sampler_mode = 15;
   SamplerEngine sampler_engine = 16;
+  string sampler_engine_version = 17;
 
   message ThreadDumper {
     Type type = 1;

spark-common/src/main/resources/spark-native/linux/aarch64/libasyncProfiler.so

@@ -39,6 +39,7 @@
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
@@ -64,6 +65,13 @@ public void testSampler(SamplerType samplerType, @TempDir Path directory) {
                     .completeAfter(2, TimeUnit.SECONDS)
                     .start(plugin.platform());
 
+            String libraryVersion = sampler.getLibraryVersion();
+            if (samplerType == SamplerType.ASYNC) {
+                assertNotNull(libraryVersion);
+            } else {
+                assertNull(libraryVersion);
+            }
+
             assertInstanceOf(samplerType.implClass(), sampler);
             assertEquals(samplerType, sampler.getType());