Skip to content

Let Prometheus exporter plugin support utf8 characters #8228

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
DaanHoogland merged 2 commits into from
Nov 15, 2023
Merged

Let Prometheus exporter plugin support utf8 characters #8228

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e88137
use length of bytearray after unicode conversion
DaanHoogland Nov 13, 2023
cab7dd4
added suggestion from @havengit in #8203
DaanHoogland Nov 14, 2023
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
19 changes: 15 additions & 4 deletions .../prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterServerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.io.IOException;
import java.io.OutputStream;
import java.net.InetSocketAddress;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;

public class PrometheusExporterServerImpl extends ManagerBase implements PrometheusExporterServer, Configurable {
Expand Down Expand Up @@ -57,11 +58,21 @@ public void handle(final HttpExchange httpExchange) throws IOException {
response = prometheusExporter.getMetrics();
responseCode = 200;
}
httpExchange.getResponseHeaders().set("content-type", "text/plain");
httpExchange.sendResponseHeaders(responseCode, response.length());
byte[] bytesToOutput = response.getBytes(StandardCharsets.UTF_8);
httpExchange.getResponseHeaders().set("content-type", "text/plain; charset=UTF-8");
httpExchange.sendResponseHeaders(responseCode, bytesToOutput.length);
final OutputStream os = httpExchange.getResponseBody();
os.write(response.getBytes());
os.close();
try {
os.write(bytesToOutput);
} catch (IOException e) {
LOG.error(String.format("could not export Prometheus data due to %s", e.getLocalizedMessage()));
if (LOG.isDebugEnabled()) {
LOG.debug("Error during Prometheus export: ", e);
}
os.write("The system could not export Prometheus due to an internal error. Contact your operator to learn about the reason.".getBytes());
} finally {
os.close();
}
}
}

Expand Down