Minimised logging for the retry handlers

Author: msrathore-db

csharp/src/Drivers/Databricks/RetryHttpHandler.cs

@@ -63,7 +63,6 @@ protected override async Task<HttpResponseMessage> SendAsync(
 
             HttpResponseMessage response;
             string? lastErrorMessage = null;
-            DateTime startTime = DateTime.UtcNow;
             int attemptCount = 0;
             int currentBackoffSeconds = _initialBackoffSeconds;
             int totalRetrySeconds = 0;
@@ -85,34 +84,15 @@ protected override async Task<HttpResponseMessage> SendAsync(
                     if (attemptCount > 0)
                     {
                         activity?.SetTag("http.retry.total_attempts", attemptCount);
-                        activity?.SetTag("http.retry.total_wait_seconds", totalRetrySeconds);
-                        activity?.SetTag("http.retry.total_elapsed_seconds",
-                            (DateTime.UtcNow - startTime).TotalSeconds);
                         activity?.SetTag("http.response.status_code", (int)response.StatusCode);
                     }
-                    return response; // Clean exit - no logging for normal success
-                }
-
-                // Retry path - log details when we first enter retry path
-                if (attemptCount == 0)
-                {
-                    activity?.SetTag("http.retry.max_timeout_seconds", _retryTimeoutSeconds);
-                    activity?.SetTag("http.request.uri", SanitizeUri(request.RequestUri));
-                    activity?.AddEvent("http.retry.start", [
-                        new("status_code", (int)response.StatusCode)
-                    ]);
+                    return response;
                 }
 
                 attemptCount++;
 
-                activity?.AddEvent("http.retry.attempt_failed", [
-                    new("attempt_number", attemptCount),
-                    new("status_code", (int)response.StatusCode)
-                ]);
-
-                // Check if we've exceeded the timeout
-                TimeSpan elapsedTime = DateTime.UtcNow - startTime;
-                if (_retryTimeoutSeconds > 0 && elapsedTime.TotalSeconds > _retryTimeoutSeconds)
+                // Check if we've exceeded the total wait time
+                if (_retryTimeoutSeconds > 0 && totalRetrySeconds > _retryTimeoutSeconds)
                 {
                     // We've exceeded the timeout, so break out of the loop
                     break;
@@ -129,39 +109,20 @@ protected override async Task<HttpResponseMessage> SendAsync(
                     {
                         // Use the Retry-After value
                         waitSeconds = retryAfterSeconds;
-                        activity?.AddEvent("http.retry.using_server_retry_after", [
-                            new("wait_seconds", waitSeconds),
-                            new("attempt_number", attemptCount)
-                        ]);
-                        activity?.SetTag("http.retry.backoff_strategy", "server_retry_after");
-                        lastErrorMessage = $"Service temporarily unavailable (HTTP {(int)response.StatusCode}). Using server-specified retry after {waitSeconds} seconds. Attempt {attemptCount}.";
+                        lastErrorMessage = $"Service temporarily unavailable (HTTP {(int)response.StatusCode}). Attempt {attemptCount}.";
                     }
                     else
                     {
                         // Invalid Retry-After value, use exponential backoff
                         waitSeconds = CalculateBackoffWithJitter(currentBackoffSeconds);
-                        activity?.AddEvent("http.retry.invalid_retry_after_header", [
-                            new("retry_after_value", retryAfterValue),
-                            new("fallback_strategy", "exponential_backoff")
-                        ]);
-                        activity?.AddEvent("http.retry.using_exponential_backoff", [
-                            new("wait_seconds", waitSeconds),
-                            new("attempt_number", attemptCount)
-                        ]);
-                        activity?.SetTag("http.retry.backoff_strategy", "exponential");
-                        lastErrorMessage = $"Service temporarily unavailable (HTTP {(int)response.StatusCode}). Invalid Retry-After header, using exponential backoff of {waitSeconds} seconds. Attempt {attemptCount}.";
+                        lastErrorMessage = $"Service temporarily unavailable (HTTP {(int)response.StatusCode}). Attempt {attemptCount}.";
                     }
                 }
                 else
                 {
                     // No Retry-After header, use exponential backoff
                     waitSeconds = CalculateBackoffWithJitter(currentBackoffSeconds);
-                    activity?.AddEvent("http.retry.using_exponential_backoff", [
-                        new("wait_seconds", waitSeconds),
-                        new("attempt_number", attemptCount)
-                    ]);
-                    activity?.SetTag("http.retry.backoff_strategy", "exponential");
-                    lastErrorMessage = $"Service temporarily unavailable (HTTP {(int)response.StatusCode}). Using exponential backoff of {waitSeconds} seconds. Attempt {attemptCount}.";
+                    lastErrorMessage = $"Service temporarily unavailable (HTTP {(int)response.StatusCode}). Attempt {attemptCount}.";
                 }
 
                 // Dispose the response before retrying
@@ -178,43 +139,24 @@ protected override async Task<HttpResponseMessage> SendAsync(
                     break;
                 }
 
-                activity?.AddEvent("http.retry.waiting", [
-                    new("wait_seconds", waitSeconds),
-                    new("attempt_number", attemptCount)
-                ]);
-
                 // Wait for the calculated time
                 await Task.Delay(TimeSpan.FromSeconds(waitSeconds), cancellationToken);
 
-                // Update metrics tags
-                activity?.SetTag("http.retry.attempt_count", attemptCount);
-                activity?.SetTag("http.retry.total_wait_seconds", totalRetrySeconds);
-
                 // Increase backoff for next attempt (exponential backoff)
                 currentBackoffSeconds = Math.Min(currentBackoffSeconds * 2, _maxBackoffSeconds);
             } while (!cancellationToken.IsCancellationRequested);
 
-            // Set final summary tags (only reached if retries exhausted)
             activity?.SetTag("http.retry.total_attempts", attemptCount);
-            activity?.SetTag("http.retry.total_elapsed_seconds",
-                (DateTime.UtcNow - startTime).TotalSeconds);
             activity?.SetTag("http.response.status_code", (int)response.StatusCode);
 
             // If we get here, we've either exceeded the timeout or been cancelled
             if (cancellationToken.IsCancellationRequested)
             {
-                activity?.AddEvent("http.retry.cancelled", [
-                    new("total_attempts", attemptCount)
-                ]);
                 activity?.SetTag("http.retry.outcome", "cancelled");
                 throw new OperationCanceledException("Request cancelled during retry wait", cancellationToken);
             }
 
             // Timeout exceeded
-            activity?.AddEvent("http.retry.timeout_exceeded", [
-                new("total_attempts", attemptCount),
-                new("configured_timeout_seconds", _retryTimeoutSeconds)
-            ]);
             activity?.SetTag("http.retry.outcome", "timeout_exceeded");
             throw new DatabricksException(lastErrorMessage ?? "Service temporarily unavailable and retry timeout exceeded", AdbcStatusCode.IOError)
                 .SetSqlState("08001");
@@ -264,14 +206,5 @@ private static async Task<HttpContent> CloneHttpContentAsync(HttpContent content
             return clone;
         }
 
-        /// <summary>
-        /// Sanitizes a URI for logging by removing query parameters and sensitive information.
-        /// </summary>
-        private static string SanitizeUri(Uri? uri)
-        {
-            if (uri == null) return "(null)";
-            // Return only scheme, host, port, and path
-            return $"{uri.Scheme}://{uri.Host}{(uri.IsDefaultPort ? "" : $":{uri.Port}")}{uri.AbsolutePath}";
-        }
     }
 }