diff --git a/.github/workflows/build-play-smoke-dist.yaml b/.github/workflows/build-play-smoke-dist.yaml index 2aee7d92ba..c2974bcc0a 100644 --- a/.github/workflows/build-play-smoke-dist.yaml +++ b/.github/workflows/build-play-smoke-dist.yaml @@ -29,5 +29,5 @@ jobs: run: | ./gradlew jib -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain ./gradlew jib -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain - ./gradlew jib -PtargetJDK=14 -Djib.httpTimeout=120000 -Djib.console=plain + ./gradlew jib -PtargetJDK=15 -Djib.httpTimeout=120000 -Djib.console=plain working-directory: smoke-tests/play \ No newline at end of file diff --git a/.github/workflows/build-springboot-smoke-dist.yaml b/.github/workflows/build-springboot-smoke-dist.yaml index b1223b0fcd..264f7d73e3 100644 --- a/.github/workflows/build-springboot-smoke-dist.yaml +++ b/.github/workflows/build-springboot-smoke-dist.yaml @@ -29,5 +29,5 @@ jobs: run: | ./gradlew jib -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace ./gradlew jib -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace - ./gradlew jib -PtargetJDK=14 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace + ./gradlew jib -PtargetJDK=15 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace working-directory: smoke-tests/springboot \ No newline at end of file diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 079f59068f..48dbd30646 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [8, 11, 14] + java: [8, 11, 15] fail-fast: false steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 6f0f328963..0005691bff 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [8, 11, 14] + java: [8, 11, 15] fail-fast: false steps: - uses: actions/checkout@v2 diff --git a/docs/contributing/running-tests.md b/docs/contributing/running-tests.md index 3210b7479b..4eedf0e844 100644 --- a/docs/contributing/running-tests.md +++ b/docs/contributing/running-tests.md @@ -2,10 +2,10 @@ #### Java versions -Open Telemetry Auto Instrumentation's minimal supported version is java 7. +Open Telemetry Auto Instrumentation's minimal supported version is java 8. All jar files that we produce, unless noted otherwise, have bytecode -compatible with java 7 runtime. In addition to that we test our code with all -later java versions as well: from 8 to 14. +compatible with java 8 runtime. Our test suite is executed against +java 8, all LTS versions and the latest non-LTS version. Some libraries that we auto-instrument may have higher minimal requirements. In this case we compile and test corresponding auto-instrumentation with diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle index c051812b80..860b9cd9df 100644 --- a/gradle/jacoco.gradle +++ b/gradle/jacoco.gradle @@ -1,7 +1,7 @@ apply plugin: "jacoco" jacoco { - toolVersion = "0.8.5" + toolVersion = "0.8.6" } jacocoTestReport { diff --git a/instrumentation/akka-http-10.0/akka-http-10.0.gradle b/instrumentation/akka-http-10.0/akka-http-10.0.gradle index a7846b594f..1f0a4a1c5d 100644 --- a/instrumentation/akka-http-10.0/akka-http-10.0.gradle +++ b/instrumentation/akka-http-10.0/akka-http-10.0.gradle @@ -2,6 +2,12 @@ apply from: "$rootDir/gradle/instrumentation.gradle" apply from: "$rootDir/gradle/test-with-scala.gradle" apply plugin: 'org.unbroken-dome.test-sets' +ext { + // TODO remove once Scala/akka supports Java 15 + // https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html + maxJavaVersionForTests = JavaVersion.VERSION_14 +} + testSets { version101Test { dirName = 'test' diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy index be851939de..604ce7510d 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy @@ -45,7 +45,7 @@ class PlaySmokeTest extends SmokeTest { stopTarget() where: - jdk << [8, 11, 14] + jdk << [8, 11, 15] } } diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy index b4ed2d11af..d1128f3f04 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy @@ -63,6 +63,6 @@ class SpringBootSmokeTest extends SmokeTest { stopTarget() where: - jdk << [8, 11, 14] + jdk << [8, 11, 15] } } diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy index 72c30ee992..26e0239594 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy @@ -55,6 +55,6 @@ class SpringBootWithSamplingSmokeTest extends SmokeTest { stopTarget() where: - jdk << [8, 11, 14] + jdk << [8, 11, 15] } }