add corner case for tomcat 7

smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy

@@ -382,14 +382,18 @@ abstract class AppServerTest extends SmokeTest {
 
  responseBody.contains("<script>console.log(hi)</script>")
 
- traces.countSpansByKind(Span.SpanKind.SPAN_KIND_SERVER) == 1
-
- traces.countSpansByName('GET /app/jsp') == 1
-
+ if (expectServerSpan()){
+ traces.countSpansByKind(Span.SpanKind.SPAN_KIND_SERVER) == 1
+  traces.countSpansByName('GET /app/jsp') == 1
+ }
  where:
  [appServer, jdk] << getTestParams()
  }
 
+ protected boolean expectServerSpan() {
+ true
+ }
+
  protected String getSpanName(String path) {
  switch (path) {
  case "/app/greeting":

smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomcatSmokeTest.groovy

@@ -17,6 +17,14 @@ abstract class TomcatSmokeTest extends AppServerTest {
  protected TargetWaitStrategy getWaitStrategy() {
  return new TargetWaitStrategy.Log(Duration.ofMinutes(1), ".*Server startup in.*")
  }
+
+ @Override
+ protected boolean expectServerSpan() {
+ if (this.serverVersion == "7.0.109") {
+ return false
+ }
+ return true
+ }
 }
 
 @AppServer(version = "7.0.109", jdk = "8")

smoke-tests/src/test/groovy/io/opentelemetry/smoketest/WildflySmokeTest.groovy

@@ -21,24 +21,6 @@ abstract class WildflySmokeTest extends AppServerTest {
  return new TargetWaitStrategy.Log(Duration.ofMinutes(1), ".*started in.*")
  }
 
- @Unroll
- def "JSP smoke test on WildFly"() {
- when:
- def response = client().get("/app/jsp").aggregate().join()
- TraceInspector traces = new TraceInspector(waitForTraces())
- String responseBody = response.contentUtf8()
-
- then:
- response.status().isSuccess()
- responseBody.contains("Successful JSP test")
-
- traces.countSpansByKind(Span.SpanKind.SPAN_KIND_SERVER) == 1
-
- traces.countSpansByName('GET /app/jsp') == 1
-
- where:
- [appServer, jdk] << getTestParams()
- }
 }
 
 @AppServer(version = "13.0.0.Final", jdk = "8")