Skip to content

Extend timeout on PrometheusV1Handler requests #35793

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

Draft
olaaun wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Extend timeout on PrometheusV1Handler requests #35793

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions container-disc/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import java.io.IOException;
import java.net.URI;
import java.time.Duration;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.Executor;
Expand All @@ -32,15 +33,15 @@ public class PrometheusV1Handler extends HttpHandlerBase {
static final String VALUES_PATH = V1_PATH + "/values";

private static final int HTTP_CONNECT_TIMEOUT = 5000;
private static final int HTTP_SOCKET_TIMEOUT = 30000;
private static final int HTTP_SOCKET_TIMEOUT = 60000;

private final String metricsProxyUri;
private final CloseableHttpClient httpClient = createHttpClient();

@Inject
public PrometheusV1Handler(Executor executor,
MetricsProxyApiConfig config) {
super(executor);
super(executor, Duration.ofSeconds(65));
metricsProxyUri = "http://localhost:" + config.metricsPort() + config.prometheusApiPath();
}

Expand Down
3 changes: 2 additions & 1 deletion ...proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.yahoo.restapi.Path;

import java.net.URI;
import java.time.Duration;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.Executor;
Expand Down Expand Up @@ -52,7 +53,7 @@ public ApplicationMetricsHandler(Executor executor,
MetricsConsumers metricsConsumers,
ApplicationDimensions applicationDimensions,
NodeDimensions nodeDimensions) {
super(executor);
super(executor, Duration.ofSeconds(60));
this.metricsRetriever = metricsRetriever;
this.metricsConsumers = metricsConsumers;
this.applicationDimensions = applicationDimensions;
Expand Down