Run grpc and spring-boot smoke tests against Java 17
MODIFY
benchmark-e2e/src/main/java/io/opentelemetry/e2ebenchmark/AgentBenchmark.java
benchmark-e2e/src/main/java/io/opentelemetry/e2ebenchmark/AgentBenchmark.java
@@ -29,7 +29,7 @@ public class AgentBenchmark {
System.getenv()
.getOrDefault(
"APP_IMAGE",
- "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk8-20210918.1248928124");
+ "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk8-20211213.1570880324");
private List<GenericContainer<?>> containers;
private static final Logger logger = LoggerFactory.getLogger(AgentBenchmark.class);

MODIFY
examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java
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/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk"
+ jdk
- + "-20210918.1248928124";
+ + "-20211213.1570880324";
}
@Test

MODIFY
examples/extension/src/test/java/com/example/javaagent/smoketest/SpringBootIntegrationTest.java
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/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk"
+ jdk
- + "-20210918.1248928124";
+ + "-20211213.1570880324";
}
@Test

MODIFY
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GrpcSmokeTest.groovy
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/opentelemetry-java-instrumentation/smoke-test-grpc:jdk$jdk-20210917.1246635135"
+ "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-grpc:jdk$jdk-20211213.1570880329"
}
@Unroll
@@ -60,6 +60,6 @@ class GrpcSmokeTest extends SmokeTest {
channel.shutdown()
where:
- jdk << [8, 11, 16]
+ jdk << [8, 11, 17]
}
}

MODIFY
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/NoopApiSmokeTest.groovy
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/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk$jdk-20210918.1248928124"
+ "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk$jdk-20211213.1570880324"
}
@Override
@@ -52,7 +52,7 @@ class NoopApiSmokeTest extends SmokeTest {
stopTarget()
where:
- jdk << [8, 11, 16]
+ jdk << [8, 11, 17]
}
}

MODIFY
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PropagationTest.groovy
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/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk$jdk-20210918.1248928124"
+ "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk$jdk-20211213.1570880324"
}
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/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk$jdk-20210918.1248928124"
+ "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk$jdk-20211213.1570880324"
}
// OtTracer only propagates lower half of trace ID so we have to mangle the trace IDs similar to

MODIFY
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy
@@ -20,7 +20,7 @@ import static java.util.stream.Collectors.toSet
class SpringBootSmokeTest extends SmokeTest {
protected String getTargetImage(String jdk) {
- "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk$jdk-20210918.1248928124"
+ "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk$jdk-20211213.1570880324"
}
@Override
@@ -85,6 +85,6 @@ class SpringBootSmokeTest extends SmokeTest {
stopTarget()
where:
- jdk << [8, 11, 16]
+ jdk << [8, 11, 17]
}
}

MODIFY
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy
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/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk$jdk-20210918.1248928124"
+ "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk$jdk-20211213.1570880324"
}
@Override
@@ -45,6 +45,6 @@ class SpringBootWithSamplingSmokeTest extends SmokeTest {
stopTarget()
where:
- jdk << [8, 11, 16]
+ jdk << [8, 11, 17]
}
}

Run grpc and spring-boot smoke tests against Java 17 (#4881)