diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java index 23afce967b..e714461252 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java @@ -820,8 +820,8 @@ public static class Builder private OpenTelemetry openTelemetry; private boolean enableApiTracing = SpannerOptions.environment.isEnableApiTracing(); private boolean enableExtendedTracing = SpannerOptions.environment.isEnableExtendedTracing(); - private boolean enableBuiltInMetrics = true; private boolean enableEndToEndTracing = SpannerOptions.environment.isEnableEndToEndTracing(); + private boolean enableBuiltInMetrics = true; private static String createCustomClientLibToken(String token) { return token + " " + ServiceOptions.getGoogApiClientLibName(); @@ -1403,10 +1403,10 @@ public Builder setEnableApiTracing(boolean enableApiTracing) { } /** - * Sets whether to enable or disable built in metrics for Data client Operations. Built in - * metrics are enabled as default. + * Sets whether to enable or disable built in metrics for Data client operations. Built in + * metrics are enabled by default. */ - public Builder setEnableBuiltInMetrics(boolean enableBuiltInMetrics) { + public Builder setBuiltInMetricsEnabled(boolean enableBuiltInMetrics) { this.enableBuiltInMetrics = enableBuiltInMetrics; return this; } @@ -1721,13 +1721,14 @@ private ApiTracerFactory getDefaultApiTracerFactory() { private ApiTracerFactory createMetricsApiTracerFactory() { OpenTelemetry openTelemetry = this.builtInOpenTelemetryMetricsProvider.getOrCreateOpenTelemetry( - this.getProjectId(), getCredentials()); + getDefaultProjectId(), getCredentials()); return openTelemetry != null ? new MetricsTracerFactory( new OpenTelemetryMetricsRecorder(openTelemetry, BuiltInMetricsConstant.METER_NAME), builtInOpenTelemetryMetricsProvider.createClientAttributes( - this.getProjectId(), "spanner-java/" + GaxProperties.getLibraryVersion(getClass()))) + getDefaultProjectId(), + "spanner-java/" + GaxProperties.getLibraryVersion(getClass()))) : null; } diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetryBuiltInMetricsTracerTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetryBuiltInMetricsTracerTest.java index 8e3d098634..b493e36c96 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetryBuiltInMetricsTracerTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetryBuiltInMetricsTracerTest.java @@ -148,7 +148,7 @@ public void createSpannerInstance() { .build()) // Setting this to false so that Spanner Options does not register Metrics Tracer // factory again. - .setEnableBuiltInMetrics(false) + .setBuiltInMetricsEnabled(false) .setApiTracerFactory(metricsTracerFactory) .build() .getService();