Skip to content

Commit 4d467d1

Browse files
PerfectSlayerPerfectSlayer
committed
feat(env): Migrate smoke tests to environment component
1 parent dd59589 commit 4d467d1

File tree

24 files changed

+133
-87
lines changed

24 files changed

+133
-87
lines changed

‎dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
import com.squareup.moshi.JsonAdapter;
1010
import com.squareup.moshi.Moshi;
11-
import datadog.trace.api.Platform;
11+
import datadog.environment.JavaVirtualMachine;
12+
import datadog.environment.OperatingSystem;
1213
import java.io.File;
1314
import java.io.IOException;
1415
import java.nio.charset.StandardCharsets;
@@ -49,7 +50,7 @@ public class CrashtrackingSmokeTest {
4950
@BeforeAll
5051
static void setupAll() {
5152
// Only Hotspot based implementation are supported
52-
assumeFalse(Platform.isJ9());
53+
assumeFalse(JavaVirtualMachine.isJ9());
5354
}
5455

5556
private Path tempDir;
@@ -127,7 +128,7 @@ private static String agentShadowJar() {
127128
}
128129

129130
private static String getExtension() {
130-
return Platform.isWindows() ? "bat" : "sh";
131+
return OperatingSystem.isWindows() ? "bat" : "sh";
131132
}
132133

133134
/*

‎dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ExceptionDebuggerIntegrationTest.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import static org.junit.jupiter.api.Assertions.assertTrue;
77

88
import com.datadog.debugger.sink.Snapshot;
9-
import datadog.trace.api.Platform;
9+
import datadog.environment.JavaVirtualMachine;
1010
import datadog.trace.bootstrap.debugger.CapturedContext;
1111
import datadog.trace.test.agent.decoder.DecodedSpan;
1212
import datadog.trace.test.agent.decoder.DecodedTrace;
@@ -44,7 +44,7 @@ protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params
4444
@Test
4545
@DisplayName("testSimpleSingleFrameException")
4646
@DisabledIf(
47-
value = "datadog.trace.api.Platform#isJ9",
47+
value = "datadog.environment.JavaVirtualMachine#isJ9",
4848
disabledReason = "we cannot get local variable debug info")
4949
void testSimpleSingleFrameException() throws Exception {
5050
appUrl = startAppAndAndGetUrl();
@@ -74,7 +74,7 @@ void testSimpleSingleFrameException() throws Exception {
7474
@Test
7575
@DisplayName("testNoSubsequentCaptureAfterFirst")
7676
@DisabledIf(
77-
value = "datadog.trace.api.Platform#isJ9",
77+
value = "datadog.environment.JavaVirtualMachine#isJ9",
7878
disabledReason = "we cannot get local variable debug info")
7979
void testNoSubsequentCaptureAfterFirst() throws Exception {
8080
appUrl = startAppAndAndGetUrl();
@@ -107,7 +107,7 @@ void testNoSubsequentCaptureAfterFirst() throws Exception {
107107
@Test
108108
@DisplayName("test3CapturedFrames")
109109
@DisabledIf(
110-
value = "datadog.trace.api.Platform#isJ9",
110+
value = "datadog.environment.JavaVirtualMachine#isJ9",
111111
disabledReason = "we cannot get local variable debug info")
112112
void test3CapturedFrames() throws Exception {
113113
appUrl = startAppAndAndGetUrl();
@@ -163,7 +163,7 @@ void test3CapturedFrames() throws Exception {
163163
@Test
164164
@DisplayName("test5CapturedFrames")
165165
@DisabledIf(
166-
value = "datadog.trace.api.Platform#isJ9",
166+
value = "datadog.environment.JavaVirtualMachine#isJ9",
167167
disabledReason = "we cannot get local variable debug info")
168168
void test5CapturedFrames() throws Exception {
169169
additionalJvmArgs.add("-Ddd.exception.replay.capture.max.frames=5");
@@ -240,7 +240,7 @@ void test5CapturedFrames() throws Exception {
240240
@Test
241241
@DisplayName("test3CapturedRecursiveFrames")
242242
@DisabledIf(
243-
value = "datadog.trace.api.Platform#isJ9",
243+
value = "datadog.environment.JavaVirtualMachine#isJ9",
244244
disabledReason = "we cannot get local variable debug info")
245245
void test3CapturedRecursiveFrames() throws Exception {
246246
appUrl = startAppAndAndGetUrl();
@@ -284,7 +284,9 @@ private static void assertRecursiveSnapshot(Snapshot snapshot) {
284284

285285
@Test
286286
@DisplayName("testLambdaHiddenFrames")
287-
@DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "HotSpot specific test")
287+
@DisabledIf(
288+
value = "datadog.environment.JavaVirtualMachine#isJ9",
289+
disabledReason = "HotSpot specific test")
288290
void testLambdaHiddenFrames() throws Exception {
289291
additionalJvmArgs.add("-XX:+UnlockDiagnosticVMOptions");
290292
additionalJvmArgs.add("-XX:+ShowHiddenFrames");
@@ -325,7 +327,7 @@ private void resetSnapshotsAndTraces() {
325327
}
326328

327329
private void assertFullMethodCaptureArgs(CapturedContext context) {
328-
if (Platform.isJ9()) {
330+
if (JavaVirtualMachine.isJ9()) {
329331
// skip for J9/OpenJ9 as we cannot get local variable debug info.
330332
return;
331333
}

‎dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.datadog.debugger.probe.LogProbe;
2323
import com.datadog.debugger.sink.Snapshot;
2424
import com.squareup.moshi.JsonAdapter;
25-
import datadog.trace.api.Platform;
25+
import datadog.environment.JavaVirtualMachine;
2626
import datadog.trace.bootstrap.debugger.CapturedContext;
2727
import datadog.trace.bootstrap.debugger.MethodLocation;
2828
import datadog.trace.bootstrap.debugger.ProbeId;
@@ -279,22 +279,28 @@ void testLineProbe() throws Exception {
279279

280280
@Test
281281
@DisplayName("testSamplingSnapshotDefault")
282-
@DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
282+
@DisabledIf(
283+
value = "datadog.environment.JavaVirtualMachine#isJ9",
284+
disabledReason = "Flaky on J9 JVMs")
283285
void testSamplingSnapshotDefault() throws Exception {
284286
doSamplingSnapshot(null, MethodLocation.EXIT);
285287
}
286288

287289
@Test
288290
@DisplayName("testSamplingSnapshotDefaultWithConditionAtEntry")
289-
@DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
291+
@DisabledIf(
292+
value = "datadog.environment.JavaVirtualMachine#isJ9",
293+
disabledReason = "Flaky on J9 JVMs")
290294
void testSamplingSnapshotDefaultWithConditionAtEntry() throws Exception {
291295
doSamplingSnapshot(
292296
new ProbeCondition(DSL.when(DSL.eq(value(1), value(1))), "1 == 1"), MethodLocation.ENTRY);
293297
}
294298

295299
@Test
296300
@DisplayName("testSamplingSnapshotDefaultWithConditionAtExit")
297-
@DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
301+
@DisabledIf(
302+
value = "datadog.environment.JavaVirtualMachine#isJ9",
303+
disabledReason = "Flaky on J9 JVMs")
298304
void testSamplingSnapshotDefaultWithConditionAtExit() throws Exception {
299305
doSamplingSnapshot(
300306
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
323329

324330
@Test
325331
@DisplayName("testSamplingLogDefault")
326-
@DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
332+
@DisabledIf(
333+
value = "datadog.environment.JavaVirtualMachine#isJ9",
334+
disabledReason = "Flaky on J9 JVMs")
327335
void testSamplingLogDefault() throws Exception {
328336
batchSize = 100;
329337
final int LOOP_COUNT = 1000;
@@ -347,7 +355,9 @@ void testSamplingLogDefault() throws Exception {
347355

348356
@Test
349357
@DisplayName("testSamplingLogCustom")
350-
@DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
358+
@DisabledIf(
359+
value = "datadog.environment.JavaVirtualMachine#isJ9",
360+
disabledReason = "Flaky on J9 JVMs")
351361
void testSamplingLogCustom() throws Exception {
352362
final int LOOP_COUNT = 1000;
353363
final String LOG_TEMPLATE = "log line {argInt} {argStr} {argDouble} {argMap} {argVar}";
@@ -460,7 +470,7 @@ private ProbeId getProbeId(int i) {
460470
}
461471

462472
private void assertFullMethodCaptureArgs(CapturedContext context) {
463-
if (Platform.isJ9()) {
473+
if (JavaVirtualMachine.isJ9()) {
464474
// skip for J9/OpenJ9 as we cannot get local variable debug info.
465475
return;
466476
}

‎dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProbeStateIntegrationTest.java

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ void setup(TestInfo testInfo) throws Exception {
2828

2929
@Test
3030
@DisplayName("testAddRemoveProbes")
31-
@DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
31+
@DisabledIf(
32+
value = "datadog.environment.JavaVirtualMachine#isJ9",
33+
disabledReason = "Flaky on J9 JVMs")
3234
void testAddRemoveProbes() throws Exception {
3335
LogProbe logProbe =
3436
LogProbe.builder().probeId(PROBE_ID).where(TEST_APP_CLASS_NAME, FULL_METHOD_NAME).build();
@@ -50,7 +52,9 @@ void testAddRemoveProbes() throws Exception {
5052

5153
@Test
5254
@DisplayName("testDisableEnableProbes")
53-
@DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
55+
@DisabledIf(
56+
value = "datadog.environment.JavaVirtualMachine#isJ9",
57+
disabledReason = "Flaky on J9 JVMs")
5458
void testDisableEnableProbes() throws Exception {
5559
LogProbe logProbe =
5660
LogProbe.builder().probeId(PROBE_ID).where(TEST_APP_CLASS_NAME, FULL_METHOD_NAME).build();
@@ -72,7 +76,9 @@ void testDisableEnableProbes() throws Exception {
7276

7377
@Test
7478
@DisplayName("testDisableEnableProbesUsingDenyList")
75-
@DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
79+
@DisabledIf(
80+
value = "datadog.environment.JavaVirtualMachine#isJ9",
81+
disabledReason = "Flaky on J9 JVMs")
7682
@Disabled("Not supported for config coming from RemoteConfig")
7783
void testDisableEnableProbesUsingDenyList() throws Exception {
7884
LogProbe logProbe =
@@ -104,7 +110,9 @@ void testDisableEnableProbesUsingDenyList() throws Exception {
104110

105111
@Test
106112
@DisplayName("testDisableEnableProbesUsingAllowList")
107-
@DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
113+
@DisabledIf(
114+
value = "datadog.environment.JavaVirtualMachine#isJ9",
115+
disabledReason = "Flaky on J9 JVMs")
108116
@Disabled("Not supported for config coming from RemoteConfig")
109117
void testDisableEnableProbesUsingAllowList() throws Exception {
110118
LogProbe logProbe =
@@ -136,7 +144,9 @@ void testDisableEnableProbesUsingAllowList() throws Exception {
136144

137145
@Test
138146
@DisplayName("testProbeStatusError")
139-
@DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
147+
@DisabledIf(
148+
value = "datadog.environment.JavaVirtualMachine#isJ9",
149+
disabledReason = "Flaky on J9 JVMs")
140150
public void testProbeStatusError() throws Exception {
141151
LogProbe logProbe =
142152
LogProbe.builder()

‎dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params
4949
@Test
5050
@DisplayName("testMethodSimpleTagNoCondition")
5151
@DisabledIf(
52-
value = "datadog.trace.api.Platform#isJ9",
52+
value = "datadog.environment.JavaVirtualMachine#isJ9",
5353
disabledReason = "we cannot get local variable debug info")
5454
void testMethodSimpleTagNoCondition() throws Exception {
5555
SpanDecorationProbe spanDecorationProbe =
@@ -79,7 +79,7 @@ void testMethodSimpleTagNoCondition() throws Exception {
7979
@Test
8080
@DisplayName("testMethodMultiTagsMultiConditions")
8181
@DisabledIf(
82-
value = "datadog.trace.api.Platform#isJ9",
82+
value = "datadog.environment.JavaVirtualMachine#isJ9",
8383
disabledReason = "we cannot get local variable debug info")
8484
void testMethodMultiTagsMultiConditions() throws Exception {
8585
List<SpanDecorationProbe.Decoration> decorations =
@@ -125,7 +125,9 @@ void testMethodMultiTagsMultiConditions() throws Exception {
125125

126126
@Test
127127
@DisplayName("testMethodSimpleTagValueError")
128-
@DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
128+
@DisabledIf(
129+
value = "datadog.environment.JavaVirtualMachine#isJ9",
130+
disabledReason = "Flaky on J9 JVMs")
129131
void testMethodSimpleTagValueError() throws Exception {
130132
SpanDecorationProbe spanDecorationProbe =
131133
SpanDecorationProbe.builder()
@@ -162,7 +164,9 @@ void testMethodSimpleTagValueError() throws Exception {
162164

163165
@Test
164166
@DisplayName("testMethodSimpleTagConditionError")
165-
@DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
167+
@DisabledIf(
168+
value = "datadog.environment.JavaVirtualMachine#isJ9",
169+
disabledReason = "Flaky on J9 JVMs")
166170
void testMethodSimpleTagConditionError() throws Exception {
167171
SpanDecorationProbe spanDecorationProbe =
168172
SpanDecorationProbe.builder()
@@ -201,7 +205,9 @@ void testMethodSimpleTagConditionError() throws Exception {
201205

202206
@Test
203207
@DisplayName("testMethodMultiTagValueError")
204-
@DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
208+
@DisabledIf(
209+
value = "datadog.environment.JavaVirtualMachine#isJ9",
210+
disabledReason = "Flaky on J9 JVMs")
205211
void testMethodMultiTagValueError() throws Exception {
206212
List<SpanDecorationProbe.Decoration> decorations =
207213
Arrays.asList(
@@ -246,7 +252,9 @@ void testMethodMultiTagValueError() throws Exception {
246252

247253
@Test
248254
@DisplayName("testSamplingSpanDecoration")
249-
@DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
255+
@DisabledIf(
256+
value = "datadog.environment.JavaVirtualMachine#isJ9",
257+
disabledReason = "Flaky on J9 JVMs")
250258
void testSamplingSpanDecoration() throws Exception {
251259
SpanDecorationProbe spanDecorationProbe =
252260
SpanDecorationProbe.builder()

‎dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanProbesIntegrationTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ void testLineRangeSpan() throws Exception {
7070

7171
@Test
7272
@DisplayName("testSingleLineSpan")
73-
@DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
73+
@DisabledIf(
74+
value = "datadog.environment.JavaVirtualMachine#isJ9",
75+
disabledReason = "Flaky on J9 JVMs")
7476
void testSingleLineSpan() throws Exception {
7577
final String METHOD_NAME = "fullMethod";
7678
final String EXPECTED_UPLOADS = "2"; // 2 probe statuses: RECEIVED + ERROR

‎dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ protected String getAppId() {
5050
@ParameterizedTest(name = "Process tags enabled ''{0}''")
5151
@ValueSource(booleans = {true, false})
5252
@DisplayName("testTracer")
53-
@DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
53+
@DisabledIf(
54+
value = "datadog.environment.JavaVirtualMachine#isJ9",
55+
disabledReason = "Flaky on J9 JVMs")
5456
void testTracer(boolean processTagsEnabled) throws Exception {
5557
LogProbe logProbe =
5658
LogProbe.builder()
@@ -81,7 +83,9 @@ void testTracer(boolean processTagsEnabled) throws Exception {
8183

8284
@Test
8385
@DisplayName("testTracerDynamicLog")
84-
@DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
86+
@DisabledIf(
87+
value = "datadog.environment.JavaVirtualMachine#isJ9",
88+
disabledReason = "Flaky on J9 JVMs")
8589
void testTracerDynamicLog() throws Exception {
8690
LogProbe logProbe =
8791
LogProbe.builder()
@@ -104,7 +108,9 @@ void testTracerDynamicLog() throws Exception {
104108

105109
@Test
106110
@DisplayName("testTracerSameMethod")
107-
@DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
111+
@DisabledIf(
112+
value = "datadog.environment.JavaVirtualMachine#isJ9",
113+
disabledReason = "Flaky on J9 JVMs")
108114
void testTracerSameMethod() throws Exception {
109115
LogProbe logProbe =
110116
LogProbe.builder()
@@ -124,7 +130,9 @@ void testTracerSameMethod() throws Exception {
124130

125131
@Test
126132
@DisplayName("testTracerLineSnapshotProbe")
127-
@DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
133+
@DisabledIf(
134+
value = "datadog.environment.JavaVirtualMachine#isJ9",
135+
disabledReason = "Flaky on J9 JVMs")
128136
void testTracerLineSnapshotProbe() throws Exception {
129137
LogProbe logProbe =
130138
LogProbe.builder()
@@ -144,7 +152,9 @@ void testTracerLineSnapshotProbe() throws Exception {
144152

145153
@Test
146154
@DisplayName("testTracerLineDynamicLogProbe")
147-
@DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
155+
@DisabledIf(
156+
value = "datadog.environment.JavaVirtualMachine#isJ9",
157+
disabledReason = "Flaky on J9 JVMs")
148158
void testTracerLineDynamicLogProbe() throws Exception {
149159
final String LOG_TEMPLATE = "processWithArg {argInt}";
150160
LogProbe logProbe =

‎dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/AbstractGradleTest.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package datadog.smoketest
22

33
import com.fasterxml.jackson.databind.JsonNode
44
import com.fasterxml.jackson.databind.ObjectMapper
5-
import datadog.trace.api.Platform
5+
import datadog.environment.JavaVirtualMachine
66
import datadog.trace.civisibility.CiVisibilitySmokeTest
77
import okhttp3.OkHttpClient
88
import okhttp3.Request
@@ -126,7 +126,7 @@ class AbstractGradleTest extends CiVisibilitySmokeTest {
126126

127127
protected void givenConfigurationCacheIsCompatibleWithCurrentPlatform(boolean configurationCacheEnabled) {
128128
if (configurationCacheEnabled) {
129-
Assumptions.assumeFalse(Platform.isIbm8(), "Configuration cache is not compatible with IBM 8")
129+
Assumptions.assumeFalse(JavaVirtualMachine.isIbm8(), "Configuration cache is not compatible with IBM 8")
130130
}
131131
}
132132

0 commit comments

Comments
 (0)