Repository navigation
feat(storage): add gcp.storage.client.response.body.size metric for read operations - #14747
nidhiii-27 wants to merge 6 commits into
Conversation
There was a problem hiding this comment.
Code Review
This pull request implements response body size tracking for the 'ReadObject' operation across both gRPC and JSON implementations of Google Cloud Storage, updating BaseStorageReadChannel, GrpcStorageImpl, StorageImpl, and StorageMetricsContext, along with adding corresponding unit tests. The review feedback suggests refactoring a long chain of excluded key checks in StorageMetricsContext into a static Set constant to improve maintainability, and replacing fully qualified class names with imports in the new test cases to enhance readability.
There was a problem hiding this comment.
Code Review
This pull request introduces tracking and recording of response body size metrics for "ReadObject" operations across both GRPC and JSON/HTTP storage implementations. It updates BaseStorageReadChannel, GrpcStorageImpl, and StorageImpl to capture the read or downloaded bytes and set them in the StorageMetricsContext, which now records the response body size metric. Corresponding unit tests are also added to StorageMetricsContextTest. The reviewer suggested avoiding the use of fully qualified class names in the new test cases to improve code readability, recommending importing them instead.
…se body size - Extract BODY_SIZE_EXCLUDED_KEYS and buildBodySizeAttributes(StorageClientMetrics) in StorageMetricsContext to deduplicate request/response body size attribute filtering. - Guard GrpcStorageImpl.readAllBytes response byte recording with error == null and move countBytes helper to the private helper section. - Wire GrpcStorageImpl.blobReadSession and BlobReadSessionAdapter to track delivered response bytes across all ReadProjectionConfig types and record gcp.storage.client.response.body.size on session close. - Track lastReadError in BaseStorageReadChannel so mid-stream read errors propagate to recordOperation on close while preserving partial read byte counts. - Replace inline FQCNs with imports in StorageMetricsContextTest and add unit tests for channel reads, StorageImpl, GrpcStorageImpl, and BlobReadSessionAdapter. [Generated-by: AI]
…rdResponseBodySize
…ge.operation on response.body.size [Generated-by: AI]
cpriti-os
left a comment
There was a problem hiding this comment.
Mostly looks good, left a few comments inline.
| return; | ||
| } | ||
| long respBytes = responseBytes.get(); | ||
| if ("ReadObject".equals(operationName) && respBytes > 0) { |
There was a problem hiding this comment.
Same as recordRequestBodySize in #14746: should we record 0 here too so empty reads show up in the histogram? The two tests asserting the metric is absent for 0 bytes would flip.
There was a problem hiding this comment.
Done! Updated recordResponseBodySize to record respBytes >= 0 so 0 B reads are included in the histogram, and updated the tests in StorageMetricsContextTest.
Co-authored by AI Agent
| protected final ReentrantLock lock; | ||
| @Nullable private final StorageMetricsContext metricsContext; | ||
| @Nullable private final StorageClientMetrics storageClientMetrics; | ||
| @Nullable private Throwable lastReadError; |
There was a problem hiding this comment.
#14698 already adds this field as lastOperationError at these same catch sites, can we rebase and reuse it instead of adding lastReadError? Also, is the reset to null on a successful read intentional? The session adapter keeps its last error sticky.
There was a problem hiding this comment.
Rebased onto #14698 to reuse lastOperationError, and removed the lastOperationError = null reset in BaseStorageReadChannel.read so the error remains sticky matching BlobReadSessionAdapter.
Co-authored by AI Agent
| public int read(ByteBuffer dst) throws IOException { | ||
| try { | ||
| int read = delegate.read(dst); | ||
| if (read > 0 && metricsContext != null) { |
There was a problem hiding this comment.
Is the metricsContext null check needed here? readAs only builds these wrappers when it is non-null.
There was a problem hiding this comment.
Done! Removed the redundant metricsContext != null checks inside wrapSeekableByteChannel and wrapScatteringByteChannel.
Co-authored by AI Agent
| Attributes.builder() | ||
| .put(StorageClientMetrics.KEY_RPC_SYSTEM_NAME, "grpc") | ||
| .put(StorageClientMetrics.KEY_SERVER_ADDRESS, "storage.googleapis.com") | ||
| .put(StorageClientMetrics.KEY_SERVER_PORT, 443L) |
There was a problem hiding this comment.
Nit: server.port isn't part of the metric schema (only server.address is), so can we drop it from this fixture rather than asserting it passes through? If it ever shows up in real base attributes the exporter would reject the series.
There was a problem hiding this comment.
Done! Dropped server.port from the test fixtures in StorageMetricsContextTest (and excluded KEY_SERVER_PORT in buildAttemptBaseAttributes).
Co-authored by AI Agent
…e-response-body-size [Generated-by: AI]
[Generated-by: AI]
Summary
This PR adds the
gcp.storage.client.response.body.sizemetric for read operations.Changes
StorageMetricsContext:gcp.storage.client.response.body.sizeinsiderecordOperation(...)whenoperationNameis"ReadObject"andresponseBytes > 0.BODY_SIZE_EXCLUDED_KEYSandbuildBodySizeAttributes(StorageClientMetrics)to share attribute filtering betweenrequest.body.sizeandresponse.body.size.BaseStorageReadChannel/BlobReadChannelV2/GrpcBlobReadChannel:BaseStorageReadChannel.read(ByteBuffer)viametricsContext.addResponseBytes(read).lastReadErroracrossread(ByteBuffer)so mid-stream errors are passed torecordOperation(...)onclose()while preserving partial byte counts.StorageImpl:readAllBytesanddownloadTo(usingCountingOutputStream.getCount()across retries without double-counting).GrpcStorageImpl&BlobReadSessionAdapter:GrpcStorageImpl.readAllBytes(whenerror == null) and accumulates written bytes inGrpcStorageImpl.downloadToviacountBytes.GrpcStorageImpl.blobReadSessionandBlobReadSessionAdapterto accumulate delivered bytes across allReadProjectionConfigtypes (asFutureBytes(),asFutureByteString(),asChannel(),asSeekableChannel()) and record the operation onclose()(or on session open failure).StorageMetricsContextTest:recordOperationattribute filtering,BaseStorageReadChannel(full read, partial read + early close, 0-byte close, mid-stream error),StorageImpl(readAllBytes,downloadTowith retries),BlobReadSessionAdapter(all projections and open failure), andGrpcStorageImpl(readAllBytes,downloadTo,blobReadSession).