From b1fa12ff78dd47c56f5becaacd89a81f748dcc8d Mon Sep 17 00:00:00 2001 From: Nabil Hachicha Date: Thu, 30 Apr 2026 12:28:37 +0100 Subject: [PATCH 1/2] Micrometer tests expect the network transport to be tcp --- .../com/mongodb/client/unified/UnifiedTestModifications.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java index c1c37576c2..ea71003c1e 100644 --- a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java +++ b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java @@ -16,6 +16,7 @@ package com.mongodb.client.unified; +import com.mongodb.ClusterFixture; import org.opentest4j.AssertionFailedError; import java.util.ArrayList; @@ -199,6 +200,9 @@ public static void applyCustomizations(final TestDef def) { // OpenTelemetry def.skipNoncompliantReactive("withTransaction is not supported in the reactive driver unified test runner") .file("open-telemetry/tests", "convenient transactions"); + def.skipAccordingToSpec("Micrometer tests expect the network transport to be tcp") + .when(ClusterFixture::isUnixSocket) + .directory("open-telemetry/tests"); // TODO-JAVA-5712 From e233e9e41f893b1e6b0425478b08ad75ff338929 Mon Sep 17 00:00:00 2001 From: Nabil Hachicha Date: Thu, 30 Apr 2026 18:58:20 +0100 Subject: [PATCH 2/2] Drop test databases between Micrometer tracing tests --- .../client/unified/MicrometerTracingTest.java | 9 +++++++++ .../functional/com/mongodb/client/unified/Entities.java | 6 ++++++ .../mongodb/client/unified/MicrometerTracingTest.java | 9 +++++++++ 3 files changed, 24 insertions(+) diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/unified/MicrometerTracingTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/unified/MicrometerTracingTest.java index bf2e6205ad..1ce8c84445 100644 --- a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/unified/MicrometerTracingTest.java +++ b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/unified/MicrometerTracingTest.java @@ -16,12 +16,21 @@ package com.mongodb.reactivestreams.client.unified; +import com.mongodb.client.unified.UnifiedTestModifications.TestDef; import org.junit.jupiter.params.provider.Arguments; import java.util.Collection; +import static com.mongodb.client.Fixture.getMongoClient; + final class MicrometerTracingTest extends UnifiedReactiveStreamsTest { private static Collection data() { return getTestData("open-telemetry/tests"); } + + @Override + protected void postCleanUp(final TestDef testDef) { + super.postCleanUp(testDef); + getEntities().getDatabaseNames().forEach(name -> getMongoClient().getDatabase(name).drop()); + } } diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java b/driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java index 954ea29142..cd95d0ef00 100644 --- a/driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java +++ b/driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java @@ -189,6 +189,12 @@ public MongoDatabase getDatabase(final String id) { return getEntity(id, databases, "database"); } + public Set getDatabaseNames() { + return databases.values().stream() + .map(MongoDatabase::getName) + .collect(Collectors.toSet()); + } + public boolean hasCollection(final String id) { return collections.containsKey(id); } diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/MicrometerTracingTest.java b/driver-sync/src/test/functional/com/mongodb/client/unified/MicrometerTracingTest.java index 8c65317d25..3f37bcedbd 100644 --- a/driver-sync/src/test/functional/com/mongodb/client/unified/MicrometerTracingTest.java +++ b/driver-sync/src/test/functional/com/mongodb/client/unified/MicrometerTracingTest.java @@ -16,12 +16,21 @@ package com.mongodb.client.unified; +import com.mongodb.client.unified.UnifiedTestModifications.TestDef; import org.junit.jupiter.params.provider.Arguments; import java.util.Collection; +import static com.mongodb.client.Fixture.getMongoClient; + final class MicrometerTracingTest extends UnifiedSyncTest { private static Collection data() { return getTestData("open-telemetry/tests"); } + + @Override + protected void postCleanUp(final TestDef testDef) { + super.postCleanUp(testDef); + getEntities().getDatabaseNames().forEach(name -> getMongoClient().getDatabase(name).drop()); + } }