Merging back missing changes after rebase

nhachicha · nhachicha · commit 33d46e8ca5f8 · 2025-08-04T13:03:10.000+01:00
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorTest.java b/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorTest.java
@@ -32,6 +32,7 @@
 import com.mongodb.internal.binding.AsyncConnectionSource;
 import com.mongodb.internal.connection.AsyncConnection;
 import com.mongodb.internal.connection.OperationContext;
+import com.mongodb.internal.tracing.TracingManager;
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
@@ -96,6 +97,7 @@ void setUp() {
 
         connectionSource = mock(AsyncConnectionSource.class);
         operationContext = mock(OperationContext.class);
+        when(operationContext.getTracingManager()).thenReturn(TracingManager.NO_OP);
         timeoutContext = new TimeoutContext(TimeoutSettings.create(
                 MongoClientSettings.builder().timeout(TIMEOUT.toMillis(), MILLISECONDS).build()));
         serverDescription = mock(ServerDescription.class);
diff --git a/driver-core/src/test/unit/com/mongodb/MongoClientSettingsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/MongoClientSettingsSpecification.groovy
@@ -555,7 +555,7 @@ class MongoClientSettingsSpecification extends Specification {
                         'heartbeatConnectTimeoutMS', 'heartbeatSocketTimeoutMS', 'inetAddressResolver', 'loggerSettingsBuilder',
                         'readConcern', 'readPreference', 'retryReads',
                         'retryWrites', 'serverApi', 'serverSettingsBuilder', 'socketSettingsBuilder', 'sslSettingsBuilder',
-                        'timeoutMS', 'transportSettings', 'uuidRepresentation', 'writeConcern']
+                        'timeoutMS', 'tracer', 'transportSettings', 'uuidRepresentation', 'writeConcern']
 
         then:
         actual == expected
@@ -570,7 +570,7 @@ class MongoClientSettingsSpecification extends Specification {
                         'applyToSslSettings', 'autoEncryptionSettings', 'build', 'codecRegistry', 'commandListenerList',
                         'compressorList', 'contextProvider', 'credential', 'dnsClient', 'heartbeatConnectTimeoutMS',
                         'heartbeatSocketTimeoutMS', 'inetAddressResolver', 'readConcern', 'readPreference', 'retryReads', 'retryWrites',
-                        'serverApi', 'timeout', 'transportSettings', 'uuidRepresentation', 'writeConcern']
+                        'serverApi', 'timeout', 'tracer', 'transportSettings', 'uuidRepresentation', 'writeConcern']
 
         then:
         actual == expected
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncChangeStreamBatchCursorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncChangeStreamBatchCursorSpecification.groovy
@@ -22,6 +22,7 @@ import com.mongodb.internal.TimeoutContext
 import com.mongodb.internal.async.SingleResultCallback
 import com.mongodb.internal.binding.AsyncReadBinding
 import com.mongodb.internal.connection.OperationContext
+import com.mongodb.internal.tracing.TracingManager
 import org.bson.Document
 import spock.lang.Specification
 
@@ -34,6 +35,7 @@ class AsyncChangeStreamBatchCursorSpecification extends Specification {
         def changeStreamOpertation = Stub(ChangeStreamOperation)
         def binding = Mock(AsyncReadBinding)
         def operationContext = Mock(OperationContext)
+        operationContext.getTracingManager() >> TracingManager.NO_OP
         def timeoutContext = Mock(TimeoutContext)
         binding.getOperationContext() >> operationContext
         operationContext.getTimeoutContext() >> timeoutContext
@@ -78,6 +80,7 @@ class AsyncChangeStreamBatchCursorSpecification extends Specification {
         def changeStreamOpertation = Stub(ChangeStreamOperation)
         def binding = Mock(AsyncReadBinding)
         def operationContext = Mock(OperationContext)
+        operationContext.getTracingManager() >> TracingManager.NO_OP
         def timeoutContext = Mock(TimeoutContext)
         binding.getOperationContext() >> operationContext
         operationContext.getTimeoutContext() >> timeoutContext
@@ -111,6 +114,7 @@ class AsyncChangeStreamBatchCursorSpecification extends Specification {
         def changeStreamOpertation = Stub(ChangeStreamOperation)
         def binding = Mock(AsyncReadBinding)
         def operationContext = Mock(OperationContext)
+        operationContext.getTracingManager() >> TracingManager.NO_OP
         def timeoutContext = Mock(TimeoutContext)
         binding.getOperationContext() >> operationContext
         operationContext.getTimeoutContext() >> timeoutContext
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncCommandBatchCursorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncCommandBatchCursorSpecification.groovy
@@ -35,6 +35,7 @@ import com.mongodb.internal.async.SingleResultCallback
 import com.mongodb.internal.binding.AsyncConnectionSource
 import com.mongodb.internal.connection.AsyncConnection
 import com.mongodb.internal.connection.OperationContext
+import com.mongodb.internal.tracing.TracingManager
 import org.bson.BsonArray
 import org.bson.BsonDocument
 import org.bson.BsonInt32
@@ -524,6 +525,7 @@ class AsyncCommandBatchCursorSpecification extends Specification {
                     .build()
         }
         OperationContext operationContext = Mock(OperationContext)
+        operationContext.getTracingManager() >> TracingManager.NO_OP
         def timeoutContext = Spy(new TimeoutContext(TimeoutSettings.create(
                 MongoClientSettings.builder().timeout(3, TimeUnit.SECONDS).build())))
         operationContext.getTimeoutContext() >> timeoutContext
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorTest.java b/driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorTest.java
@@ -25,6 +25,7 @@
 import com.mongodb.internal.binding.ReadBinding;
 import com.mongodb.internal.connection.Connection;
 import com.mongodb.internal.connection.OperationContext;
+import com.mongodb.internal.tracing.TracingManager;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
 import org.bson.Document;
@@ -296,6 +297,7 @@ void setUp() {
         doNothing().when(timeoutContext).resetTimeoutIfPresent();
 
         operationContext = mock(OperationContext.class);
+        when(operationContext.getTracingManager()).thenReturn(TracingManager.NO_OP);
         when(operationContext.getTimeoutContext()).thenReturn(timeoutContext);
         connection = mock(Connection.class);
         when(connection.command(any(), any(), any(), any(), any(), any())).thenReturn(null);
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorSpecification.groovy
@@ -35,6 +35,7 @@ import com.mongodb.internal.TimeoutSettings
 import com.mongodb.internal.binding.ConnectionSource
 import com.mongodb.internal.connection.Connection
 import com.mongodb.internal.connection.OperationContext
+import com.mongodb.internal.tracing.TracingManager
 import org.bson.BsonArray
 import org.bson.BsonDocument
 import org.bson.BsonInt32
@@ -574,6 +575,7 @@ class CommandBatchCursorSpecification extends Specification {
                     .build()
         }
         OperationContext operationContext = Mock(OperationContext)
+        operationContext.getTracingManager() >> TracingManager.NO_OP
         def timeoutContext = Spy(new TimeoutContext(TimeoutSettings.create(
                 MongoClientSettings.builder().timeout(3, TimeUnit.SECONDS).build())))
         operationContext.getTimeoutContext() >> timeoutContext
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorTest.java b/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorTest.java
@@ -31,6 +31,7 @@
 import com.mongodb.internal.binding.ConnectionSource;
 import com.mongodb.internal.connection.Connection;
 import com.mongodb.internal.connection.OperationContext;
+import com.mongodb.internal.tracing.TracingManager;
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
@@ -94,6 +95,8 @@ void setUp() {
 
         connectionSource = mock(ConnectionSource.class);
         operationContext = mock(OperationContext.class);
+        when(operationContext.getTracingManager()).thenReturn(TracingManager.NO_OP);
+
         timeoutContext = new TimeoutContext(TimeoutSettings.create(
                 MongoClientSettings.builder().timeout(TIMEOUT.toMillis(), MILLISECONDS).build()));
         serverDescription = mock(ServerDescription.class);
diff --git a/driver-kotlin-coroutine/build.gradle.kts b/driver-kotlin-coroutine/build.gradle.kts
@@ -38,6 +38,7 @@ dependencies {
     integrationTestImplementation(project(path = ":bson", configuration = "testArtifacts"))
     integrationTestImplementation(project(path = ":driver-sync", configuration = "testArtifacts"))
     integrationTestImplementation(project(path = ":driver-core", configuration = "testArtifacts"))
+    integrationTestImplementation(libs.micrometer)
 }
 
 configureMavenPublication {
diff --git a/driver-kotlin-sync/build.gradle.kts b/driver-kotlin-sync/build.gradle.kts
@@ -32,6 +32,7 @@ dependencies {
     integrationTestImplementation(project(path = ":bson", configuration = "testArtifacts"))
     integrationTestImplementation(project(path = ":driver-sync", configuration = "testArtifacts"))
     integrationTestImplementation(project(path = ":driver-core", configuration = "testArtifacts"))
+    integrationTestImplementation(libs.micrometer)
 }
 
 configureMavenPublication {
diff --git a/driver-scala/src/test/scala/org/mongodb/scala/ApiAliasAndCompanionSpec.scala b/driver-scala/src/test/scala/org/mongodb/scala/ApiAliasAndCompanionSpec.scala
@@ -94,7 +94,8 @@ class ApiAliasAndCompanionSpec extends BaseSpec {
       "SyncClientEncryption",
       "BaseClientUpdateOptions",
       "BaseClientDeleteOptions",
-      "MongoBaseInterfaceAssertions"
+      "MongoBaseInterfaceAssertions",
+      "MicrometerTracer"
     )
     val scalaExclusions = Set(
       "BuildInfo",
diff --git a/driver-sync/src/test/functional/com/mongodb/client/tracing/ZipkinTracer.java b/driver-sync/src/test/functional/com/mongodb/client/tracing/ZipkinTracer.java
@@ -35,7 +35,7 @@
  * A utility class to create a Zipkin tracer using OpenTelemetry protocol, useful for visualizing spans in Zipkin UI
  * This tracer can be used to send spans to a Zipkin server.
  * <p>
- * Spans are visible in the Zipkin UI at <a href="http://localhost:9411">...</a>.
+ * Spans are visible in the Zipkin UI at <a href="http://localhost:9411">http://localhost:9411</a>.
  * <p>
  * To Start Zipkin server, you can use the following command:
  * <pre>{@code
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
@@ -66,6 +66,9 @@
 import com.mongodb.lang.NonNull;
 import com.mongodb.lang.Nullable;
 import com.mongodb.logging.TestLoggingInterceptor;
+import com.mongodb.tracing.MicrometerTracer;
+import io.micrometer.tracing.Tracer;
+import io.micrometer.tracing.test.simple.SimpleTracer;
 import org.bson.BsonArray;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
@@ -112,7 +115,7 @@ public final class Entities {
     private static final Set<String> SUPPORTED_CLIENT_ENTITY_OPTIONS = new HashSet<>(
             asList(
                     "id", "uriOptions", "serverApi", "useMultipleMongoses", "storeEventsAsEntities",
-                    "observeEvents", "observeLogMessages", "observeSensitiveCommands", "ignoreCommandMonitoringEvents"));
+                    "observeEvents", "observeLogMessages", "observeSensitiveCommands", "ignoreCommandMonitoringEvents", "tracing"));
     private final Set<String> entityNames = new HashSet<>();
     private final Map<String, ExecutorService> threads = new HashMap<>();
     private final Map<String, ArrayList<Future<?>>> tasks = new HashMap<>();
@@ -126,6 +129,7 @@ public final class Entities {
     private final Map<String, ClientEncryption> clientEncryptions = new HashMap<>();
     private final Map<String, TestCommandListener> clientCommandListeners = new HashMap<>();
     private final Map<String, TestLoggingInterceptor> clientLoggingInterceptors = new HashMap<>();
+    private final Map<String, Tracer> clientTracing = new HashMap<>();
     private final Map<String, TestConnectionPoolListener> clientConnectionPoolListeners = new HashMap<>();
     private final Map<String, TestServerListener> clientServerListeners = new HashMap<>();
     private final Map<String, TestClusterListener> clientClusterListeners = new HashMap<>();
@@ -294,6 +298,10 @@ public TestLoggingInterceptor getClientLoggingInterceptor(final String id) {
         return getEntity(id + "-logging-interceptor", clientLoggingInterceptors, "logging interceptor");
     }
 
+    public Tracer getClientTracer(final String id) {
+        return getEntity(id + "-tracing", clientTracing, "micrometer tracing");
+    }
+
     public TestConnectionPoolListener getConnectionPoolListener(final String id) {
         return getEntity(id + "-connection-pool-listener", clientConnectionPoolListeners, "connection pool listener");
     }
@@ -604,6 +612,22 @@ private void initClient(final BsonDocument entity, final String id,
             }
             clientSettingsBuilder.serverApi(serverApiBuilder.build());
         }
+
+        if (entity.containsKey("tracing")) {
+            boolean enableCommandPayload = entity.getDocument("tracing").get("enableCommandPayload", BsonBoolean.FALSE).asBoolean().getValue();
+            /* To enable Zipkin backend, uncomment the following lines and ensure you have the server started
+            (docker run -d -p 9411:9411 openzipkin/zipkin). The tests will fail but the captured spans will be
+             visible in the Zipkin UI at http://localhost:9411 for debugging purpose.
+             *
+             * Tracer tracer = ZipkinTracer.getTracer("UTR");
+             * putEntity(id + "-tracing", new SimpleTracer(), clientTracing);
+             */
+            Tracer tracer = new SimpleTracer();
+            putEntity(id + "-tracing", tracer, clientTracing);
+
+            clientSettingsBuilder.tracer(new MicrometerTracer(tracer, enableCommandPayload));
+        }
+
         MongoClientSettings clientSettings = clientSettingsBuilder.build();
 
         if (entity.containsKey("observeLogMessages")) {
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
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.unified;
+
+import org.junit.jupiter.params.provider.Arguments;
+
+import java.util.Collection;
+
+final class MicrometerTracingTest extends UnifiedSyncTest {
+    private static Collection<Arguments> data() {
+        return getTestData("tracing/tests");
+    }
+}
diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/MongoClusterSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/MongoClusterSpecification.groovy
@@ -28,6 +28,7 @@ import com.mongodb.internal.TimeoutSettings
 import com.mongodb.internal.client.model.changestream.ChangeStreamLevel
 import com.mongodb.internal.connection.Cluster
 import com.mongodb.internal.session.ServerSessionPool
+import com.mongodb.internal.tracing.TracingManager
 import org.bson.BsonDocument
 import org.bson.Document
 import org.bson.codecs.UuidCodec
@@ -258,6 +259,7 @@ class MongoClusterSpecification extends Specification {
     MongoClusterImpl createMongoCluster(final MongoClientSettings settings, final OperationExecutor operationExecutor) {
         new MongoClusterImpl(null, cluster, settings.codecRegistry, null, null,
                 originator, operationExecutor, settings.readConcern, settings.readPreference, settings.retryReads, settings.retryWrites,
-                null, serverSessionPool, TimeoutSettings.create(settings), settings.uuidRepresentation, settings.writeConcern)
+                null, serverSessionPool, TimeoutSettings.create(settings), settings.uuidRepresentation,
+                settings.writeConcern, TracingManager.NO_OP)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ dependencies {`
`38`	`38`	`integrationTestImplementation(project(path = ":bson", configuration = "testArtifacts"))`
`39`	`39`	`integrationTestImplementation(project(path = ":driver-sync", configuration = "testArtifacts"))`
`40`	`40`	`integrationTestImplementation(project(path = ":driver-core", configuration = "testArtifacts"))`
	`41`	`+ integrationTestImplementation(libs.micrometer)`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`configureMavenPublication {`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ dependencies {`
`32`	`32`	`integrationTestImplementation(project(path = ":bson", configuration = "testArtifacts"))`
`33`	`33`	`integrationTestImplementation(project(path = ":driver-sync", configuration = "testArtifacts"))`
`34`	`34`	`integrationTestImplementation(project(path = ":driver-core", configuration = "testArtifacts"))`
	`35`	`+ integrationTestImplementation(libs.micrometer)`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`configureMavenPublication {`