Update "other" smoke tests to Java 16 (#4144)

* Update "other" smoke tests to Java 16 * Bump extraTag * Play doesn't support Java 16 (or 17) yet * Fix formatting
2021-09-17 11:50:21 -07:00 · 2021-09-17 11:50:21 -07:00 · 28c68b91a0
parent 699cc81990
commit 28c68b91a0
13 changed files with 19 additions and 22 deletions
--- a/.github/workflows/publish-smoke-test-grpc-images.yml
+++ b/.github/workflows/publish-smoke-test-grpc-images.yml
@ -48,8 +48,6 @@ jobs:
          echo "Pushing to tag $TAG"
          ./gradlew jib -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace -Ptag=$TAG
          ./gradlew jib -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace -Ptag=$TAG
-          # TODO (trask) drop JDK 15 after JDK 16 is passing
-          ./gradlew jib -PtargetJDK=15 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace -Ptag=$TAG
          ./gradlew jib -PtargetJDK=16 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace -Ptag=$TAG
        working-directory: smoke-tests/grpc

--- a/.github/workflows/publish-smoke-test-play-images.yml
+++ b/.github/workflows/publish-smoke-test-play-images.yml
@ -48,9 +48,9 @@ jobs:
          echo "Pushing to tag $TAG"
          ./gradlew jib -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain -Ptag=$TAG
          ./gradlew jib -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain -Ptag=$TAG
-          # TODO (trask) drop JDK 15 after JDK 16 is passing
+          # Play doesn't support Java 16 (or 17) yet
+          # https://github.com/playframework/playframework/pull/10819
          ./gradlew jib -PtargetJDK=15 -Djib.httpTimeout=120000 -Djib.console=plain -Ptag=$TAG
-          ./gradlew jib -PtargetJDK=16 -Djib.httpTimeout=120000 -Djib.console=plain -Ptag=$TAG
        working-directory: smoke-tests/play

  issue:
--- a/.github/workflows/publish-smoke-test-spring-boot-images.yml
+++ b/.github/workflows/publish-smoke-test-spring-boot-images.yml
@ -48,8 +48,6 @@ jobs:
          echo "Pushing to tag $TAG"
          ./gradlew jib -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace -Ptag=$TAG
          ./gradlew jib -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace -Ptag=$TAG
-          # TODO (trask) drop JDK 15 after JDK 16 is passing
-          ./gradlew jib -PtargetJDK=15 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace -Ptag=$TAG
          ./gradlew jib -PtargetJDK=16 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace -Ptag=$TAG
        working-directory: smoke-tests/springboot

--- a/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java
+++ b/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java
@ -17,7 +17,7 @@ class SpringBootSmokeTest extends SmokeTest {
  protected String getTargetImage(int jdk) {
    return "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk"
        + jdk
-        + "-20210218.577304949";
+        + "-20210915.1238472439";
  }

  @Test
--- a/examples/extension/src/test/java/com/example/javaagent/smoketest/SpringBootIntegrationTest.java
+++ b/examples/extension/src/test/java/com/example/javaagent/smoketest/SpringBootIntegrationTest.java
@ -17,7 +17,7 @@ class SpringBootIntegrationTest extends IntegrationTest {
  protected String getTargetImage(int jdk) {
    return "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk"
        + jdk
-        + "-20210218.577304949";
+        + "-20210915.1238472439";
  }

  @Test
--- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GrpcSmokeTest.groovy
+++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GrpcSmokeTest.groovy
@ -21,7 +21,7 @@ import static java.util.stream.Collectors.toSet
 class GrpcSmokeTest extends SmokeTest {

  protected String getTargetImage(String jdk) {
-    "ghcr.io/open-telemetry/java-test-containers:smoke-grpc-jdk$jdk-20210225.598590600"
+    "ghcr.io/open-telemetry/java-test-containers:smoke-grpc-jdk$jdk-20210915.1238472435"
  }

  @Unroll
@ -60,6 +60,6 @@ class GrpcSmokeTest extends SmokeTest {
    channel.shutdown()

    where:
-    jdk << [8, 11, 15]
+    jdk << [8, 11, 16]
  }
 }
--- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JaegerExporterSmokeTest.groovy
+++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JaegerExporterSmokeTest.groovy
@ -17,7 +17,7 @@ import static java.util.stream.Collectors.toSet
 class JaegerExporterSmokeTest extends SmokeTest {

  protected String getTargetImage(String jdk) {
-    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.577304949"
+    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210915.1238472439"
  }

  @Override
--- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/NoopApiSmokeTest.groovy
+++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/NoopApiSmokeTest.groovy
@ -16,7 +16,7 @@ import java.util.jar.JarFile
 class NoopApiSmokeTest extends SmokeTest {

  protected String getTargetImage(String jdk) {
-    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.577304949"
+    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210915.1238472439"
  }

  @Override
@ -52,7 +52,7 @@ class NoopApiSmokeTest extends SmokeTest {
    stopTarget()

    where:
-    jdk << [8, 11, 15]
+    jdk << [8, 11, 16]
  }
 }

--- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy
+++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy
@ -12,7 +12,7 @@ import spock.lang.IgnoreIf
 class PlaySmokeTest extends SmokeTest {

  protected String getTargetImage(String jdk) {
-    "ghcr.io/open-telemetry/java-test-containers:smoke-play-jdk$jdk-20201128.1734635"
+    "ghcr.io/open-telemetry/java-test-containers:smoke-play-jdk$jdk-20210915.1238703013"
  }

  def "play smoke test on JDK #jdk"(int jdk) {
@ -32,7 +32,8 @@ class PlaySmokeTest extends SmokeTest {
    stopTarget()

    where:
+    // Play doesn't support Java 16 (or 17) yet
+    // https://github.com/playframework/playframework/pull/10819
    jdk << [8, 11, 15]
  }
-
 }
--- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PropagationTest.groovy
+++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PropagationTest.groovy
@ -15,7 +15,7 @@ abstract class PropagationTest extends SmokeTest {

  @Override
  protected String getTargetImage(String jdk) {
-    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.577304949"
+    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210915.1238472439"
  }

  def "Should propagate test"() {
@ -82,7 +82,7 @@ class JaegerPropagationTest extends PropagationTest {
 class OtTracePropagationTest extends SmokeTest {
  @Override
  protected String getTargetImage(String jdk) {
-    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.577304949"
+    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210915.1238472439"
  }

  // OtTracer only propagates lower half of trace ID so we have to mangle the trace IDs similar to
--- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy
+++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy
@ -19,7 +19,7 @@ import static java.util.stream.Collectors.toSet
 class SpringBootSmokeTest extends SmokeTest {

  protected String getTargetImage(String jdk) {
-    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.577304949"
+    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210915.1238472439"
  }

  @Override
@ -79,6 +79,6 @@ class SpringBootSmokeTest extends SmokeTest {
    stopTarget()

    where:
-    jdk << [8, 11, 15]
+    jdk << [8, 11, 16]
  }
 }
--- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy
+++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy
@ -16,7 +16,7 @@ class SpringBootWithSamplingSmokeTest extends SmokeTest {
  static final int ALLOWED_DEVIATION = 0.1 * NUM_TRIES

  protected String getTargetImage(String jdk) {
-    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.577304949"
+    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210915.1238472439"
  }

  @Override
@ -45,6 +45,6 @@ class SpringBootWithSamplingSmokeTest extends SmokeTest {
    stopTarget()

    where:
-    jdk << [8, 11, 15]
+    jdk << [8, 11, 16]
  }
 }
--- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/ZipkinExporterSmokeTest.groovy
+++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/ZipkinExporterSmokeTest.groovy
@ -12,7 +12,7 @@ import spock.lang.IgnoreIf
 class ZipkinExporterSmokeTest extends SmokeTest {

  protected String getTargetImage(String jdk) {
-    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.577304949"
+    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210915.1238472439"
  }

  @Override