update contracts

Azure · Sep 1, 2023 · fb3ae09 · fb3ae09
1 parent 26e4ca6
commit fb3ae09
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 8 deletions.
diff --git a/Microsoft.Azure.Cosmos.Samples/Tools/Benchmark/BenchmarkConfig.cs b/Microsoft.Azure.Cosmos.Samples/Tools/Benchmark/BenchmarkConfig.cs
@@ -220,16 +220,18 @@ internal Microsoft.Azure.Cosmos.CosmosClient CreateCosmosClient(string accountKe
                 MaxRetryAttemptsOnRateLimitedRequests = 0,
                 MaxRequestsPerTcpConnection = this.MaxRequestsPerTcpConnection,
                 MaxTcpConnectionsPerEndpoint = this.MaxTcpConnectionsPerEndpoint,
-                EnableClientTelemetry = this.EnableClientTelemetry 
+                CosmosClientTelemetryOptions = new Microsoft.Azure.Cosmos.CosmosClientTelemetryOptions()
+                {
+                    EnableSendingMetricsToService = this.EnableTelemetry,
+                    DisableDistributedTracing = !this.EnableDistributedTracing
+                }
             };
 
             if (!string.IsNullOrWhiteSpace(this.ConsistencyLevel))
             {
                 clientOptions.ConsistencyLevel = (Microsoft.Azure.Cosmos.ConsistencyLevel)Enum.Parse(typeof(Microsoft.Azure.Cosmos.ConsistencyLevel), this.ConsistencyLevel, ignoreCase: true);
             }
 
-            clientOptions.IsDistributedTracingEnabled = this.EnableDistributedTracing;
-
             return new Microsoft.Azure.Cosmos.CosmosClient(
                         this.EndPoint,
                         accountKey,

diff --git a/Microsoft.Azure.Cosmos.Samples/Tools/CTL/CTLConfig.cs b/Microsoft.Azure.Cosmos.Samples/Tools/CTL/CTLConfig.cs
@@ -130,7 +130,10 @@ internal CosmosClient CreateCosmosClient()
             CosmosClientOptions clientOptions = new CosmosClientOptions()
             {
                 ApplicationName = CTLConfig.UserAgentSuffix,
-                EnableClientTelemetry = this.EnableClientTelemetry
+                CosmosClientTelemetryOptions = new CosmosClientTelemetryOptions()
+                {
+                    EnableSendingMetricsToService = true,
+                }
             };
 
             if (this.UseGatewayMode)

diff --git a/Microsoft.Azure.Cosmos.Samples/Tools/CTL/Program.cs b/Microsoft.Azure.Cosmos.Samples/Tools/CTL/Program.cs
@@ -52,6 +52,12 @@ await scenario.InitializeAsync(
 
                     logger.LogInformation("Initialization completed.");
 
+                    if(client.ClientOptions.CosmosClientTelemetryOptions.EnableSendingMetricsToService) {
+                        logger.LogInformation("Telemetry is enabled for CTL.");
+                    } else {
+                        logger.LogInformation("Telemetry is disabled for CTL.");
+                    }
+
                     List<Task> tasks = new List<Task>
                     {
                         scenario.RunAsync(

diff --git a/...rTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.BulkOperationsAsync.xml b/...rTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.BulkOperationsAsync.xml
@@ -3969,9 +3969,14 @@
             maxRetryWaitTimeOnThrottledRequests: TimeSpan.FromSeconds(1),
             maxRetryAttemptsOnThrottledRequests: 3)
             .WithBulkExecution(true)
-            .WithDistributedTracingOptions(new DistributedTracingOptions()
+            .WithClientTelemetryOptions(new CosmosClientTelemetryOptions()
              {
-                 LatencyThresholdForDiagnosticEvent = TimeSpan.FromMilliseconds(0)
+                DisableDistributedTracing = false,
+                CosmosThresholdOptions = new CosmosThresholdOptions()
+                {
+                    PointOperationLatencyThreshold = TimeSpan.FromMilliseconds(0),
+                    NonPointOperationLatencyThreshold = TimeSpan.FromMilliseconds(0)
+                }
              })
             .WithTransportClientHandlerFactory(transportClient => new TransportClientWrapper(
                 transportClient,

diff --git a/...lineTest/TestBaseline/EndToEndTraceWriterBaselineTests.PointOperationsExceptionsAsync.xml b/...lineTest/TestBaseline/EndToEndTraceWriterBaselineTests.PointOperationsExceptionsAsync.xml
@@ -190,9 +190,14 @@
     Guid exceptionActivityId = Guid.NewGuid();
     using CosmosClient throttleClient = TestCommon.CreateCosmosClient(builder =>
         builder
-         .WithDistributedTracingOptions(new DistributedTracingOptions()
+        .WithClientTelemetryOptions(new CosmosClientTelemetryOptions()
          {
-             LatencyThresholdForDiagnosticEvent = TimeSpan.FromMilliseconds(0)
+            DisableDistributedTracing = false,
+            CosmosThresholdOptions = new CosmosThresholdOptions()
+            {
+                PointOperationLatencyThreshold = TimeSpan.FromMilliseconds(0),
+                NonPointOperationLatencyThreshold = TimeSpan.FromMilliseconds(0)
+            }
          })
         .WithThrottlingRetryOptions(
             maxRetryWaitTimeOnThrottledRequests: TimeSpan.FromSeconds(1),

diff --git a/.../BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.TypedPointOperationsAsync.xml b/.../BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.TypedPointOperationsAsync.xml
@@ -149,6 +149,14 @@
     <ATTRIBUTE key="tcp.sub_status_code">0</ATTRIBUTE>
     <ATTRIBUTE key="tcp.status_code">201</ATTRIBUTE>
   </ACTIVITY>
+  <ACTIVITY source="Azure.Cosmos.Request" operationName="RequestAsync" displayName="Read Database">
+    <ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
+    <ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.17.0</ATTRIBUTE>
+    <ATTRIBUTE key="tcp.uri">Some Value</ATTRIBUTE>
+    <ATTRIBUTE key="tcp.sub_status_code">0</ATTRIBUTE>
+    <ATTRIBUTE key="tcp.status_code">404</ATTRIBUTE>
+  </ACTIVITY>
+  <EVENT name="LatencyOverThreshold" />
   <EVENT name="LatencyOverThreshold" />
 </OTelActivities></Output>
   </Result>