open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Trask Stalnaker 2021-12-13 01:29:46 -08:00 committed by GitHub
parent 63aec1a401
commit 9896cab71a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmark-e2e/src/main/java/io/opentelemetry/e2ebenchmark/AgentBenchmark.java
View File

@ -29,7 +29,7 @@ public class AgentBenchmark {
System.getenv() System.getenv()
.getOrDefault( .getOrDefault(
"APP_IMAGE", "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 List<GenericContainer<?>> containers;
private static final Logger logger = LoggerFactory.getLogger(AgentBenchmark.class); private static final Logger logger = LoggerFactory.getLogger(AgentBenchmark.class);

2
examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java
View File

@ -17,7 +17,7 @@ class SpringBootSmokeTest extends SmokeTest {
protected String getTargetImage(int jdk) { protected String getTargetImage(int jdk) {
return "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk" return "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk"
+ jdk + jdk
+ "-20210918.1248928124"; + "-20211213.1570880324";
} }
@Test @Test

2
examples/extension/src/test/java/com/example/javaagent/smoketest/SpringBootIntegrationTest.java
View File

@ -17,7 +17,7 @@ class SpringBootIntegrationTest extends IntegrationTest {
protected String getTargetImage(int jdk) { protected String getTargetImage(int jdk) {
return "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk" return "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk"
+ jdk + jdk
+ "-20210918.1248928124"; + "-20211213.1570880324";
} }
@Test @Test

4
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GrpcSmokeTest.groovy
View File

@ -21,7 +21,7 @@ import static java.util.stream.Collectors.toSet
class GrpcSmokeTest extends SmokeTest { class GrpcSmokeTest extends SmokeTest {
protected String getTargetImage(String jdk) { 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 @Unroll
@ -60,6 +60,6 @@ class GrpcSmokeTest extends SmokeTest {
channel.shutdown() channel.shutdown()
where: where:
jdk << [8, 11, 16] jdk << [8, 11, 17]
} }
} }

4
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/NoopApiSmokeTest.groovy
View File

@ -16,7 +16,7 @@ import java.util.jar.JarFile
class NoopApiSmokeTest extends SmokeTest { class NoopApiSmokeTest extends SmokeTest {
protected String getTargetImage(String jdk) { 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 @Override
@ -52,7 +52,7 @@ class NoopApiSmokeTest extends SmokeTest {
stopTarget() stopTarget()
where: where:
jdk << [8, 11, 16] jdk << [8, 11, 17]
} }
} }

4
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PropagationTest.groovy
View File

@ -15,7 +15,7 @@ abstract class PropagationTest extends SmokeTest {
@Override @Override
protected String getTargetImage(String jdk) { 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"() { def "Should propagate test"() {
@ -82,7 +82,7 @@ class JaegerPropagationTest extends PropagationTest {
class OtTracePropagationTest extends SmokeTest { class OtTracePropagationTest extends SmokeTest {
@Override @Override
protected String getTargetImage(String jdk) { 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 // OtTracer only propagates lower half of trace ID so we have to mangle the trace IDs similar to

4
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy
View File

@ -20,7 +20,7 @@ import static java.util.stream.Collectors.toSet
class SpringBootSmokeTest extends SmokeTest { class SpringBootSmokeTest extends SmokeTest {
protected String getTargetImage(String jdk) { 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 @Override
@ -85,6 +85,6 @@ class SpringBootSmokeTest extends SmokeTest {
stopTarget() stopTarget()
where: where:
jdk << [8, 11, 16] jdk << [8, 11, 17]
} }
} }

4
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy
View File

@ -16,7 +16,7 @@ class SpringBootWithSamplingSmokeTest extends SmokeTest {
static final int ALLOWED_DEVIATION = 0.1 * NUM_TRIES static final int ALLOWED_DEVIATION = 0.1 * NUM_TRIES
protected String getTargetImage(String jdk) { 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 @Override
@ -45,6 +45,6 @@ class SpringBootWithSamplingSmokeTest extends SmokeTest {
stopTarget() stopTarget()
where: where:
jdk << [8, 11, 16] jdk << [8, 11, 17]
} }
} }