From 2f04130af78e12180dd885974f0a6f7272115dfe Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Tue, 19 Aug 2025 09:02:54 +0200 Subject: [PATCH] Support prometheus metrics - add micrometer-registry-prometheus dep and test that /actuator/prometheus endpoint is available Issue-ID: SO-4231 Change-Id: I6010dbf3caa556c64db16bc912730e1318afe539 Signed-off-by: Fiete Ostkamp --- so-cnf-adapter-application/pom.xml | 4 ++ .../org/onap/so/adapters/cnf/rest/MetricsTest.java | 54 ++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/rest/MetricsTest.java diff --git a/so-cnf-adapter-application/pom.xml b/so-cnf-adapter-application/pom.xml index c11eedd..489f84b 100755 --- a/so-cnf-adapter-application/pom.xml +++ b/so-cnf-adapter-application/pom.xml @@ -158,6 +158,10 @@ org.apache.cxf cxf-spring-boot-starter-jaxrs + + io.micrometer + micrometer-registry-prometheus + org.apache.httpcomponents httpmime diff --git a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/rest/MetricsTest.java b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/rest/MetricsTest.java new file mode 100644 index 0000000..94530c7 --- /dev/null +++ b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/rest/MetricsTest.java @@ -0,0 +1,54 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2025 Deutsche Telekom. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.so.adapters.cnf.rest; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static org.hamcrest.Matchers.containsString; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.MockMvc; + +@SpringBootTest(properties = { + "management.metrics.export.prometheus.enabled=true", + "management.endpoints.web.exposure.include=prometheus", + "management.endpoint.prometheus.enabled=true", +}) +@AutoConfigureMockMvc +@RunWith(SpringRunner.class) +public class MetricsTest { + + @Autowired + private MockMvc mockMvc; + + @Test + public void prometheusEndpointShouldReturnMetrics() throws Exception { + mockMvc.perform(get("/actuator/prometheus")) + .andExpect(status().isOk()) // HTTP 200 OK + .andExpect(content().string(containsString("# HELP"))); // Prometheus metrics contain HELP header comments + } +} -- 2.16.6