suggested changes

Author: AgraVator

opentelemetry/src/main/java/io/grpc/opentelemetry/OpenTelemetryMetricsModule.java

@@ -436,29 +436,17 @@ void recordFinishedCall() {
 
       // Retry counts
       if (module.resource.clientCallRetriesCounter() != null) {
-
-        long retriesPerCall = 0;
-        long attempts = attemptsPerCall.get();
-        if (attempts > 0) {
-          retriesPerCall = attempts - 1;
-        }
-
+        long retriesPerCall = attemptsPerCall.get() - 1 >= 0 ? attemptsPerCall.get() - 1 : 0;
         if (retriesPerCall > 0) {
           module.resource.clientCallRetriesCounter().record(retriesPerCall, baseAttributes);
         }
       }
 
       // Hedge counts
       if (module.resource.clientCallHedgesCounter() != null) {
-
-        long hedgesPerCall = 0;
-        long attempts = hedgedAttemptsPerCall.get();
-        if (attempts > 0) {
-          hedgesPerCall = attempts - 1;
-        }
-
-        if (hedgesPerCall > 0) {
-          module.resource.clientCallHedgesCounter().record(hedgesPerCall, baseAttributes);
+        if (hedgedAttemptsPerCall.get() > 0) {
+          module.resource.clientCallHedgesCounter()
+              .record(hedgedAttemptsPerCall.get(), baseAttributes);
         }
       }
 

opentelemetry/src/main/java/io/grpc/opentelemetry/internal/OpenTelemetryConstants.java

@@ -49,12 +49,12 @@ public final class OpenTelemetryConstants {
           0L, 1024L, 2048L, 4096L, 16384L, 65536L, 262144L, 1048576L, 4194304L, 16777216L,
           67108864L, 268435456L, 1073741824L, 4294967296L);
 
-  public static final List<Long> RETRY_BUCKETS = ImmutableList.of(0L, 1L, 2L, 3L, 4L, 5L);
+  public static final List<Long> RETRY_BUCKETS = ImmutableList.of(1L, 2L, 3L, 4L, 5L);
 
   public static final List<Long> TRANSPARENT_RETRY_BUCKETS =
-      ImmutableList.of(0L, 1L, 2L, 3L, 4L, 5L, 10L);
+      ImmutableList.of(1L, 2L, 3L, 4L, 5L, 10L);
 
-  public static final List<Long> HEDGE_BUCKETS = ImmutableList.of(0L, 1L, 2L, 3L, 4L, 5L);
+  public static final List<Long> HEDGE_BUCKETS = ImmutableList.of(1L, 2L, 3L, 4L, 5L);
 
   private OpenTelemetryConstants() {
   }

opentelemetry/src/test/java/io/grpc/opentelemetry/OpenTelemetryMetricsModuleTest.java

@@ -1081,7 +1081,7 @@ public void recordAttemptMetrics_withHedgedCalls() {
                 .hasHistogramSatisfying(histogram -> histogram.hasPointsSatisfying(
                     point -> point
                         .hasCount(1)
-                        .hasSum(1)
+                        .hasSum(2)
                         .hasAttributes(finalAttributes))),
             metric -> assertThat(metric)
                 .hasName(CLIENT_CALL_RETRY_DELAY)