Use Jetty 11 in performance tool

Because Jetty 9.4 is going out of support.
This makes the performance tool require Java 11, but this
is acceptable considering its nature (not the Java library itself).

This does not change the requirements of the Java client library.
The client JAR will not contain the performance tool classes anymore.

Fixes #143

Author: acogoluegnes

pom.xml

@@ -57,7 +57,7 @@
     <micrometer.version>1.9.1</micrometer.version>
     <swiftmq-client.version>12.2.2</swiftmq-client.version>
     <picocli.version>4.6.3</picocli.version>
-    <jetty.version>9.4.48.v20220622</jetty.version>
+    <jetty.version>11.0.11</jetty.version>
     <guava.version>31.1-jre</guava.version>
     <commons-compress.version>1.21</commons-compress.version>
     <zstd-jni.version>1.5.2-3</zstd-jni.version>
@@ -189,7 +189,7 @@
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
+      <artifactId>jetty-server</artifactId>
       <version>${jetty.version}</version>
       <optional>true</optional>
     </dependency>
@@ -578,6 +578,49 @@
   </build>
 
   <profiles>
+
+    <profile>
+      <id>perf</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <version>3.3.0</version>
+            <executions>
+              <execution>
+                <id>add-source</id>
+                <phase>generate-sources</phase>
+                <goals>
+                  <goal>add-source</goal>
+                </goals>
+                <configuration>
+                  <sources>
+                    <source>src/performance-tool/java</source>
+                  </sources>
+                </configuration>
+              </execution>
+              <execution>
+                <id>add-test-source</id>
+                <phase>generate-test-sources</phase>
+                <goals>
+                  <goal>add-test-source</goal>
+                </goals>
+                <configuration>
+                  <sources>
+                    <source>src/performance-tool/test</source>
+                  </sources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
     <profile>
       <id>performance-tool</id>
       <dependencies>
@@ -621,7 +664,7 @@
 
         <dependency>
           <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-servlet</artifactId>
+          <artifactId>jetty-server</artifactId>
           <version>${jetty.version}</version>
         </dependency>
 

src/docs/asciidoc/performance-tool.adoc

@@ -1,5 +1,7 @@
 == The Performance Tool
 
+NOTE: The performance tool requires *Java 11 or more*.
+
 The library contains also a performance tool to test the RabbitMQ Stream plugin.
 It is usable as an uber JAR
 https://github.com/rabbitmq/rabbitmq-stream-java-client/releases[downloadable from GitHub Release] or as a https://hub.docker.com/r/pivotalrabbitmq/stream-perf-test[Docker image].

…stream/perf/DebugEndpointMonitoring.java …stream/perf/DebugEndpointMonitoring.javasrc/main/java/com/rabbitmq/stream/perf/DebugEndpointMonitoring.java renamed to src/performance-tool/java/com/rabbitmq/stream/perf/DebugEndpointMonitoring.java src/main/java/com/rabbitmq/stream/perf/DebugEndpointMonitoring.java renamed to src/performance-tool/java/com/rabbitmq/stream/perf/DebugEndpointMonitoring.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2021 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2021-2022 VMware, Inc. or its affiliates.  All rights reserved.
 //
 // This software, the RabbitMQ Stream Java client library, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
@@ -13,6 +13,8 @@
 // info@rabbitmq.com.
 package com.rabbitmq.stream.perf;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -26,8 +28,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import picocli.CommandLine.Option;
@@ -54,7 +54,6 @@ public void handle(
                 HttpServletRequest request,
                 HttpServletResponse response)
                 throws IOException {
-
               ThreadInfo[] threadInfos =
                   ManagementFactory.getThreadMXBean().dumpAllThreads(true, true);
               String content = formatter.format(threadInfos);

…ream/perf/DefaultPerformanceMetrics.java …ream/perf/DefaultPerformanceMetrics.javasrc/main/java/com/rabbitmq/stream/perf/DefaultPerformanceMetrics.java renamed to src/performance-tool/java/com/rabbitmq/stream/perf/DefaultPerformanceMetrics.java src/main/java/com/rabbitmq/stream/perf/DefaultPerformanceMetrics.java renamed to src/performance-tool/java/com/rabbitmq/stream/perf/DefaultPerformanceMetrics.java

@@ -26,9 +26,13 @@
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class MonitoringContext {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(MonitoringContext.class);
+
   private final int monitoringPort;
   private final CompositeMeterRegistry meterRegistry;
 
@@ -70,14 +74,17 @@ void start() throws Exception {
           new ContextHandlerCollection(contextHandlers.toArray(new ContextHandler[0]));
       server.setHandler(contextHandler);
 
-      server.setStopTimeout(1000);
+      server.setStopTimeout(10000);
       server.start();
     }
   }
 
   void close() throws Exception {
     if (server != null) {
+      LOGGER.debug("Closing Jetty server");
+      long start = System.currentTimeMillis();
       server.stop();
+      LOGGER.debug("Closed Jetty server in {} ms", (System.currentTimeMillis() - start));
     }
   }
 

…a/com/rabbitmq/stream/perf/LogUtils.java …a/com/rabbitmq/stream/perf/LogUtils.javasrc/main/java/com/rabbitmq/stream/perf/LogUtils.java renamed to src/performance-tool/java/com/rabbitmq/stream/perf/LogUtils.java src/main/java/com/rabbitmq/stream/perf/LogUtils.java renamed to src/performance-tool/java/com/rabbitmq/stream/perf/LogUtils.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2021 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2021-2022 VMware, Inc. or its affiliates.  All rights reserved.
 //
 // This software, the RabbitMQ Stream Java client library, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
@@ -15,9 +15,9 @@
 
 import io.micrometer.prometheus.PrometheusConfig;
 import io.micrometer.prometheus.PrometheusMeterRegistry;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import picocli.CommandLine.Option;
@@ -47,7 +47,6 @@ public void handle(
                 HttpServletRequest request,
                 HttpServletResponse response)
                 throws IOException {
-
               String scraped = registry.scrape();
 
               response.setStatus(HttpServletResponse.SC_OK);