summaryrefslogtreecommitdiffstats
path: root/container-core
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@vespa.ai>2024-01-03 15:14:18 +0100
committerBjørn Christian Seime <bjorncs@vespa.ai>2024-01-03 15:14:20 +0100
commit425639a256a3722cca40bbfa8d7ea7b7ed228c2d (patch)
tree1708915fe89589c2435c23dc25d3a731280a4610 /container-core
parent6de274a61b95a228f8c6c15461e19516afa93069 (diff)
Disable metric reporter for tests taking manual snapshot
Ensure that metric reporter cannot reset response counters.
Diffstat (limited to 'container-core')
-rw-r--r--container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java5
-rw-r--r--container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ResponseMetricAggregatorTest.java2
2 files changed, 4 insertions, 3 deletions
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
index adb35db8ebf..1f5d38b3555 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
@@ -178,7 +178,7 @@ public class HttpServerTest {
var metricConsumer = new MetricConsumerMock();
JettyTestDriver driver = JettyTestDriver.newConfiguredInstance(
mockRequestHandler(),
- new ServerConfig.Builder(),
+ new ServerConfig.Builder().metric(new ServerConfig.Metric.Builder().reporterEnabled(false)),
new ConnectorConfig.Builder(),
binder -> binder.bind(MetricConsumer.class).toInstance(metricConsumer.mockitoMock()));
driver.client()
@@ -614,7 +614,8 @@ public class HttpServerTest {
@Test
void requireThatResponseStatsAreCollected() throws Exception {
RequestTypeHandler handler = new RequestTypeHandler();
- JettyTestDriver driver = JettyTestDriver.newInstance(handler);
+ var cfg = new ServerConfig.Builder().metric(new ServerConfig.Metric.Builder().reporterEnabled(false));
+ JettyTestDriver driver = JettyTestDriver.newConfiguredInstance(handler, cfg, new ConnectorConfig.Builder());
var statisticsCollector = ResponseMetricAggregator.getBean(driver.server());;
{
List<ResponseMetricAggregator.StatisticsEntry> stats = statisticsCollector.takeStatistics();
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ResponseMetricAggregatorTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ResponseMetricAggregatorTest.java
index 25a93849acb..7f355922b35 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ResponseMetricAggregatorTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ResponseMetricAggregatorTest.java
@@ -26,7 +26,7 @@ public class ResponseMetricAggregatorTest {
private final List<String> monitoringPaths = List.of("/status.html");
private final List<String> searchPaths = List.of("/search");
- private final ResponseMetricAggregator collector = new ResponseMetricAggregator(monitoringPaths, searchPaths, Set.of());
+ private final ResponseMetricAggregator collector = new ResponseMetricAggregator(monitoringPaths, searchPaths, Set.of(), false);
@BeforeEach
public void initializeCollector() {