PR feedback

Author: nhachicha

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

@@ -50,7 +50,7 @@ public KeyValues getLowCardinalityKeyValues(final MongodbObservationContext cont
         MongodbObservation observationType = context.getObservationType();
         if (observationType == null) {
             return KeyValues.empty();
-        } else if  (observationType == MongodbObservation.MONGODB_TRANSACTION) {
+        } else if (observationType == MongodbObservation.MONGODB_TRANSACTION) {
             return KeyValues.of(MongodbObservation.TransactionLowCardinalityKeyNames.SYSTEM.withValue("mongodb"));
         } else if (observationType == MongodbObservation.MONGODB_OPERATION) {
             return getOperationLowCardinalityKeyValues(context);

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

@@ -427,10 +427,10 @@ public <T> T execute(final ReadOperation<T, ?> operation, final ReadPreference r
             ReadBinding binding = getReadBinding(readPreference, actualClientSession, implicitSession);
             Span span = operationContext.getTracingManager().createOperationSpan(
                     actualClientSession.getTransactionSpan(), operationContext, operation.getCommandName(), operation.getNamespace());
-            if (span != null) {
-                span.openScope();
-            }
             try {
+                if (span != null) {
+                    span.openScope();
+                }
                 if (actualClientSession.hasActiveTransaction() && !binding.getReadPreference().equals(primary())) {
                     throw new MongoClientException("Read preference in a transaction must be primary");
                 }
@@ -465,10 +465,10 @@ public <T> T execute(final WriteOperation<T> operation, final ReadConcern readCo
             WriteBinding binding = getWriteBinding(actualClientSession, isImplicitSession(session));
             Span span = operationContext.getTracingManager().createOperationSpan(
                     actualClientSession.getTransactionSpan(), operationContext, operation.getCommandName(), operation.getNamespace());
-            if (span != null) {
-                span.openScope();
-            }
             try {
+                if (span != null) {
+                    span.openScope();
+                }
                 return operation.execute(binding, operationContext);
             } catch (MongoException e) {
                 MongoException exceptionToHandle = OperationHelper.unwrap(e);