Skip to content

Commit 4d56672

Browse files
committed
review comments
1 parent 1274a7d commit 4d56672

File tree

3 files changed

+25
-24
lines changed

3 files changed

+25
-24
lines changed

google-cloud-spanner/pom.xml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,24 @@
255255
<groupId>io.opentelemetry</groupId>
256256
<artifactId>opentelemetry-context</artifactId>
257257
</dependency>
258+
<dependency>
259+
<groupId>io.opentelemetry</groupId>
260+
<artifactId>opentelemetry-sdk-common</artifactId>
261+
</dependency>
262+
<dependency>
263+
<groupId>io.opentelemetry</groupId>
264+
<artifactId>opentelemetry-sdk-metrics</artifactId>
265+
</dependency>
266+
<dependency>
267+
<groupId>com.google.cloud</groupId>
268+
<artifactId>google-cloud-monitoring</artifactId>
269+
<version>3.38.0</version>
270+
</dependency>
271+
<dependency>
272+
<groupId>com.google.api.grpc</groupId>
273+
<artifactId>proto-google-cloud-monitoring-v3</artifactId>
274+
<version>3.38.0</version>
275+
</dependency>
258276
<dependency>
259277
<groupId>com.google.auth</groupId>
260278
<artifactId>google-auth-library-oauth2-http</artifactId>
@@ -415,14 +433,6 @@
415433
<artifactId>opentelemetry-sdk</artifactId>
416434
<scope>test</scope>
417435
</dependency>
418-
<dependency>
419-
<groupId>io.opentelemetry</groupId>
420-
<artifactId>opentelemetry-sdk-common</artifactId>
421-
</dependency>
422-
<dependency>
423-
<groupId>io.opentelemetry</groupId>
424-
<artifactId>opentelemetry-sdk-metrics</artifactId>
425-
</dependency>
426436
<dependency>
427437
<groupId>io.opentelemetry</groupId>
428438
<artifactId>opentelemetry-sdk-trace</artifactId>
@@ -433,16 +443,6 @@
433443
<artifactId>opentelemetry-sdk-testing</artifactId>
434444
<scope>test</scope>
435445
</dependency>
436-
<dependency>
437-
<groupId>com.google.cloud</groupId>
438-
<artifactId>google-cloud-monitoring</artifactId>
439-
<version>3.38.0</version>
440-
</dependency>
441-
<dependency>
442-
<groupId>com.google.api.grpc</groupId>
443-
<artifactId>proto-google-cloud-monitoring-v3</artifactId>
444-
<version>3.38.0</version>
445-
</dependency>
446446
</dependencies>
447447
<profiles>
448448
<profile>

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@ static SpannerCloudMonitoringExporter create(String projectId, @Nullable Credent
110110
@Override
111111
public CompletableResultCode export(Collection<MetricData> collection) {
112112
if (isShutdown.get()) {
113-
logger.log(Level.WARNING, "Exporter is shutting down");
113+
logger.log(Level.WARNING, "Exporter is shut down");
114114
return CompletableResultCode.ofFailure();
115115
}
116116

117-
lastExportCode = exportSpannerClientMetrics(collection);
117+
this.lastExportCode = exportSpannerClientMetrics(collection);
118118
return lastExportCode;
119119
}
120120

@@ -131,12 +131,12 @@ private CompletableResultCode exportSpannerClientMetrics(Collection<MetricData>
131131
return CompletableResultCode.ofSuccess();
132132
}
133133

134-
// Verifies metrics project id are the same as the spanner project id set on this client
134+
// Verifies metrics project id is the same as the spanner project id set on this client
135135
if (!spannerMetricData.stream()
136136
.flatMap(metricData -> metricData.getData().getPoints().stream())
137137
.allMatch(
138138
pd -> spannerProjectId.equals(SpannerCloudMonitoringExporterUtils.getProjectId(pd)))) {
139-
logger.log(Level.WARNING, "Metric data has different a projectId. Skip exporting.");
139+
logger.log(Level.WARNING, "Metric data has a different projectId. Skipping export.");
140140
return CompletableResultCode.ofFailure();
141141
}
142142

@@ -199,8 +199,7 @@ private ApiFuture<List<Empty>> exportTimeSeriesInBatch(
199199
.setName(projectName.toString())
200200
.addAllTimeSeries(batch)
201201
.build();
202-
ApiFuture<Empty> f = this.client.createServiceTimeSeriesCallable().futureCall(req);
203-
batchResults.add(f);
202+
batchResults.add(this.client.createServiceTimeSeriesCallable().futureCall(req));
204203
}
205204

206205
return ApiFutures.allAsList(batchResults);

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ class SpannerCloudMonitoringExporterUtils {
6060
private static final Logger logger =
6161
Logger.getLogger(SpannerCloudMonitoringExporterUtils.class.getName());
6262

63+
private SpannerCloudMonitoringExporterUtils() {}
64+
6365
static String getProjectId(PointData pointData) {
6466
return pointData.getAttributes().get(PROJECT_ID_KEY);
6567
}

0 commit comments

Comments
 (0)