Fixing tests

Author: nhachicha

driver-core/src/main/com/mongodb/internal/observability/micrometer/TransactionSpan.java

@@ -31,7 +31,6 @@ public class TransactionSpan {
 
     public TransactionSpan(final TracingManager tracingManager) {
         this.span = tracingManager.addTransactionSpan();
-        this.span.openScope();
     }
 
     /**
@@ -113,4 +112,12 @@ public void setIsConvenientTransaction() {
     public TraceContext getContext() {
         return span.context();
     }
+
+    /**
+     * Opens a scope for the transaction span, making it the current observation on the thread.
+     * Must only be called from the sync driver where open and close happen on the same thread.
+     */
+    public void openScope() {
+        span.openScope();
+    }
 }

driver-sync/src/main/com/mongodb/client/internal/ClientSessionImpl.java

@@ -178,6 +178,7 @@ private void startTransaction(final TransactionOptions transactionOptions, final
 
         if (tracingManager.isEnabled()) {
             transactionSpan = new TransactionSpan(tracingManager);
+            transactionSpan.openScope();
         }
         clearTransactionContext();
         setTimeoutContext(timeoutContext);

driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java

@@ -49,7 +49,6 @@
 import com.mongodb.lang.Nullable;
 import com.mongodb.logging.TestLoggingInterceptor;
 import com.mongodb.observability.ObservabilitySettings;
-import io.micrometer.observation.Observation;
 import io.micrometer.observation.ObservationRegistry;
 import io.micrometer.tracing.test.reporter.inmemory.InMemoryOtelSetup;
 import org.bson.BsonArray;
@@ -114,7 +113,6 @@ public final class Entities {
     private final Map<String, TestLoggingInterceptor> clientLoggingInterceptors = new HashMap<>();
     private final Map<String, InMemoryOtelSetup.Builder.OtelBuildingBlocks> clientTracing = new HashMap<>();
     private final Set<InMemoryOtelSetup> inMemoryOTelInstances = new HashSet<>();
-    private final Set<Observation.Scope> observationScopes = new HashSet<>();
     private final Map<String, TestConnectionPoolListener> clientConnectionPoolListeners = new HashMap<>();
     private final Map<String, TestServerListener> clientServerListeners = new HashMap<>();
     private final Map<String, TestClusterListener> clientClusterListeners = new HashMap<>();
@@ -596,11 +594,6 @@ private void initClient(final BsonDocument entity, final String id,
                     .observationRegistry(observationRegistry)
                     .enableCommandPayloadTracing(enableCommandPayload).build());
 
-            // Simulate what Spring Boot's observation does
-            // open a parent observation's scope before running the MongoDB operation
-            Observation parentObservation = Observation.createNotStarted("http.request", observationRegistry)
-                    .start();
-            observationScopes.add(parentObservation.openScope());
         }
 
         MongoClientSettings clientSettings = clientSettingsBuilder.build();
@@ -824,6 +817,5 @@ public void close() {
         clientLoggingInterceptors.values().forEach(TestLoggingInterceptor::close);
         threads.values().forEach(ExecutorService::shutdownNow);
         inMemoryOTelInstances.forEach(InMemoryOtelSetup::close);
-        observationScopes.forEach(Observation.Scope::close);
     }
 }

driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java

@@ -197,6 +197,10 @@ public static void applyCustomizations(final TestDef def) {
                 .test("client-side-operations-timeout", "timeoutMS can be configured on a MongoClient",
                         "timeoutMS can be set to 0 on a MongoClient - dropIndexes on collection");
 
+        // OpenTelemetry
+        def.skipNoncompliantReactive("withTransaction is not supported in the reactive driver unified test runner")
+                .file("open-telemetry/tests", "convenient transactions");
+
         // TODO-JAVA-5712
 
         // collection-management