zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-22 02:36:03 +02:00
Code Issues Projects Releases Packages Wiki Activity

Enforce very basic URL-like metric names

Browse source 
This change enforces URL-like metric names to match the behavior of
Stackdriver. The StackdriverWriter no longer prepends a slash, which was a
crutch.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=130537347
This commit is contained in:
shikhman 2016-08-17 10:50:18 -07:00 • committed by Ben McIlwain
parent b45c2ca2ee
commit 564bbdef83
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
java/google/registry/monitoring/metrics/MetricSchema.java
View file

@ -45,7 +45,8 @@ public abstract class MetricSchema {
checkArgument(!name.isEmpty(), "Name must not be blank"); checkArgument(!name.isEmpty(), "Name must not be blank");
checkArgument(!description.isEmpty(), "Description must not be blank"); checkArgument(!description.isEmpty(), "Description must not be blank");
checkArgument(!valueDisplayName.isEmpty(), "Value Display Name must not be empty"); checkArgument(!valueDisplayName.isEmpty(), "Value Display Name must not be empty");
// TODO: strengthen metric name validation. checkArgument(name.startsWith("/"), "Name must be URL-like and start with a '/'");
// TODO(b/30916431): strengthen metric name validation.
return new AutoValue_MetricSchema(name, description, valueDisplayName, kind, labels); return new AutoValue_MetricSchema(name, description, valueDisplayName, kind, labels);
} }

2
java/google/registry/monitoring/metrics/StackdriverWriter.java
View file

@ -155,7 +155,7 @@ public class StackdriverWriter implements MetricWriter {
static <V> MetricDescriptor createMetricDescriptor( static <V> MetricDescriptor createMetricDescriptor(
google.registry.monitoring.metrics.Metric<V> metric) { google.registry.monitoring.metrics.Metric<V> metric) {
return new MetricDescriptor() return new MetricDescriptor()
.setType(METRIC_DOMAIN + "/" + metric.getMetricSchema().name()) .setType(METRIC_DOMAIN + metric.getMetricSchema().name())
.setDescription(metric.getMetricSchema().description()) .setDescription(metric.getMetricSchema().description())
.setDisplayName(metric.getMetricSchema().valueDisplayName()) .setDisplayName(metric.getMetricSchema().valueDisplayName())
.setValueType(ENCODED_METRIC_TYPES.get(metric.getValueClass())) .setValueType(ENCODED_METRIC_TYPES.get(metric.getValueClass()))