diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java index 92dbad9bcd9..a5380f30ed5 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java @@ -2044,7 +2044,7 @@ public void duplicateLocalDifferentScope() throws IOException, URISyntaxExceptio @Test @DisabledIf( - value = "datadog.trace.api.Platform#isJ9", + value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "we cannot get local variable debug info") public void mixingIntAndLongWhenHoisting() throws IOException, URISyntaxException { final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31"; @@ -2063,7 +2063,7 @@ public void mixingIntAndLongWhenHoisting() throws IOException, URISyntaxExceptio @Test @DisabledIf( - value = "datadog.trace.api.Platform#isJ9", + value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "we cannot get local variable debug info") public void mixingIntAndCharWhenHoisting() throws IOException, URISyntaxException { final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31"; @@ -2082,7 +2082,7 @@ public void mixingIntAndCharWhenHoisting() throws IOException, URISyntaxExceptio @Test @DisabledIf( - value = "datadog.trace.api.Platform#isJ9", + value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "we cannot get local variable debug info") public void mixingIntAndRefTypeWhenHoisting() throws IOException, URISyntaxException { final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31"; @@ -2101,7 +2101,7 @@ public void mixingIntAndRefTypeWhenHoisting() throws IOException, URISyntaxExcep @Test @DisabledIf( - value = "datadog.trace.api.Platform#isJ9", + value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "we cannot get local variable debug info") public void sameSlotAndTypeDifferentName() throws IOException, URISyntaxException { final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31"; @@ -2125,7 +2125,7 @@ public void sameSlotAndTypeDifferentName() throws IOException, URISyntaxExceptio @Test @DisabledIf( - value = "datadog.trace.api.Platform#isJ9", + value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "we cannot get local variable debug info") public void sameSlotAndNameOneReturn() throws IOException, URISyntaxException { final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31"; diff --git a/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java b/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java index e3d8b38659a..db136a56927 100644 --- a/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java +++ b/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java @@ -8,7 +8,8 @@ import com.squareup.moshi.JsonAdapter; import com.squareup.moshi.Moshi; -import datadog.trace.api.Platform; +import datadog.environment.JavaVirtualMachine; +import datadog.environment.OperatingSystem; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -49,7 +50,7 @@ public class CrashtrackingSmokeTest { @BeforeAll static void setupAll() { // Only Hotspot based implementation are supported - assumeFalse(Platform.isJ9()); + assumeFalse(JavaVirtualMachine.isJ9()); } private Path tempDir; @@ -127,7 +128,7 @@ private static String agentShadowJar() { } private static String getExtension() { - return Platform.isWindows() ? "bat" : "sh"; + return OperatingSystem.isWindows() ? "bat" : "sh"; } /* diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ExceptionDebuggerIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ExceptionDebuggerIntegrationTest.java index f73ad478fcf..700c70f4360 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ExceptionDebuggerIntegrationTest.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ExceptionDebuggerIntegrationTest.java @@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import com.datadog.debugger.sink.Snapshot; -import datadog.trace.api.Platform; +import datadog.environment.JavaVirtualMachine; import datadog.trace.bootstrap.debugger.CapturedContext; import datadog.trace.test.agent.decoder.DecodedSpan; import datadog.trace.test.agent.decoder.DecodedTrace; @@ -44,7 +44,7 @@ protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params @Test @DisplayName("testSimpleSingleFrameException") @DisabledIf( - value = "datadog.trace.api.Platform#isJ9", + value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "we cannot get local variable debug info") void testSimpleSingleFrameException() throws Exception { appUrl = startAppAndAndGetUrl(); @@ -74,7 +74,7 @@ void testSimpleSingleFrameException() throws Exception { @Test @DisplayName("testNoSubsequentCaptureAfterFirst") @DisabledIf( - value = "datadog.trace.api.Platform#isJ9", + value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "we cannot get local variable debug info") void testNoSubsequentCaptureAfterFirst() throws Exception { appUrl = startAppAndAndGetUrl(); @@ -107,7 +107,7 @@ void testNoSubsequentCaptureAfterFirst() throws Exception { @Test @DisplayName("test3CapturedFrames") @DisabledIf( - value = "datadog.trace.api.Platform#isJ9", + value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "we cannot get local variable debug info") void test3CapturedFrames() throws Exception { appUrl = startAppAndAndGetUrl(); @@ -163,7 +163,7 @@ void test3CapturedFrames() throws Exception { @Test @DisplayName("test5CapturedFrames") @DisabledIf( - value = "datadog.trace.api.Platform#isJ9", + value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "we cannot get local variable debug info") void test5CapturedFrames() throws Exception { additionalJvmArgs.add("-Ddd.exception.replay.capture.max.frames=5"); @@ -240,7 +240,7 @@ void test5CapturedFrames() throws Exception { @Test @DisplayName("test3CapturedRecursiveFrames") @DisabledIf( - value = "datadog.trace.api.Platform#isJ9", + value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "we cannot get local variable debug info") void test3CapturedRecursiveFrames() throws Exception { appUrl = startAppAndAndGetUrl(); @@ -284,7 +284,9 @@ private static void assertRecursiveSnapshot(Snapshot snapshot) { @Test @DisplayName("testLambdaHiddenFrames") - @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "HotSpot specific test") + @DisabledIf( + value = "datadog.environment.JavaVirtualMachine#isJ9", + disabledReason = "HotSpot specific test") void testLambdaHiddenFrames() throws Exception { additionalJvmArgs.add("-XX:+UnlockDiagnosticVMOptions"); additionalJvmArgs.add("-XX:+ShowHiddenFrames"); @@ -325,7 +327,7 @@ private void resetSnapshotsAndTraces() { } private void assertFullMethodCaptureArgs(CapturedContext context) { - if (Platform.isJ9()) { + if (JavaVirtualMachine.isJ9()) { // skip for J9/OpenJ9 as we cannot get local variable debug info. return; } diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java index 1e4824cfb60..ef60048e630 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java @@ -22,7 +22,7 @@ import com.datadog.debugger.probe.LogProbe; import com.datadog.debugger.sink.Snapshot; import com.squareup.moshi.JsonAdapter; -import datadog.trace.api.Platform; +import datadog.environment.JavaVirtualMachine; import datadog.trace.bootstrap.debugger.CapturedContext; import datadog.trace.bootstrap.debugger.MethodLocation; import datadog.trace.bootstrap.debugger.ProbeId; @@ -279,14 +279,18 @@ void testLineProbe() throws Exception { @Test @DisplayName("testSamplingSnapshotDefault") - @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs") + @DisabledIf( + value = "datadog.environment.JavaVirtualMachine#isJ9", + disabledReason = "Flaky on J9 JVMs") void testSamplingSnapshotDefault() throws Exception { doSamplingSnapshot(null, MethodLocation.EXIT); } @Test @DisplayName("testSamplingSnapshotDefaultWithConditionAtEntry") - @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs") + @DisabledIf( + value = "datadog.environment.JavaVirtualMachine#isJ9", + disabledReason = "Flaky on J9 JVMs") void testSamplingSnapshotDefaultWithConditionAtEntry() throws Exception { doSamplingSnapshot( new ProbeCondition(DSL.when(DSL.eq(value(1), value(1))), "1 == 1"), MethodLocation.ENTRY); @@ -294,7 +298,9 @@ void testSamplingSnapshotDefaultWithConditionAtEntry() throws Exception { @Test @DisplayName("testSamplingSnapshotDefaultWithConditionAtExit") - @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs") + @DisabledIf( + value = "datadog.environment.JavaVirtualMachine#isJ9", + disabledReason = "Flaky on J9 JVMs") void testSamplingSnapshotDefaultWithConditionAtExit() throws Exception { doSamplingSnapshot( new ProbeCondition(DSL.when(DSL.eq(value(1), value(1))), "1 == 1"), MethodLocation.EXIT); @@ -323,7 +329,9 @@ private void doSamplingSnapshot(ProbeCondition probeCondition, MethodLocation ev @Test @DisplayName("testSamplingLogDefault") - @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs") + @DisabledIf( + value = "datadog.environment.JavaVirtualMachine#isJ9", + disabledReason = "Flaky on J9 JVMs") void testSamplingLogDefault() throws Exception { batchSize = 100; final int LOOP_COUNT = 1000; @@ -347,7 +355,9 @@ void testSamplingLogDefault() throws Exception { @Test @DisplayName("testSamplingLogCustom") - @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs") + @DisabledIf( + value = "datadog.environment.JavaVirtualMachine#isJ9", + disabledReason = "Flaky on J9 JVMs") void testSamplingLogCustom() throws Exception { final int LOOP_COUNT = 1000; final String LOG_TEMPLATE = "log line {argInt} {argStr} {argDouble} {argMap} {argVar}"; @@ -460,7 +470,7 @@ private ProbeId getProbeId(int i) { } private void assertFullMethodCaptureArgs(CapturedContext context) { - if (Platform.isJ9()) { + if (JavaVirtualMachine.isJ9()) { // skip for J9/OpenJ9 as we cannot get local variable debug info. return; } diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProbeStateIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProbeStateIntegrationTest.java index 99b56a40573..d540485b2c8 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProbeStateIntegrationTest.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProbeStateIntegrationTest.java @@ -28,7 +28,9 @@ void setup(TestInfo testInfo) throws Exception { @Test @DisplayName("testAddRemoveProbes") - @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs") + @DisabledIf( + value = "datadog.environment.JavaVirtualMachine#isJ9", + disabledReason = "Flaky on J9 JVMs") void testAddRemoveProbes() throws Exception { LogProbe logProbe = LogProbe.builder().probeId(PROBE_ID).where(TEST_APP_CLASS_NAME, FULL_METHOD_NAME).build(); @@ -50,7 +52,9 @@ void testAddRemoveProbes() throws Exception { @Test @DisplayName("testDisableEnableProbes") - @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs") + @DisabledIf( + value = "datadog.environment.JavaVirtualMachine#isJ9", + disabledReason = "Flaky on J9 JVMs") void testDisableEnableProbes() throws Exception { LogProbe logProbe = LogProbe.builder().probeId(PROBE_ID).where(TEST_APP_CLASS_NAME, FULL_METHOD_NAME).build(); @@ -72,7 +76,9 @@ void testDisableEnableProbes() throws Exception { @Test @DisplayName("testDisableEnableProbesUsingDenyList") - @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs") + @DisabledIf( + value = "datadog.environment.JavaVirtualMachine#isJ9", + disabledReason = "Flaky on J9 JVMs") @Disabled("Not supported for config coming from RemoteConfig") void testDisableEnableProbesUsingDenyList() throws Exception { LogProbe logProbe = @@ -104,7 +110,9 @@ void testDisableEnableProbesUsingDenyList() throws Exception { @Test @DisplayName("testDisableEnableProbesUsingAllowList") - @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs") + @DisabledIf( + value = "datadog.environment.JavaVirtualMachine#isJ9", + disabledReason = "Flaky on J9 JVMs") @Disabled("Not supported for config coming from RemoteConfig") void testDisableEnableProbesUsingAllowList() throws Exception { LogProbe logProbe = @@ -136,7 +144,9 @@ void testDisableEnableProbesUsingAllowList() throws Exception { @Test @DisplayName("testProbeStatusError") - @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs") + @DisabledIf( + value = "datadog.environment.JavaVirtualMachine#isJ9", + disabledReason = "Flaky on J9 JVMs") public void testProbeStatusError() throws Exception { LogProbe logProbe = LogProbe.builder() diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java index e6e35ae3f18..3d1fc4d3c0a 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java @@ -49,7 +49,7 @@ protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params @Test @DisplayName("testMethodSimpleTagNoCondition") @DisabledIf( - value = "datadog.trace.api.Platform#isJ9", + value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "we cannot get local variable debug info") void testMethodSimpleTagNoCondition() throws Exception { SpanDecorationProbe spanDecorationProbe = @@ -79,7 +79,7 @@ void testMethodSimpleTagNoCondition() throws Exception { @Test @DisplayName("testMethodMultiTagsMultiConditions") @DisabledIf( - value = "datadog.trace.api.Platform#isJ9", + value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "we cannot get local variable debug info") void testMethodMultiTagsMultiConditions() throws Exception { List decorations = @@ -125,7 +125,9 @@ void testMethodMultiTagsMultiConditions() throws Exception { @Test @DisplayName("testMethodSimpleTagValueError") - @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs") + @DisabledIf( + value = "datadog.environment.JavaVirtualMachine#isJ9", + disabledReason = "Flaky on J9 JVMs") void testMethodSimpleTagValueError() throws Exception { SpanDecorationProbe spanDecorationProbe = SpanDecorationProbe.builder() @@ -162,7 +164,9 @@ void testMethodSimpleTagValueError() throws Exception { @Test @DisplayName("testMethodSimpleTagConditionError") - @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs") + @DisabledIf( + value = "datadog.environment.JavaVirtualMachine#isJ9", + disabledReason = "Flaky on J9 JVMs") void testMethodSimpleTagConditionError() throws Exception { SpanDecorationProbe spanDecorationProbe = SpanDecorationProbe.builder() @@ -201,7 +205,9 @@ void testMethodSimpleTagConditionError() throws Exception { @Test @DisplayName("testMethodMultiTagValueError") - @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs") + @DisabledIf( + value = "datadog.environment.JavaVirtualMachine#isJ9", + disabledReason = "Flaky on J9 JVMs") void testMethodMultiTagValueError() throws Exception { List decorations = Arrays.asList( @@ -246,7 +252,9 @@ void testMethodMultiTagValueError() throws Exception { @Test @DisplayName("testSamplingSpanDecoration") - @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs") + @DisabledIf( + value = "datadog.environment.JavaVirtualMachine#isJ9", + disabledReason = "Flaky on J9 JVMs") void testSamplingSpanDecoration() throws Exception { SpanDecorationProbe spanDecorationProbe = SpanDecorationProbe.builder() diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanProbesIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanProbesIntegrationTest.java index 8d2725b44ec..48d23641b6a 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanProbesIntegrationTest.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanProbesIntegrationTest.java @@ -70,7 +70,9 @@ void testLineRangeSpan() throws Exception { @Test @DisplayName("testSingleLineSpan") - @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs") + @DisabledIf( + value = "datadog.environment.JavaVirtualMachine#isJ9", + disabledReason = "Flaky on J9 JVMs") void testSingleLineSpan() throws Exception { final String METHOD_NAME = "fullMethod"; final String EXPECTED_UPLOADS = "2"; // 2 probe statuses: RECEIVED + ERROR diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java index ab91d10e3c2..ea198200ac3 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java @@ -50,7 +50,9 @@ protected String getAppId() { @ParameterizedTest(name = "Process tags enabled ''{0}''") @ValueSource(booleans = {true, false}) @DisplayName("testTracer") - @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs") + @DisabledIf( + value = "datadog.environment.JavaVirtualMachine#isJ9", + disabledReason = "Flaky on J9 JVMs") void testTracer(boolean processTagsEnabled) throws Exception { LogProbe logProbe = LogProbe.builder() @@ -81,7 +83,9 @@ void testTracer(boolean processTagsEnabled) throws Exception { @Test @DisplayName("testTracerDynamicLog") - @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs") + @DisabledIf( + value = "datadog.environment.JavaVirtualMachine#isJ9", + disabledReason = "Flaky on J9 JVMs") void testTracerDynamicLog() throws Exception { LogProbe logProbe = LogProbe.builder() @@ -104,7 +108,9 @@ void testTracerDynamicLog() throws Exception { @Test @DisplayName("testTracerSameMethod") - @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs") + @DisabledIf( + value = "datadog.environment.JavaVirtualMachine#isJ9", + disabledReason = "Flaky on J9 JVMs") void testTracerSameMethod() throws Exception { LogProbe logProbe = LogProbe.builder() @@ -124,7 +130,9 @@ void testTracerSameMethod() throws Exception { @Test @DisplayName("testTracerLineSnapshotProbe") - @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs") + @DisabledIf( + value = "datadog.environment.JavaVirtualMachine#isJ9", + disabledReason = "Flaky on J9 JVMs") void testTracerLineSnapshotProbe() throws Exception { LogProbe logProbe = LogProbe.builder() @@ -144,7 +152,9 @@ void testTracerLineSnapshotProbe() throws Exception { @Test @DisplayName("testTracerLineDynamicLogProbe") - @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs") + @DisabledIf( + value = "datadog.environment.JavaVirtualMachine#isJ9", + disabledReason = "Flaky on J9 JVMs") void testTracerLineDynamicLogProbe() throws Exception { final String LOG_TEMPLATE = "processWithArg {argInt}"; LogProbe logProbe = diff --git a/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/AbstractGradleTest.groovy b/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/AbstractGradleTest.groovy index 9d4e562d809..91837011645 100644 --- a/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/AbstractGradleTest.groovy +++ b/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/AbstractGradleTest.groovy @@ -2,7 +2,7 @@ package datadog.smoketest import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.ObjectMapper -import datadog.trace.api.Platform +import datadog.environment.JavaVirtualMachine import datadog.trace.civisibility.CiVisibilitySmokeTest import okhttp3.OkHttpClient import okhttp3.Request @@ -126,7 +126,7 @@ class AbstractGradleTest extends CiVisibilitySmokeTest { protected void givenConfigurationCacheIsCompatibleWithCurrentPlatform(boolean configurationCacheEnabled) { if (configurationCacheEnabled) { - Assumptions.assumeFalse(Platform.isIbm8(), "Configuration cache is not compatible with IBM 8") + Assumptions.assumeFalse(JavaVirtualMachine.isIbm8(), "Configuration cache is not compatible with IBM 8") } } diff --git a/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy b/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy index b6616e8347b..73281459792 100644 --- a/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy +++ b/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy @@ -1,13 +1,11 @@ package datadog.smoketest +import datadog.environment.JavaVirtualMachine import datadog.trace.api.Config -import datadog.trace.api.Platform import datadog.trace.api.config.CiVisibilityConfig import datadog.trace.api.config.GeneralConfig import datadog.trace.api.config.TraceInstrumentationConfig import datadog.trace.util.Strings -import java.nio.file.Files -import java.nio.file.Path import org.gradle.testkit.runner.BuildResult import org.gradle.testkit.runner.GradleRunner import org.gradle.testkit.runner.TaskOutcome @@ -22,6 +20,9 @@ import spock.lang.IgnoreIf import spock.lang.Shared import spock.lang.TempDir +import java.nio.file.Files +import java.nio.file.Path + class GradleDaemonSmokeTest extends AbstractGradleTest { private static final String TEST_SERVICE_NAME = "test-gradle-service" @@ -43,7 +44,7 @@ class GradleDaemonSmokeTest extends AbstractGradleTest { } @IgnoreIf(reason = "Jacoco plugin does not work with OpenJ9 in older Gradle versions", value = { - Platform.isJ9() + JavaVirtualMachine.isJ9() }) def "test legacy #projectName, v#gradleVersion"() { runGradleTest(gradleVersion, projectName, false, successExpected, false, expectedTraces, expectedCoverages) @@ -60,7 +61,7 @@ class GradleDaemonSmokeTest extends AbstractGradleTest { } @IgnoreIf(reason = "Failing on Java 24. Skip until we have a fix.", value = { - Platform.isJavaVersionAtLeast(24) + JavaVirtualMachine.isJavaVersionAtLeast(24) }) def "test #projectName, v#gradleVersion, configCache: #configurationCache"() { runGradleTest(gradleVersion, projectName, configurationCache, successExpected, flakyRetries, expectedTraces, expectedCoverages) diff --git a/dd-smoke-tests/jboss-modules/src/test/groovy/datadog/smoketest/JBossModulesV2SmokeTest.groovy b/dd-smoke-tests/jboss-modules/src/test/groovy/datadog/smoketest/JBossModulesV2SmokeTest.groovy index 22c08efba93..3591248da53 100644 --- a/dd-smoke-tests/jboss-modules/src/test/groovy/datadog/smoketest/JBossModulesV2SmokeTest.groovy +++ b/dd-smoke-tests/jboss-modules/src/test/groovy/datadog/smoketest/JBossModulesV2SmokeTest.groovy @@ -1,9 +1,9 @@ package datadog.smoketest +import datadog.environment.JavaVirtualMachine import spock.lang.IgnoreIf -import datadog.trace.api.Platform @IgnoreIf(reason = "Failing on Java 24. Skip until we have a fix.", value = { - Platform.isJavaVersionAtLeast(24) + JavaVirtualMachine.isJavaVersionAtLeast(24) }) class JBossModulesV2SmokeTest extends AbstractModulesSmokeTest {} diff --git a/dd-smoke-tests/jersey-2/src/test/groovy/datadog/smoketest/Jersey2AppsecSmokeTest.groovy b/dd-smoke-tests/jersey-2/src/test/groovy/datadog/smoketest/Jersey2AppsecSmokeTest.groovy index ee70d63feb2..10da02e08fd 100644 --- a/dd-smoke-tests/jersey-2/src/test/groovy/datadog/smoketest/Jersey2AppsecSmokeTest.groovy +++ b/dd-smoke-tests/jersey-2/src/test/groovy/datadog/smoketest/Jersey2AppsecSmokeTest.groovy @@ -1,8 +1,8 @@ package datadog.smoketest +import datadog.environment.JavaVirtualMachine import datadog.smoketest.appsec.AbstractAppSecServerSmokeTest import datadog.trace.agent.test.utils.OkHttpUtils -import datadog.trace.api.Platform import groovy.json.JsonOutput import groovy.json.JsonSlurper import okhttp3.MediaType @@ -23,7 +23,7 @@ class Jersey2AppsecSmokeTest extends AbstractAppSecServerSmokeTest{ command.addAll(defaultJavaProperties) command.addAll(defaultAppSecProperties) command.add('-Ddd.integration.grizzly.enabled=true') - if (Platform.isJavaVersionAtLeast(17)) { + if (JavaVirtualMachine.isJavaVersionAtLeast(17)) { command.addAll((String[]) ['--add-opens', 'java.base/java.lang=ALL-UNNAMED']) } command.addAll(['-jar', jarPath, Integer.toString(httpPort)]) diff --git a/dd-smoke-tests/jersey-2/src/test/groovy/datadog/smoketest/Jersey2SmokeTest.groovy b/dd-smoke-tests/jersey-2/src/test/groovy/datadog/smoketest/Jersey2SmokeTest.groovy index 120d34c2a08..0aa67101c04 100644 --- a/dd-smoke-tests/jersey-2/src/test/groovy/datadog/smoketest/Jersey2SmokeTest.groovy +++ b/dd-smoke-tests/jersey-2/src/test/groovy/datadog/smoketest/Jersey2SmokeTest.groovy @@ -1,9 +1,9 @@ package datadog.smoketest -import datadog.trace.api.Platform +import datadog.environment.JavaVirtualMachine import datadog.trace.api.config.IastConfig -import datadog.trace.test.util.Predicates.IBM8 import datadog.trace.test.util.Flaky +import datadog.trace.test.util.Predicates.IBM8 import static datadog.trace.api.iast.IastContext.Mode.GLOBAL @@ -18,7 +18,7 @@ class Jersey2SmokeTest extends AbstractJerseySmokeTest { command.addAll(defaultJavaProperties) command.addAll(iastJvmOpts()) command.add(withSystemProperty('integration.grizzly.enabled', true)) - if (Platform.isJavaVersionAtLeast(17)) { + if (JavaVirtualMachine.isJavaVersionAtLeast(17)) { command.addAll((String[]) ['--add-opens', 'java.base/java.lang=ALL-UNNAMED']) } command.addAll(['-jar', jarPath, Integer.toString(httpPort)]) diff --git a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy index 79a3ad7f715..573ab2a5346 100644 --- a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy +++ b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy @@ -1,10 +1,10 @@ package datadog.smoketest +import datadog.environment.JavaVirtualMachine import datadog.trace.api.Config import datadog.trace.api.civisibility.CIConstants import datadog.trace.api.config.CiVisibilityConfig import datadog.trace.api.config.GeneralConfig -import datadog.trace.api.Platform import datadog.trace.civisibility.CiVisibilitySmokeTest import datadog.trace.util.Strings import java.nio.file.FileVisitResult @@ -33,7 +33,7 @@ import spock.lang.TempDir import spock.util.environment.Jvm @IgnoreIf(reason = "Failing on Java 24. Skip until we have a fix.", value = { - Platform.isJavaVersionAtLeast(24) + JavaVirtualMachine.isJavaVersionAtLeast(24) }) class MavenSmokeTest extends CiVisibilitySmokeTest { diff --git a/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/CodeHotspotsTest.java b/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/CodeHotspotsTest.java index dd32da025bf..e74c92847ad 100644 --- a/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/CodeHotspotsTest.java +++ b/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/CodeHotspotsTest.java @@ -11,10 +11,10 @@ import static org.openjdk.jmc.common.unit.UnitLookup.NUMBER; import static org.openjdk.jmc.common.unit.UnitLookup.PLAIN_TEXT; +import datadog.environment.OperatingSystem; import datadog.smoketest.profiling.CodeHotspotsApplication; import datadog.smoketest.profiling.GenerativeStackTraces; import datadog.smoketest.profiling.NativeLibrariesApplication; -import datadog.trace.api.Platform; import datadog.trace.test.util.Flaky; import java.io.File; import java.lang.management.ManagementFactory; @@ -65,7 +65,7 @@ public final class CodeHotspotsTest { @BeforeAll static void setupAll() throws Exception { assumeFalse( - Platform.isMac() || System.getenv("TEST_LIBDDPROF") == null, + OperatingSystem.isMacOs() || System.getenv("TEST_LIBDDPROF") == null, "Test skipped. Set TEST_LIBDDPROF env variable to point to MacOS version of libjavaProfiler.so, and rerun."); Files.createDirectories(LOG_FILE_BASE); } diff --git a/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/DisableOnJ9Condition.java b/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/DisableOnJ9Condition.java index 06d284febdc..bfbba362667 100644 --- a/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/DisableOnJ9Condition.java +++ b/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/DisableOnJ9Condition.java @@ -1,6 +1,9 @@ package datadog.smoketest; -import datadog.trace.api.Platform; +import static datadog.environment.JavaVirtualMachine.isJ9; +import static datadog.environment.JavaVirtualMachine.isJavaVersion; +import static datadog.environment.JavaVirtualMachine.isJavaVersionAtLeast; + import org.junit.jupiter.api.extension.ConditionEvaluationResult; import org.junit.jupiter.api.extension.ExecutionCondition; import org.junit.jupiter.api.extension.ExtensionContext; @@ -14,9 +17,9 @@ public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext con } private static boolean isDdprofSupported() { - return !Platform.isJ9() - || (Platform.isJavaVersion(8) && Platform.isJavaVersion(8, 0, 361)) - || Platform.isJavaVersionAtLeast(11, 0, 18) - || Platform.isJavaVersionAtLeast(17, 0, 6); + return !isJ9() + || (isJavaVersion(8) && isJavaVersion(8, 0, 361)) + || isJavaVersionAtLeast(11, 0, 18) + || isJavaVersionAtLeast(17, 0, 6); } } diff --git a/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/JFRBasedProfilingIntegrationTest.java b/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/JFRBasedProfilingIntegrationTest.java index 3c16bd110df..9ed4eb6f924 100644 --- a/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/JFRBasedProfilingIntegrationTest.java +++ b/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/JFRBasedProfilingIntegrationTest.java @@ -13,8 +13,8 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Multimap; +import datadog.environment.JavaVirtualMachine; import datadog.trace.api.Pair; -import datadog.trace.api.Platform; import datadog.trace.api.config.ProfilingConfig; import delight.fileupload.FileUpload; import io.airlift.compress.zstd.ZstdInputStream; @@ -217,7 +217,7 @@ private void testContinuousRecording( logFilePath) .start(); - Assumptions.assumeFalse(Platform.isJ9()); + Assumptions.assumeFalse(JavaVirtualMachine.isJ9()); final RecordedRequest firstRequest = retrieveRequest(); @@ -623,7 +623,7 @@ private void assertRecordingEvents( verifyJdkEventsDisabled(events); verifyDatadogEventsNotCorrupt(events); assertEquals( - Platform.isJavaVersionAtLeast(11), + JavaVirtualMachine.isJavaVersionAtLeast(11), events.apply(ItemFilters.type("datadog.ObjectSample")).hasItems()); // TODO ddprof (async) profiler seems to be having some issues with stack depth limit and // native frames @@ -847,6 +847,6 @@ private static boolean logHasErrors(final Path logFilePath) throws IOException { } public static boolean isJavaVersionAtLeast24() { - return Platform.isJavaVersionAtLeast(24); + return JavaVirtualMachine.isJavaVersionAtLeast(24); } } diff --git a/dd-smoke-tests/quarkus/src/test/groovy/datadog/smoketest/QuarkusJBossLoggingSmokeTest.groovy b/dd-smoke-tests/quarkus/src/test/groovy/datadog/smoketest/QuarkusJBossLoggingSmokeTest.groovy index 61671b31499..81e548c93cb 100644 --- a/dd-smoke-tests/quarkus/src/test/groovy/datadog/smoketest/QuarkusJBossLoggingSmokeTest.groovy +++ b/dd-smoke-tests/quarkus/src/test/groovy/datadog/smoketest/QuarkusJBossLoggingSmokeTest.groovy @@ -1,10 +1,10 @@ package datadog.smoketest -import datadog.trace.api.Platform +import datadog.environment.JavaVirtualMachine import spock.lang.IgnoreIf @IgnoreIf(reason = "Failing on Java 24. Skip until we have a fix.", value = { - Platform.isJavaVersionAtLeast(24) + JavaVirtualMachine.isJavaVersionAtLeast(24) }) class QuarkusJBossLoggingSmokeTest extends QuarkusSmokeTest { @Override diff --git a/dd-smoke-tests/quarkus/src/test/groovy/datadog/smoketest/QuarkusSlf4jSmokeTest.groovy b/dd-smoke-tests/quarkus/src/test/groovy/datadog/smoketest/QuarkusSlf4jSmokeTest.groovy index c65028e3959..0603da189d9 100644 --- a/dd-smoke-tests/quarkus/src/test/groovy/datadog/smoketest/QuarkusSlf4jSmokeTest.groovy +++ b/dd-smoke-tests/quarkus/src/test/groovy/datadog/smoketest/QuarkusSlf4jSmokeTest.groovy @@ -1,10 +1,10 @@ package datadog.smoketest -import datadog.trace.api.Platform +import datadog.environment.JavaVirtualMachine import spock.lang.IgnoreIf @IgnoreIf(reason = "Failing on Java 24. Skip until we have a fix.", value = { - Platform.isJavaVersionAtLeast(24) + JavaVirtualMachine.isJavaVersionAtLeast(24) }) class QuarkusSlf4jSmokeTest extends QuarkusSmokeTest { @Override diff --git a/dd-smoke-tests/resteasy/src/test/groovy/smoketest/ResteasyAppsecSmokeTest.groovy b/dd-smoke-tests/resteasy/src/test/groovy/smoketest/ResteasyAppsecSmokeTest.groovy index abd0c9d9df1..6a6669e7e42 100644 --- a/dd-smoke-tests/resteasy/src/test/groovy/smoketest/ResteasyAppsecSmokeTest.groovy +++ b/dd-smoke-tests/resteasy/src/test/groovy/smoketest/ResteasyAppsecSmokeTest.groovy @@ -1,7 +1,7 @@ package smoketest +import datadog.environment.JavaVirtualMachine import datadog.smoketest.appsec.AbstractAppSecServerSmokeTest -import datadog.trace.api.Platform import groovy.json.JsonOutput import groovy.json.JsonSlurper import okhttp3.MediaType @@ -22,7 +22,7 @@ class ResteasyAppsecSmokeTest extends AbstractAppSecServerSmokeTest { command.add(javaPath()) command.addAll(defaultJavaProperties) command.addAll(defaultAppSecProperties) - if (Platform.isJavaVersionAtLeast(17)) { + if (JavaVirtualMachine.isJavaVersionAtLeast(17)) { command.addAll(["--add-opens", "java.base/java.lang=ALL-UNNAMED"]) } command.addAll(["-jar", jarPath, Integer.toString(httpPort)]) diff --git a/dd-smoke-tests/resteasy/src/test/groovy/smoketest/ResteasySmokeTest.groovy b/dd-smoke-tests/resteasy/src/test/groovy/smoketest/ResteasySmokeTest.groovy index b53ae383594..914f6e07fee 100644 --- a/dd-smoke-tests/resteasy/src/test/groovy/smoketest/ResteasySmokeTest.groovy +++ b/dd-smoke-tests/resteasy/src/test/groovy/smoketest/ResteasySmokeTest.groovy @@ -1,7 +1,7 @@ package smoketest +import datadog.environment.JavaVirtualMachine import datadog.smoketest.AbstractIastServerSmokeTest -import datadog.trace.api.Platform import datadog.trace.api.config.IastConfig import okhttp3.Request import spock.lang.IgnoreIf @@ -23,7 +23,7 @@ class ResteasySmokeTest extends AbstractIastServerSmokeTest { withSystemProperty(IastConfig.IAST_DETECTION_MODE, 'FULL'), withSystemProperty(IastConfig.IAST_DEBUG_ENABLED, true) ]) - if (Platform.isJavaVersionAtLeast(17)) { + if (JavaVirtualMachine.isJavaVersionAtLeast(17)) { command.addAll(["--add-opens", "java.base/java.lang=ALL-UNNAMED"]) } command.addAll(["-jar", jarPath, Integer.toString(httpPort)]) diff --git a/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy b/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy index 1693195a153..e38090b2b5d 100644 --- a/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy +++ b/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy @@ -1,7 +1,7 @@ package datadog.smoketest +import datadog.environment.JavaVirtualMachine import datadog.trace.agent.test.utils.ThreadUtils -import datadog.trace.api.Platform import okhttp3.FormBody import okhttp3.Request import spock.lang.Requires @@ -13,7 +13,7 @@ import java.nio.file.Path import java.nio.file.Paths // This test currently fails on IBM JVMs -@Requires({ !Platform.isJ9() }) +@Requires({ !JavaVirtualMachine.isJ9() }) class SpringBootOpenLibertySmokeTest extends AbstractServerSmokeTest { @Shared diff --git a/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy b/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy index 7a8bbc0ba10..4a0149e7e74 100644 --- a/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy +++ b/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy @@ -1,6 +1,6 @@ package datadog.smoketest -import datadog.trace.api.Platform +import datadog.environment.JavaVirtualMachine import datadog.trace.test.agent.decoder.DecodedSpan import okhttp3.Request import spock.lang.Requires @@ -14,7 +14,7 @@ import java.nio.file.Paths import java.util.function.Function // This test currently fails on IBM JVMs -@Requires({ !Platform.isJ9() }) +@Requires({ !JavaVirtualMachine.isJ9() }) class SpringBootOpenLibertySmokeVulnerabilityTest extends AbstractServerSmokeTest { @Shared diff --git a/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy b/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy index 9c473ded2a7..2e9ce62849d 100644 --- a/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy +++ b/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy @@ -1,7 +1,7 @@ package datadog.smoketest +import datadog.environment.JavaVirtualMachine import datadog.trace.agent.test.utils.ThreadUtils -import datadog.trace.api.Platform import okhttp3.FormBody import okhttp3.Request import spock.lang.Requires @@ -13,7 +13,7 @@ import java.nio.file.Path import java.nio.file.Paths // This test currently fails on IBM JVMs -@Requires({ !Platform.isJ9() }) +@Requires({ !JavaVirtualMachine.isJ9() }) class SpringBootOpenLibertySmokeTest extends AbstractServerSmokeTest { @Shared diff --git a/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy b/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy index b48bc0e615f..af65db958f0 100644 --- a/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy +++ b/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy @@ -1,7 +1,6 @@ package datadog.smoketest - -import datadog.trace.api.Platform +import datadog.environment.JavaVirtualMachine import datadog.trace.test.agent.decoder.DecodedSpan import okhttp3.Request import spock.lang.Requires @@ -15,7 +14,7 @@ import java.nio.file.Paths import java.util.function.Function // This test currently fails on IBM JVMs -@Requires({ !Platform.isJ9() }) +@Requires({ !JavaVirtualMachine.isJ9() }) class SpringBootOpenLibertySmokeVulnerabilityTest extends AbstractServerSmokeTest { @Shared diff --git a/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy b/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy index e5d1c70f019..4c2f95ddaea 100644 --- a/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy +++ b/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy @@ -1,21 +1,21 @@ package datadog.smoketest +import datadog.environment.JavaVirtualMachine +import datadog.environment.OperatingSystem import datadog.trace.agent.test.server.http.TestHttpServer -import datadog.trace.api.Platform -import datadog.trace.test.agent.decoder.DecodedSpan -import datadog.trace.test.agent.decoder.Decoder import datadog.trace.test.agent.decoder.DecodedMessage +import datadog.trace.test.agent.decoder.DecodedSpan import datadog.trace.test.agent.decoder.DecodedTrace +import datadog.trace.test.agent.decoder.Decoder import datadog.trace.util.Strings import groovy.json.JsonSlurper - -import java.nio.charset.StandardCharsets -import java.util.concurrent.CopyOnWriteArrayList -import java.util.concurrent.atomic.AtomicInteger import spock.lang.AutoCleanup import spock.lang.Shared import spock.util.concurrent.PollingConditions +import java.nio.charset.StandardCharsets +import java.util.concurrent.CopyOnWriteArrayList +import java.util.concurrent.atomic.AtomicInteger import java.util.function.Function import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer @@ -199,7 +199,7 @@ abstract class AbstractSmokeTest extends ProcessManager { ret += "-Ddd.telemetry.heartbeat.interval=5" } // DQH - Nov 2024 - skipping for J9 which doesn't have full crash tracking support - if (testCrashTracking() && !Platform.isJ9()) { + if (testCrashTracking() && !JavaVirtualMachine.isJ9()) { def extension = getScriptExtension() ret += "-XX:OnError=${tmpDir}/dd_crash_uploader.${extension} %p" // Unlike crash tracking smoke test, keep the default delay; otherwise, otherwise other tests will fail @@ -209,7 +209,7 @@ abstract class AbstractSmokeTest extends ProcessManager { } static String getScriptExtension() { - return Platform.isWindows() ? "bat" : "sh" + return OperatingSystem.isWindows() ? "bat" : "sh" } def inferServiceName() { @@ -218,7 +218,7 @@ abstract class AbstractSmokeTest extends ProcessManager { private static boolean isDdprofSafe() { // currently the J9 handling of jmethodIDs will cause frequent crashes - return !Platform.isJ9() + return !JavaVirtualMachine.isJ9() }