Rework async smoke test (#9261)

This commit is contained in:
Lauri Tulmin 2023-08-21 15:54:55 +03:00 committed by GitHub
parent 5abba34ade
commit eb3ded15e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 12 deletions

View File

@ -10,15 +10,17 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
import javax.servlet.AsyncContext;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@SuppressWarnings("SystemOut")
public class AsyncGreetingServlet extends GreetingServlet {
public class AsyncGreetingServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
private static final BlockingQueue<AsyncContext> jobQueue = new LinkedBlockingQueue<>();
private static final ExecutorService executor = Executors.newFixedThreadPool(2);
private static final GreetingServlet greetingServlet = new GreetingServlet();
@Override
public void init() {
@ -56,14 +58,15 @@ public class AsyncGreetingServlet extends GreetingServlet {
}
private static void handleRequest(AsyncContext ac) {
System.err.println("dispatch async request");
System.err.println("handle async request");
try {
ac.dispatch("/greeting");
System.err.println("async request dispatched");
greetingServlet.doGet(
(HttpServletRequest) ac.getRequest(), (HttpServletResponse) ac.getResponse());
ac.complete();
System.err.println("async request handled");
} catch (Throwable throwable) {
System.err.println("dispatching async request failed");
System.err.println("handling async request failed");
throwable.printStackTrace();
throw throwable;
}
}
}

View File

@ -6,6 +6,7 @@
package io.opentelemetry.smoketest.matrix;
import jakarta.servlet.AsyncContext;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.concurrent.BlockingQueue;
@ -14,10 +15,11 @@ import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
@SuppressWarnings("SystemOut")
public class AsyncGreetingServlet extends GreetingServlet {
public class AsyncGreetingServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
private static final BlockingQueue<AsyncContext> jobQueue = new LinkedBlockingQueue<>();
private static final ExecutorService executor = Executors.newFixedThreadPool(2);
private static final GreetingServlet greetingServlet = new GreetingServlet();
@Override
public void init() {
@ -55,14 +57,15 @@ public class AsyncGreetingServlet extends GreetingServlet {
}
private static void handleRequest(AsyncContext ac) {
System.err.println("dispatch async request");
System.err.println("handle async request");
try {
ac.dispatch("/greeting");
System.err.println("async request dispatched");
greetingServlet.doGet(
(HttpServletRequest) ac.getRequest(), (HttpServletResponse) ac.getResponse());
ac.complete();
System.err.println("async request handled");
} catch (Throwable throwable) {
System.err.println("dispatching async request failed");
System.err.println("handling async request failed");
throwable.printStackTrace();
throw throwable;
}
}
}