Merge branch 'master' into users/dibahlfi/HedgingCancellationTokenExc…

…petion

Microsoft.Azure.Cosmos/FaultInjection/src/FaultInjector.cs

@@ -7,7 +7,7 @@ namespace Microsoft.Azure.Cosmos.FaultInjection
     using System.Collections.Generic;
     using Microsoft.Azure.Documents.FaultInjection;
 
-    public class FaultInjector
+    public class FaultInjector : IFaultInjector
     {
         private readonly ChaosInterceptorFactory chaosInterceptorFactory;
 
@@ -48,5 +48,10 @@ internal IChaosInterceptorFactory GetChaosInterceptorFactory()
         {
             return this.chaosInterceptorFactory;
         }
+
+        IChaosInterceptorFactory IFaultInjector.GetChaosInterceptorFactory()
+        {
+            return this.chaosInterceptorFactory;
+        }
     }
 }

Microsoft.Azure.Cosmos/src/CosmosClient.cs

@@ -1438,6 +1438,8 @@ private int DecrementNumberOfActiveClients()
             // In case dispose is called multiple times. Check if at least 1 active client is there
             if (NumberOfActiveClients > 0)
             {
+                CosmosDbOperationMeter.RemoveInstanceCount(this.Endpoint);
+
                 return Interlocked.Decrement(ref NumberOfActiveClients);
             }
 

Microsoft.Azure.Cosmos/src/CosmosClientOptions.cs

@@ -12,7 +12,8 @@ namespace Microsoft.Azure.Cosmos
     using System.Net;
     using System.Net.Http;
     using System.Net.Security;
-    using System.Security.Cryptography.X509Certificates;
+    using System.Security.Cryptography.X509Certificates;
+    using Microsoft.Azure.Cosmos.FaultInjection;
     using Microsoft.Azure.Cosmos.Fluent;
     using Microsoft.Azure.Documents;
     using Microsoft.Azure.Documents.Client;
@@ -72,7 +73,8 @@ public class CosmosClientOptions
         private PortReuseMode? portReuseMode;
         private IWebProxy webProxy;
         private Func<HttpClient> httpClientFactory;
-        private string applicationName;
+        private string applicationName;
+        private IFaultInjector faultInjector;
 
         /// <summary>
         /// Creates a new CosmosClientOptions
@@ -898,6 +900,46 @@ internal Func<X509Certificate2, X509Chain, SslPolicyErrors, bool> GetServerCerti
         /// </summary>
         public CosmosClientTelemetryOptions CosmosClientTelemetryOptions { get; set; }
 
+        /// <summary>
+        /// Create a client with Fault Injection capabilities using the Cosmos DB Fault Injection Library.
+        /// </summary>
+        /// <example>
+        /// How to create a CosmosClient with Fault Injection capabilities.
+        /// <code language="c#">
+        /// <![CDATA[
+        /// FaultInjectionRule rule = new FaultInjectionRuleBuilder(
+        ///     id: "ruleId",
+        ///     condition: new FaultInjectionConditionBuilder()
+        ///         .WithRegion("East US")
+        ///         .Build(),
+        ///     result: new FaultInjectionResultBuilder.GetResultBuilder(FaultInjectionServerErrorType.ServiceUnavailable)
+        ///         .Build())
+        ///     .Build();
+        ///     
+        /// FaultInjector faultInjector = new FaultInjector(new List<FaultInjectionRule>() { rule });
+        /// 
+        /// CosmosClientOptions clientOptions = new CosmosClientOptions()
+        /// {
+        ///     FaultInjector = faultInjector
+        /// };
+        /// 
+        /// CosmosClient client = new CosmosClient("connection string", clientOptions);
+        /// ]]>
+        /// </code>
+        /// </example> 
+        public IFaultInjector FaultInjector
+        {
+            get => this.faultInjector;
+            set
+            {
+                this.faultInjector = value;
+                if (this.faultInjector != null)
+                {
+                    this.ChaosInterceptorFactory = this.faultInjector.GetChaosInterceptorFactory();
+                }
+            }
+        }
+
         internal IChaosInterceptorFactory ChaosInterceptorFactory { get; set; }
 
         internal void SetSerializerIfNotConfigured(CosmosSerializer serializer)

Microsoft.Azure.Cosmos/src/CosmosClientTelemetryOptions.cs

@@ -53,5 +53,13 @@ public class CosmosClientTelemetryOptions
         /// but has to beware that customer data may be shown when the later option is chosen. It's the user's responsibility to sanitize the queries if necessary.
         /// </summary>
         public QueryTextMode QueryTextMode { get; set; } = QueryTextMode.None;
+
+        /// <summary>
+        /// Indicates whether client-side metrics collection is enabled or disabled. 
+        /// When set to true, the application will capture and report client metrics such as request counts, latencies, errors, and other key performance indicators. 
+        /// If false, no metrics related to the client will be gathered or reported.
+        /// <remarks>Metrics data can be published to a monitoring system like Prometheus or Azure Monitor, depending on the configured metrics provider.</remarks>
+        /// </summary>
+        public bool IsClientMetricsEnabled { get; set; }
     }
 }

Microsoft.Azure.Cosmos/src/DocumentClient.cs

@@ -956,6 +956,13 @@ internal virtual void Initialize(Uri serviceEndpoint,
             // Loading VM Information (non blocking call and initialization won't fail if this call fails)
             VmMetadataApiHandler.TryInitialize(this.httpClient);
 
+            if (this.cosmosClientTelemetryOptions.IsClientMetricsEnabled)
+            {
+                CosmosDbOperationMeter.Initialize();
+
+                CosmosDbOperationMeter.AddInstanceCount(this.ServiceEndpoint);
+            }
+
             // Starting ClientTelemetry Job
             this.telemetryToServiceHelper = TelemetryToServiceHelper.CreateAndInitializeClientConfigAndTelemetryJob(this.clientId,
                                                                  this.ConnectionPolicy,

Microsoft.Azure.Cosmos/src/FaultInjection/IFaultInjector.cs

@@ -0,0 +1,16 @@
+//------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//------------------------------------------------------------
+namespace Microsoft.Azure.Cosmos.FaultInjection
+{
+    /// <summary>  
+    /// Interface for injecting faults into the Cosmos DB client operations.  
+    /// </summary>  
+    public interface IFaultInjector
+    {
+        /// <summary>  
+        /// Gets the chaosInterceptorFactory for client building  
+        /// </summary>  
+        internal IChaosInterceptorFactory GetChaosInterceptorFactory();
+    }
+}

Microsoft.Azure.Cosmos/src/Fluent/CosmosClientBuilder.cs

@@ -13,6 +13,7 @@ namespace Microsoft.Azure.Cosmos.Fluent
     using global::Azure;
     using global::Azure.Core;
     using Microsoft.Azure.Cosmos.Core.Trace;
+    using Microsoft.Azure.Cosmos.FaultInjection;
     using Microsoft.Azure.Documents;
     using Microsoft.Azure.Documents.Client;
 
@@ -755,6 +756,17 @@ internal CosmosClientBuilder WithFaultInjection(IChaosInterceptorFactory chaosIn
         {
             this.clientOptions.ChaosInterceptorFactory = chaosInterceptorFactory;
             return this;
+        }
+
+        /// <summary>
+        /// Enables SDK to inject fault. Used for testing applications.  
+        /// </summary>
+        /// <param name="faultInjector"></param>
+        /// <returns>>The <see cref="CosmosClientBuilder"/> object</returns>
+        public CosmosClientBuilder WithFaultInjection(IFaultInjector faultInjector)
+        {
+            this.clientOptions.ChaosInterceptorFactory = faultInjector.GetChaosInterceptorFactory();
+            return this;
         }
 
         /// <summary>

Microsoft.Azure.Cosmos/src/Handler/RequestInvokerHandler.cs

@@ -106,7 +106,9 @@ public override async Task<ResponseMessage> SendAsync(
                 && response.Content != null
                 && response.Content is not CloneableStream)
             {
-                response.Content = await StreamExtension.AsClonableStreamAsync(response.Content, default);
+                response.Content = await StreamExtension.AsClonableStreamAsync(
+                    mediaStream: response.Content,
+                    allowUnsafeDataAccess: true);
             }
 
             return response;