Skip to content

Commit c6eb6f1

Browse files
committed
test
1 parent d8dea12 commit c6eb6f1

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ public class BuiltInMetricsConstant {
102102

103103
public static final Set<String> GRPC_ATTRIBUTES =
104104
ImmutableSet.of(
105-
"grpc_lb_rls_data_plane_target",
106-
"grpc_lb_pick_result");
105+
"grpc.lb.rls.data_plane_target",
106+
"grpc.lb.pick_result");
107107

108108
static Aggregation AGGREGATION_WITH_MILLIS_HISTOGRAM =
109109
Aggregation.explicitBucketHistogram(

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public void enableGrpcMetrics(
104104
GrpcOpenTelemetry.newBuilder()
105105
.sdk(this.getOrCreateOpenTelemetry(projectId, credentials, monitoringHost))
106106
.enableMetrics(BuiltInMetricsConstant.GRPC_METRICS_TO_ENABLE)
107-
// .disableMetrics(BuiltInMetricsConstant.GRPC_METRICS_ENABLED_BY_DEFAULT)
107+
.disableMetrics(BuiltInMetricsConstant.GRPC_METRICS_ENABLED_BY_DEFAULT)
108108
.build();
109109
ApiFunction<ManagedChannelBuilder, ManagedChannelBuilder> channelConfigurator =
110110
channelProviderBuilder.getChannelConfigurator();

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ static SpannerCloudMonitoringExporter create(
105105

106106
@Override
107107
public CompletableResultCode export(@Nonnull Collection<MetricData> collection) {
108-
// Print
109108
collection.stream()
109+
.filter(md -> "grpc-java".equals(md.getInstrumentationScopeInfo().getName()))
110110
.forEach(md -> {
111111
System.out.println("Name: " + md.getName()); // Print the name
112112

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ private static TimeSeries convertPointToSpannerTimeSeries(
122122
if (SPANNER_PROMOTED_RESOURCE_LABELS.contains(key)) {
123123
monitoredResourceBuilder.putLabels(key.getKey(), String.valueOf(attributes.get(key)));
124124
} else {
125-
metricBuilder.putLabels(key.getKey(), String.valueOf(attributes.get(key)));
125+
metricBuilder.putLabels(key.getKey().replace(".", "/"), String.valueOf(attributes.get(key)));
126126
}
127127
}
128128

0 commit comments

Comments
 (0)