From bb7670ba2e20a3b59d9f0db0153703d493329ffa Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 24 Sep 2024 07:43:23 -0700 Subject: [PATCH 1/3] Update Java versions for tests --- .github/workflows/build-common.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml index 9d7babd5d0a..13277674b9b 100644 --- a/.github/workflows/build-common.yml +++ b/.github/workflows/build-common.yml @@ -117,7 +117,8 @@ jobs: - 8 - 11 - 17 - - 18 + - 21 + - 22 vm: - hotspot # TODO (trask) enable once profiler supports OpenJ9 From 05556ec471f2eb1c1644f96029a03928ff646ac0 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 24 Sep 2024 07:46:32 -0700 Subject: [PATCH 2/3] 22 -> 23 --- .github/workflows/build-common.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml index 13277674b9b..8b9c8dbbfe8 100644 --- a/.github/workflows/build-common.yml +++ b/.github/workflows/build-common.yml @@ -118,7 +118,7 @@ jobs: - 11 - 17 - 21 - - 22 + - 23 vm: - hotspot # TODO (trask) enable once profiler supports OpenJ9 From 6bad36ce74ec29e586200fdbe945153b2773c61e Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 23 Oct 2024 12:36:59 -0700 Subject: [PATCH 3/3] Disable G1 test on 21+ --- .../com/microsoft/gcmonitortests/VariousCollectorsTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/agent/agent-gc-monitor/gc-monitor-tests/src/test/java/com/microsoft/gcmonitortests/VariousCollectorsTest.java b/agent/agent-gc-monitor/gc-monitor-tests/src/test/java/com/microsoft/gcmonitortests/VariousCollectorsTest.java index 3cae349e251..b4c8ca40013 100644 --- a/agent/agent-gc-monitor/gc-monitor-tests/src/test/java/com/microsoft/gcmonitortests/VariousCollectorsTest.java +++ b/agent/agent-gc-monitor/gc-monitor-tests/src/test/java/com/microsoft/gcmonitortests/VariousCollectorsTest.java @@ -6,6 +6,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.condition.JRE.JAVA_11; import static org.junit.jupiter.api.condition.JRE.JAVA_13; +import static org.junit.jupiter.api.condition.JRE.JAVA_17; import static org.junit.jupiter.api.condition.OS.LINUX; import com.microsoft.gcmonitor.GcCollectionEvent; @@ -33,6 +34,7 @@ void testParallel() throws Exception { } @Test + @EnabledForJreRange(max = JAVA_17) void testG1() throws Exception { testGc("-XX:+UseG1GC", 50); } @@ -42,7 +44,7 @@ void testSerial() throws Exception { testGc("-XX:+UseSerialGC", 50); } - @Disabled + @Disabled // see https://github.com/microsoft/ApplicationInsights-Java/pull/3083 @Test @EnabledForJreRange(min = JAVA_11) void testShenandoah() throws Exception {