Skip to content

Commit 274f7b2

Browse files
authored
Do not run JFR specific tests on J9 (#8744)
1 parent bd7a9c8 commit 274f7b2

File tree

6 files changed

+28
-2
lines changed

6 files changed

+28
-2
lines changed

dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkControllerTest.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@
1212
import static org.junit.jupiter.api.Assertions.assertEquals;
1313
import static org.junit.jupiter.api.Assertions.assertFalse;
1414
import static org.junit.jupiter.api.Assertions.assertTrue;
15+
import static org.junit.jupiter.api.Assumptions.assumeFalse;
1516

1617
import com.datadog.profiling.controller.ControllerContext;
1718
import com.datadog.profiling.controller.jfr.JfpUtilsTest;
19+
import datadog.trace.api.Platform;
1820
import datadog.trace.api.profiling.RecordingData;
1921
import datadog.trace.bootstrap.config.provider.ConfigProvider;
2022
import java.util.Properties;
2123
import jdk.jfr.Recording;
22-
import org.junit.jupiter.api.Assumptions;
24+
import org.junit.jupiter.api.BeforeAll;
2325
import org.junit.jupiter.api.Test;
2426
import org.junit.jupiter.api.extension.ExtendWith;
2527
import org.mockito.junit.jupiter.MockitoExtension;
@@ -29,6 +31,11 @@ public class OpenJdkControllerTest {
2931

3032
private static final String TEST_NAME = "recording name";
3133

34+
@BeforeAll
35+
static void setupSpec() {
36+
assumeFalse(Platform.isJ9());
37+
}
38+
3239
@Test
3340
public void testCreateContinuousRecording() throws Exception {
3441
Properties props = getConfigProperties();
@@ -194,7 +201,7 @@ public void testAllocationProfilerIsStillOverriddenThroughConfig() throws Except
194201

195202
@Test
196203
public void testNativeProfilerIsDisabledOnUnsupportedVersion() throws Exception {
197-
Assumptions.assumeFalse(isNativeMethodSampleAvailable());
204+
assumeFalse(isNativeMethodSampleAvailable());
198205
Properties props = getConfigProperties();
199206

200207
ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);

dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecordingTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package com.datadog.profiling.controller.openjdk;
22

33
import static org.junit.jupiter.api.Assertions.*;
4+
import static org.junit.jupiter.api.Assumptions.assumeFalse;
45
import static org.mockito.Mockito.never;
56
import static org.mockito.Mockito.verify;
67
import static org.mockito.Mockito.when;
78

89
import com.datadog.profiling.controller.ControllerContext;
10+
import datadog.trace.api.Platform;
911
import datadog.trace.api.profiling.RecordingData;
1012
import java.time.Instant;
1113
import jdk.jfr.Recording;
@@ -34,6 +36,7 @@ public class OpenJdkOngoingRecordingTest {
3436

3537
@BeforeEach
3638
public void setup() {
39+
assumeFalse(Platform.isJ9());
3740
when(recording.getState()).thenReturn(RecordingState.RUNNING);
3841
when(recording.getName()).thenReturn(TEST_NAME);
3942

dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkRecordingDataTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
import static org.hamcrest.MatcherAssert.assertThat;
55
import static org.junit.jupiter.api.Assertions.assertEquals;
66
import static org.junit.jupiter.api.Assertions.assertNotNull;
7+
import static org.junit.jupiter.api.Assumptions.assumeFalse;
78
import static org.mockito.Mockito.verify;
89
import static org.mockito.Mockito.when;
910

11+
import datadog.trace.api.Platform;
1012
import datadog.trace.api.profiling.ProfilingSnapshot;
1113
import java.io.IOException;
1214
import java.io.InputStream;
@@ -42,6 +44,7 @@ public class OpenJdkRecordingDataTest {
4244

4345
@BeforeEach
4446
public void setup() throws IOException {
47+
assumeFalse(Platform.isJ9());
4548
when(recording.getStream(start, end)).thenReturn(stream);
4649
when(recording.getStream(customStart, customEnd)).thenReturn(customStream);
4750
when(recording.getStartTime()).thenReturn(start);

dd-java-agent/instrumentation/exception-profiling/src/test/groovy/datadog/trace/bootstrap/instrumentation/jfr/exceptions/KnownExcludesForkedTest.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
import com.zaxxer.hikari.pool.ProxyLeakTask
22
import datadog.trace.agent.test.AgentTestRunner
3+
import datadog.trace.api.Platform
34
import datadog.trace.bootstrap.instrumentation.jfr.InstrumentationBasedProfiling
45
import jdk.jfr.Recording
56
import org.openjdk.jmc.common.item.Attribute
67
import org.openjdk.jmc.common.item.IAttribute
78
import org.openjdk.jmc.common.item.ItemFilters
89
import org.openjdk.jmc.common.unit.UnitLookup
910
import org.openjdk.jmc.flightrecorder.JfrLoaderToolkit
11+
import spock.lang.Requires
1012
import spock.lang.Shared
1113

1214
import java.nio.file.Files
1315

16+
@Requires({
17+
!Platform.isJ9()
18+
})
1419
class KnownExcludesForkedTest extends AgentTestRunner {
1520
private static final IAttribute<String> TYPE =
1621
Attribute.attr("type", "type", "Exception type", UnitLookup.PLAIN_TEXT)

dd-java-agent/instrumentation/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
import static org.junit.jupiter.api.Assertions.assertEquals;
66
import static org.junit.jupiter.api.Assertions.assertFalse;
77
import static org.junit.jupiter.api.Assertions.assertTrue;
8+
import static org.junit.jupiter.api.Assumptions.assumeFalse;
89

910
import com.google.common.collect.ImmutableMap;
1011
import com.google.common.collect.ImmutableSortedMap;
1112
import datadog.trace.api.Config;
13+
import datadog.trace.api.Platform;
1214
import java.io.IOException;
1315
import java.time.Instant;
1416
import java.util.Comparator;
@@ -60,6 +62,7 @@ public boolean equals(final Object obj) {
6062

6163
@BeforeEach
6264
public void setup() {
65+
assumeFalse(Platform.isJ9());
6366
recording = new Recording();
6467
recording.enable("datadog.ExceptionCount");
6568
recording.start();

dd-java-agent/instrumentation/java-directbytebuffer/src/test/groovy/DirectAllocationTrackingTest.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import datadog.trace.agent.test.AgentTestRunner
2+
import datadog.trace.api.Platform
23
import datadog.trace.bootstrap.instrumentation.api.AgentTracer
34
import datadog.trace.bootstrap.instrumentation.jfr.InstrumentationBasedProfiling
45
import jdk.jfr.FlightRecorder
56
import jdk.jfr.Recording
67
import jdk.jfr.consumer.RecordingFile
8+
import spock.lang.Requires
79

810
import java.nio.ByteBuffer
911
import java.nio.channels.FileChannel
@@ -14,6 +16,9 @@ import java.util.stream.Collectors
1416

1517
import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
1618

19+
@Requires({
20+
!Platform.isJ9()
21+
})
1722
class DirectAllocationTrackingTest extends AgentTestRunner {
1823

1924
Recording recording

0 commit comments

Comments
 (0)