Skip to content

Commit 2b9409b

Browse files
committed
combine enable/disable fn into single fn
1 parent d2fd1c8 commit 2b9409b

File tree

3 files changed

+20
-23
lines changed

3 files changed

+20
-23
lines changed

google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1408,22 +1408,13 @@ public Builder setEnableExtendedTracing(boolean enableExtendedTracing) {
14081408
}
14091409

14101410
/**
1411-
* Enable spanner server side tracing. Enabling this option will create the trace spans at the
1412-
* Spanner layer. By default, server side tracing is disabled. Enabling server side tracing
1413-
* requires OpenTelemetry to be set up properly. Simply enabling this option won't generate
1414-
* server side traces.
1411+
* Sets whether to enable Spanner server side tracing. Enabling this option will create the
1412+
* trace spans at the Spanner layer. By default, server side tracing is disabled. Enabling
1413+
* server side tracing requires OpenTelemetry to be set up properly. Simply enabling this option
1414+
* won't generate server side traces.
14151415
*/
1416-
public Builder enableServerSideTracing() {
1417-
this.enableServerSideTracing = true;
1418-
return this;
1419-
}
1420-
1421-
/**
1422-
* Disable spanner server side tracing. If server side is disabled, trace spans won't be created
1423-
* at the Spanner layer.
1424-
*/
1425-
public Builder disableServerSideTracing() {
1426-
this.enableServerSideTracing = false;
1416+
public Builder setEnableServerSideTracing(boolean enableServerSideTracing) {
1417+
this.enableServerSideTracing = enableServerSideTracing;
14271418
return this;
14281419
}
14291420

google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -738,13 +738,13 @@ public void testServerSideTracingEnablement() {
738738
assertTrue(
739739
SpannerOptions.newBuilder()
740740
.setProjectId("p")
741-
.enableServerSideTracing()
741+
.setEnableServerSideTracing(true)
742742
.build()
743743
.isServerSideTracingEnabled());
744744
assertFalse(
745745
SpannerOptions.newBuilder()
746746
.setProjectId("p")
747-
.disableServerSideTracing()
747+
.setEnableServerSideTracing(false)
748748
.build()
749749
.isServerSideTracingEnabled());
750750
}

google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpcTest.java

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,10 @@ public void testNewCallContextWithRouteToLeaderHeaderAndLarDisabled() {
493493
@Test
494494
public void testNewCallContextWithServerSideTracingHeader() {
495495
SpannerOptions options =
496-
SpannerOptions.newBuilder().setProjectId("some-project").enableServerSideTracing().build();
496+
SpannerOptions.newBuilder()
497+
.setProjectId("some-project")
498+
.setEnableServerSideTracing(true)
499+
.build();
497500
GapicSpannerRpc rpc = new GapicSpannerRpc(options, false);
498501
GrpcCallContext callContext =
499502
rpc.newCallContext(
@@ -514,7 +517,10 @@ public void testNewCallContextWithServerSideTracingHeader() {
514517
@Test
515518
public void testNewCallContextWithoutServerSideTracingHeader() {
516519
SpannerOptions options =
517-
SpannerOptions.newBuilder().setProjectId("some-project").disableServerSideTracing().build();
520+
SpannerOptions.newBuilder()
521+
.setProjectId("some-project")
522+
.setEnableServerSideTracing(false)
523+
.build();
518524
GapicSpannerRpc rpc = new GapicSpannerRpc(options, false);
519525
GrpcCallContext callContext =
520526
rpc.newCallContext(
@@ -530,7 +536,7 @@ public void testNewCallContextWithoutServerSideTracingHeader() {
530536
@Test
531537
public void testServerSideTracingHeaderWithEnabledTracing() {
532538
final SpannerOptions options =
533-
createSpannerOptions().toBuilder().enableServerSideTracing().build();
539+
createSpannerOptions().toBuilder().setEnableServerSideTracing(true).build();
534540
try (Spanner spanner = options.getService()) {
535541
final DatabaseClient databaseClient =
536542
spanner.getDatabaseClient(DatabaseId.of("[PROJECT]", "[INSTANCE]", "[DATABASE]"));
@@ -547,7 +553,7 @@ public void testServerSideTracingHeaderWithEnabledTracing() {
547553
@Test
548554
public void testServerSideTracingHeaderWithDisabledTracing() {
549555
final SpannerOptions options =
550-
createSpannerOptions().toBuilder().disableServerSideTracing().build();
556+
createSpannerOptions().toBuilder().setEnableServerSideTracing(false).build();
551557
try (Spanner spanner = options.getService()) {
552558
final DatabaseClient databaseClient =
553559
spanner.getDatabaseClient(DatabaseId.of("[PROJECT]", "[INSTANCE]", "[DATABASE]"));
@@ -644,7 +650,7 @@ public void testTraceContextHeaderWithOpenTelemetryAndServerSideTracingEnabled()
644650
createSpannerOptions()
645651
.toBuilder()
646652
.setOpenTelemetry(openTelemetry)
647-
.enableServerSideTracing()
653+
.setEnableServerSideTracing(true)
648654
.build();
649655
try (Spanner spanner = options.getService()) {
650656
final DatabaseClient databaseClient =
@@ -670,7 +676,7 @@ public void testTraceContextHeaderWithOpenTelemetryAndServerSideTracingDisabled(
670676
createSpannerOptions()
671677
.toBuilder()
672678
.setOpenTelemetry(openTelemetry)
673-
.disableServerSideTracing()
679+
.setEnableServerSideTracing(false)
674680
.build();
675681
try (Spanner spanner = options.getService()) {
676682
final DatabaseClient databaseClient =

0 commit comments

Comments
 (0)