Skip to content

Commit 24d6819

Browse files
committed
changed the host env variable
1 parent 8ad2163 commit 24d6819

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ protected SpannerOptions(Builder builder) {
673673
enableExtendedTracing = builder.enableExtendedTracing;
674674
enableBuiltInMetrics = builder.enableBuiltInMetrics;
675675
enableEndToEndTracing = builder.enableEndToEndTracing;
676-
metricsHost = builder.metricsHost;
676+
metricsHost = builder.spannerMonitoringHost;
677677
}
678678

679679
/**
@@ -715,7 +715,7 @@ default boolean isEnableEndToEndTracing() {
715715
return false;
716716
}
717717

718-
default String getMetricsHost() {
718+
default String getSpannerMonitoringHost() {
719719
return null;
720720
}
721721
}
@@ -734,7 +734,7 @@ private static class SpannerEnvironmentImpl implements SpannerEnvironment {
734734
private static final String SPANNER_ENABLE_END_TO_END_TRACING =
735735
"SPANNER_ENABLE_END_TO_END_TRACING";
736736
private static final String SPANNER_DISABLE_BUILTIN_METRICS = "SPANNER_DISABLE_BUILTIN_METRICS";
737-
private static final String SPANNER_METRICS_HOST = "SPANNER_METRICS_HOST";
737+
private static final String SPANNER_MONITORING_HOST = "SPANNER_MONITORING_HOST";
738738

739739
private SpannerEnvironmentImpl() {}
740740

@@ -772,8 +772,8 @@ public boolean isEnableEndToEndTracing() {
772772
}
773773

774774
@Override
775-
public String getMetricsHost() {
776-
return System.getenv(SPANNER_METRICS_HOST);
775+
public String getSpannerMonitoringHost() {
776+
return System.getenv(SPANNER_MONITORING_HOST);
777777
}
778778
}
779779

@@ -840,7 +840,7 @@ public static class Builder
840840
private boolean enableExtendedTracing = SpannerOptions.environment.isEnableExtendedTracing();
841841
private boolean enableEndToEndTracing = SpannerOptions.environment.isEnableEndToEndTracing();
842842
private boolean enableBuiltInMetrics = SpannerOptions.environment.isEnableBuiltInMetrics();
843-
private String metricsHost = SpannerOptions.environment.getMetricsHost();
843+
private String spannerMonitoringHost = SpannerOptions.environment.getSpannerMonitoringHost();
844844

845845
private static String createCustomClientLibToken(String token) {
846846
return token + " " + ServiceOptions.getGoogApiClientLibName();
@@ -908,7 +908,7 @@ protected Builder() {
908908
this.enableExtendedTracing = options.enableExtendedTracing;
909909
this.enableBuiltInMetrics = options.enableBuiltInMetrics;
910910
this.enableEndToEndTracing = options.enableEndToEndTracing;
911-
this.metricsHost = options.metricsHost;
911+
this.spannerMonitoringHost = options.metricsHost;
912912
}
913913

914914
@Override
@@ -1432,8 +1432,8 @@ public Builder setBuiltInMetricsEnabled(boolean enableBuiltInMetrics) {
14321432
}
14331433

14341434
/** Sets the metrics host to be used for Built-in client side metrics */
1435-
public Builder setMetricsHost(String metricsHost) {
1436-
this.metricsHost = metricsHost;
1435+
public Builder setSpannerMonitoringHost(String spannerMonitoringHost) {
1436+
this.spannerMonitoringHost = spannerMonitoringHost;
14371437
return this;
14381438
}
14391439

@@ -1775,7 +1775,7 @@ public boolean isEnableBuiltInMetrics() {
17751775
}
17761776

17771777
/** Returns the override metrics Host. */
1778-
String getMetricsHost() {
1778+
String getSpannerMonitoringHost() {
17791779
return metricsHost;
17801780
}
17811781

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -757,13 +757,13 @@ public void testEndToEndTracingEnablement() {
757757
@Test
758758
public void testMetricsHost() {
759759
String metricsEndpoint = "test-endpoint:443";
760-
assertNull(SpannerOptions.newBuilder().setProjectId("p").build().getMetricsHost());
760+
assertNull(SpannerOptions.newBuilder().setProjectId("p").build().getSpannerMonitoringHost());
761761
assertThat(
762762
SpannerOptions.newBuilder()
763763
.setProjectId("p")
764-
.setMetricsHost(metricsEndpoint)
764+
.setSpannerMonitoringHost(metricsEndpoint)
765765
.build()
766-
.getMetricsHost())
766+
.getSpannerMonitoringHost())
767767
.isEqualTo(metricsEndpoint);
768768
}
769769

0 commit comments

Comments
 (0)