Add tomee to supported servers (open-telemetry#2180)

* Add tomee to supported servers * move tomee after tomcat * correct tomee image tag
malafeev · Feb 4, 2021 · c65fb3e · c65fb3e
1 parent c5456d5
commit c65fb3e
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -390,6 +390,7 @@ These are the supported application servers:
 | [Jetty](https://www.eclipse.org/jetty/)                                                   | 9.4.x, 10.0.x, 11.0.x       | OpenJDK 8, 11    | Ubuntu 20                      |
 | [Payara](https://www.payara.fish/)                                                        | 5.0.x, 5.1.x                | OpenJDK 8, 11    | Ubuntu 18, Windows Server 2019 |
 | [Tomcat](http://tomcat.apache.org/)                                                       | 7.0.x, 8.5.x, 9.0.x, 10.0.x | OpenJDK 8, 11    | Ubuntu 18                      |
+| [TomEE](https://tomee.apache.org/)                                                        | 7.x, 8.x                    | OpenJDK 8, 11    | Ubuntu 18                      |
 | [Weblogic](https://www.oracle.com/java/weblogic/)                                         | 12                          | Oracle JDK 8     | Oracle Linux 7, 8              |
 | [Weblogic](https://www.oracle.com/java/weblogic/)                                         | 14                          | Oracle JDK 8, 11 | Oracle Linux 7, 8              |
 | [Websphere Liberty Profile](https://www.ibm.com/cloud/websphere-liberty)                  | 20.0.0.12                   | OpenJDK 8, 11    | Ubuntu 18, Windows Server 2019 |

diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomeeSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomeeSmokeTest.groovy
@@ -0,0 +1,36 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.smoketest
+
+import java.time.Duration
+import org.testcontainers.containers.wait.strategy.Wait
+import org.testcontainers.containers.wait.strategy.WaitStrategy
+
+@AppServer(version = "7.0.0", jdk = "8")
+@AppServer(version = "8.0.6", jdk = "8")
+@AppServer(version = "8.0.6", jdk = "11")
+class TomeeSmokeTest extends AppServerTest {
+
+  protected String getTargetImage(String jdk, String serverVersion) {
+    "ghcr.io/open-telemetry/java-test-containers:tomee-${serverVersion}-jdk$jdk-20210202.531569197"
+  }
+
+  @Override
+  protected WaitStrategy getWaitStrategy() {
+    return Wait
+      .forLogMessage(".*Server startup in.*", 1)
+      .withStartupTimeout(Duration.ofMinutes(3))
+  }
+
+  @Override
+  protected String getSpanName(String path) {
+    switch (path) {
+      case "/app/WEB-INF/web.xml":
+        return "CoyoteAdapter.service"
+    }
+    return path
+  }
+}