Document supported technologies
@@ -75,13 +75,35 @@ export CATALINA_OPTS="$CATALINA_OPTS -javaagent:/path/to/elastic-apm-agent-<vers
[float]
[[supported-technologies]]
=== Supported technologies
+The Elastic APM Java agent automatically instruments various APIs,
+frameworks and application servers.
+This section lists all supported technologies.
+
+
+[float]
+[[supported-technologies]]
+==== Java versions
+
+|===
+|Vendor |Supported versions
+
+|Oracle JDK
+|7, 8, 9, 10
+
+|Open JDK
+|7, 8, 9, 10
+
+|IBM J9 VM
+|8
|===
-|Technology |Supported versions | Description
-|Java
-|Oracle and OpenJDK versions 7, 8 and 9
-|
+
+[float]
+[[supported-apis]]
+==== APIs
+|===
+|API |Supported versions | Description
|JDBC
|4.1+
@@ -92,9 +114,51 @@ export CATALINA_OPTS="$CATALINA_OPTS -javaagent:/path/to/elastic-apm-agent-<vers
|3+
|A transaction will be created for all incoming HTTP requests to your Servlet API-based application.
-|Spring MVC
-|4+
+|===
+
+[float]
+[[supported-frameworks]]
+==== Frameworks
+|===
+|Framework |Supported versions | Description
+
+
+|Spring Web MVC
+|4.x, 5.x
|If you are using Spring MVC (for example with Spring Boot),
the transactions are named based on your controllers (`ControllerClass#controllerMethod`).
+
+|Spring Boot
+|1.5+, 2.x
+|Supports embedded Tomcat, Jetty and Undertow
+
|===
+
+[float]
+[[supported-app-servers]]
+==== Application Servers/Servlet Containers
+The Elastic APM Java agent has generic support for the Servlet API 3+.
+However, some servers require special handling.
+The servers listed here are tested by an integration test suite to make sure Elastic APM is compatible with them.
+Other Servlet 3+ compliant servers will most likely work as well.
+
+|===
+|Server |Supported versions
+
+|Tomcat
+|7.x, 8.5.x, 9.x
+
+|WildFly
+|8-13
+
+|Jetty
+|9.2, 9.3, 9.4
+
+|WebSphere
+|8.5.5, 18.0.x
+
+|Undertow Servlet
+|1.4
+
+|===
