From bb7e0111da2cafd5585b0ebebd8526f73c101cec Mon Sep 17 00:00:00 2001 From: Sydney Munro Date: Wed, 16 Oct 2024 10:28:01 -0700 Subject: [PATCH] linter --- .../google/cloud/storage/otel/NoOpOpenTelemetryInstance.java | 5 +++-- .../java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java | 5 ++--- .../java/com/google/cloud/storage/OpenTelemetryTest.java | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/otel/NoOpOpenTelemetryInstance.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/otel/NoOpOpenTelemetryInstance.java index 9e3c89504..417bd21a2 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/otel/NoOpOpenTelemetryInstance.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/otel/NoOpOpenTelemetryInstance.java @@ -30,8 +30,8 @@ public OpenTelemetryTraceUtil.Span startSpan(String spanName) { } @Override - public OpenTelemetryTraceUtil.Span startSpan(String spanName, - OpenTelemetryTraceUtil.Context parent) { + public OpenTelemetryTraceUtil.Span startSpan( + String spanName, OpenTelemetryTraceUtil.Context parent) { return new Span(); } @@ -82,6 +82,7 @@ public Scope makeCurrent() { return new Scope(); } } + static class Context implements OpenTelemetryTraceUtil.Context { @Override public Scope makeCurrent() { diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java index d74c01167..fdfec4619 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java @@ -360,8 +360,7 @@ private Span startSpan(String spanName) { @Override public Bucket create(Bucket bucket, Map options) { - OpenTelemetryTraceUtil.Span otelSpan = - openTelemetryTraceUtil.startSpan("create(Bucket,Map)"); + OpenTelemetryTraceUtil.Span otelSpan = openTelemetryTraceUtil.startSpan("create(Bucket,Map)"); Span span = startSpan(HttpStorageRpcSpans.SPAN_NAME_CREATE_BUCKET); Scope scope = tracer.withSpan(span); try (OpenTelemetryTraceUtil.Scope unused = otelSpan.makeCurrent()) { @@ -1832,4 +1831,4 @@ private static StorageException buildStorageException(int statusCode, String sta error.setMessage(statusMessage); return translate(error); } -} \ No newline at end of file +} diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/OpenTelemetryTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/OpenTelemetryTest.java index cd519a267..fe1164f7f 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/OpenTelemetryTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/OpenTelemetryTest.java @@ -71,8 +71,7 @@ public void checkInstrumentation() { @Test public void noOpDoesNothing() { - StorageOptions storageOptions = - StorageOptions.http().build(); + StorageOptions storageOptions = StorageOptions.http().build(); Storage storage = storageOptions.getService(); storage.create(BucketInfo.of(generator.randomBucketName())); }