Skip to content

Commit 4840665

Browse files
committed
fix: address code quality issues
1 parent 761232d commit 4840665

3 files changed

Lines changed: 7 additions & 10 deletions

File tree

gax-java/gax/src/main/java/com/google/api/gax/tracing/SpanTracerFactory.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ public ApiTracer newTracer(ApiTracer parent, SpanName spanName, OperationType op
7373
// feature is developed.
7474
String attemptSpanName = spanName.getClientName() + "/" + spanName.getMethodName() + "/attempt";
7575

76-
SpanTracer spanTracer = new SpanTracer(tracer, this.apiTracerContext, attemptSpanName);
77-
return spanTracer;
76+
return new SpanTracer(tracer, this.apiTracerContext, attemptSpanName);
7877
}
7978

8079
@Override

gax-java/gax/src/test/java/com/google/api/gax/tracing/SpanTracerFactoryTest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import static com.google.common.truth.Truth.assertThat;
3434
import static org.mockito.ArgumentMatchers.any;
3535
import static org.mockito.ArgumentMatchers.anyString;
36-
import static org.mockito.ArgumentMatchers.eq;
3736
import static org.mockito.Mockito.atLeastOnce;
3837
import static org.mockito.Mockito.mock;
3938
import static org.mockito.Mockito.verify;
@@ -209,7 +208,7 @@ void testNewTracer_withContext_grpc_usesFullMethodName() {
209208

210209
tracerInstance.attemptStarted(null, 1);
211210

212-
verify(tracer).spanBuilder(eq("google.cloud.v1.Service/Method"));
211+
verify(tracer).spanBuilder("google.cloud.v1.Service/Method");
213212
}
214213

215214
@ParameterizedTest
@@ -235,7 +234,7 @@ void testNewTracer_withContext_http_usesHttpMethodAndPathTemplate(
235234

236235
tracerInstance.attemptStarted(null, 1);
237236

238-
verify(tracer).spanBuilder(eq(expectedSpanName));
237+
verify(tracer).spanBuilder(expectedSpanName);
239238
}
240239

241240
@Test
@@ -252,7 +251,7 @@ void testNewTracer_withContext_http_noHttpMethodOrPathTemplate_usesFullMethodNam
252251

253252
tracerInstance.attemptStarted(null, 1);
254253

255-
verify(tracer).spanBuilder(eq("google.cloud.v1.Service.Method"));
254+
verify(tracer).spanBuilder("google.cloud.v1.Service.Method");
256255
}
257256

258257
@Test
@@ -263,7 +262,7 @@ void testNewTracer_withSpanName_usesPlaceholder() {
263262

264263
tracerInstance.attemptStarted(null, 1);
265264

266-
verify(tracer).spanBuilder(eq("Service/Method/attempt"));
265+
verify(tracer).spanBuilder("Service/Method/attempt");
267266
}
268267

269268
@Test

gax-java/gax/src/test/java/com/google/api/gax/tracing/SpanTracerTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import static com.google.common.truth.Truth.assertThat;
3333
import static org.mockito.ArgumentMatchers.any;
3434
import static org.mockito.ArgumentMatchers.anyString;
35-
import static org.mockito.ArgumentMatchers.eq;
3635
import static org.mockito.Mockito.verify;
3736
import static org.mockito.Mockito.when;
3837

@@ -70,8 +69,8 @@ void testAttemptLifecycle_startsAndEndsAttemptSpan() {
7069
spanTracer.attemptStarted(new Object(), 1);
7170
spanTracer.attemptSucceeded();
7271

73-
verify(tracer).spanBuilder(eq(ATTEMPT_SPAN_NAME));
74-
verify(spanBuilder).setSpanKind(eq(SpanKind.CLIENT));
72+
verify(tracer).spanBuilder(ATTEMPT_SPAN_NAME);
73+
verify(spanBuilder).setSpanKind(SpanKind.CLIENT);
7574
verify(span).end();
7675
}
7776

0 commit comments

Comments
 (0)