Skip to content

Do not run JFR specific tests on J9 #8744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,16 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assumptions.assumeFalse;

import com.datadog.profiling.controller.ControllerContext;
import com.datadog.profiling.controller.jfr.JfpUtilsTest;
import datadog.trace.api.Platform;
import datadog.trace.api.profiling.RecordingData;
import datadog.trace.bootstrap.config.provider.ConfigProvider;
import java.util.Properties;
import jdk.jfr.Recording;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
Expand All @@ -29,6 +31,11 @@ public class OpenJdkControllerTest {

private static final String TEST_NAME = "recording name";

@BeforeAll
static void setupSpec() {
assumeFalse(Platform.isJ9());
}

@Test
public void testCreateContinuousRecording() throws Exception {
Properties props = getConfigProperties();
Expand Down Expand Up @@ -194,7 +201,7 @@ public void testAllocationProfilerIsStillOverriddenThroughConfig() throws Except

@Test
public void testNativeProfilerIsDisabledOnUnsupportedVersion() throws Exception {
Assumptions.assumeFalse(isNativeMethodSampleAvailable());
assumeFalse(isNativeMethodSampleAvailable());
Properties props = getConfigProperties();

ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package com.datadog.profiling.controller.openjdk;

import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assumptions.assumeFalse;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import com.datadog.profiling.controller.ControllerContext;
import datadog.trace.api.Platform;
import datadog.trace.api.profiling.RecordingData;
import java.time.Instant;
import jdk.jfr.Recording;
Expand Down Expand Up @@ -34,6 +36,7 @@ public class OpenJdkOngoingRecordingTest {

@BeforeEach
public void setup() {
assumeFalse(Platform.isJ9());
when(recording.getState()).thenReturn(RecordingState.RUNNING);
when(recording.getName()).thenReturn(TEST_NAME);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assumptions.assumeFalse;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import datadog.trace.api.Platform;
import datadog.trace.api.profiling.ProfilingSnapshot;
import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -42,6 +44,7 @@ public class OpenJdkRecordingDataTest {

@BeforeEach
public void setup() throws IOException {
assumeFalse(Platform.isJ9());
when(recording.getStream(start, end)).thenReturn(stream);
when(recording.getStream(customStart, customEnd)).thenReturn(customStream);
when(recording.getStartTime()).thenReturn(start);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
import com.zaxxer.hikari.pool.ProxyLeakTask
import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.api.Platform
import datadog.trace.bootstrap.instrumentation.jfr.InstrumentationBasedProfiling
import jdk.jfr.Recording
import org.openjdk.jmc.common.item.Attribute
import org.openjdk.jmc.common.item.IAttribute
import org.openjdk.jmc.common.item.ItemFilters
import org.openjdk.jmc.common.unit.UnitLookup
import org.openjdk.jmc.flightrecorder.JfrLoaderToolkit
import spock.lang.Requires
import spock.lang.Shared

import java.nio.file.Files

@Requires({
!Platform.isJ9()
})
class KnownExcludesForkedTest extends AgentTestRunner {
private static final IAttribute<String> TYPE =
Attribute.attr("type", "type", "Exception type", UnitLookup.PLAIN_TEXT)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assumptions.assumeFalse;

import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSortedMap;
import datadog.trace.api.Config;
import datadog.trace.api.Platform;
import java.io.IOException;
import java.time.Instant;
import java.util.Comparator;
Expand Down Expand Up @@ -60,6 +62,7 @@ public boolean equals(final Object obj) {

@BeforeEach
public void setup() {
assumeFalse(Platform.isJ9());
recording = new Recording();
recording.enable("datadog.ExceptionCount");
recording.start();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.api.Platform
import datadog.trace.bootstrap.instrumentation.api.AgentTracer
import datadog.trace.bootstrap.instrumentation.jfr.InstrumentationBasedProfiling
import jdk.jfr.FlightRecorder
import jdk.jfr.Recording
import jdk.jfr.consumer.RecordingFile
import spock.lang.Requires

import java.nio.ByteBuffer
import java.nio.channels.FileChannel
Expand All @@ -14,6 +16,9 @@ import java.util.stream.Collectors

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

@Requires({
!Platform.isJ9()
})
class DirectAllocationTrackingTest extends AgentTestRunner {

Recording recording
Expand Down