Temporary remove the NetworkTimeout (#20860)

Azure · May 5, 2021 · 21f1f09 · 21f1f09
1 parent 8a30dbb
commit 21f1f09
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/sdk/core/Azure.Core/api/Azure.Core.net461.cs b/sdk/core/Azure.Core/api/Azure.Core.net461.cs
@@ -300,7 +300,6 @@ public HttpMessage(Azure.Core.Request request, Azure.Core.ResponseClassifier res
         public bool BufferResponse { get { throw null; } set { } }
         public System.Threading.CancellationToken CancellationToken { get { throw null; } }
         public bool HasResponse { get { throw null; } }
-        public System.TimeSpan? NetworkTimeout { get { throw null; } set { } }
         public Azure.Core.Request Request { get { throw null; } }
         public Azure.Response Response { get { throw null; } set { } }
         public Azure.Core.ResponseClassifier ResponseClassifier { get { throw null; } }

diff --git a/sdk/core/Azure.Core/api/Azure.Core.net5.0.cs b/sdk/core/Azure.Core/api/Azure.Core.net5.0.cs
@@ -300,7 +300,6 @@ public HttpMessage(Azure.Core.Request request, Azure.Core.ResponseClassifier res
         public bool BufferResponse { get { throw null; } set { } }
         public System.Threading.CancellationToken CancellationToken { get { throw null; } }
         public bool HasResponse { get { throw null; } }
-        public System.TimeSpan? NetworkTimeout { get { throw null; } set { } }
         public Azure.Core.Request Request { get { throw null; } }
         public Azure.Response Response { get { throw null; } set { } }
         public Azure.Core.ResponseClassifier ResponseClassifier { get { throw null; } }

diff --git a/sdk/core/Azure.Core/api/Azure.Core.netcoreapp2.1.cs b/sdk/core/Azure.Core/api/Azure.Core.netcoreapp2.1.cs
@@ -300,7 +300,6 @@ public HttpMessage(Azure.Core.Request request, Azure.Core.ResponseClassifier res
         public bool BufferResponse { get { throw null; } set { } }
         public System.Threading.CancellationToken CancellationToken { get { throw null; } }
         public bool HasResponse { get { throw null; } }
-        public System.TimeSpan? NetworkTimeout { get { throw null; } set { } }
         public Azure.Core.Request Request { get { throw null; } }
         public Azure.Response Response { get { throw null; } set { } }
         public Azure.Core.ResponseClassifier ResponseClassifier { get { throw null; } }

diff --git a/sdk/core/Azure.Core/api/Azure.Core.netstandard2.0.cs b/sdk/core/Azure.Core/api/Azure.Core.netstandard2.0.cs
@@ -300,7 +300,6 @@ public HttpMessage(Azure.Core.Request request, Azure.Core.ResponseClassifier res
         public bool BufferResponse { get { throw null; } set { } }
         public System.Threading.CancellationToken CancellationToken { get { throw null; } }
         public bool HasResponse { get { throw null; } }
-        public System.TimeSpan? NetworkTimeout { get { throw null; } set { } }
         public Azure.Core.Request Request { get { throw null; } }
         public Azure.Response Response { get { throw null; } set { } }
         public Azure.Core.ResponseClassifier ResponseClassifier { get { throw null; } }

diff --git a/sdk/core/Azure.Core/src/HttpMessage.cs b/sdk/core/Azure.Core/src/HttpMessage.cs
@@ -78,7 +78,7 @@ public Response Response
         /// Gets or sets the network timeout value for this message. If <c>null</c> the value provided in <see cref="RetryOptions.NetworkTimeout"/> would be used instead.
         /// Defaults to <c>null</c>.
         /// </summary>
-        public TimeSpan? NetworkTimeout { get; set; }
+        internal TimeSpan? NetworkTimeout { get; set; }
 
         /// <summary>
         /// Gets a property that modifies the pipeline behavior. Please refer to individual policies documentation on what properties it supports.

diff --git a/sdk/monitor/Azure.Monitor.Query/src/LogsClient.cs b/sdk/monitor/Azure.Monitor.Query/src/LogsClient.cs
@@ -176,10 +176,11 @@ private async Task<Response<LogsQueryResult>> ExecuteAsync(string workspaceId, s
             QueryBody queryBody = CreateQueryBody(query, timeRange, options, out string prefer);
             using var message = _queryClient.CreateExecuteRequest(workspaceId, queryBody, prefer);
 
-            if (options?.Timeout != null)
-            {
-                message.NetworkTimeout = options.Timeout;
-            }
+            // TODO: https://github.com/Azure/azure-sdk-for-net/issues/20859
+            // if (options?.Timeout != null)
+            // {
+            //     message.NetworkTimeout = options.Timeout;
+            // }
 
             if (async)
             {

diff --git a/sdk/monitor/Azure.Monitor.Query/tests/LogsQueryClientClientTests.cs b/sdk/monitor/Azure.Monitor.Query/tests/LogsQueryClientClientTests.cs
@@ -13,12 +13,14 @@ public class LogsQueryClientClientTests
         public void CanSetServiceTimeout_Mocked()
         {
             string preferHeader = null;
-            TimeSpan? networkOverride = default;
+            // TODO: https://github.com/Azure/azure-sdk-for-net/issues/20859
+            // TimeSpan? networkOverride = default;
 
             var mockTransport = MockTransport.FromMessageCallback(message =>
             {
                 Assert.True(message.Request.Headers.TryGetValue("prefer", out preferHeader));
-                networkOverride = message.NetworkTimeout;
+                // TODO: https://github.com/Azure/azure-sdk-for-net/issues/20859
+                //networkOverride = message.NetworkTimeout;
 
                 return new MockResponse(500);
             });
@@ -34,7 +36,8 @@ public void CanSetServiceTimeout_Mocked()
             }));
 
             Assert.AreEqual("wait=600", preferHeader);
-            Assert.AreEqual(TimeSpan.FromMinutes(10), networkOverride);
+            // TODO: https://github.com/Azure/azure-sdk-for-net/issues/20859
+            //Assert.AreEqual(TimeSpan.FromMinutes(10), networkOverride);
         }
     }
 }