Skip to content

Commit ea91e2d

Browse files
committed
lint
1 parent 1c44d72 commit ea91e2d

File tree

5 files changed

+8
-21
lines changed

5 files changed

+8
-21
lines changed

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import static com.google.cloud.spanner.BuiltInMetricsConstant.INSTANCE_ID_KEY;
2525
import static com.google.cloud.spanner.BuiltInMetricsConstant.LOCATION_ID_KEY;
2626
import static com.google.cloud.spanner.BuiltInMetricsConstant.PROJECT_ID_KEY;
27-
import static com.google.cloud.spanner.BuiltInMetricsConstant.SPANNER_RESOURCE_TYPE;
2827

2928
import com.google.api.core.ApiFunction;
3029
import com.google.api.gax.core.GaxProperties;
@@ -33,10 +32,6 @@
3332
import com.google.cloud.opentelemetry.detection.AttributeKeys;
3433
import com.google.cloud.opentelemetry.detection.DetectedPlatform;
3534
import com.google.cloud.opentelemetry.detection.GCPPlatformDetector;
36-
import com.google.cloud.opentelemetry.metric.GoogleCloudMetricExporter;
37-
import com.google.cloud.opentelemetry.metric.MetricConfiguration;
38-
import com.google.cloud.opentelemetry.metric.MonitoredResourceDescription;
39-
import com.google.common.collect.ImmutableSet;
4035
import com.google.common.hash.HashFunction;
4136
import com.google.common.hash.Hashing;
4237
import io.grpc.ManagedChannelBuilder;
@@ -47,8 +42,8 @@
4742
import io.opentelemetry.sdk.OpenTelemetrySdk;
4843
import io.opentelemetry.sdk.metrics.SdkMeterProvider;
4944
import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder;
50-
import io.opentelemetry.sdk.metrics.export.MetricExporter;
5145
import io.opentelemetry.sdk.resources.Resource;
46+
import java.io.IOException;
5247
import java.lang.management.ManagementFactory;
5348
import java.lang.reflect.Method;
5449
import java.net.InetAddress;
@@ -80,15 +75,13 @@ OpenTelemetry getOrCreateOpenTelemetry(
8075
BuiltInMetricsView.registerBuiltinMetrics(
8176
SpannerCloudMonitoringExporter.create(projectId, credentials, monitoringHost),
8277
sdkMeterProviderBuilder);
83-
8478
sdkMeterProviderBuilder.setResource(Resource.create(createResourceAttributes(projectId)));
8579
SdkMeterProvider sdkMeterProvider = sdkMeterProviderBuilder.build();
86-
8780
this.openTelemetry = OpenTelemetrySdk.builder().setMeterProvider(sdkMeterProvider).build();
8881
Runtime.getRuntime().addShutdownHook(new Thread(sdkMeterProvider::close));
8982
}
9083
return this.openTelemetry;
91-
} catch (Exception ex) {
84+
} catch (IOException ex) {
9285
logger.log(
9386
Level.WARNING,
9487
"Unable to get OpenTelemetry object for client side metrics, will skip exporting client"

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
import com.google.api.gax.tracing.ApiTracer;
2222
import com.google.api.gax.tracing.MethodName;
2323
import com.google.api.gax.tracing.MetricsTracer;
24-
import io.opentelemetry.api.common.Attributes;
25-
import io.opentelemetry.api.common.AttributesBuilder;
2624
import java.util.HashMap;
2725
import java.util.Map;
2826
import java.util.concurrent.CancellationException;
@@ -48,8 +46,7 @@ class BuiltInMetricsTracer extends MetricsTracer implements ApiTracer {
4846
private ISpan currentSpan;
4947

5048
BuiltInMetricsTracer(
51-
MethodName methodName,
52-
BuiltInMetricsRecorder builtInOpenTelemetryMetricsRecorder) {
49+
MethodName methodName, BuiltInMetricsRecorder builtInOpenTelemetryMetricsRecorder) {
5350
super(methodName, builtInOpenTelemetryMetricsRecorder);
5451
this.builtInOpenTelemetryMetricsRecorder = builtInOpenTelemetryMetricsRecorder;
5552
this.attributes.put(METHOD_ATTRIBUTE, methodName.toString());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public ApiTracer newTracer(ApiTracer parent, SpanName spanName, OperationType op
6161
new BuiltInMetricsTracer(
6262
MethodName.of(spanName.getClientName(), spanName.getMethodName()),
6363
builtInMetricsRecorder,
64-
this.traceWrapper,
64+
this.traceWrapper,
6565
currentSpan);
6666
metricsTracer.addAttributes(attributes);
6767
return metricsTracer;

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@
2222
import static com.google.api.MetricDescriptor.ValueType.DISTRIBUTION;
2323
import static com.google.api.MetricDescriptor.ValueType.DOUBLE;
2424
import static com.google.api.MetricDescriptor.ValueType.INT64;
25-
26-
import com.google.monitoring.v3.DroppedLabels;
27-
import com.google.monitoring.v3.SpanContext;
28-
import com.google.protobuf.Any;
29-
import com.google.protobuf.Timestamp;
3025
import static com.google.cloud.spanner.BuiltInMetricsConstant.GAX_METER_NAME;
3126
import static com.google.cloud.spanner.BuiltInMetricsConstant.GRPC_METER_NAME;
3227
import static com.google.cloud.spanner.BuiltInMetricsConstant.PROJECT_ID_KEY;

google-cloud-spanner/src/main/java/com/google/cloud/spanner/testing/RemoteSpannerHelper.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,10 @@ public static OpenTelemetry createTraceExporter() {
276276

277277
// Export to a collector that is expecting OTLP using gRPC.
278278
OpenTelemetry openTelemetry =
279-
OpenTelemetrySdk.builder().setTracerProvider(sdkTracerProvider).setPropagators(
280-
ContextPropagators.create(W3CTraceContextPropagator.getInstance())).build();
279+
OpenTelemetrySdk.builder()
280+
.setTracerProvider(sdkTracerProvider)
281+
.setPropagators(ContextPropagators.create(W3CTraceContextPropagator.getInstance()))
282+
.build();
281283

282284
return openTelemetry;
283285
}

0 commit comments

Comments
 (0)