Browse Source

Add debg output to test async servlet (#8703)

Lauri Tulmin 1 year ago
parent
commit
88fe752d7c

+ 9 - 2
smoke-tests/images/servlet/servlet-3.0/src/main/java/io/opentelemetry/smoketest/matrix/AsyncGreetingServlet.java

@@ -10,10 +10,10 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
 import javax.servlet.AsyncContext;
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+@SuppressWarnings("SystemOut")
 public class AsyncGreetingServlet extends GreetingServlet {
   private static final long serialVersionUID = 1L;
 
@@ -21,7 +21,8 @@ public class AsyncGreetingServlet extends GreetingServlet {
   private static final ExecutorService executor = Executors.newFixedThreadPool(2);
 
   @Override
-  public void init() throws ServletException {
+  public void init() {
+    System.err.println("init AsyncGreetingServlet");
     executor.submit(
         new Runnable() {
           @Override
@@ -29,6 +30,7 @@ public class AsyncGreetingServlet extends GreetingServlet {
             try {
               while (true) {
                 AsyncContext ac = jobQueue.take();
+                System.err.println("got async request from queue");
                 executor.submit(() -> handleRequest(ac));
               }
             } catch (InterruptedException e) {
@@ -40,16 +42,21 @@ public class AsyncGreetingServlet extends GreetingServlet {
 
   @Override
   public void destroy() {
+    System.err.println("destroy AsyncGreetingServlet");
     executor.shutdownNow();
   }
 
   @Override
   protected void doGet(HttpServletRequest req, HttpServletResponse resp) {
+    System.err.println("start async request");
     AsyncContext ac = req.startAsync(req, resp);
+    System.err.println("add async request to queue");
     jobQueue.add(ac);
+    System.err.println("async request added to queue");
   }
 
   private static void handleRequest(AsyncContext ac) {
+    System.err.println("dispatch async request");
     ac.dispatch("/greeting");
   }
 }

+ 9 - 2
smoke-tests/images/servlet/servlet-5.0/src/main/java/io/opentelemetry/smoketest/matrix/AsyncGreetingServlet.java

@@ -6,7 +6,6 @@
 package io.opentelemetry.smoketest.matrix;
 
 import jakarta.servlet.AsyncContext;
-import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.util.concurrent.BlockingQueue;
@@ -14,13 +13,15 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
 
+@SuppressWarnings("SystemOut")
 public class AsyncGreetingServlet extends GreetingServlet {
   private static final long serialVersionUID = 1L;
   private static final BlockingQueue<AsyncContext> jobQueue = new LinkedBlockingQueue<>();
   private static final ExecutorService executor = Executors.newFixedThreadPool(2);
 
   @Override
-  public void init() throws ServletException {
+  public void init() {
+    System.err.println("init AsyncGreetingServlet");
     executor.submit(
         new Runnable() {
           @Override
@@ -28,6 +29,7 @@ public class AsyncGreetingServlet extends GreetingServlet {
             try {
               while (true) {
                 AsyncContext ac = jobQueue.take();
+                System.err.println("got async request from queue");
                 executor.submit(() -> handleRequest(ac));
               }
             } catch (InterruptedException e) {
@@ -39,16 +41,21 @@ public class AsyncGreetingServlet extends GreetingServlet {
 
   @Override
   public void destroy() {
+    System.err.println("destroy AsyncGreetingServlet");
     executor.shutdownNow();
   }
 
   @Override
   protected void doGet(HttpServletRequest req, HttpServletResponse resp) {
+    System.err.println("start async request");
     AsyncContext ac = req.startAsync(req, resp);
+    System.err.println("add async request to queue");
     jobQueue.add(ac);
+    System.err.println("async request added to queue");
   }
 
   private static void handleRequest(AsyncContext ac) {
+    System.err.println("dispatch async request");
     ac.dispatch("/greeting");
   }
 }

+ 1 - 1
smoke-tests/images/servlet/src/payara.windows.dockerfile

@@ -4,7 +4,7 @@ ARG jdkImage
 FROM mcr.microsoft.com/windows/servercore:ltsc2022 as builder
 ARG version
 
-ADD https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/${version}/payara-${version}.zip /server.zip
+ADD https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/${version}/payara-${version}.zip /server.zip
 RUN ["powershell", "-Command", "expand-archive -Path /server.zip -DestinationPath /server"]
 RUN ["powershell", "-Command", "Get-ChildItem -Path /server/ -filter payara* | Rename-Item -NewName payara"]
 RUN ["powershell", "-Command", "remove-item -Path /server/payara/glassfish/modules/phonehome-bootstrap.jar"]