From 6281583770d46420ceac91352c8d90a10fca31b6 Mon Sep 17 00:00:00 2001 From: Nikita Salnikov-Tarnovski Date: Mon, 7 Dec 2020 16:21:22 +0200 Subject: [PATCH] Fix smoke tests to use new images (#1845) --- .../io/opentelemetry/smoketest/AppServerTest.groovy | 8 ++++---- .../io/opentelemetry/smoketest/GlassFishSmokeTest.groovy | 2 +- .../io/opentelemetry/smoketest/WildflySmokeTest.groovy | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy index 69e4fa761d..7c25ae763b 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy @@ -17,7 +17,7 @@ abstract class AppServerTest extends SmokeTest { def "#appServer smoke test on JDK #jdk"(String appServer, int jdk) { setup: startTarget(jdk, appServer) - String url = "http://localhost:${target.getMappedPort(8080)}/greeting" + String url = "http://localhost:${target.getMappedPort(8080)}/app/greeting" def request = new Request.Builder().url(url).get().build() def currentAgentVersion = new JarFile(agentPath).getManifest().getMainAttributes().get(Attributes.Name.IMPLEMENTATION_VERSION) @@ -37,14 +37,14 @@ abstract class AppServerTest extends SmokeTest { traces.countSpansByKind(Span.SpanKind.SPAN_KIND_SERVER) == 2 and: "Expected span names" - traces.countSpansByName('/greeting') == 1 - traces.countSpansByName('/headers') == 1 + traces.countSpansByName('/app/greeting') == 1 + traces.countSpansByName('/app/headers') == 1 and: "The span for the initial web request" traces.countFilteredAttributes("http.url", url) == 1 and: "Client and server spans for the remote call" - traces.countFilteredAttributes("http.url", "http://localhost:8080/headers") == 2 + traces.countFilteredAttributes("http.url", "http://localhost:8080/app/headers") == 2 and: "Number of spans tagged with current otel library version" traces.countFilteredResourceAttributes("telemetry.auto.version", currentAgentVersion) == 3 diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GlassFishSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GlassFishSmokeTest.groovy index b078c6c88d..8568a1a88e 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GlassFishSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GlassFishSmokeTest.groovy @@ -13,7 +13,7 @@ import org.testcontainers.containers.wait.strategy.WaitStrategy class GlassFishSmokeTest extends AppServerTest { protected String getTargetImage(int jdk, String serverVersion) { - "ghcr.io/open-telemetry/java-test-containers:payara-${serverVersion}-jdk$jdk" + "ghcr.io/open-telemetry/java-test-containers:payara-${serverVersion}-jdk$jdk-20201207.405832649" } @Override diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/WildflySmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/WildflySmokeTest.groovy index 2700df8a45..5e119613cb 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/WildflySmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/WildflySmokeTest.groovy @@ -11,13 +11,13 @@ import okhttp3.Request class WildflySmokeTest extends AppServerTest { protected String getTargetImage(int jdk, String serverVersion) { - "ghcr.io/open-telemetry/java-test-containers:wildfly-${serverVersion}-jdk$jdk" + "ghcr.io/open-telemetry/java-test-containers:wildfly-${serverVersion}-jdk$jdk-20201207.405832649" } def "JSP smoke test on WildFly"() { setup: startTarget(11, "21.0.0.Final") - String url = "http://localhost:${target.getMappedPort(8080)}/jsp" + String url = "http://localhost:${target.getMappedPort(8080)}/app/jsp" def request = new Request.Builder().url(url).get().build() when: @@ -31,7 +31,7 @@ class WildflySmokeTest extends AppServerTest { traces.countSpansByKind(Span.SpanKind.SPAN_KIND_SERVER) == 1 - traces.countSpansByName('/jsp') == 1 + traces.countSpansByName('/app/jsp') == 1 }