Skip to content

Init swap okhttp -> airlift http client #4698

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

Closed
bentito wants to merge 2 commits into from
Closed

Init swap okhttp -> airlift http client #4698

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
2500a38
Switch OkHttp -> Airlift HTTP client
bentito Aug 5, 2020
4667354
Trying explicit setMethod("GET")
bentito Aug 27, 2020
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
10 changes: 5 additions & 5 deletions presto-prometheus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@
<artifactId>configuration</artifactId>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>http-client</artifactId>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>json</artifactId>
Expand Down Expand Up @@ -66,11 +71,6 @@
<artifactId>guice</artifactId>
</dependency>

<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</dependency>

<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
Expand Down
32 changes: 19 additions & 13 deletions presto-prometheus/src/main/java/io/prestosql/plugin/prometheus/PrometheusClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.Files;
import io.airlift.http.client.HttpClient;
import io.airlift.http.client.HttpStatus;
import io.airlift.http.client.Request;
import io.airlift.http.client.Response;
import io.airlift.json.JsonCodec;
import io.prestosql.spi.PrestoException;
import io.prestosql.spi.type.DoubleType;
import io.prestosql.spi.type.MapType;
import io.prestosql.spi.type.TimestampType;
import io.prestosql.spi.type.TypeManager;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import okhttp3.ResponseBody;
import org.apache.http.client.utils.URIBuilder;

import javax.inject.Inject;
Expand All @@ -37,11 +37,14 @@
import java.io.UncheckedIOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.ByteBuffer;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;

import static io.airlift.http.client.FullJsonResponseHandler.createFullJsonResponseHandler;
import static io.airlift.http.client.HttpStatus.familyForStatusCode;
import static io.prestosql.plugin.prometheus.PrometheusErrorCode.PROMETHEUS_TABLES_METRICS_RETRIEVE_ERROR;
import static io.prestosql.plugin.prometheus.PrometheusErrorCode.PROMETHEUS_UNKNOWN_ERROR;
import static io.prestosql.spi.StandardErrorCode.NOT_FOUND;
Expand All @@ -54,7 +57,7 @@ public class PrometheusClient
{
private PrometheusConnectorConfig config;
static final String METRICS_ENDPOINT = "/api/v1/label/__name__/values";
private static final OkHttpClient httpClient = new OkHttpClient.Builder().build();
private static final HttpClient httpClient = null;
private final Supplier<Map<String, Object>> tableSupplier;
private final TypeManager typeManager;

Expand Down Expand Up @@ -131,7 +134,8 @@ private static Supplier<Map<String, Object>> metricsSupplier(final JsonCodec<Map
{
return () -> {
try {
byte[] json = getHttpResponse(metadataUri).bytes();
ByteBuffer buffer = ByteBuffer.allocate(Long.BYTES);
byte[] json = buffer.putLong(getHttpResponse(metadataUri, metricsCodec)).array();
Map<String, Object> metrics = metricsCodec.fromJson(json);
return metrics;
}
Expand All @@ -141,22 +145,24 @@ private static Supplier<Map<String, Object>> metricsSupplier(final JsonCodec<Map
};
}

static ResponseBody getHttpResponse(URI uri)
static long getHttpResponse(URI uri, JsonCodec metricsCodec)
throws IOException, URISyntaxException
{
Request.Builder requestBuilder = new Request.Builder();
if (new PrometheusConnectorConfig() != null) {
getBearerAuthInfoFromFile().map(bearerToken ->
requestBuilder.header("Authorization", "Bearer " + bearerToken));
requestBuilder.addHeader("Authorization", "Bearer " + bearerToken));
}
requestBuilder.url(uri.toURL());
requestBuilder.setUri(uri);
requestBuilder.setMethod("GET");
Request request = requestBuilder.build();
Response response = httpClient.newCall(request).execute();
if (response.isSuccessful()) {
return response.body();
Response response = (Response) httpClient.execute(request, createFullJsonResponseHandler(metricsCodec));

if (familyForStatusCode(response.getStatusCode()) != HttpStatus.Family.SUCCESSFUL) {
return response.getBytesRead();
}
else {
throw new PrestoException(PROMETHEUS_UNKNOWN_ERROR, "Bad response " + response.code() + response.message());
throw new PrestoException(PROMETHEUS_UNKNOWN_ERROR, "Bad response " + response.getStatusCode());
}
}

Expand Down
7 changes: 6 additions & 1 deletion presto-prometheus/src/main/java/io/prestosql/plugin/prometheus/PrometheusRecordSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import com.google.common.collect.ImmutableList;
import com.google.common.io.ByteSource;
import io.airlift.json.JsonCodec;
import io.prestosql.spi.PrestoException;
import io.prestosql.spi.connector.RecordCursor;
import io.prestosql.spi.connector.RecordSet;
Expand All @@ -23,7 +24,9 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.nio.ByteBuffer;
import java.util.List;
import java.util.Map;

import static io.prestosql.plugin.prometheus.PrometheusErrorCode.PROMETHEUS_UNKNOWN_ERROR;
import static java.util.Objects.requireNonNull;
Expand All @@ -34,6 +37,7 @@ public class PrometheusRecordSet
private final List<PrometheusColumnHandle> columnHandles;
private final List<Type> columnTypes;
private ByteSource byteSource;
private JsonCodec<Map<String, Object>> metricCodec;

public PrometheusRecordSet(PrometheusSplit split, List<PrometheusColumnHandle> columnHandles)
{
Expand All @@ -47,7 +51,8 @@ public PrometheusRecordSet(PrometheusSplit split, List<PrometheusColumnHandle> c
this.columnTypes = types.build();

try {
byteSource = ByteSource.wrap(PrometheusClient.getHttpResponse(split.getUri()).bytes());
ByteBuffer buffer = ByteBuffer.allocate(Long.BYTES);
byteSource = ByteSource.wrap(buffer.putLong(PrometheusClient.getHttpResponse(split.getUri(), metricCodec)).array());
}
catch (MalformedURLException e) {
throw new PrestoException(PROMETHEUS_UNKNOWN_ERROR, "split URL to use with Prometheus has an error: " + e.getMessage());
Expand Down
29 changes: 17 additions & 12 deletions ...metheus/src/test/java/io/prestosql/plugin/prometheus/TestPrometheusIntegrationTests3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,25 @@
*/
package io.prestosql.plugin.prometheus;

import io.airlift.http.client.HttpClient;
import io.airlift.http.client.HttpClientConfig;
import io.airlift.http.client.HttpUriBuilder;
import io.airlift.http.client.Request;
import io.airlift.http.client.jetty.JettyHttpClient;
import io.airlift.log.Logger;
import io.airlift.units.Duration;
import io.prestosql.Session;
import io.prestosql.testing.AbstractTestQueryFramework;
import io.prestosql.testing.MaterializedResult;
import io.prestosql.testing.MaterializedRow;
import io.prestosql.testing.QueryRunner;
import okhttp3.HttpUrl;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import org.testng.annotations.Test;

import java.net.URI;
import java.time.LocalDateTime;
import java.util.concurrent.TimeUnit;

import static io.airlift.http.client.StringResponseHandler.createStringResponseHandler;
import static io.prestosql.plugin.prometheus.PrometheusQueryRunner.createPrometheusClient;
import static io.prestosql.plugin.prometheus.PrometheusQueryRunner.createPrometheusQueryRunner;
import static org.testng.Assert.assertEquals;
Expand Down Expand Up @@ -62,21 +67,21 @@ public void testConfirmMetricAvailableAndCheckUp()
runner = createQueryRunner();
session = runner.getDefaultSession();
int tries = 0;
final OkHttpClient httpClient = new OkHttpClient.Builder()
.connectTimeout(120, TimeUnit.SECONDS)
.readTimeout(120, TimeUnit.SECONDS)
.build();
HttpClientConfig config = new HttpClientConfig()
.setConnectTimeout(new Duration(120, TimeUnit.SECONDS));
final HttpClient httpClient = new JettyHttpClient(config);
String prometheusServer = server.getAddress().toString();
HttpUrl.Builder urlBuilder = HttpUrl.parse("http://" + prometheusServer + "/api/v1/query").newBuilder();
urlBuilder.addQueryParameter("query", "up[1d]");
String url = urlBuilder.build().toString();
HttpUriBuilder uriBuilder = HttpUriBuilder.uriBuilderFrom(
new URI("http://" + prometheusServer + "/api/v1/query"));
uriBuilder.addParameter("query", "up[1d]");
URI uri = uriBuilder.build();
Request request = new Request.Builder()
.url(url)
.setUri(uri)
.build();
String responseBody;
// this seems to be a reliable way to ensure Prometheus has `up` metric data
while (tries < maxTries) {
responseBody = httpClient.newCall(request).execute().body().string();
responseBody = httpClient.execute(request, createStringResponseHandler()).getBody();
if (responseBody.contains("values")) {
Logger log = Logger.get(TestPrometheusIntegrationTests3.class);
log.info("prometheus response: %s", responseBody);
Expand Down