WIP

Author: marcingrzejszczak

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>3.4.0-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data MongoDB</name>
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.7.0-GH-1617-SNAPSHOT</version>
+		<version>3.0.0-GH-1617-SNAPSHOT</version>
 	</parent>
 
 	<modules>
@@ -26,7 +26,7 @@
 	<properties>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
-		<springdata.commons>2.7.0-SNAPSHOT</springdata.commons>
+		<springdata.commons>3.0.0-SNAPSHOT</springdata.commons>
 		<mongo>4.4.1</mongo>
 		<mongo.reactivestreams>${mongo}</mongo.reactivestreams>
 		<jmh.version>1.19</jmh.version>

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MicrometerMongoCommandListener.java

@@ -58,7 +58,7 @@ public final class MicrometerMongoCommandListener implements CommandListener {
 
 	private final MeterRegistry registry;
 
-	MicrometerMongoCommandListener(MeterRegistry registry) {
+	public MicrometerMongoCommandListener(MeterRegistry registry) {
 		this.registry = registry;
 	}
 
@@ -89,9 +89,12 @@ private void setupObservability(CommandStartedEvent event, RequestContext reques
 		String commandName = event.getCommandName();
 		BsonDocument command = event.getCommand();
 		String collectionName = getCollectionName(command, commandName);
-		String metricName = getMetricName(commandName, collectionName);
-		Timer.Builder timerBuilder = Timer.builder(metricName);
+		Timer.Builder timerBuilder = Timer.builder("mongodb.command");
 		MongoHandlerContext mongoHandlerContext = new MongoHandlerContext(event) {
+			@Override public String getSimpleName() {
+				return getMetricName(commandName, collectionName);
+			}
+
 			@Override public Tags getLowCardinalityTags() {
 				Tags tags = Tags.empty();
 				if (collectionName != null) {
@@ -109,7 +112,8 @@ private void setupObservability(CommandStartedEvent event, RequestContext reques
 			}
 		};
 		Timer.Sample child = Timer.start(this.registry, mongoHandlerContext);
-		requestContext.put(mongoHandlerContext, MongoHandlerContext.class);
+		requestContext.put(Timer.Sample.class, child);
+		requestContext.put(MongoHandlerContext.class, mongoHandlerContext);
 		requestContext.put(Timer.Builder.class, timerBuilder);
 		if (log.isDebugEnabled()) {
 			log.debug("Created a child sample  [" + child

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoHandlerContext.java

@@ -21,7 +21,7 @@
 import com.mongodb.event.CommandSucceededEvent;
 import io.micrometer.core.instrument.Timer;
 
-public class MongoHandlerContext extends Timer.HandlerContext {
+public abstract class MongoHandlerContext extends Timer.HandlerContext {
 
 	private final CommandStartedEvent commandStartedEvent;
 
@@ -34,22 +34,24 @@ public MongoHandlerContext(CommandStartedEvent commandStartedEvent) {
 	}
 
 	public CommandStartedEvent getCommandStartedEvent() {
-		return commandStartedEvent;
+		return this.commandStartedEvent;
 	}
 
 	public CommandSucceededEvent getCommandSucceededEvent() {
-		return commandSucceededEvent;
+		return this.commandSucceededEvent;
 	}
 
 	public void setCommandSucceededEvent(CommandSucceededEvent commandSucceededEvent) {
 		this.commandSucceededEvent = commandSucceededEvent;
 	}
 
 	public CommandFailedEvent getCommandFailedEvent() {
-		return commandFailedEvent;
+		return this.commandFailedEvent;
 	}
 
 	public void setCommandFailedEvent(CommandFailedEvent commandFailedEvent) {
 		this.commandFailedEvent = commandFailedEvent;
 	}
+
+	public abstract String getSimpleName();
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoTracingRecordingHandler.java

@@ -79,11 +79,15 @@ private void setRemoteIpAndPort(CommandStartedEvent event, Span.Builder spanBuil
 	@Override public void onStop(Timer.Sample sample, MongoHandlerContext context, Timer timer, Duration duration) {
 		TracingContext tracingContext = getTracingContext(context);
 		Span span = tracingContext.getSpan();
-		span.name(timer.getId().getName());
+		span.name(context.getSimpleName());
 		tagSpan(context, timer.getId(), span);
 		span.end();
 	}
 
+	@Override public boolean supportsContext(Timer.HandlerContext context) {
+		return context instanceof MongoHandlerContext;
+	}
+
 	public boolean isSetRemoteIpAndPortEnabled() {
 		return this.setRemoteIpAndPortEnabled;
 	}