diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-05-12 14:28:26 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-05-12 14:28:26 +0200 |
commit | ed3560b3c448a1d6911a66f9f8703ff83823c91a (patch) | |
tree | c439766e1893dd2be3d57978ca5f51e38b1440d0 /container-core/src/test/java/com/yahoo/jdisc/http/server | |
parent | 18afc9cf39d86308f03330243d2f3d90f5d4fffe (diff) |
Add metric for requests per connection
Diffstat (limited to 'container-core/src/test/java/com/yahoo/jdisc/http/server')
-rw-r--r-- | container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java | 4 | ||||
-rw-r--r-- | container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java | 14 |
2 files changed, 17 insertions, 1 deletions
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java index df794c7ecb8..93261a2401f 100644 --- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java +++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java @@ -31,8 +31,10 @@ public class ConnectorFactoryTest { JettyConnectionLogger connectionLogger = new JettyConnectionLogger( new ServerConfig.ConnectionLog.Builder().enabled(false).build(), new VoidConnectionLog()); + DummyMetric metric = new DummyMetric(); + var connectionMetricAggregator = new ConnectionMetricAggregator(new ServerConfig(new ServerConfig.Builder()), metric); JDiscServerConnector connector = - (JDiscServerConnector)factory.createConnector(new DummyMetric(), server, connectionLogger); + (JDiscServerConnector)factory.createConnector(metric, server, connectionLogger, connectionMetricAggregator); server.addConnector(connector); server.setHandler(new HelloWorldHandler()); server.start(); 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 a5804dc9b86..5056cf91d79 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 @@ -917,6 +917,20 @@ public class HttpServerTest { assertThat(driver.close(), is(true)); } + @Test + public void requireThatRequestsPerConnectionMetricIsAggregated() throws IOException { + Path privateKeyFile = tmpFolder.newFile().toPath(); + Path certificateFile = tmpFolder.newFile().toPath(); + generatePrivateKeyAndCertificate(privateKeyFile, certificateFile); + var metricConsumer = new MetricConsumerMock(); + InMemoryConnectionLog connectionLog = new InMemoryConnectionLog(); + JettyTestDriver driver = createSslTestDriver(certificateFile, privateKeyFile, metricConsumer, connectionLog); + driver.client().get("/").expectStatusCode(is(OK)); + assertThat(driver.close(), is(true)); + verify(metricConsumer.mockitoMock(), atLeast(1)) + .set(MetricDefinitions.REQUESTS_PER_CONNECTION, 1L, MetricConsumerMock.STATIC_CONTEXT); + } + private ContentResponse sendJettyClientRequest(JettyTestDriver testDriver, Path certificateFile, Object tag) throws Exception { HttpClient client = createJettyHttpClient(certificateFile); |