8000 Various Gitlab tweaks and test fixes (#8847) · DataDog/dd-trace-java@dec7833 · GitHub
[go: up one dir, main page]
Skip to content

Commit dec7833

Browse files
randomandersonrandomanderson
authored
Various Gitlab tweaks and test fixes (#8847)
* skip should be for entire class * bump memory to combat oom issues * bump smoketests and forked tests memory and defaults
1 parent 4ab4ee3 commit dec7833

File tree

6 files changed

+13
-8
lines changed

6 files changed

+13
-8
lines changed

‎.gitlab-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -377,8 +377,8 @@ muzzle-dep-report:
377377
needs: [ build_tests ]
378378
stage: tests
379379
variables:
380-
KUBERNETES_MEMORY_REQUEST: 16Gi
381-
KUBERNETES_MEMORY_LIMIT: 16Gi
380+
KUBERNETES_MEMORY_REQUEST: 17Gi
381+
KUBERNETES_MEMORY_LIMIT: 17Gi
382382
KUBERNETES_CPU_REQUEST: 10
383383
GRADLE_WORKERS: 4
384384
GRADLE_MEM: 3G
@@ -402,7 +402,7 @@ muzzle-dep-report:
402402
export PROFILER_COMMAND="-XX:StartFlightRecording=settings=profile,filename=/tmp/${CI_JOB_NAME_SLUG}.jfr,dumponexit=true";
403403
fi
404404
- *prepare_test_env
405-
- export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM $PROFILER_COMMAND -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp' -Ddatadog.forkedMaxHeapSize=768M -Ddatadog.forkedMinHeapSize=128M"
405+
- export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM $PROFILER_COMMAND -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp' -Ddatadog.forkedMaxHeapSize=1024M -Ddatadog.forkedMinHeapSize=128M"
406406
- ./gradlew $GRADLE_TARGET $GRADLE_PARAMS -PtestJvm=$testJvm -PtaskPartitionCount=$NORMALIZED_NODE_TOTAL -PtaskPartition=$NORMALIZED_NODE_INDEX $GRADLE_ARGS --continue || $CONTINUE_ON_FAILURE
407407
after_script:
408408
- *restore_pretest_env

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import jdk.jfr.FlightRecorder;
2222
import jdk.jfr.Recording;
2323
import org.junit.jupiter.api.AfterEach;
24+
import org.junit.jupiter.api.BeforeAll;
2425
import org.junit.jupiter.api.BeforeEach;
2526
import org.junit.jupiter.api.Test;
2627
import org.openjdk.jmc.common.item.Aggregators;
@@ -60,9 +61,13 @@ public boolean equals(final Object obj) {
6061
private Recording snapshot;
6162
private ExceptionHistogram instance;
6263

64+
@BeforeAll
65+
public static void precheck() {
66+
assumeFalse(Platform.isJ9());
67+
}
68+
6369
@BeforeEach
6470
public void setup() {
65-
assumeFalse(Platform.isJ9());
6671
recording = new Recording();
6772
recording.enable("datadog.ExceptionCount");
6873
recording.start();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public static ProcessBuilder createProcessBuilder(
3232
Arrays.asList(
3333
javaPath(),
3434
// "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=localhost:5006",
35-
"-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "512M"),
35+
"-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "1024M"),
3636
"-Xms" + System.getProperty("datadog.forkedMinHeapSize", "64M"),
3737
"-javaagent:" + agentShadowJar(),
3838
"-XX:ErrorFile=/tmp/hs_err_pid%p.log",

‎dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/JFRBasedProfilingIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@ private static ProcessBuilder createProcessBuilder(
748748
final List<String> command =
749749
Arrays.asList(
750750
javaPath(),
751-
"-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "512M"),
751+
"-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "1024M"),
752752
"-Xms" + System.getProperty("datadog.forkedMinHeapSize", "64M"),
753753
"-javaagent:" + agentShadowJar(),
754754
"-XX:ErrorFile=/tmp/hs_err_pid%p.log",

‎dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/SmokeTestUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static ProcessBuilder createProcessBuilder(
2828
new ArrayList<>(
2929
Arrays.asList(
3030
javaPath(),
31-
"-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "512M"),
31+
"-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "1024M"),
3232
"-Xms" + System.getProperty("datadog.forkedMinHeapSize", "64M"),
3333
"-javaagent:" + agentShadowJar(),
3434
"-XX:ErrorFile=/tmp/hs_err_pid%p.log",

‎utils/test-utils/src/main/java/datadog/trace/test/util/ForkedTestUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
public class ForkedTestUtils {
44
public static String getMaxMemoryArgumentForFork() {
5-
return "-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "512M");
5+
return "-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "1024M");
66
}
77

88
public static String getMinMemoryArgumentForFork() {

0 commit comments

Comments
 (0)
0