Updates after comments from Boris.

Author: ajcvickers

src/MongoDB.Driver/Core/Connections/CommandEventHelper.cs

@@ -36,9 +36,9 @@ internal class CommandEventHelper
         private readonly EventLogger<LogCategories.Command> _eventLogger;
         private ConcurrentDictionary<int, CommandState> _state;
 
-        private readonly bool _shouldProcessRequestMessages;
+        private readonly bool _eventsNeedBeforeSending;
         private readonly bool _shouldTrackStarted;
-        private readonly bool _shouldTrackState;
+        private readonly bool _eventsNeedState;
         private readonly bool _shouldTrackFailed;
         private readonly bool _shouldTrackSucceeded;
         private readonly bool _tracingDisabled;
@@ -57,26 +57,26 @@ public CommandEventHelper(EventLogger<LogCategories.Command> eventLogger, Tracin
             _tracingDisabled = tracingOptions?.Disabled == true;
             _queryTextMaxLength = tracingOptions?.QueryTextMaxLength ?? 0;
 
-            _shouldTrackState = _shouldTrackSucceeded || _shouldTrackFailed;
-            _shouldProcessRequestMessages = _shouldTrackStarted || _shouldTrackState;
+            _eventsNeedState = _shouldTrackSucceeded || _shouldTrackFailed;
+            _eventsNeedBeforeSending = _shouldTrackStarted || _eventsNeedState;
 
-            if (_shouldTrackState)
+            if (_eventsNeedState)
             {
                 // we only need to track state if we have to raise
                 // a succeeded or failed event or for tracing
                 _state = new ConcurrentDictionary<int, CommandState>();
             }
         }
 
-        public bool ShouldCallBeforeSending => _shouldProcessRequestMessages || ShouldTraceWithActivityListener();
+        public bool ShouldCallBeforeSending => _eventsNeedBeforeSending || ShouldTraceWithActivityListener();
 
-        public bool ShouldCallAfterSending => _shouldTrackState || ShouldTraceWithActivityListener();
+        public bool ShouldCallAfterSending => _eventsNeedState || ShouldTraceWithActivityListener();
 
-        public bool ShouldCallErrorSending => _shouldTrackState || ShouldTraceWithActivityListener();
+        public bool ShouldCallErrorSending => _eventsNeedState || ShouldTraceWithActivityListener();
 
-        public bool ShouldCallAfterReceiving => _shouldTrackState || ShouldTraceWithActivityListener();
+        public bool ShouldCallAfterReceiving => _eventsNeedState || ShouldTraceWithActivityListener();
 
-        public bool ShouldCallErrorReceiving => _shouldTrackState || ShouldTraceWithActivityListener();
+        public bool ShouldCallErrorReceiving => _eventsNeedState || ShouldTraceWithActivityListener();
 
         private bool ShouldTraceWithActivityListener()
             => !_tracingDisabled && MongoTelemetry.ActivitySource.HasListeners();
@@ -742,16 +742,12 @@ private void TrackCommandState(
         {
             var shouldTraceCommand = ShouldTraceWithActivityListener() && !shouldRedactCommand && !skipLogging;
 
-            if (!_shouldTrackState && !shouldTraceCommand)
+            if (!_eventsNeedState && !shouldTraceCommand)
             {
                 return;
             }
 
-            if (!_shouldTrackState && shouldTraceCommand)
-            {
-                // Lazy initialize state dictionary when tracing is needed but event tracking is not
-                _state ??= new ConcurrentDictionary<int, CommandState>();
-            }
+            _state ??= new ConcurrentDictionary<int, CommandState>();
 
             var commandState = new CommandState
             {

tests/MongoDB.Driver.Tests/Core/Connections/CommandEventHelperTests.cs

@@ -78,8 +78,8 @@ public void ShouldTrackState_should_be_correct(
             var tracingOptions = new TracingOptions { Disabled = true };
             var commandHelper = new CommandEventHelper(eventLogger, tracingOptions);
 
-            // No ActivityListener, so tracing doesn't contribute to _shouldTrackState
-            commandHelper._shouldTrackState().Should().Be(logCommands || captureCommandSucceeded || captureCommandFailed);
+            // No ActivityListener, so tracing doesn't contribute to _eventsNeedState
+            commandHelper._eventsNeedState().Should().Be(logCommands || captureCommandSucceeded || captureCommandFailed);
         }
 
         [Theory]
@@ -142,8 +142,8 @@ public void Callbacks_turn_on_when_listener_is_added_even_if_no_events(
 
     internal static class CommandEventHelperReflector
     {
-        public static bool _shouldTrackState(this CommandEventHelper commandEventHelper) =>
-            (bool)Reflector.GetFieldValue(commandEventHelper, nameof(_shouldTrackState));
+        public static bool _eventsNeedState(this CommandEventHelper commandEventHelper) =>
+            (bool)Reflector.GetFieldValue(commandEventHelper, nameof(_eventsNeedState));
 
 
         public static bool ShouldRedactCommand(BsonDocument command) =>

tests/SmokeTests/MongoDB.Driver.SmokeTests.Sdk/OpenTelemetryTests.cs

@@ -26,7 +26,6 @@ namespace MongoDB.Driver.SmokeTests.Sdk
     [Trait("Category", "Integration")]
     public sealed class OpenTelemetryTests
     {
-
         [Fact]
         public void MongoClient_should_create_activities_when_tracing_enabled()
         {