WIP - updates

sdk/core/System.ClientModel/src/Internal/Logging/LoggingHandler.cs → sdk/core/System.ClientModel/src/Internal/Logging/PipelineLoggingHandler.cs

@@ -10,19 +10,22 @@
 
 namespace System.ClientModel.Internal;
 
-internal class LoggingHandler
+internal class PipelineLoggingHandler
 {
     private readonly ILogger _logger;
     private readonly PipelineMessageSanitizer _sanitizer;
-    private readonly ClientModelLogMessages _logMessages;
+    private readonly ClientModelLogMessages? _logMessages;
     private readonly bool _useILogger;
 
-    public LoggingHandler(ILogger logger, PipelineMessageSanitizer sanitizer)
+    public PipelineLoggingHandler(ILogger? logger, PipelineMessageSanitizer sanitizer)
     {
-        _logger = logger;
+        _logger = logger ?? NullLogger.Instance;
         _sanitizer = sanitizer;
-        _logMessages = new ClientModelLogMessages(logger, _sanitizer);
         _useILogger = logger is not NullLogger;
+        if (_useILogger)
+        {
+            _logMessages = new ClientModelLogMessages(_logger, _sanitizer);
+        }
     }
 
     /// <summary>
@@ -41,7 +44,7 @@ public void LogRequest(PipelineRequest request, string requestId, string? assemb
     {
         if (_useILogger)
         {
-            _logMessages.Request(requestId, request, assemblyName);
+            _logMessages?.Request(requestId, request, assemblyName);
         }
         else
         {
@@ -53,7 +56,7 @@ public void LogRequestContent(string requestId, byte[] content, Encoding? textEn
     {
         if (_useILogger)
         {
-            _logMessages.RequestContent(requestId, content, textEncoding);
+            _logMessages?.RequestContent(requestId, content, textEncoding);
         }
         else
         {
@@ -65,7 +68,7 @@ public void LogResponse(string requestId, PipelineResponse response, double seco
     {
         if (_useILogger)
         {
-            _logMessages.Response(requestId, response, seconds);
+            _logMessages?.Response(requestId, response, seconds);
         }
         else
         {
@@ -77,7 +80,7 @@ public void LogResponseContent(string requestId, byte[] content, Encoding? textE
     {
         if (_useILogger)
         {
-            _logMessages.ResponseContent(requestId, content, textEncoding);
+            _logMessages?.ResponseContent(requestId, content, textEncoding);
         }
         else
         {
@@ -89,7 +92,7 @@ public void LogResponseContentBlock(string requestId, int blockNumber, byte[] co
     {
         if (_useILogger)
         {
-            _logMessages.ResponseContentBlock(requestId, blockNumber, content, textEncoding);
+            _logMessages?.ResponseContentBlock(requestId, blockNumber, content, textEncoding);
         }
         else
         {
@@ -101,7 +104,7 @@ public void LogErrorResponse(string requestId, PipelineResponse response, double
     {
         if (_useILogger)
         {
-            _logMessages.ErrorResponse(requestId, response, seconds);
+            _logMessages?.ErrorResponse(requestId, response, seconds);
         }
         else
         {
@@ -113,7 +116,7 @@ public void LogErrorResponseContent(string requestId, byte[] content, Encoding?
     {
         if (_useILogger)
         {
-            _logMessages.ErrorResponseContent(requestId, content, textEncoding);
+            _logMessages?.ErrorResponseContent(requestId, content, textEncoding);
         }
         else
         {
@@ -125,7 +128,7 @@ public void LogErrorResponseContentBlock(string requestId, int blockNumber, byte
     {
         if (_useILogger)
         {
-            _logMessages.ErrorResponseContentBlock(requestId, blockNumber, content, textEncoding);
+            _logMessages?.ErrorResponseContentBlock(requestId, blockNumber, content, textEncoding);
         }
         else
         {
@@ -137,7 +140,7 @@ public void LogRequestRetrying(string requestId, int retryCount, double seconds)
     {
         if (_useILogger)
         {
-            _logMessages.RequestRetrying(requestId, retryCount, seconds);
+            _logMessages?.RequestRetrying(requestId, retryCount, seconds);
         }
         else
         {
@@ -149,7 +152,7 @@ public void LogResponseDelay(string requestId, double seconds)
     {
         if (_useILogger)
         {
-            _logMessages.ResponseDelay(requestId, seconds);
+            _logMessages?.ResponseDelay(requestId, seconds);
         }
         else
         {
@@ -164,7 +167,7 @@ public void LogExceptionResponse(string requestId, Exception exception)
 
         if (_useILogger && isLoggerEnabled)
         {
-            _logMessages.ExceptionResponse(requestId, exception);
+            _logMessages?.ExceptionResponse(requestId, exception);
         }
         else if (isEventSourceEnabled)
         {

sdk/core/System.ClientModel/src/Internal/Logging/PipelineMessageSanitizer.cs

@@ -48,7 +48,7 @@ public string SanitizeUrl(string url)
             return url;
         }
 
-#if NET5_0_OR_GREATER
+#if NET6_0_OR_GREATER
         int indexOfQuerySeparator = url.IndexOf('?', StringComparison.Ordinal);
 #else
         int indexOfQuerySeparator = url.IndexOf('?');

sdk/core/System.ClientModel/src/Internal/TrackingList.cs

@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace System.ClientModel.Internal;
+
+internal class TrackingList<T> : List<T>, IList<T>
+{
+    public TrackingList(IEnumerable<T> collection) : base(collection)
+    {
+    }
+
+    public bool HasChanged { get; private set; }
+
+    public new T this[int index]
+    {
+        get => base[index];
+        set
+        {
+            if (!EqualityComparer<T>.Default.Equals(base[index], value))
+            {
+                HasChanged = true;
+            }
+            base[index] = value;
+        }
+    }
+
+    public new void Add(T item)
+    {
+        base.Add(item);
+        HasChanged = true;
+    }
+
+    public new void Clear()
+    {
+        if (Count > 0)
+        {
+            HasChanged = true;
+        }
+        base.Clear();
+    }
+
+    public new bool Remove(T item)
+    {
+        if (base.Remove(item))
+        {
+            HasChanged = true;
+            return true;
+        }
+        return false;
+    }
+
+    public new void RemoveAt(int index)
+    {
+        if (index >= 0 && index < Count)
+        {
+            HasChanged = true;
+        }
+        base.RemoveAt(index);
+    }
+
+    public void AcceptChanges()
+    {
+        HasChanged = false;
+    }
+}

sdk/core/System.ClientModel/src/Message/PipelineMessage.cs

@@ -157,8 +157,6 @@ public void SetProperty(Type key, object? value) =>
 
     internal int RetryCount { get; set; }
 
-    internal string? LoggingCorrelationId { get; set; }
-
     /// <summary>
     /// Gets or sets the value indicating whether the response should be buffered
     /// in-memory by the pipeline. Defaults to true.

sdk/core/System.ClientModel/src/Message/PipelineRequest.cs

@@ -68,6 +68,11 @@ public BinaryContent? Content
     /// </summary>
     protected abstract BinaryContent? ContentCore { get; set; }
 
+    /// <summary>
+    /// The client request id to include in log entries.
+    /// </summary>
+    internal string? ClientRequestId { get; set; }
+
     /// <inheritdoc/>
     public abstract void Dispose();
 }

sdk/core/System.ClientModel/src/Message/PipelineResponse.cs

@@ -70,6 +70,11 @@ public abstract class PipelineResponse : IDisposable
     /// </remarks>
     public abstract BinaryData Content { get; }
 
+    /// <summary>
+    /// The client request id to include in log entries.
+    /// </summary>
+    internal string? ClientRequestId { get; set; }
+
     /// <summary>
     /// Transfer the contents of the response network stream from
     /// <see cref="ContentStream"/> to a buffered cache on this