Add metric for requests per connection

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);