diff options
author | Arne H Juul <arnej@yahooinc.com> | 2021-12-14 15:03:39 +0000 |
---|---|---|
committer | Arne H Juul <arnej@yahooinc.com> | 2021-12-14 15:03:39 +0000 |
commit | b7f48119dffb1771719397d9838b502f19799ff4 (patch) | |
tree | 5fa000a291940760cfc46947327f2ddd28b2e710 /container-core | |
parent | 6fb22f75be2bf950e4bfa32f94c63729875af14b (diff) |
minimal implementation of "ignore some user agents"
Diffstat (limited to 'container-core')
4 files changed, 33 insertions, 7 deletions
diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json index a6783d1e5f5..c3c946ab537 100644 --- a/container-core/abi-spec.json +++ b/container-core/abi-spec.json @@ -1990,11 +1990,14 @@ "public com.yahoo.jdisc.http.ServerConfig$Metric$Builder monitoringHandlerPaths(java.util.Collection)", "public com.yahoo.jdisc.http.ServerConfig$Metric$Builder searchHandlerPaths(java.lang.String)", "public com.yahoo.jdisc.http.ServerConfig$Metric$Builder searchHandlerPaths(java.util.Collection)", + "public com.yahoo.jdisc.http.ServerConfig$Metric$Builder ignoredUserAgents(java.lang.String)", + "public com.yahoo.jdisc.http.ServerConfig$Metric$Builder ignoredUserAgents(java.util.Collection)", "public com.yahoo.jdisc.http.ServerConfig$Metric build()" ], "fields": [ "public java.util.List monitoringHandlerPaths", - "public java.util.List searchHandlerPaths" + "public java.util.List searchHandlerPaths", + "public java.util.List ignoredUserAgents" ] }, "com.yahoo.jdisc.http.ServerConfig$Metric": { @@ -2009,7 +2012,9 @@ "public java.util.List monitoringHandlerPaths()", "public java.lang.String monitoringHandlerPaths(int)", "public java.util.List searchHandlerPaths()", - "public java.lang.String searchHandlerPaths(int)" + "public java.lang.String searchHandlerPaths(int)", + "public java.util.List ignoredUserAgents()", + "public java.lang.String ignoredUserAgents(int)" ], "fields": [] }, diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollector.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollector.java index 0aa2820f959..13598b2dbe8 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollector.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollector.java @@ -3,6 +3,7 @@ package com.yahoo.jdisc.http.server.jetty; import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.http.HttpRequest; +import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.server.AsyncContextEvent; import org.eclipse.jetty.server.Handler; @@ -21,6 +22,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Objects; @@ -106,12 +108,25 @@ class HttpResponseStatisticsCollector extends HandlerWrapper implements Graceful } } - private void observeEndOfRequest(Request request, HttpServletResponse flushableResponse) throws IOException { - var metrics = StatusCodeMetric.of(request, monitoringHandlerPaths, searchHandlerPaths); - metrics.forEach(metric -> - statistics.computeIfAbsent(metric, __ -> new LongAdder()) - .increment()); + public void ignoreUserAgent(String agentName) { + ignoredUserAgents.add(agentName); + } + private Set<String> ignoredUserAgents = new HashSet<>(); + + private boolean shouldLogMetricsFor(Request request) { + String agent = request.getHeader(HttpHeader.USER_AGENT.toString()); + if (agent == null) return true; + return ! ignoredUserAgents.contains(agent); + } + + private void observeEndOfRequest(Request request, HttpServletResponse flushableResponse) throws IOException { + if (shouldLogMetricsFor(request)) { + var metrics = StatusCodeMetric.of(request, monitoringHandlerPaths, searchHandlerPaths); + metrics.forEach(metric -> + statistics.computeIfAbsent(metric, __ -> new LongAdder()) + .increment()); + } long live = inFlight.decrementAndGet(); FutureCallback shutdownCb = shutdown.get(); if (shutdownCb != null) { diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java index fca34f3bbd7..006d6cc84da 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java @@ -159,6 +159,9 @@ public class JettyHttpServer extends AbstractServerProvider { new HttpResponseStatisticsCollector(serverConfig.metric().monitoringHandlerPaths(), serverConfig.metric().searchHandlerPaths()); statisticsCollector.setHandler(gzipHandler); + for (String agent : serverConfig.metric().ignoredUserAgents()) { + statisticsCollector.ignoreUserAgent(agent); + } StatisticsHandler statisticsHandler = newStatisticsHandler(); statisticsHandler.setHandler(statisticsCollector); diff --git a/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def index db7322c76f2..7e1404bbc5e 100644 --- a/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def +++ b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def @@ -57,6 +57,9 @@ metric.monitoringHandlerPaths[] string # Paths that should be reported with search dimensions where applicable metric.searchHandlerPaths[] string +# User-agent names to ignore wrt statistics (crawlers etc) +metric.ignoredUserAgents[] string + # HTTP request headers that contain remote address accessLog.remoteAddressHeaders[] string |