Fix issue: grpc-previous-rpc-attempts not added to initial response m…

…etadata
grpc · Nov 10, 2022 · 356626c · 356626c
1 parent eb1e5a1
commit 356626c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/src/main/java/io/grpc/internal/RetriableStream.java b/core/src/main/java/io/grpc/internal/RetriableStream.java
@@ -252,7 +252,7 @@ final Metadata updateHeaders(
       Metadata originalHeaders, int previousAttemptCount) {
     Metadata newHeaders = new Metadata();
     newHeaders.merge(originalHeaders);
-    if (previousAttemptCount > 0) {
+    if (previousAttemptCount >= 0) {
       newHeaders.put(GRPC_PREVIOUS_RPC_ATTEMPTS, String.valueOf(previousAttemptCount));
     }
     return newHeaders;

diff --git a/core/src/test/java/io/grpc/internal/RetriableStreamTest.java b/core/src/test/java/io/grpc/internal/RetriableStreamTest.java
@@ -1165,7 +1165,7 @@ public void updateHeaders() {
     Metadata originalHeaders = new Metadata();
     Metadata headers = retriableStream.updateHeaders(originalHeaders, 0);
     assertNotSame(originalHeaders, headers);
-    assertNull(headers.get(GRPC_PREVIOUS_RPC_ATTEMPTS));
+    assertEquals("0", headers.get(GRPC_PREVIOUS_RPC_ATTEMPTS));
 
     headers = retriableStream.updateHeaders(originalHeaders, 345);
     assertEquals("345", headers.get(GRPC_PREVIOUS_RPC_ATTEMPTS));