Skip to content

AVRO-4229 - Update StatsServer resource handler #3648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martin-g merged 2 commits into from
Feb 17, 2026
Merged

AVRO-4229 - Update StatsServer resource handler #3648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d16ed5
AVRO-4229 - Update StatsServer resource handler
terjekid Feb 12, 2026
7a73f44
Fix review comments
terjekid Feb 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions lang/java/ipc-jetty/src/main/java/org/apache/avro/ipc/jetty/StaticServlet.java
View file
Open in desktop

This file was deleted.

41 changes: 32 additions & 9 deletions lang/java/ipc-jetty/src/main/java/org/apache/avro/ipc/jetty/StatsServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
package org.apache.avro.ipc.jetty;

import org.apache.avro.ipc.stats.StatsPlugin;
import org.apache.avro.ipc.stats.StatsServlet;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Expand All @@ -19,9 +15,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.avro.ipc.jetty;

import org.apache.avro.ipc.stats.StatsPlugin;
import org.apache.avro.ipc.stats.StatsServlet;

import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletHandler;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.HandlerList;
import org.eclipse.jetty.server.handler.ResourceHandler;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.resource.Resource;

/* This is a server that displays live information from a StatsPlugin.
*
Expand All @@ -42,11 +48,28 @@ public StatsServer(StatsPlugin plugin, int port) throws Exception {
this.httpServer = new Server(port);
this.plugin = plugin;

ServletHandler handler = new ServletHandler();
httpServer.setHandler(handler);
handler.addServletWithMapping(new ServletHolder(new StaticServlet()), "/");
ServletContextHandler servletContext = new ServletContextHandler(ServletContextHandler.SESSIONS);
servletContext.setContextPath("/");

ServletHolder servletHolder = new ServletHolder(new StatsServlet(plugin));
servletContext.addServlet(servletHolder, "/");

HandlerList handlers = new HandlerList(servletContext);

Resource classPathResource = Resource.newClassPathResource("/org/apache/avro/ipc/stats/static");
if (classPathResource.exists() && classPathResource.isDirectory()) {
ResourceHandler resourceHandler = new ResourceHandler();
resourceHandler.setBaseResource(classPathResource);
resourceHandler.setDirectoriesListed(false); // Optional: prevent directory listing

ContextHandler staticContext = new ContextHandler();
staticContext.setContextPath("/static");
staticContext.setHandler(resourceHandler);

handlers.prependHandler(staticContext);
}

handler.addServletWithMapping(new ServletHolder(new StatsServlet(plugin)), "/");
httpServer.setHandler(handlers);

httpServer.start();
}
Expand Down