Skip to content

Commit 3655b50

Browse files
committed
test: logs
1 parent 1aa16f1 commit 3655b50

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import static com.google.cloud.spanner.BuiltInMetricsConstant.CLIENT_NAME_KEY;
2222
import static com.google.cloud.spanner.BuiltInMetricsConstant.CLIENT_UID_KEY;
2323
import static com.google.cloud.spanner.BuiltInMetricsConstant.INSTANCE_CONFIG_ID_KEY;
24+
import static com.google.cloud.spanner.BuiltInMetricsConstant.INSTANCE_ID_KEY;
2425
import static com.google.cloud.spanner.BuiltInMetricsConstant.LOCATION_ID_KEY;
2526
import static com.google.cloud.spanner.BuiltInMetricsConstant.PROJECT_ID_KEY;
2627

@@ -119,6 +120,7 @@ Attributes createResourceAttributes(String projectId) {
119120
.put(PROJECT_ID_KEY.getKey(), projectId)
120121
.put(INSTANCE_CONFIG_ID_KEY.getKey(), "unknown")
121122
.put(CLIENT_HASH_KEY.getKey(), generateClientHash(getDefaultTaskValue()))
123+
.put(INSTANCE_ID_KEY.getKey(), "unknown")
122124
.put(LOCATION_ID_KEY.getKey(), detectClientLocation());
123125

124126
return attributesBuilder.build();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ private CompletableResultCode exportSpannerClientMetrics(Collection<MetricData>
137137
// Filter spanner metrics. Only include metrics that contain a project and instance ID.
138138
List<MetricData> spannerMetricData =
139139
collection.stream()
140-
.filter(md -> SPANNER_METRICS.contains(md.getName()))
140+
// .filter(md -> SPANNER_METRICS.contains(md.getName()))
141141
.collect(Collectors.toList());
142142

143143
// Log warnings for metrics that will be skipped.

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ static List<TimeSeries> convertToSpannerTimeSeries(List<MetricData> collection)
8383
|| metricData.getInstrumentationScopeInfo().getName().equals(SPANNER_METER_NAME)
8484
|| metricData.getInstrumentationScopeInfo().getName().equals(GRPC_METER_NAME))) {
8585
// Filter out metric data for instruments that are not part of the spanner metrics list
86+
System.out.println("Skipped some data" + metricData.getInstrumentationScopeInfo().getName().toString());
8687
continue;
8788
}
8889

@@ -102,7 +103,6 @@ static List<TimeSeries> convertToSpannerTimeSeries(List<MetricData> collection)
102103
convertPointToSpannerTimeSeries(metricData, pointData, monitoredResourceBuilder))
103104
.forEach(allTimeSeries::add);
104105
}
105-
106106
return allTimeSeries;
107107
}
108108

@@ -114,6 +114,7 @@ private static TimeSeries convertPointToSpannerTimeSeries(
114114
TimeSeries.newBuilder()
115115
.setMetricKind(convertMetricKind(metricData))
116116
.setValueType(convertValueType(metricData.getType()));
117+
System.out.println("convertPointToSpannerTimeSeries Metric name " +metricData.getName());
117118
Metric.Builder metricBuilder = Metric.newBuilder().setType(metricData.getName());
118119

119120
Attributes attributes = pointData.getAttributes();
@@ -123,7 +124,7 @@ private static TimeSeries convertPointToSpannerTimeSeries(
123124
monitoredResourceBuilder.putLabels(key.getKey(), String.valueOf(attributes.get(key)));
124125
} else {
125126
metricBuilder.putLabels(
126-
key.getKey().replace(".", "/"), String.valueOf(attributes.get(key)));
127+
key.getKey().replace(".", "_"), String.valueOf(attributes.get(key)));
127128
}
128129
}
129130

0 commit comments

Comments
 (0)