open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow starting and stopping of test server to throw an exception (#9895)

This commit is contained in:
Lauri Tulmin 2023-11-17 17:53:48 +02:00 committed by GitHub
parent 6313391d71
commit f491250efa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
instrumentation/tapestry-5.4/javaagent/src/test/java/TapestryTest.java
View File

@ -31,33 +31,26 @@ class TapestryTest extends AbstractHttpServerUsingTest<Server> {
HttpServerInstrumentationExtension.forAgent(); HttpServerInstrumentationExtension.forAgent();
@Override @Override
protected Server setupServer() { protected Server setupServer() throws Exception {
WebAppContext webAppContext = new WebAppContext(); WebAppContext webAppContext = new WebAppContext();
webAppContext.setContextPath(getContextPath()); webAppContext.setContextPath(getContextPath());
Server jettyServer = new Server(port); Server jettyServer = new Server(port);
// set up test application // set up test application
try { webAppContext.setBaseResource(Resource.newResource("src/test/webapp"));
webAppContext.setBaseResource(Resource.newResource("src/test/webapp")); for (Connector connector : jettyServer.getConnectors()) {
for (Connector connector : jettyServer.getConnectors()) { connector.setHost("localhost");
connector.setHost("localhost");
}
jettyServer.setHandler(webAppContext);
jettyServer.start();
} catch (Exception e) {
throw new RuntimeException(e);
} }
jettyServer.setHandler(webAppContext);
jettyServer.start();
return jettyServer; return jettyServer;
} }
@Override @Override
protected void stopServer(Server server) { protected void stopServer(Server server) throws Exception {
try { server.stop();
server.stop();
} catch (Exception e) {
throw new RuntimeException(e);
}
} }
@Override @Override

16
testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerUsingTest.java
View File

@ -27,9 +27,9 @@ public abstract class AbstractHttpServerUsingTest<SERVER> {
public int port; public int port;
public URI address; public URI address;
protected abstract SERVER setupServer(); protected abstract SERVER setupServer() throws Exception;
protected abstract void stopServer(SERVER server); protected abstract void stopServer(SERVER server) throws Exception;
protected final InstrumentationTestRunner testing() { protected final InstrumentationTestRunner testing() {
return testing; return testing;
@ -40,7 +40,11 @@ public abstract class AbstractHttpServerUsingTest<SERVER> {
address = buildAddress(); address = buildAddress();
} }
server = setupServer(); try {
server = setupServer();
} catch (Exception exception) {
throw new IllegalStateException("Failed to start server", exception);
}
if (server != null) { if (server != null) {
logger.info( logger.info(
getClass().getName() getClass().getName()
@ -57,7 +61,11 @@ public abstract class AbstractHttpServerUsingTest<SERVER> {
logger.info(getClass().getName() + " can't stop null server"); logger.info(getClass().getName() + " can't stop null server");
return; return;
} }
stopServer(server); try {
stopServer(server);
} catch (Exception exception) {
throw new IllegalStateException("Failed to stop server", exception);
}
server = null; server = null;
logger.info(getClass().getName() + " http server stopped at: http://localhost:" + port + "/"); logger.info(getClass().getName() + " http server stopped at: http://localhost:" + port + "/");
} }