Replace smallrye metrics with micrometer

Author: pascalseeland

websocket-api-impl/pom.xml

@@ -41,10 +41,6 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-jsonb</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-smallrye-metrics</artifactId>
-    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-smallrye-health</artifactId>
@@ -91,8 +87,8 @@
       <artifactId>microprofile-config-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.microprofile.metrics</groupId>
-      <artifactId>microprofile-metrics-api</artifactId>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-micrometer-registry-prometheus</artifactId>
     </dependency>
     <dependency>
       <groupId>com.auth0</groupId>

websocket-api-impl/src/main/java/de/uni_stuttgart/tik/viplab/websocket_api/ComputationWebSocket.java

@@ -20,7 +20,7 @@
 import jakarta.websocket.Session;
 import jakarta.websocket.server.ServerEndpoint;
 
-import org.eclipse.microprofile.metrics.annotation.Counted;
+import io.micrometer.core.annotation.Counted;
 import org.slf4j.Logger;
 
 import com.auth0.jwt.interfaces.DecodedJWT;

websocket-api-impl/src/main/java/de/uni_stuttgart/tik/viplab/websocket_api/NotificationServiceImpl.java

@@ -6,13 +6,15 @@
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.function.Consumer;
 
+import jakarta.annotation.PostConstruct;
 import jakarta.enterprise.context.ApplicationScoped;
 
-import org.eclipse.microprofile.metrics.MetricUnits;
-import org.eclipse.microprofile.metrics.annotation.Gauge;
-import org.eclipse.microprofile.metrics.annotation.Timed;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Gauge;
+import io.micrometer.core.annotation.Timed;
 
 import io.quarkus.scheduler.Scheduled;
+import jakarta.inject.Inject;
 
 /**
  * This NotificationService handles WebSocket sessions and make it possible to
@@ -23,13 +25,22 @@
 public class NotificationServiceImpl implements NotificationService {
 	private ConcurrentHashMap<String, Set<Session>> subscriptions = new ConcurrentHashMap<>();
 
-	@Gauge(name= "topics-count", unit = MetricUnits.NONE)
+	@Inject
+	MeterRegistry registry;
+
+	@PostConstruct
+	public void init() {
+		Gauge.builder("topics-count", this, NotificationServiceImpl::getTopicCount)
+				.description("Number of subscriptions")
+				.register(registry);
+	}
+
 	public int getTopicCount() {
 		return subscriptions.size();
 	}
 
 	@Scheduled(every = "60s")
-	@Timed(name = "subscriptions-cleanup")
+	@Timed(value = "subscriptions-cleanup")
 	protected void cleanUpSubscriptions() {
 		this.subscriptions.forEach((topic, sessions) -> sessions.stream().filter(session -> !session.isOpen())
 				.forEach(session -> this.unsubscribe(topic, session)));

websocket-api-impl/src/main/java/de/uni_stuttgart/tik/viplab/websocket_api/validation/ParameterValidatorImpl.java

@@ -7,7 +7,7 @@
 
 import jakarta.enterprise.context.ApplicationScoped;
 
-import org.eclipse.microprofile.metrics.annotation.Timed;
+import io.micrometer.core.annotation.Timed;
 import org.json.JSONArray;
 
 import de.uni_stuttgart.tik.viplab.websocket_api.model.AnyValueParameter;
@@ -21,7 +21,7 @@ public class ParameterValidatorImpl implements ParameterValidator {
 	* Validate Parameters of mode any
 	* Input can be String, Number or Array of Numbers
 	*/
-	@Timed(name = "InputValidation", description = "A measure of how long it takes to perform the validation of the input.")
+	@Timed(value = "InputValidation", description = "A measure of how long it takes to perform the validation of the input.")
 	@Override
 	public boolean isValid(Object input, AnyValueParameter parameter) {
 		boolean valid = true;
@@ -76,7 +76,7 @@ public boolean isValid(Object input, AnyValueParameter parameter) {
 	* Validate Parameters of mode fixed
 	* Input can be Array or String
 	*/
-	@Timed(name = "InputValidation", description = "A measure of how long it takes to perform the validation of the input.")
+	@Timed(value = "InputValidation", description = "A measure of how long it takes to perform the validation of the input.")
 	@Override
 	public boolean isValid(Object input, FixedValueParameter parameter) {
 		boolean valid = true;