MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update json metrics reporter to use HttpClient

This commit is contained in:
Moxie Marlinspike 2019-04-22 10:55:48 -07:00
parent 527c3996ae
commit 341138b731
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/org/whispersystems/textsecuregcm/metrics/JsonMetricsReporter.java
View File

@ -16,12 +16,14 @@ import com.fasterxml.jackson.core.JsonGenerator;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.URL; import java.net.URI;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.util.Map; import java.util.Map;
import java.util.SortedMap; import java.util.SortedMap;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -34,18 +36,16 @@ public class JsonMetricsReporter extends ScheduledReporter {
private final Logger logger = LoggerFactory.getLogger(JsonMetricsReporter.class); private final Logger logger = LoggerFactory.getLogger(JsonMetricsReporter.class);
private final JsonFactory factory = new JsonFactory(); private final JsonFactory factory = new JsonFactory();
private final String token; private final URI uri;
private final String hostname; private final HttpClient httpClient;
private final String host;
public JsonMetricsReporter(MetricRegistry registry, String token, String hostname, public JsonMetricsReporter(MetricRegistry registry, String token, String hostname,
MetricFilter filter, TimeUnit rateUnit, TimeUnit durationUnit) MetricFilter filter, TimeUnit rateUnit, TimeUnit durationUnit)
throws UnknownHostException throws UnknownHostException
{ {
super(registry, "json-reporter", filter, rateUnit, durationUnit); super(registry, "json-reporter", filter, rateUnit, durationUnit);
this.token = token; this.httpClient = HttpClient.newBuilder().version(HttpClient.Version.HTTP_2).build();
this.hostname = hostname; this.uri = URI.create(String.format("https://%s/report/metrics?t=%s&h=%s", hostname, token, InetAddress.getLocalHost().getHostName()));
this.host = InetAddress.getLocalHost().getHostName();
} }
@Override @Override
@ -57,13 +57,8 @@ public class JsonMetricsReporter extends ScheduledReporter {
{ {
try { try {
logger.debug("Reporting metrics..."); logger.debug("Reporting metrics...");
URL url = new URL("https", hostname, 443, String.format("/report/metrics?t=%s&h=%s", token, host));
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setDoOutput(true); ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
connection.addRequestProperty("Content-Type", "application/json");
OutputStream outputStream = connection.getOutputStream();
JsonGenerator json = factory.createGenerator(outputStream, JsonEncoding.UTF8); JsonGenerator json = factory.createGenerator(outputStream, JsonEncoding.UTF8);
json.writeStartObject(); json.writeStartObject();
@ -93,7 +88,15 @@ public class JsonMetricsReporter extends ScheduledReporter {
outputStream.close(); outputStream.close();
logger.debug("Metrics server response: " + connection.getResponseCode()); HttpRequest request = HttpRequest.newBuilder()
.uri(uri)
.POST(HttpRequest.BodyPublishers.ofByteArray(outputStream.toByteArray()))
.header("Content-Type", "application/json")
.build();
HttpResponse<Void> response = httpClient.send(request, HttpResponse.BodyHandlers.discarding());
logger.debug("Metrics server response: " + response.statusCode());
} catch (IOException e) { } catch (IOException e) {
logger.warn("Error sending metrics", e); logger.warn("Error sending metrics", e);
} catch (Exception e) { } catch (Exception e) {