Skip to content

Commit f6b2b66

Browse files
committed
style: replace fully qualified names with imports in o11y logic
Cleaned up instances of fully qualified class references (LibraryMetadata, Strings, Nullable) by introducing proper Java import statements across GoldenSignalsMetricsRecorder and its associated tests.
1 parent 8af6e80 commit f6b2b66

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/GoldenSignalsMetricsRecorder.java

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,15 @@
2929
*/
3030
package com.google.api.gax.tracing;
3131

32+
import com.google.api.gax.rpc.LibraryMetadata;
3233
import io.opentelemetry.api.OpenTelemetry;
3334
import io.opentelemetry.api.metrics.DoubleHistogram;
3435
import io.opentelemetry.api.metrics.Meter;
36+
import io.opentelemetry.api.metrics.MeterBuilder;
37+
38+
import com.google.common.base.Strings;
39+
import javax.annotation.Nullable;
40+
3541
import java.util.Arrays;
3642
import java.util.List;
3743
import java.util.Map;
@@ -53,21 +59,21 @@ class GoldenSignalsMetricsRecorder {
5359
900.0, 3600.0);
5460
final DoubleHistogram clientRequestDurationRecorder;
5561

56-
@javax.annotation.Nullable
62+
@Nullable
5763
static GoldenSignalsMetricsRecorder create(
58-
OpenTelemetry openTelemetry, com.google.api.gax.rpc.LibraryMetadata libraryMetadata) {
59-
if (libraryMetadata == null || com.google.common.base.Strings.isNullOrEmpty(libraryMetadata.artifactName())) {
64+
OpenTelemetry openTelemetry, LibraryMetadata libraryMetadata) {
65+
if (libraryMetadata == null || Strings.isNullOrEmpty(libraryMetadata.artifactName())) {
6066
return null;
6167
}
6268
return new GoldenSignalsMetricsRecorder(openTelemetry, libraryMetadata);
6369
}
6470

6571
private GoldenSignalsMetricsRecorder(
66-
OpenTelemetry openTelemetry, com.google.api.gax.rpc.LibraryMetadata libraryMetadata) {
67-
io.opentelemetry.api.metrics.MeterBuilder meterBuilder =
72+
OpenTelemetry openTelemetry, LibraryMetadata libraryMetadata) {
73+
MeterBuilder meterBuilder =
6874
openTelemetry.meterBuilder(libraryMetadata.artifactName());
6975
String libraryVersion = libraryMetadata.version();
70-
if (!com.google.common.base.Strings.isNullOrEmpty(libraryVersion)) {
76+
if (!Strings.isNullOrEmpty(libraryVersion)) {
7177
meterBuilder.setInstrumentationVersion(libraryVersion);
7278
}
7379
Meter meter = meterBuilder.build();

sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/GoldenSignalsMetricsRecorderTest.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import static com.google.api.gax.tracing.GoldenSignalsMetricsRecorder.CLIENT_REQUEST_DURATION_METRIC_NAME;
3535
import static com.google.common.truth.Truth.assertThat;
3636

37+
import com.google.api.gax.rpc.LibraryMetadata;
3738
import com.google.common.collect.ImmutableMap;
3839
import io.opentelemetry.api.OpenTelemetry;
3940
import io.opentelemetry.api.common.AttributeKey;
@@ -65,7 +66,7 @@ void setUp() {
6566
recorder =
6667
GoldenSignalsMetricsRecorder.create(
6768
openTelemetry,
68-
com.google.api.gax.rpc.LibraryMetadata.newBuilder()
69+
LibraryMetadata.newBuilder()
6970
.setArtifactName(ARTIFACT_NAME)
7071
.setVersion("1.2.3")
7172
.build());
@@ -130,17 +131,17 @@ void create_shouldReturnNull_whenLibraryMetadataIsNull() {
130131

131132
@Test
132133
void create_shouldReturnNull_whenArtifactNameIsNull() {
133-
com.google.api.gax.rpc.LibraryMetadata metadata =
134-
com.google.api.gax.rpc.LibraryMetadata.newBuilder().setVersion("1.0.0").build();
134+
LibraryMetadata metadata =
135+
LibraryMetadata.newBuilder().setVersion("1.0.0").build();
135136
GoldenSignalsMetricsRecorder actual =
136137
GoldenSignalsMetricsRecorder.create(OpenTelemetry.noop(), metadata);
137138
assertThat(actual).isNull();
138139
}
139140

140141
@Test
141142
void create_shouldReturnNull_whenArtifactNameIsEmpty() {
142-
com.google.api.gax.rpc.LibraryMetadata metadata =
143-
com.google.api.gax.rpc.LibraryMetadata.newBuilder().setArtifactName("").build();
143+
LibraryMetadata metadata =
144+
LibraryMetadata.newBuilder().setArtifactName("").build();
144145
GoldenSignalsMetricsRecorder actual =
145146
GoldenSignalsMetricsRecorder.create(OpenTelemetry.noop(), metadata);
146147
assertThat(actual).isNull();

sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/GoldenSignalsMetricsTracerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void setUp() {
7070
new GoldenSignalsMetricsTracer(
7171
GoldenSignalsMetricsRecorder.create(
7272
openTelemetry,
73-
com.google.api.gax.rpc.LibraryMetadata.newBuilder()
73+
LibraryMetadata.newBuilder()
7474
.setArtifactName(ARTIFACT_NAME)
7575
.setVersion("1.2.3")
7676
.build()),

0 commit comments

Comments
 (0)