Skip to content

Commit 2035d59

Browse files
committed
resolve comments
1 parent ab71745 commit 2035d59

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,10 @@ default boolean isEnableExtendedTracing() {
698698
default boolean isEnableApiTracing() {
699699
return false;
700700
}
701+
702+
default boolean isEnableServerSideTracing() {
703+
return false;
704+
}
701705
}
702706

703707
/**
@@ -711,6 +715,7 @@ private static class SpannerEnvironmentImpl implements SpannerEnvironment {
711715
"SPANNER_OPTIMIZER_STATISTICS_PACKAGE";
712716
private static final String SPANNER_ENABLE_EXTENDED_TRACING = "SPANNER_ENABLE_EXTENDED_TRACING";
713717
private static final String SPANNER_ENABLE_API_TRACING = "SPANNER_ENABLE_API_TRACING";
718+
private static final String SPANNER_ENABLE_SERVER_SIDE_TRACING = "SPANNER_ENABLE_SERVER_SIDE_TRACING";
714719

715720
private SpannerEnvironmentImpl() {}
716721

@@ -736,6 +741,11 @@ public boolean isEnableExtendedTracing() {
736741
public boolean isEnableApiTracing() {
737742
return Boolean.parseBoolean(System.getenv(SPANNER_ENABLE_API_TRACING));
738743
}
744+
745+
@Override
746+
public boolean isEnableServerSideTracing() {
747+
return Boolean.parseBoolean(System.getenv(SPANNER_ENABLE_SERVER_SIDE_TRACING));
748+
}
739749
}
740750

741751
/** Builder for {@link SpannerOptions} instances. */
@@ -801,7 +811,7 @@ public static class Builder
801811
private OpenTelemetry openTelemetry;
802812
private boolean enableApiTracing = SpannerOptions.environment.isEnableApiTracing();
803813
private boolean enableExtendedTracing = SpannerOptions.environment.isEnableExtendedTracing();
804-
private boolean enableServerSideTracing = false;
814+
private boolean enableServerSideTracing = SpannerOptions.environment.isEnableServerSideTracing();
805815

806816
private static String createCustomClientLibToken(String token) {
807817
return token + " " + ServiceOptions.getGoogApiClientLibName();
@@ -1502,6 +1512,7 @@ public static void enableOpenCensusTraces() {
15021512
*/
15031513
@ObsoleteApi(
15041514
"The OpenCensus project is deprecated. Use enableOpenTelemetryTraces to switch to OpenTelemetry traces")
1515+
@VisibleForTesting
15051516
public static void resetActiveTracingFramework() {
15061517
activeTracingFramework = null;
15071518
}

0 commit comments

Comments
 (0)