From 235d3b487b78250b6b06f29032a2c1664b863fd7 Mon Sep 17 00:00:00 2001
From: Jonas Kunz <jonas.kunz@elastic.co>
Date: Fri, 2 May 2025 09:20:01 +0200
Subject: [PATCH] Upgrade async-profiler to 4.0

---
 dependencyManagement/build.gradle.kts                       | 2 +-
 inferred-spans/build.gradle.kts                             | 4 ++++
 .../contrib/inferredspans/internal/SamplingProfiler.java    | 2 +-
 .../inferredspans/internal/SamplingProfilerTest.java        | 6 +++---
 inferred-spans/src/test/resources/logging.properties        | 4 ++++
 5 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 inferred-spans/src/test/resources/logging.properties

diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
index 55f3e3288..10a1d94c2 100644
--- a/dependencyManagement/build.gradle.kts
+++ b/dependencyManagement/build.gradle.kts
@@ -54,7 +54,7 @@ dependencies {
     api("org.testcontainers:kafka:1.21.0")
     api("com.lmax:disruptor:3.4.4")
     api("org.jctools:jctools-core:4.0.5")
-    api("tools.profiler:async-profiler:3.0")
+    api("tools.profiler:async-profiler:4.0")
     api("com.blogspot.mydailyjava:weak-lock-free:0.18")
     api("org.agrona:agrona:1.22.0")
   }
diff --git a/inferred-spans/build.gradle.kts b/inferred-spans/build.gradle.kts
index dba8e0334..d0921a940 100644
--- a/inferred-spans/build.gradle.kts
+++ b/inferred-spans/build.gradle.kts
@@ -42,4 +42,8 @@ tasks {
       }
     }
   }
+
+  withType<Test>().configureEach {
+    jvmArgs("-Djava.util.logging.config.file=${project.projectDir.resolve("src/test/resources/logging.properties")}")
+  }
 }
diff --git a/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/SamplingProfiler.java b/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/SamplingProfiler.java
index d05496084..23e0dfc99 100644
--- a/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/SamplingProfiler.java
+++ b/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/SamplingProfiler.java
@@ -426,7 +426,7 @@ private void profile(Duration profilingDuration) throws Exception {
 
   String createStartCommand() {
     StringBuilder startCommand =
-        new StringBuilder("start,jfr,clock=m,event=wall,cstack=n,interval=")
+        new StringBuilder("start,jfr,clock=m,event=wall,nobatch,cstack=n,interval=")
             .append(config.getSamplingInterval().toMillis())
             .append("ms,filter,file=")
             .append(jfrFile)
diff --git a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/SamplingProfilerTest.java b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/SamplingProfilerTest.java
index a355cb76f..b97ce8729 100644
--- a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/SamplingProfilerTest.java
+++ b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/SamplingProfilerTest.java
@@ -144,13 +144,13 @@ void testStartCommand() {
     setupProfiler(false);
     assertThat(setup.profiler.createStartCommand())
         .isEqualTo(
-            "start,jfr,clock=m,event=wall,cstack=n,interval=5ms,filter,file=null,safemode=0");
+            "start,jfr,clock=m,event=wall,nobatch,cstack=n,interval=5ms,filter,file=null,safemode=0");
 
     setup.close();
     setupProfiler(config -> config.startScheduledProfiling(false).profilerLoggingEnabled(false));
     assertThat(setup.profiler.createStartCommand())
         .isEqualTo(
-            "start,jfr,clock=m,event=wall,cstack=n,interval=5ms,filter,file=null,safemode=0,loglevel=none");
+            "start,jfr,clock=m,event=wall,nobatch,cstack=n,interval=5ms,filter,file=null,safemode=0,loglevel=none");
 
     setup.close();
     setupProfiler(
@@ -162,7 +162,7 @@ void testStartCommand() {
                 .asyncProfilerSafeMode(14));
     assertThat(setup.profiler.createStartCommand())
         .isEqualTo(
-            "start,jfr,clock=m,event=wall,cstack=n,interval=10ms,filter,file=null,safemode=14,loglevel=none");
+            "start,jfr,clock=m,event=wall,nobatch,cstack=n,interval=10ms,filter,file=null,safemode=14,loglevel=none");
   }
 
   @Test
diff --git a/inferred-spans/src/test/resources/logging.properties b/inferred-spans/src/test/resources/logging.properties
new file mode 100644
index 000000000..f9ad0c6c2
--- /dev/null
+++ b/inferred-spans/src/test/resources/logging.properties
@@ -0,0 +1,4 @@
+handlers=java.util.logging.ConsoleHandler
+.level=ALL
+java.util.logging.ConsoleHandler.level=ALL
+java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter