Skip to content

do not propagate IOException from the MetricsServlet #4832

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
merged 1 commit into from
Aug 29, 2025
Merged

do not propagate IOException from the MetricsServlet #4832

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 16 additions & 2 deletions opengrok-web/src/main/java/org/opengrok/web/servlet/MetricsServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

/*
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
*/
package org.opengrok.web.servlet;

Expand All @@ -27,19 +27,33 @@
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.opengrok.indexer.Metrics;
import org.opengrok.indexer.logger.LoggerFactory;

import java.io.IOException;
import java.io.PrintWriter;
import java.io.Serial;
import java.util.logging.Logger;
import java.util.logging.Level;

@WebServlet("/metrics/prometheus")
public class MetricsServlet extends HttpServlet {

@Serial
private static final long serialVersionUID = 0L;

private static final Logger logger = LoggerFactory.getLogger(MetricsServlet.class);

@Override
protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws IOException {
protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) {
try (PrintWriter pw = resp.getWriter()) {
pw.print(Metrics.getPrometheusRegistry().scrape());
} catch (IOException e) {
try {
resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
String.format("failed to write the output data: %s", e.getMessage()));
} catch (IOException ex) {
logger.log(Level.WARNING, String.format("failed to send error code: %s", e.getMessage()));
}
}
}
}
Loading