Merge branch 'master' into bdu/peertag-backpropagation

Author: bric3

.gitlab/upload_ciapp.sh

@@ -35,5 +35,20 @@ junit_upload() {
         ./results
 }
 
+# Upload code coverage results to Datadog
+coverage_upload() {
+    DD_API_KEY=$1 \
+    [email protected]:DataDog/dd-trace-java.git \
+        datadog-ci coverage upload --ignored-paths=./test-published-dependencies .
+}
+
 # Upload test results to production environment like all other CI jobs
 junit_upload "$DATADOG_API_KEY_PROD"
+junit_upload_status=$?
+
+coverage_upload "$DATADOG_API_KEY_PROD"
+coverage_upload_status=$?
+
+if [[ $junit_upload_status -ne 0 || $coverage_upload_status -ne 0 ]]; then
+  exit 1
+fi

buildSrc/build.gradle.kts

@@ -46,7 +46,7 @@ dependencies {
   implementation("org.ow2.asm", "asm", "9.8")
   implementation("org.ow2.asm", "asm-tree", "9.8")
 
-  testImplementation("org.spockframework", "spock-core", "2.2-groovy-3.0")
+  testImplementation("org.spockframework", "spock-core", "2.3-groovy-3.0")
   testImplementation("org.codehaus.groovy", "groovy-all", "3.0.17")
 }
 

buildSrc/call-site-instrumentation-plugin/build.gradle.kts

@@ -37,7 +37,7 @@ dependencies {
   implementation("com.github.javaparser", "javaparser-symbol-solver-core", "3.24.4")
 
   testImplementation("net.bytebuddy", "byte-buddy", "1.17.5")
-  testImplementation("org.spockframework", "spock-core", "2.0-groovy-3.0")
+  testImplementation("org.spockframework", "spock-core", "2.3-groovy-3.0")
   testImplementation("org.objenesis", "objenesis", "3.0.1")
   testImplementation("org.codehaus.groovy", "groovy-all", "3.0.17")
   testImplementation("javax.servlet", "javax.servlet-api", "3.0.1")
@@ -68,7 +68,7 @@ val copyCallSiteSources = tasks.register<Copy>("copyCallSiteSources") {
 }
 
 tasks {
-  withType<AbstractCompile>() {
+  withType<AbstractCompile> {
     dependsOn(copyCallSiteSources)
   }
 }

dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle

@@ -29,7 +29,6 @@ dependencies {
 
   testImplementation libs.bundles.junit5
   testImplementation libs.bundles.mockito
-  testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.1'
   testImplementation project(':dd-java-agent:agent-profiling')
 }
 

dd-java-agent/agent-profiling/profiling-controller-ddprof/gradle.lockfile

@@ -85,8 +85,6 @@ org.codehaus.groovy:groovy:3.0.17=testCompileClasspath,testRuntimeClasspath
 org.codenarc:CodeNarc:2.2.0=codenarc
 org.dom4j:dom4j:2.1.3=spotbugs
 org.gmetrics:GMetrics:1.1=codenarc
-org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath
-org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath
 org.jacoco:org.jacoco.agent:0.8.5=jacocoAgent,jacocoAnt
 org.jacoco:org.jacoco.ant:0.8.5=jacocoAnt
 org.jacoco:org.jacoco.core:0.8.5=jacocoAnt

dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerControllerTest.java

@@ -8,7 +8,7 @@
 import datadog.trace.api.profiling.RecordingData;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import java.util.Properties;
-import org.junit.Assume;
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -20,7 +20,7 @@ public class DatadogProfilerControllerTest {
 
   @Test
   public void testCreateContinuousRecording() throws Exception {
-    Assume.assumeTrue(OperatingSystem.isLinux());
+    Assumptions.assumeTrue(OperatingSystem.isLinux());
     Properties props = new Properties();
     props.put(PROFILING_AUXILIARY_TYPE, "ddprof");
     ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);

dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecordingTest.java

@@ -6,8 +6,8 @@
 import com.datadog.profiling.ddprof.JavaProfilerLoader;
 import datadog.trace.api.profiling.RecordingData;
 import java.time.Instant;
-import org.junit.Assume;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -34,7 +34,7 @@ public class DatadogProfilerOngoingRecordingTest {
   public static void setupAll() {
     // If the profiler couldn't be loaded, the reason why is saved.
     // This test assumes the profiler could be loaded.
-    Assume.assumeNoException("profiler not available", JavaProfilerLoader.REASON_NOT_LOADED);
+    Assumptions.assumeTrue(JavaProfilerLoader.REASON_NOT_LOADED == null, "profiler not available");
   }
 
   @BeforeEach

dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingTest.java

@@ -10,8 +10,8 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.time.Instant;
-import org.junit.Assume;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -21,17 +21,17 @@ class DatadogProfilerRecordingTest {
   private DatadogProfilerRecording recording;
 
   @BeforeEach
-  void setup() throws Exception {
-    Assume.assumeTrue(OperatingSystem.isLinux());
-    Assume.assumeNoException("Profiler not available", JavaProfilerLoader.REASON_NOT_LOADED);
+  void setup() {
+    Assumptions.assumeTrue(OperatingSystem.isLinux());
+    Assumptions.assumeTrue(JavaProfilerLoader.REASON_NOT_LOADED == null, "Profiler not available");
     profiler = DatadogProfiler.newInstance(ConfigProvider.getInstance());
-    Assume.assumeFalse(profiler.isActive());
+    Assumptions.assumeFalse(profiler.isActive());
     recording = (DatadogProfilerRecording) profiler.start();
-    Assume.assumeTrue(recording != null);
+    Assumptions.assumeTrue(recording != null);
   }
 
   @AfterEach
-  void shutdown() throws Exception {
+  void shutdown() {
     // Apparently, failed 'assume' does not prevent shutdown from running
     // Do a sanity check before invoking profiler methods
     if (profiler != null && recording != null) {
@@ -40,24 +40,24 @@ void shutdown() throws Exception {
   }
 
   @Test
-  void testClose() throws Exception {
-    Assume.assumeNoException("Profiler not available", JavaProfilerLoader.REASON_NOT_LOADED);
+  void testClose() {
+    Assumptions.assumeTrue(JavaProfilerLoader.REASON_NOT_LOADED == null, "Profiler not available");
     assertTrue(Files.exists(recording.getRecordingFile()));
     recording.close();
     assertFalse(Files.exists(recording.getRecordingFile()));
   }
 
   @Test
-  void testStop() throws Exception {
-    Assume.assumeNoException("Profiler not available", JavaProfilerLoader.REASON_NOT_LOADED);
+  void testStop() {
+    Assumptions.assumeTrue(JavaProfilerLoader.REASON_NOT_LOADED == null, "Profiler not available");
     RecordingData data = recording.stop();
     assertNotNull(data);
     assertTrue(Files.exists(recording.getRecordingFile()));
   }
 
   @Test
   void testSnapshot() throws Exception {
-    Assume.assumeNoException("Profiler not available", JavaProfilerLoader.REASON_NOT_LOADED);
+    Assumptions.assumeTrue(JavaProfilerLoader.REASON_NOT_LOADED == null, "Profiler not available");
     RecordingData data = recording.snapshot(Instant.now());
     assertNotNull(data);
     assertTrue(Files.exists(recording.getRecordingFile()));

dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerTest.java

@@ -6,7 +6,6 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.datadog.profiling.controller.OngoingRecording;
-import com.datadog.profiling.controller.UnsupportedEnvironmentException;
 import com.datadog.profiling.utils.ProfilingMode;
 import datadog.environment.OperatingSystem;
 import datadog.trace.api.config.ProfilingConfig;
@@ -21,7 +20,6 @@
 import java.util.UUID;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
-import org.junit.Assume;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -43,7 +41,7 @@ public void setup() {
 
   @Test
   void test() throws Exception {
-    Assume.assumeNoException("Profiler not available", JavaProfilerLoader.REASON_NOT_LOADED);
+    Assumptions.assumeTrue(JavaProfilerLoader.REASON_NOT_LOADED == null, "Profiler not available");
     DatadogProfiler profiler = DatadogProfiler.newInstance(ConfigProvider.getInstance());
     assertFalse(profiler.enabledModes().isEmpty());
 
@@ -75,8 +73,8 @@ void test() throws Exception {
 
   @ParameterizedTest
   @MethodSource("profilingModes")
-  void testStartCmd(boolean cpu, boolean wall, boolean alloc, boolean memleak) throws Exception {
-    Assume.assumeNoException("Profiler not available", JavaProfilerLoader.REASON_NOT_LOADED);
+  void testStartCmd(boolean cpu, boolean wall, boolean alloc, boolean memleak) {
+    Assumptions.assumeTrue(JavaProfilerLoader.REASON_NOT_LOADED == null, "Profiler not available");
     DatadogProfiler profiler =
         DatadogProfiler.newInstance(configProvider(cpu, wall, alloc, memleak));
 
@@ -105,7 +103,7 @@ private static Stream<Arguments> profilingModes() {
   }
 
   @Test
-  public void testContextRegistration() throws UnsupportedEnvironmentException {
+  public void testContextRegistration() {
     // warning - the profiler is a process wide singleton and can't be reinitialised
     // so there is only one shot to test it here, 'foo,bar' need to be kept in the same
     // order whether in the list or the enum, and any other test which tries to register
@@ -121,7 +119,7 @@ public void testContextRegistration() throws UnsupportedEnvironmentException {
     DatadogProfilerContextSetter fooSetter = new DatadogProfilerContextSetter("foo", profiler);
     DatadogProfilerContextSetter barSetter = new DatadogProfilerContextSetter("bar", profiler);
     int[] snapshot0 = profiler.snapshot();
-    try (ProfilingScope outer = new DatadogProfilingScope(profiler)) {
+    try (ProfilingScope ignored = new DatadogProfilingScope(profiler)) {
       fooSetter.set("foo0");
       barSetter.set("bar0");
       int[] snapshot1 = profiler.snapshot();