Skip to content

Commit 60414b2

Browse files
traskjeanbisutti
trask
and
jeanbisutti
authored
Add Java 18 to test matrix (#2391)
* Add Java 18 to test matrix * Exclude asm transitive dependencies from agent * Disable Log4j 1.2 smoke test for Java version greater than 17 * Disable Log4j 1.2 smoke test for Java version greater than 17 Co-authored-by: jeanbisutti <[email protected]>
1 parent f0d550e commit 60414b2

File tree

49 files changed

+314
-5
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+314
-5
lines changed

‎.github/workflows/reusable-test.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
- 8
1717
- 11
1818
- 17
19+
- 18
1920
vm:
2021
- hotspot
2122
# TODO (trask) enable once profiler supports OpenJ9

‎agent/agent-tooling/build.gradle.kts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ dependencies {
1616
implementation(project(":agent:agent-gc-monitor:gc-monitor-api"))
1717
implementation(project(":agent:agent-gc-monitor:gc-monitor-core"))
1818
implementation(project(":agent:agent-profiler:agent-diagnostics-api"))
19-
implementation(project(":agent:azure-monitor-exporter"))
19+
implementation(project(":agent:azure-monitor-exporter")) {
20+
exclude("org.ow2.asm", "asm")
21+
}
2022

2123
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap")
2224
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")
@@ -47,6 +49,7 @@ dependencies {
4749
// via `IntelliJCredential` or `DefaultAzureCredential`"
4850
// NOTE this exclusion saves 6.5 mb !!!!
4951
exclude("org.linguafranca.pwdb", "KeePassJava2")
52+
exclude("org.ow2.asm", "asm")
5053
}
5154

5255
// compileOnly("io.opentelemetry:opentelemetry-sdk-extension-tracing-incubator")

‎buildSrc/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ dependencies {
3434
implementation("com.diffplug.spotless:spotless-plugin-gradle:5.14.0")
3535
implementation("com.google.guava:guava:30.1-jre")
3636
implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
37-
implementation("org.ow2.asm:asm:9.1")
38-
implementation("org.ow2.asm:asm-tree:9.1")
37+
implementation("org.ow2.asm:asm:9.3")
38+
implementation("org.ow2.asm:asm-tree:9.3")
3939
implementation("org.apache.httpcomponents:httpclient:4.5.13")
4040
implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
4141

‎smoke-tests/apps/ActuatorMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerTest.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_11_OPENJ9;
2626
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_17;
2727
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_17_OPENJ9;
28+
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_18;
29+
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_18_OPENJ9;
2830
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_8;
2931
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_8_OPENJ9;
3032
import static org.assertj.core.api.Assertions.assertThat;
@@ -100,6 +102,12 @@ static class Java11OpenJ9Test extends MicrometerTest {}
100102
@Environment(JAVA_17)
101103
static class Java17Test extends MicrometerTest {}
102104

105+
@Environment(JAVA_18)
106+
static class Java18Test extends MicrometerTest {}
107+
103108
@Environment(JAVA_17_OPENJ9)
104109
static class Java17OpenJ9Test extends MicrometerTest {}
110+
111+
@Environment(JAVA_18_OPENJ9)
112+
static class Java18OpenJ9Test extends MicrometerTest {}
105113
}

‎smoke-tests/apps/AutoPerfCounters/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/PerfCountersDataTest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11;
2525
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
2626
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_17;
27+
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_18;
2728
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8;
2829
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
2930
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.WILDFLY_13_JAVA_8;
@@ -163,6 +164,9 @@ static class Tomcat8Java11OpenJ9Test extends PerfCountersDataTest {}
163164
@Environment(TOMCAT_8_JAVA_17)
164165
static class Tomcat8Java17Test extends PerfCountersDataTest {}
165166

167+
@Environment(TOMCAT_8_JAVA_18)
168+
static class Tomcat8Java18Test extends PerfCountersDataTest {}
169+
166170
@Environment(WILDFLY_13_JAVA_8)
167171
static class Wildfly13Java8Test extends PerfCountersDataTest {}
168172

‎smoke-tests/apps/AzureSdk/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AzureSdkTest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11;
2525
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
2626
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_17;
27+
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_18;
2728
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8;
2829
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
2930
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.WILDFLY_13_JAVA_8;
@@ -77,6 +78,9 @@ static class Tomcat8Java11OpenJ9Test extends AzureSdkTest {}
7778
@Environment(TOMCAT_8_JAVA_17)
7879
static class Tomcat8Java17Test extends AzureSdkTest {}
7980

81+
@Environment(TOMCAT_8_JAVA_18)
82+
static class Tomcat8Java18Test extends AzureSdkTest {}
83+
8084
@Environment(WILDFLY_13_JAVA_8)
8185
static class Wildfly13Java8Test extends AzureSdkTest {}
8286

‎smoke-tests/apps/Cassandra/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CassandraTest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11;
2525
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
2626
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_17;
27+
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_18;
2728
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8;
2829
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
2930
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.WILDFLY_13_JAVA_8;
@@ -82,6 +83,9 @@ static class Tomcat8Java11OpenJ9Test extends CassandraTest {}
8283
@Environment(TOMCAT_8_JAVA_17)
8384
static class Tomcat8Java17Test extends CassandraTest {}
8485

86+
@Environment(TOMCAT_8_JAVA_18)
87+
static class Tomcat8Java18Test extends CassandraTest {}
88+
8589
@Environment(WILDFLY_13_JAVA_8)
8690
static class Wildfly13Java8Test extends CassandraTest {}
8791

‎smoke-tests/apps/CustomDimensions/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CustomDimensionsTest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11;
2525
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
2626
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_17;
27+
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_18;
2728
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8;
2829
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
2930
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.WILDFLY_13_JAVA_8;
@@ -66,6 +67,9 @@ static class Tomcat8Java11OpenJ9Test extends CustomDimensionsTest {}
6667
@Environment(TOMCAT_8_JAVA_17)
6768
static class Tomcat8Java17Test extends CustomDimensionsTest {}
6869

70+
@Environment(TOMCAT_8_JAVA_18)
71+
static class Tomcat8Java18Test extends CustomDimensionsTest {}
72+
6973
@Environment(WILDFLY_13_JAVA_8)
7074
static class Wildfly13Java8Test extends CustomDimensionsTest {}
7175

‎smoke-tests/apps/CustomInstrumentation/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CustomInstrumentationTest.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
package com.microsoft.applicationinsights.smoketest;
22

33
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_11;
4+
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_11_OPENJ9;
45
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_17;
6+
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_17_OPENJ9;
7+
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_18;
8+
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_18_OPENJ9;
59
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_8;
10+
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_8_OPENJ9;
611
import static org.assertj.core.api.Assertions.assertThat;
712

813
import com.microsoft.applicationinsights.smoketest.schemav2.Data;
@@ -68,9 +73,24 @@ private static Envelope getRequestEnvelope(List<Envelope> envelopes, String name
6873
@Environment(JAVA_8)
6974
static class Java8Test extends CustomInstrumentationTest {}
7075

76+
@Environment(JAVA_8_OPENJ9)
77+
static class Java8OpenJ9Test extends CustomInstrumentationTest {}
78+
7179
@Environment(JAVA_11)
7280
static class Java11Test extends CustomInstrumentationTest {}
7381

82+
@Environment(JAVA_11_OPENJ9)
83+
static class Java11OpenJ9Test extends CustomInstrumentationTest {}
84+
7485
@Environment(JAVA_17)
7586
static class Java17Test extends CustomInstrumentationTest {}
87+
88+
@Environment(JAVA_18)
89+
static class Java18Test extends CustomInstrumentationTest {}
90+
91+
@Environment(JAVA_17_OPENJ9)
92+
static class Java17OpenJ9Test extends CustomInstrumentationTest {}
93+
94+
@Environment(JAVA_18_OPENJ9)
95+
static class Java18OpenJ9Test extends CustomInstrumentationTest {}
7696
}

‎smoke-tests/apps/HeartBeat/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HeartBeatTest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11;
2525
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
2626
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_17;
27+
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_18;
2728
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8;
2829
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
2930
import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.WILDFLY_13_JAVA_8;
@@ -75,6 +76,9 @@ static class Tomcat8Java11OpenJ9Test extends HeartBeatTest {}
7576
@Environment(TOMCAT_8_JAVA_17)
7677
static class Tomcat8Java17Test extends HeartBeatTest {}
7778

79+
@Environment(TOMCAT_8_JAVA_18)
80+
static class Tomcat8Java18Test extends HeartBeatTest {}
81+
7882
@Environment(WILDFLY_13_JAVA_8)
7983
static class Wildfly13Java8Test extends HeartBeatTest {}
8084

0 commit comments

Comments
 (0)