Skip to content

Commit aca9d30

Browse files
committed
conflict fix
1 parent 7b06791 commit aca9d30

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ OpenTelemetry getOrCreateOpenTelemetry(
6767
BuiltInOpenTelemetryMetricsView.registerBuiltinMetrics(
6868
SpannerCloudMonitoringExporter.create(projectId, credentials, monitoringHost),
6969
sdkMeterProviderBuilder);
70-
this.openTelemetry =
71-
OpenTelemetrySdk.builder().setMeterProvider(sdkMeterProviderBuilder.build()).build();
70+
SdkMeterProvider sdkMeterProvider = sdkMeterProviderBuilder.build();
71+
this.openTelemetry = OpenTelemetrySdk.builder().setMeterProvider(sdkMeterProvider).build();
7272
Runtime.getRuntime().addShutdownHook(new Thread(sdkMeterProvider::close));
7373
}
7474
return this.openTelemetry;

0 commit comments

Comments
 (0)