Derive aws sdk retry count from request count

trinodb · Jan 2, 2025 · c06f1e1 · c06f1e1
1 parent 1a4bdbf
commit c06f1e1
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/AwsSdkClientCoreStats.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/AwsSdkClientCoreStats.java
@@ -44,6 +44,7 @@ public final class AwsSdkClientCoreStats
 {
     private final CounterStat awsRequestCount = new CounterStat();
     private final CounterStat awsRetryCount = new CounterStat();
+    private final CounterStat awsHttpClientRetryCount = new CounterStat();
     private final CounterStat awsThrottleExceptions = new CounterStat();
     private final TimeStat awsRequestTime = new TimeStat(MILLISECONDS);
     private final TimeStat awsClientExecuteTime = new TimeStat(MILLISECONDS);
@@ -66,6 +67,13 @@ public CounterStat getAwsRetryCount()
         return awsRetryCount;
     }
 
+    @Managed
+    @Nested
+    public CounterStat getAwsHttpClientRetryCount()
+    {
+        return awsHttpClientRetryCount;
+    }
+
     @Managed
     @Nested
     public CounterStat getAwsThrottleExceptions()
@@ -134,12 +142,16 @@ public void collectMetrics(Request<?> request, Response<?> response)
 
             Number requestCounts = timingInfo.getCounter(RequestCount.name());
             if (requestCounts != null) {
-                stats.awsRequestCount.update(requestCounts.longValue());
+                long count = requestCounts.longValue();
+                stats.awsRequestCount.update(count);
+                if (count > 1) {
+                    stats.awsRetryCount.update(count - 1);
+                }
             }
 
-            Number retryCounts = timingInfo.getCounter(HttpClientRetryCount.name());
-            if (retryCounts != null) {
-                stats.awsRetryCount.update(retryCounts.longValue());
+            Number httpClientRetryCounts = timingInfo.getCounter(HttpClientRetryCount.name());
+            if (httpClientRetryCounts != null) {
+                stats.awsHttpClientRetryCount.update(httpClientRetryCounts.longValue());
             }
 
             Number throttleExceptions = timingInfo.getCounter(ThrottleException.name());

diff --git a/...rino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/v1/AwsSdkClientCoreStats.java b/...rino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/v1/AwsSdkClientCoreStats.java
@@ -44,6 +44,7 @@ public final class AwsSdkClientCoreStats
 {
     private final CounterStat awsRequestCount = new CounterStat();
     private final CounterStat awsRetryCount = new CounterStat();
+    private final CounterStat awsHttpClientRetryCount = new CounterStat();
     private final CounterStat awsThrottleExceptions = new CounterStat();
     private final TimeStat awsRequestTime = new TimeStat(MILLISECONDS);
     private final TimeStat awsClientExecuteTime = new TimeStat(MILLISECONDS);
@@ -66,6 +67,13 @@ public CounterStat getAwsRetryCount()
         return awsRetryCount;
     }
 
+    @Managed
+    @Nested
+    public CounterStat getAwsHttpClientRetryCount()
+    {
+        return awsHttpClientRetryCount;
+    }
+
     @Managed
     @Nested
     public CounterStat getAwsThrottleExceptions()
@@ -134,12 +142,16 @@ public void collectMetrics(Request<?> request, Response<?> response)
 
             Number requestCounts = timingInfo.getCounter(RequestCount.name());
             if (requestCounts != null) {
-                stats.awsRequestCount.update(requestCounts.longValue());
+                long count = requestCounts.longValue();
+                stats.awsRequestCount.update(count);
+                if (count > 1) {
+                    stats.awsRetryCount.update(count - 1);
+                }
             }
 
-            Number retryCounts = timingInfo.getCounter(HttpClientRetryCount.name());
-            if (retryCounts != null) {
-                stats.awsRetryCount.update(retryCounts.longValue());
+            Number httpClientRetryCounts = timingInfo.getCounter(HttpClientRetryCount.name());
+            if (httpClientRetryCounts != null) {
+                stats.awsHttpClientRetryCount.update(httpClientRetryCounts.longValue());
             }
 
             Number throttleExceptions = timingInfo.getCounter(ThrottleException.name());