Skip to content

chore: Migrate gsutil usage to gcloud storage #3521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
risha-vijayvargiya-22 wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −12
Open

chore: Migrate gsutil usage to gcloud storage #3521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions google-cloud-storage/src/main/java/com/google/cloud/storage/BlobId.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ public Long getGeneration() {
}

/**
* Returns this blob's Storage url which can be used with gsutil. If {@link #generation} is
* Returns this blob's Storage url which can be used with gcloud storage. If {@link #generation} is
* non-null it will not be included in the uri.
*/
public String toGsUtilUri() {
return "gs://" + bucket + "/" + name;
}

/**
* Returns this blob's Storage url which can be used with gsutil. If {@link #generation} is
* Returns this blob's Storage url which can be used with gcloud storage. If {@link #generation} is
* non-null it will be included in the uri
*
* @since 2.22.1
Expand Down
12 changes: 6 additions & 6 deletions ...ud-storage/src/main/java/com/google/cloud/storage/OtelMultipartUploadClientDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public CreateMultipartUploadResponse createMultipartUpload(CreateMultipartUpload
tracer
.spanBuilder("createMultipartUpload")
.setAttribute(
"gsutil.uri", String.format("gs://%s/%s", request.bucket(), request.key()))
"gcloud.storage.uri", String.format("gs://%s/%s", request.bucket(), request.key()))
.startSpan();
try (Scope ignore = span.makeCurrent()) {
return delegate.createMultipartUpload(request);
Expand All @@ -81,7 +81,7 @@ public ListPartsResponse listParts(ListPartsRequest request) {
tracer
.spanBuilder("listParts")
.setAttribute(
"gsutil.uri", String.format("gs://%s/%s", request.bucket(), request.key()))
"gcloud.storage.uri", String.format("gs://%s/%s", request.bucket(), request.key()))
.startSpan();
try (Scope ignore = span.makeCurrent()) {
return delegate.listParts(request);
Expand All @@ -100,7 +100,7 @@ public AbortMultipartUploadResponse abortMultipartUpload(AbortMultipartUploadReq
tracer
.spanBuilder("abortMultipartUpload")
.setAttribute(
"gsutil.uri", String.format("gs://%s/%s", request.bucket(), request.key()))
"gcloud.storage.uri", String.format("gs://%s/%s", request.bucket(), request.key()))
.startSpan();
try (Scope ignore = span.makeCurrent()) {
return delegate.abortMultipartUpload(request);
Expand All @@ -120,7 +120,7 @@ public CompleteMultipartUploadResponse completeMultipartUpload(
tracer
.spanBuilder("completeMultipartUpload")
.setAttribute(
"gsutil.uri", String.format("gs://%s/%s", request.bucket(), request.key()))
"gcloud.storage.uri", String.format("gs://%s/%s", request.bucket(), request.key()))
.startSpan();
try (Scope ignore = span.makeCurrent()) {
return delegate.completeMultipartUpload(request);
Expand All @@ -139,7 +139,7 @@ public UploadPartResponse uploadPart(UploadPartRequest request, RequestBody requ
tracer
.spanBuilder("uploadPart")
.setAttribute(
"gsutil.uri", String.format("gs://%s/%s", request.bucket(), request.key()))
"gcloud.storage.uri", String.format("gs://%s/%s", request.bucket(), request.key()))
.setAttribute("partNumber", request.partNumber())
.startSpan();
try (Scope ignore = span.makeCurrent()) {
Expand All @@ -158,7 +158,7 @@ public ListMultipartUploadsResponse listMultipartUploads(ListMultipartUploadsReq
Span span =
tracer
.spanBuilder("listMultipartUploads")
.setAttribute("gsutil.uri", String.format("gs://%s/", request.bucket()))
.setAttribute("gcloud.storage.uri", String.format("gs://%s/", request.bucket()))
.startSpan();
try (Scope ignore = span.makeCurrent()) {
return delegate.listMultipartUploads(request);
Expand Down
8 changes: 4 additions & 4 deletions google-cloud-storage/src/test/java/com/google/cloud/storage/ITOpenTelemetryMPUTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,26 +123,26 @@ public void checkMPUInstrumentation() throws Exception {
SpanData createSpan = spans.get(0);
assertThat(createSpan.getName())
.isEqualTo("com.google.cloud.storage.MultipartUploadClient/createMultipartUpload");
assertThat(createSpan.getAttributes().get(AttributeKey.stringKey("gsutil.uri")))
assertThat(createSpan.getAttributes().get(AttributeKey.stringKey("gcloud.storage.uri")))
.isEqualTo(String.format("gs://%s/%s", bucket.getName(), objectName));

SpanData uploadSpan = spans.get(1);
assertThat(uploadSpan.getName())
.isEqualTo("com.google.cloud.storage.MultipartUploadClient/uploadPart");
assertThat(uploadSpan.getAttributes().get(AttributeKey.stringKey("gsutil.uri")))
assertThat(uploadSpan.getAttributes().get(AttributeKey.stringKey("gcloud.storage.uri")))
.isEqualTo(String.format("gs://%s/%s", bucket.getName(), objectName));
assertThat(uploadSpan.getAttributes().get(AttributeKey.longKey("partNumber"))).isEqualTo(1);

SpanData completeSpan = spans.get(2);
assertThat(completeSpan.getName())
.isEqualTo("com.google.cloud.storage.MultipartUploadClient/completeMultipartUpload");
assertThat(completeSpan.getAttributes().get(AttributeKey.stringKey("gsutil.uri")))
assertThat(completeSpan.getAttributes().get(AttributeKey.stringKey("gcloud.storage.uri")))
.isEqualTo(String.format("gs://%s/%s", bucket.getName(), objectName));

SpanData listSpan = spans.get(3);
assertThat(listSpan.getName())
.isEqualTo("com.google.cloud.storage.MultipartUploadClient/listMultipartUploads");
assertThat(listSpan.getAttributes().get(AttributeKey.stringKey("gsutil.uri")))
assertThat(listSpan.getAttributes().get(AttributeKey.stringKey("gcloud.storage.uri")))
.isEqualTo(String.format("gs://%s/", bucket.getName()));
}
}
Loading