Remove Dropwizard/Stagemonitor metrics related code and deps

Methods annotated with @timed now use Micrometers annotation. The @Gauge annotation has been remove without replacement for now. While configuration for the use of Micrometer's TimedAspect has been prepared, it is not yet active because of compatibility issues with compile-time weaving. See micrometer-metrics/micrometer#1149.
particify · Aug 4, 2019 · d436194 · d436194
1 parent 1c8c10c
commit d436194
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 42 deletions.
diff --git a/pom.xml b/pom.xml
@@ -407,11 +407,6 @@
 			<artifactId>swagger-annotations</artifactId>
 			<version>1.5.22</version>
 		</dependency>
-		<dependency>
-			<groupId>com.codahale.metrics</groupId>
-			<artifactId>metrics-annotation</artifactId>
-			<version>3.0.2</version>
-		</dependency>
 		<dependency>
 			<groupId>org.checkerframework</groupId>
 			<artifactId>checker-qual</artifactId>
@@ -453,6 +448,12 @@
 					<source>1.8</source>
 					<target>1.8</target>
 					<aspectLibraries>
+						<!-- Disabled for now, see https://github.com/micrometer-metrics/micrometer/issues/1149.
+						<aspectLibrary>
+							<groupId>io.micrometer</groupId>
+							<artifactId>micrometer-core</artifactId>
+						</aspectLibrary>
+						-->
 						<aspectLibrary>
 							<groupId>org.springframework</groupId>
 							<artifactId>spring-aspects</artifactId>

diff --git a/src/main/java/de/thm/arsnova/config/AppConfig.java b/src/main/java/de/thm/arsnova/config/AppConfig.java
@@ -37,7 +37,12 @@
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
-import org.springframework.context.annotation.*;
+import org.springframework.context.annotation.AdviceMode;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.aspectj.EnableSpringConfigured;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.env.Environment;

diff --git a/src/main/java/de/thm/arsnova/service/UserServiceImpl.java b/src/main/java/de/thm/arsnova/service/UserServiceImpl.java
@@ -18,7 +18,6 @@
 
 package de.thm.arsnova.service;
 
-import com.codahale.metrics.annotation.Gauge;
 import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -66,7 +65,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.Validator;
 import org.springframework.web.util.UriUtils;
-import org.stagemonitor.core.metrics.MonitorGauges;
 
 import de.thm.arsnova.config.properties.AuthenticationProviderProperties;
 import de.thm.arsnova.config.properties.SecurityProperties;
@@ -87,7 +85,6 @@
  * Performs all user related operations.
  */
 @Service
-@MonitorGauges
 public class UserServiceImpl extends DefaultEntityServiceImpl<UserProfile> implements UserService {
 
 	private static final int LOGIN_TRY_RESET_DELAY_MS = 30 * 1000;
@@ -324,7 +321,6 @@ public void removeUserIdFromMaps(final String userId) {
 	}
 
 	@Override
-	@Gauge
 	public int loggedInUsers() {
 		return userIdToRoomId.size();
 	}

diff --git a/src/main/java/de/thm/arsnova/websocket/ArsnovaSocketioServerImpl.java b/src/main/java/de/thm/arsnova/websocket/ArsnovaSocketioServerImpl.java
@@ -18,7 +18,6 @@
 
 package de.thm.arsnova.websocket;
 
-import com.codahale.metrics.annotation.Timed;
 import com.corundumstudio.socketio.AckRequest;
 import com.corundumstudio.socketio.Configuration;
 import com.corundumstudio.socketio.SocketConfig;
@@ -29,6 +28,7 @@
 import com.corundumstudio.socketio.listener.DisconnectListener;
 import com.corundumstudio.socketio.protocol.Packet;
 import com.corundumstudio.socketio.protocol.PacketType;
+import io.micrometer.core.annotation.Timed;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -153,7 +153,7 @@ public void startServer() {
 
 		server.addEventListener("setFeedback", Feedback.class, new DataListener<Feedback>() {
 			@Override
-			@Timed(name = "setFeedbackEvent.onData")
+			@Timed("setFeedbackEvent.onData")
 			public void onData(final SocketIOClient client, final Feedback data, final AckRequest ackSender) {
 				final String userId = userService.getUserIdToSocketId(client.getSessionId());
 				if (userId == null) {
@@ -177,7 +177,7 @@ public void onData(final SocketIOClient client, final Feedback data, final AckRe
 
 		server.addEventListener("setSession", Room.class, new DataListener<Room>() {
 			@Override
-			@Timed(name = "setSessionEvent.onData")
+			@Timed("setSessionEvent.onData")
 			public void onData(final SocketIOClient client, final Room room, final AckRequest ackSender) {
 				final String userId = userService.getUserIdToSocketId(client.getSessionId());
 				if (null == userId) {
@@ -211,7 +211,7 @@ public void onData(final SocketIOClient client, final Room room, final AckReques
 				Comment.class,
 				new DataListener<Comment>() {
 					@Override
-					@Timed(name = "readInterposedQuestionEvent.onData")
+					@Timed("readInterposedQuestionEvent.onData")
 					public void onData(
 							final SocketIOClient client,
 							final Comment comment,
@@ -244,7 +244,7 @@ public void onData(final SocketIOClient client, final String answerId, final Ack
 				ScoreOptions.class,
 				new DataListener<ScoreOptions>() {
 					@Override
-					@Timed(name = "setLearningProgressOptionsEvent.onData")
+					@Timed("setLearningProgressOptionsEvent.onData")
 					public void onData(
 							final SocketIOClient client, final ScoreOptions scoreOptions, final AckRequest ack) {
 						throw new UnsupportedOperationException("Not implemented.");
@@ -254,15 +254,15 @@ public void onData(
 
 		server.addConnectListener(new ConnectListener() {
 			@Override
-			@Timed
+			@Timed("onConnect")
 			public void onConnect(final SocketIOClient client) {
 
 			}
 		});
 
 		server.addDisconnectListener(new DisconnectListener() {
 			@Override
-			@Timed
+			@Timed("onDisconnect")
 			public void onDisconnect(final SocketIOClient client) {
 				if (
 						userService == null

diff --git a/src/main/java/org/stagemonitor/core/metrics/MonitorGauges.java b/src/main/java/org/stagemonitor/core/metrics/MonitorGauges.java
diff --git a/src/main/resources/META-INF/aop.xml b/src/main/resources/META-INF/aop.xml
@@ -9,5 +9,9 @@
 		<aspect name="de.thm.arsnova.web.RangeAspect"/>
 		<aspect name="de.thm.arsnova.web.InternalEntityAspect"/>
 		<aspect name="de.thm.arsnova.websocket.WebsocketAuthenticationAspect"/>
+		<!-- Micrometer does not have a aop.xml config for its aspects. -->
+		<!-- Disabled for now, see https://github.com/micrometer-metrics/micrometer/issues/1149.
+		<aspect name="io.micrometer.core.aop.TimedAspect"/>
+		-->
 	</aspects>
 </aspectj>