use totalBytes for test

Author: xinsong-cui

runtime/auth/aws-signing-common/api/aws-signing-common.api

@@ -14,6 +14,7 @@ public final class aws/smithy/kotlin/runtime/auth/awssigning/AwsChunkedByteReadC
 	public fun cancel (Ljava/lang/Throwable;)Z
 	public fun getAvailableForRead ()I
 	public fun getClosedCause ()Ljava/lang/Throwable;
+	public final fun getTotalBytesTransferred ()J
 	public fun isClosedForRead ()Z
 	public fun isClosedForWrite ()Z
 	public fun read (Laws/smithy/kotlin/runtime/io/SdkBuffer;JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -23,9 +24,8 @@ public final class aws/smithy/kotlin/runtime/auth/awssigning/AwsChunkedSource :
 	public fun <init> (Laws/smithy/kotlin/runtime/io/SdkSource;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigner;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningConfig;[BLaws/smithy/kotlin/runtime/http/DeferredHeaders;)V
 	public synthetic fun <init> (Laws/smithy/kotlin/runtime/io/SdkSource;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigner;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningConfig;[BLaws/smithy/kotlin/runtime/http/DeferredHeaders;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun close ()V
-	public final fun getContentBytesTransferred ()J
+	public final fun getTotalBytesTransferred ()J
 	public fun read (Laws/smithy/kotlin/runtime/io/SdkBuffer;J)J
-	public final fun setContentBytesTransferred (J)V
 }
 
 public final class aws/smithy/kotlin/runtime/auth/awssigning/AwsSignatureType : java/lang/Enum {

runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AwsChunkedByteReadChannel.kt

@@ -45,10 +45,32 @@ public class AwsChunkedByteReadChannel(
     override val availableForRead: Int
         get() = chunkReader.chunk.size.toInt() + delegate.availableForRead
 
+    /**
+     * Tracks the total bytes transferred, including chunk metadata.
+     */
+    private var totalBytesTransferred: Long = 0L
+
+    /**
+     * Gets the total bytes transferred for testing purposes only.
+     */
+    @InternalApi
+    public fun getTotalBytesTransferred(): Long = totalBytesTransferred
+
     override suspend fun read(sink: SdkBuffer, limit: Long): Long {
         require(limit >= 0L) { "Invalid limit ($limit) must be >= 0L" }
-        if (!chunkReader.ensureValidChunk()) return -1L
-        return chunkReader.chunk.read(sink, limit)
+
+        // Reset metadata bytes counter
+        chunkReader.chunkMetadataBytes = 0
+
+        if (!chunkReader.ensureValidChunk()) {
+            totalBytesTransferred = -1L
+            return -1L
+        }
+
+        totalBytesTransferred = chunkReader.chunk.read(sink, limit)
+
+        // Return the actual bytes excluding metadata
+        return totalBytesTransferred - chunkReader.chunkMetadataBytes
     }
 }
 

runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AwsChunkedSource.kt

@@ -41,26 +41,35 @@ public class AwsChunkedSource(
     )
 
     /**
-     * Tracks the content bytes transferred, excluding chunk metadata.
-     * This public property can be accessed to monitor file transfer progress.
+     * Tracks the total bytes transferred, including chunk metadata.
      */
-    public var contentBytesTransferred: Long = 0L
+    private var totalBytesTransferred: Long = 0L
+
+    /**
+     * Gets the total bytes transferred for testing purposes only.
+     */
+    @InternalApi
+    public fun getTotalBytesTransferred(): Long = totalBytesTransferred
 
     override fun read(sink: SdkBuffer, limit: Long): Long {
         require(limit >= 0L) { "Invalid limit ($limit) must be >= 0L" }
-        // COROUTINE SAFETY: runBlocking is allowed here because SdkSource is a synchronous blocking interface
 
-        // reset metadata bytes counter
+        // Reset metadata bytes counter
         chunkReader.chunkMetadataBytes = 0
+
+        // COROUTINE SAFETY: runBlocking is allowed here because SdkSource is a synchronous blocking interface
         val isChunkValid = runBlocking {
             chunkReader.ensureValidChunk()
         }
-        if (!isChunkValid) return -1L
+        if (!isChunkValid) {
+            totalBytesTransferred = -1L
+            return -1L
+        }
 
-        val totalBytesTransferred = chunkReader.chunk.read(sink, limit)
-        contentBytesTransferred = totalBytesTransferred - chunkReader.chunkMetadataBytes
+        totalBytesTransferred = chunkReader.chunk.read(sink, limit)
 
-        return totalBytesTransferred
+        // Return the actual bytes excluding metadata
+        return totalBytesTransferred - chunkReader.chunkMetadataBytes
     }
 
     override fun close() {

runtime/auth/aws-signing-tests/common/src/aws/smithy/kotlin/runtime/auth/awssigning/tests/AwsChunkedByteReadChannelTestBase.kt

@@ -42,16 +42,14 @@ abstract class AwsChunkedByteReadChannelTestBase : AwsChunkedTestBase(AwsChunked
 
         writeJob.invokeOnCompletion { cause -> chan.close(cause) }
 
-        val totalBytesExpected = encodedChunkLength(CHUNK_SIZE_BYTES) * (numChunks - 1) +
-            encodedChunkLength(CHUNK_SIZE_BYTES / 2) + encodedChunkLength(0) + "\r\n".length
         val sink = SdkBuffer()
 
         val bytesRead = awsChunked.readAll(sink)
         writeJob.join()
 
         val bytesAsString = sink.readUtf8()
 
-        assertEquals(totalBytesExpected.toLong(), bytesRead)
+        assertEquals(dataLengthBytes.toLong() , bytesRead)
         assertTrue(awsChunked.isClosedForRead)
 
         val chunkSignatures = getChunkSignatures(bytesAsString)

runtime/auth/aws-signing-tests/common/src/aws/smithy/kotlin/runtime/auth/awssigning/tests/AwsChunkedTestBase.kt

@@ -31,7 +31,12 @@ fun interface AwsChunkedReaderFactory {
             val chunked = AwsChunkedByteReadChannel(ch, signer, signingConfig, previousSignature, trailingHeaders)
             object : AwsChunkedTestReader {
                 override fun isClosedForRead(): Boolean = chunked.isClosedForRead
-                override suspend fun read(sink: SdkBuffer, limit: Long): Long = chunked.read(sink, limit)
+
+                // Override read function to track totalBytesTransferred for testing
+                override suspend fun read(sink: SdkBuffer, limit: Long): Long {
+                    chunked.read(sink, limit)
+                    return chunked.getTotalBytesTransferred()
+                }
             }
         }
     }

runtime/auth/aws-signing-tests/jvm/src/aws/smithy/kotlin/runtime/auth/awssigning/tests/AwsChunkedSourceTestBase.kt

@@ -18,7 +18,12 @@ val AwsChunkedReaderFactory.Companion.Source: AwsChunkedReaderFactory
                 val rc = chunked.read(sink, Long.MAX_VALUE)
                 return rc == -1L
             }
-            override suspend fun read(sink: SdkBuffer, limit: Long): Long = chunked.read(sink, limit)
+
+            // Override read function to track totalBytesTransferred for testing
+            override suspend fun read(sink: SdkBuffer, limit: Long): Long {
+                chunked.read(sink, limit)
+                return chunked.getTotalBytesTransferred()
+            }
         }
     }