Repository: GoogleCloudPlatform/opentelemetry-operations-go
Pull request #309 (2022-02-02 21:28:49)

Split client configuration per-endpoint
Second attempt at https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/pull/298


Patch:
diff --git a/exporter/collector/README.md b/exporter/collector/README.md
index 0b3d49c..8766ab3 100644
--- a/exporter/collector/README.md
+++ b/exporter/collector/README.md
@@ -44,7 +44,6 @@ These instructions are to get you up and running quickly with the GCP exporter i
     processors:
       memory_limiter:
       batch:
-        # Google Cloud Monitoring limits batches to 200 metric points.
         send_batch_max_size: 200
         send_batch_size: 200
     service:
@@ -55,7 +54,7 @@ These instructions are to get you up and running quickly with the GCP exporter i
           exporters: [googlecloud, logging]
         metrics:
           receivers: [otlp]
-          processors: [memory_limiter, batch]
+          processors: [memory_limiter]
           exporters: [googlecloud, logging]
     ```
 
diff --git a/exporter/collector/breaking-changes.md b/exporter/collector/breaking-changes.md
index be6001f..385a48b 100644
--- a/exporter/collector/breaking-changes.md
+++ b/exporter/collector/breaking-changes.md
@@ -3,6 +3,29 @@
 The new pdata based exporter has some breaking changes from the original OpenCensus (OC)
 stackdriver based `googlecloud` exporter:
 
+## Configuration
+
+Client-specific configuration, including `endpoint` and `use_insecure` are now separated per-signal.  `resource_mappings` is now nested under `metric`.  For example,
+
+```yaml
+googlecloud:
+  endpoint: test-endpoint
+  use_insecure: true
+  resource_mappings:
+```
+Is now:
+
+```yaml
+googlecloud:
+  trace:
+    endpoint: test-trace-endpoint
+    use_insecure: true
+  metric:
+    endpoint: test-metric-endpoint
+    use_insecure: true
+    resource_mappings:
+```
+
 ## Metric Names and Descriptors
 
 The previous collector exporter would default to sending metrics with the type:
@@ -26,6 +49,10 @@ domain name of the metric type.  E.g. if a metric called
 `workload.googleapis.com/nginx/latency` is created, the display name will
 be `nginx/latency` instead of `workload.googleapis.com/nginx/latency`.
 
+## Summaries
+
+The previous exporter would split summary metrics into `_summary_count`, `_summary_sum`, `_summary_percentile`, and the percentiles metric had the label `percentile` with values in 0 < 100. The new exporter splits summary metrics into `_count`, `_sum`, no suffix. The metric without a suffix has a `quantile`, with values in 0 < 1. This change was done to match the semantics of prometheus summary metrics, which users are more familiar with.
+
 ## Monitored Resources
 
 Mapping from OTel Resource to GCM monitored resource has been completely changed. The OC based
diff --git a/exporter/collector/config.go b/exporter/collector/config.go
index d42d4f3..fe95a77 100644
--- a/exporter/collector/config.go
+++ b/exporter/collector/config.go
@@ -28,23 +28,33 @@ const (
 type Config struct {
 	ProjectID string `mapstructure:"project"`
 	UserAgent string `mapstructure:"user_agent"`
-	Endpoint  string `mapstructure:"endpoint"`
+
+	TraceConfig TraceConfig `mapstructure:"trace"`
+
+	MetricConfig MetricConfig `mapstructure:"metric"`
+}
+
+type ClientConfig struct {
+	Endpoint string `mapstructure:"endpoint"`
 	// Only has effect if Endpoint is not ""
 	UseInsecure bool `mapstructure:"use_insecure"`
 
-	ResourceMappings []ResourceMapping `mapstructure:"resource_mappings"`
 	// GetClientOptions returns additional options to be passed
 	// to the underlying Google Cloud API client.
 	// Must be set programmatically (no support via declarative config).
 	// Optional.
 	GetClientOptions func() []option.ClientOption
+}
 
-	MetricConfig MetricConfig `mapstructure:"metric"`
+type TraceConfig struct {
+	ClientConfig ClientConfig `mapstructure:",squash"`
 }
 
 type MetricConfig struct {
-	Prefix                     string `mapstructure:"prefix"`
-	SkipCreateMetricDescriptor bool   `mapstructure:"skip_create_descriptor"`
+	ClientConfig               ClientConfig      `mapstructure:",squash"`
+	Prefix                     string            `mapstructure:"prefix"`
+	ResourceMappings           []ResourceMapping `mapstructure:"resource_mappings"`
+	SkipCreateMetricDescriptor bool              `mapstructure:"skip_create_descriptor"`
 	// If a metric belongs to one of these domains it does not get a prefix.
 	KnownDomains []string `mapstructure:"known_domains"`
 
diff --git a/exporter/collector/googlecloud.go b/exporter/collector/googlecloud.go
index 47c39a3..29f2716 100644
--- a/exporter/collector/googlecloud.go
+++ b/exporter/collector/googlecloud.go
@@ -45,11 +45,11 @@ func setVersionInUserAgent(cfg *Config, version string) {
 	cfg.UserAgent = strings.ReplaceAll(cfg.UserAgent, "{{version}}", version)
 }
 
-func generateClientOptions(cfg *Config) ([]option.ClientOption, error) {
+func generateClientOptions(cfg *ClientConfig, userAgent string) ([]option.ClientOption, error) {
 	var copts []option.ClientOption
 	// option.WithUserAgent is used by the Trace exporter, but not the Metric exporter (see comment below)
-	if cfg.UserAgent != "" {
-		copts = append(copts, option.WithUserAgent(cfg.UserAgent))
+	if userAgent != "" {
+		copts = append(copts, option.WithUserAgent(userAgent))
 	}
 	if cfg.Endpoint != "" {
 		if cfg.UseInsecure {
@@ -59,8 +59,8 @@ func generateClientOptions(cfg *Config) ([]option.ClientOption, error) {
 				grpc.WithStatsHandler(&ocgrpc.ClientHandler{}),
 				grpc.WithInsecure(),
 			}
-			if cfg.UserAgent != "" {
-				dialOpts = append(dialOpts, grpc.WithUserAgent(cfg.UserAgent))
+			if userAgent != "" {
+				dialOpts = append(dialOpts, grpc.WithUserAgent(userAgent))
 			}
 			conn, err := grpc.Dial(cfg.Endpoint, dialOpts...)
 			if err != nil {
@@ -86,7 +86,7 @@ func NewGoogleCloudTracesExporter(cfg Config, version string, timeout time.Durat
 		cloudtrace.WithTimeout(timeout),
 	}
 
-	copts, err := generateClientOptions(&cfg)
+	copts, err := generateClientOptions(&cfg.TraceConfig.ClientConfig, cfg.UserAgent)
 	if err != nil {
 		return nil, err
 	}
diff --git a/exporter/collector/metricsexporter.go b/exporter/collector/metricsexporter.go
index f249370..23dbe4e 100644
--- a/exporter/collector/metricsexporter.go
+++ b/exporter/collector/metricsexporter.go
@@ -83,9 +83,8 @@ type metricMapper struct {
 
 // Constants we use when translating summary metrics into GCP.
 const (
-	SummaryCountPrefix      = "_summary_count"
-	SummarySumSuffix        = "_summary_sum"
-	SummaryPercentileSuffix = "_summary_percentile"
+	SummaryCountPrefix = "_count"
+	SummarySumSuffix   = "_sum"
 )
 
 const (
@@ -142,7 +141,7 @@ func NewGoogleCloudMetricsExporter(
 		cfg.ProjectID = creds.ProjectID
 	}
 
-	clientOpts, err := generateClientOptions(&cfg)
+	clientOpts, err := generateClientOptions(&cfg.MetricConfig.ClientConfig, cfg.UserAgent)
 	if err != nil {
 		return nil, err
 	}
@@ -396,7 +395,7 @@ func (m *metricMapper) summaryPointToTimeSeries(
 	sum pdata.Summary,
 	point pdata.SummaryDataPoint,
 ) []*monitoringpb.TimeSeries {
-	sumName, countName, percentileName := summaryMetricNames(metric.Name())
+	sumName, countName := summaryMetricNames(metric.Name())
 	startTime := timestamppb.New(point.StartTimestamp().AsTime())
 	endTime := timestamppb.New(point.Timestamp().AsTime())
 	result := []*monitoringpb.TimeSeries{
@@ -449,8 +448,7 @@ func (m *metricMapper) summaryPointToTimeSeries(
 	for i := 0; i < quantiles.Len(); i++ {
 		quantile := quantiles.At(i)
 		pLabel := labels{
-			// Convert to percentile.
-			"percentile": fmt.Sprintf("%f", quantile.Quantile()*100),
+			"quantile": fmt.Sprintf("%f", quantile.Quantile()),
 		}
 		result = append(result, &monitoringpb.TimeSeries{
 			Resource:   resource,
@@ -466,7 +464,7 @@ func (m *metricMapper) summaryPointToTimeSeries(
 				}},
 			}},
 			Metric: &metricpb.Metric{
-				Type: m.metricNameToType(percentileName),
+				Type: m.metricNameToType(metric.Name()),
 				Labels: mergeLabels(
 					attributesToLabels(point.Attributes()),
 					extraLabels,
@@ -877,16 +875,15 @@ func (m *metricMapper) labelDescriptors(pm pdata.Metric) []*label.LabelDescripto
 	return result
 }
 
-// Returns (sum, count, percentile) metric names for a summary metric.
-func summaryMetricNames(name string) (string, string, string) {
+// Returns (sum, count) metric names for a summary metric.
+func summaryMetricNames(name string) (string, string) {
 	sumName := fmt.Sprintf("%s%s", name, SummarySumSuffix)
 	countName := fmt.Sprintf("%s%s", name, SummaryCountPrefix)
-	percentileName := fmt.Sprintf("%s%s", name, SummaryPercentileSuffix)
-	return sumName, countName, percentileName
+	return sumName, countName
 }
 
 func (m *metricMapper) summaryMetricDescriptors(pm pdata.Metric) []*metricpb.MetricDescriptor {
-	sumName, countName, percentileName := summaryMetricNames(pm.Name())
+	sumName, countName := summaryMetricNames(pm.Name())
 	labels := m.labelDescriptors(pm)
 	return []*metricpb.MetricDescriptor{
 		{
@@ -908,18 +905,18 @@ func (m *metricMapper) summaryMetricDescriptors(pm pdata.Metric) []*metricpb.Met
 			DisplayName: countName,
 		},
 		{
-			Type: m.metricNameToType(percentileName),
+			Type: m.metricNameToType(pm.Name()),
 			Labels: append(
 				labels,
 				&label.LabelDescriptor{
-					Key:         "percentile",
-					Description: "the value at a given percentile of a distribution",
+					Key:         "quantile",
+					Description: "the value at a given quantile of a distribution",
 				}),
 			MetricKind:  metricpb.MetricDescriptor_GAUGE,
 			ValueType:   metricpb.MetricDescriptor_DOUBLE,
 			Unit:        pm.Unit(),
 			Description: pm.Description(),
-			DisplayName: percentileName,
+			DisplayName: pm.Name(),
 		},
 	}
 }


Test patch:
diff --git a/exporter/collector/googlecloud_test.go b/exporter/collector/googlecloud_test.go
index f30dc67..59be3c5 100644
--- a/exporter/collector/googlecloud_test.go
+++ b/exporter/collector/googlecloud_test.go
@@ -65,9 +65,13 @@ func TestGoogleCloudTraceExport(t *testing.T) {
 		{
 			name: "Standard",
 			cfg: Config{
-				ProjectID:   "idk",
-				Endpoint:    "127.0.0.1:8080",
-				UseInsecure: true,
+				ProjectID: "idk",
+				TraceConfig: TraceConfig{
+					ClientConfig: ClientConfig{
+						Endpoint:    "127.0.0.1:8080",
+						UseInsecure: true,
+					},
+				},
 			},
 		},
 	}
@@ -164,11 +168,11 @@ func TestGoogleCloudMetricExport(t *testing.T) {
 
 	config := DefaultConfig()
 	config.ProjectID = "idk"
-	config.Endpoint = "127.0.0.1:8080"
+	config.MetricConfig.ClientConfig.Endpoint = "127.0.0.1:8080"
 	config.UserAgent = "MyAgent {{version}}"
-	config.UseInsecure = true
+	config.MetricConfig.ClientConfig.UseInsecure = true
 	config.MetricConfig.InstrumentationLibraryLabels = false
-	config.GetClientOptions = func() []option.ClientOption {
+	config.MetricConfig.ClientConfig.GetClientOptions = func() []option.ClientOption {
 		// Example with overridden client options
 		return []option.ClientOption{
 			option.WithoutAuthentication(),
diff --git a/exporter/collector/integrationtest/config/config_test.go b/exporter/collector/integrationtest/config/config_test.go
index eb1a2d2..8d6320d 100644
--- a/exporter/collector/integrationtest/config/config_test.go
+++ b/exporter/collector/integrationtest/config/config_test.go
@@ -54,33 +54,19 @@ func TestLoadConfig(t *testing.T) {
 		&testExporterConfig{
 			ExporterSettings: config.NewExporterSettings(config.NewComponentIDWithName(typeStr, "customname")),
 			Config: collector.Config{
-				ProjectID:   "my-project",
-				UserAgent:   "opentelemetry-collector-contrib {{version}}",
-				Endpoint:    "test-endpoint",
-				UseInsecure: true,
-				ResourceMappings: []collector.ResourceMapping{
-					{
-						SourceType: "source.resource1",
-						TargetType: "target-resource1",
-						LabelMappings: []collector.LabelMapping{
-							{
-								SourceKey: "contrib.opencensus.io/exporter/googlecloud/project_id",
-								TargetKey: "project_id",
-								Optional:  true,
-							},
-							{
-								SourceKey: "source.label1",
-								TargetKey: "target_label_1",
-								Optional:  false,
-							},
-						},
-					},
-					{
-						SourceType: "source.resource2",
-						TargetType: "target-resource2",
+				ProjectID: "my-project",
+				UserAgent: "opentelemetry-collector-contrib {{version}}",
+				TraceConfig: collector.TraceConfig{
+					ClientConfig: collector.ClientConfig{
+						Endpoint:    "test-trace-endpoint",
+						UseInsecure: true,
 					},
 				},
 				MetricConfig: collector.MetricConfig{
+					ClientConfig: collector.ClientConfig{
+						Endpoint:    "test-metric-endpoint",
+						UseInsecure: true,
+					},
 					Prefix:                     "prefix",
 					SkipCreateMetricDescriptor: true,
 					KnownDomains: []string{
@@ -88,6 +74,28 @@ func TestLoadConfig(t *testing.T) {
 					},
 					InstrumentationLibraryLabels:     true,
 					CreateMetricDescriptorBufferSize: 10,
+					ResourceMappings: []collector.ResourceMapping{
+						{
+							SourceType: "source.resource1",
+							TargetType: "target-resource1",
+							LabelMappings: []collector.LabelMapping{
+								{
+									SourceKey: "contrib.opencensus.io/exporter/googlecloud/project_id",
+									TargetKey: "project_id",
+									Optional:  true,
+								},
+								{
+									SourceKey: "source.label1",
+									TargetKey: "target_label_1",
+									Optional:  false,
+								},
+							},
+						},
+						{
+							SourceType: "source.resource2",
+							TargetType: "target-resource2",
+						},
+					},
 				},
 			},
 		})
diff --git a/exporter/collector/integrationtest/metric_test_server.go b/exporter/collector/integrationtest/metric_test_server.go
index 88fdf5a..8a1ba98 100644
--- a/exporter/collector/integrationtest/metric_test_server.go
+++ b/exporter/collector/integrationtest/metric_test_server.go
@@ -151,8 +151,8 @@ func (m *MetricsTestServer) NewExporter(
 	t testing.TB,
 	cfg collector.Config,
 ) *collector.MetricsExporter {
-	cfg.Endpoint = m.Endpoint
-	cfg.UseInsecure = true
+	cfg.MetricConfig.ClientConfig.Endpoint = m.Endpoint
+	cfg.MetricConfig.ClientConfig.UseInsecure = true
 	cfg.ProjectID = "fakeprojectid"
 
 	exporter, err := collector.NewGoogleCloudMetricsExporter(
@@ -163,6 +163,6 @@ func (m *MetricsTestServer) NewExporter(
 		collector.DefaultTimeout,
 	)
 	require.NoError(t, err)
-	t.Logf("Collector MetricsTestServer exporter started, pointing at %v", cfg.Endpoint)
+	t.Logf("Collector MetricsTestServer exporter started, pointing at %v", cfg.MetricConfig.ClientConfig.Endpoint)
 	return exporter
 }
diff --git a/exporter/collector/integrationtest/testdata/config.yaml b/exporter/collector/integrationtest/testdata/config.yaml
index 4c2c4ab..2f0509a 100644
--- a/exporter/collector/integrationtest/testdata/config.yaml
+++ b/exporter/collector/integrationtest/testdata/config.yaml
@@ -8,21 +8,24 @@ exporters:
   googlecloud:
   googlecloud/customname:
     project: my-project
-    endpoint: test-endpoint
     user_agent: opentelemetry-collector-contrib {{version}}
-    use_insecure: true
-    resource_mappings:
-      - source_type: source.resource1
-        target_type: target-resource1
-        label_mappings:
-          - source_key: contrib.opencensus.io/exporter/googlecloud/project_id
-            target_key: project_id
-            optional: true
-          - source_key: source.label1
-            target_key: target_label_1
-      - source_type: source.resource2
-        target_type: target-resource2
+    trace:
+      endpoint: test-trace-endpoint
+      use_insecure: true
     metric:
+      endpoint: test-metric-endpoint
+      use_insecure: true
+      resource_mappings:
+        - source_type: source.resource1
+          target_type: target-resource1
+          label_mappings:
+            - source_key: contrib.opencensus.io/exporter/googlecloud/project_id
+              target_key: project_id
+              optional: true
+            - source_key: source.label1
+              target_key: target_label_1
+        - source_type: source.resource2
+          target_type: target-resource2
       prefix: prefix
       skip_create_descriptor: true
 
diff --git a/exporter/collector/integrationtest/testdata/fixtures/batching_metrics_expect.json b/exporter/collector/integrationtest/testdata/fixtures/batching_metrics_expect.json
index d334dfb..737a347 100644
--- a/exporter/collector/integrationtest/testdata/fixtures/batching_metrics_expect.json
+++ b/exporter/collector/integrationtest/testdata/fixtures/batching_metrics_expect.json
@@ -4,7 +4,7 @@
       "timeSeries": [
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 1_summary_sum",
+            "type": "workload.googleapis.com/testsummary 1_sum",
             "labels": {
               "foo": "bar"
             }
@@ -34,7 +34,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 1_summary_count",
+            "type": "workload.googleapis.com/testsummary 1_count",
             "labels": {
               "foo": "bar"
             }
@@ -64,10 +64,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 1_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 1",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -94,10 +94,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 1_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 1",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -124,10 +124,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 1_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 1",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -154,7 +154,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 2_summary_sum",
+            "type": "workload.googleapis.com/testsummary 2_sum",
             "labels": {
               "foo": "bar"
             }
@@ -184,7 +184,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 2_summary_count",
+            "type": "workload.googleapis.com/testsummary 2_count",
             "labels": {
               "foo": "bar"
             }
@@ -214,10 +214,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 2_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 2",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -244,10 +244,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 2_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 2",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -274,10 +274,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 2_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 2",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -304,7 +304,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 3_summary_sum",
+            "type": "workload.googleapis.com/testsummary 3_sum",
             "labels": {
               "foo": "bar"
             }
@@ -334,7 +334,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 3_summary_count",
+            "type": "workload.googleapis.com/testsummary 3_count",
             "labels": {
               "foo": "bar"
             }
@@ -364,10 +364,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 3_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 3",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -394,10 +394,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 3_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 3",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -424,10 +424,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 3_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 3",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -454,7 +454,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 4_summary_sum",
+            "type": "workload.googleapis.com/testsummary 4_sum",
             "labels": {
               "foo": "bar"
             }
@@ -484,7 +484,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 4_summary_count",
+            "type": "workload.googleapis.com/testsummary 4_count",
             "labels": {
               "foo": "bar"
             }
@@ -514,10 +514,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 4_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 4",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -544,10 +544,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 4_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 4",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -574,10 +574,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 4_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 4",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -604,7 +604,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 5_summary_sum",
+            "type": "workload.googleapis.com/testsummary 5_sum",
             "labels": {
               "foo": "bar"
             }
@@ -634,7 +634,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 5_summary_count",
+            "type": "workload.googleapis.com/testsummary 5_count",
             "labels": {
               "foo": "bar"
             }
@@ -664,10 +664,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 5_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 5",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -694,10 +694,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 5_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 5",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -724,10 +724,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 5_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 5",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -754,7 +754,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 6_summary_sum",
+            "type": "workload.googleapis.com/testsummary 6_sum",
             "labels": {
               "foo": "bar"
             }
@@ -784,7 +784,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 6_summary_count",
+            "type": "workload.googleapis.com/testsummary 6_count",
             "labels": {
               "foo": "bar"
             }
@@ -814,10 +814,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 6_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 6",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -844,10 +844,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 6_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 6",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -874,10 +874,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 6_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 6",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -904,7 +904,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 7_summary_sum",
+            "type": "workload.googleapis.com/testsummary 7_sum",
             "labels": {
               "foo": "bar"
             }
@@ -934,7 +934,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 7_summary_count",
+            "type": "workload.googleapis.com/testsummary 7_count",
             "labels": {
               "foo": "bar"
             }
@@ -964,10 +964,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 7_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 7",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -994,10 +994,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 7_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 7",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -1024,10 +1024,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 7_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 7",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -1054,7 +1054,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 8_summary_sum",
+            "type": "workload.googleapis.com/testsummary 8_sum",
             "labels": {
               "foo": "bar"
             }
@@ -1084,7 +1084,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 8_summary_count",
+            "type": "workload.googleapis.com/testsummary 8_count",
             "labels": {
               "foo": "bar"
             }
@@ -1114,10 +1114,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 8_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 8",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -1144,10 +1144,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 8_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 8",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -1174,10 +1174,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 8_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 8",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -1204,7 +1204,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 9_summary_sum",
+            "type": "workload.googleapis.com/testsummary 9_sum",
             "labels": {
               "foo": "bar"
             }
@@ -1234,7 +1234,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 9_summary_count",
+            "type": "workload.googleapis.com/testsummary 9_count",
             "labels": {
               "foo": "bar"
             }
@@ -1264,10 +1264,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 9_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 9",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -1294,10 +1294,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 9_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 9",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -1324,10 +1324,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 9_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 9",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -1354,7 +1354,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 10_summary_sum",
+            "type": "workload.googleapis.com/testsummary 10_sum",
             "labels": {
               "foo": "bar"
             }
@@ -1384,7 +1384,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 10_summary_count",
+            "type": "workload.googleapis.com/testsummary 10_count",
             "labels": {
               "foo": "bar"
             }
@@ -1414,10 +1414,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 10_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 10",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -1444,10 +1444,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 10_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 10",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -1474,10 +1474,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 10_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 10",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -1504,7 +1504,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 11_summary_sum",
+            "type": "workload.googleapis.com/testsummary 11_sum",
             "labels": {
               "foo": "bar"
             }
@@ -1534,7 +1534,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 11_summary_count",
+            "type": "workload.googleapis.com/testsummary 11_count",
             "labels": {
               "foo": "bar"
             }
@@ -1564,10 +1564,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 11_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 11",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -1594,10 +1594,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 11_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 11",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -1624,10 +1624,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 11_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 11",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -1654,7 +1654,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 12_summary_sum",
+            "type": "workload.googleapis.com/testsummary 12_sum",
             "labels": {
               "foo": "bar"
             }
@@ -1684,7 +1684,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 12_summary_count",
+            "type": "workload.googleapis.com/testsummary 12_count",
             "labels": {
               "foo": "bar"
             }
@@ -1714,10 +1714,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 12_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 12",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -1744,10 +1744,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 12_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 12",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -1774,10 +1774,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 12_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 12",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -1804,7 +1804,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 13_summary_sum",
+            "type": "workload.googleapis.com/testsummary 13_sum",
             "labels": {
               "foo": "bar"
             }
@@ -1834,7 +1834,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 13_summary_count",
+            "type": "workload.googleapis.com/testsummary 13_count",
             "labels": {
               "foo": "bar"
             }
@@ -1864,10 +1864,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 13_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 13",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -1894,10 +1894,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 13_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 13",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -1924,10 +1924,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 13_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 13",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -1954,7 +1954,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 14_summary_sum",
+            "type": "workload.googleapis.com/testsummary 14_sum",
             "labels": {
               "foo": "bar"
             }
@@ -1984,7 +1984,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 14_summary_count",
+            "type": "workload.googleapis.com/testsummary 14_count",
             "labels": {
               "foo": "bar"
             }
@@ -2014,10 +2014,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 14_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 14",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -2044,10 +2044,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 14_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 14",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -2074,10 +2074,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 14_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 14",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -2104,7 +2104,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 15_summary_sum",
+            "type": "workload.googleapis.com/testsummary 15_sum",
             "labels": {
               "foo": "bar"
             }
@@ -2134,7 +2134,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 15_summary_count",
+            "type": "workload.googleapis.com/testsummary 15_count",
             "labels": {
               "foo": "bar"
             }
@@ -2164,10 +2164,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 15_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 15",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -2194,10 +2194,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 15_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 15",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -2224,10 +2224,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 15_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 15",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -2254,7 +2254,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 16_summary_sum",
+            "type": "workload.googleapis.com/testsummary 16_sum",
             "labels": {
               "foo": "bar"
             }
@@ -2284,7 +2284,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 16_summary_count",
+            "type": "workload.googleapis.com/testsummary 16_count",
             "labels": {
               "foo": "bar"
             }
@@ -2314,10 +2314,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 16_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 16",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -2344,10 +2344,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 16_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 16",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -2374,10 +2374,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 16_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 16",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -2404,7 +2404,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 17_summary_sum",
+            "type": "workload.googleapis.com/testsummary 17_sum",
             "labels": {
               "foo": "bar"
             }
@@ -2434,7 +2434,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 17_summary_count",
+            "type": "workload.googleapis.com/testsummary 17_count",
             "labels": {
               "foo": "bar"
             }
@@ -2464,10 +2464,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 17_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 17",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -2494,10 +2494,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 17_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 17",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -2524,10 +2524,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 17_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 17",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -2554,7 +2554,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 18_summary_sum",
+            "type": "workload.googleapis.com/testsummary 18_sum",
             "labels": {
               "foo": "bar"
             }
@@ -2584,7 +2584,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 18_summary_count",
+            "type": "workload.googleapis.com/testsummary 18_count",
             "labels": {
               "foo": "bar"
             }
@@ -2614,10 +2614,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 18_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 18",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -2644,10 +2644,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 18_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 18",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -2674,10 +2674,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 18_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 18",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -2704,7 +2704,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 19_summary_sum",
+            "type": "workload.googleapis.com/testsummary 19_sum",
             "labels": {
               "foo": "bar"
             }
@@ -2734,7 +2734,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 19_summary_count",
+            "type": "workload.googleapis.com/testsummary 19_count",
             "labels": {
               "foo": "bar"
             }
@@ -2764,10 +2764,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 19_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 19",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -2794,10 +2794,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 19_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 19",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -2824,10 +2824,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 19_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 19",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -2854,7 +2854,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 20_summary_sum",
+            "type": "workload.googleapis.com/testsummary 20_sum",
             "labels": {
               "foo": "bar"
             }
@@ -2884,7 +2884,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 20_summary_count",
+            "type": "workload.googleapis.com/testsummary 20_count",
             "labels": {
               "foo": "bar"
             }
@@ -2914,10 +2914,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 20_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 20",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -2944,10 +2944,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 20_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 20",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -2974,10 +2974,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 20_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 20",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -3004,7 +3004,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 21_summary_sum",
+            "type": "workload.googleapis.com/testsummary 21_sum",
             "labels": {
               "foo": "bar"
             }
@@ -3034,7 +3034,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 21_summary_count",
+            "type": "workload.googleapis.com/testsummary 21_count",
             "labels": {
               "foo": "bar"
             }
@@ -3064,10 +3064,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 21_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 21",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -3094,10 +3094,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 21_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 21",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -3124,10 +3124,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 21_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 21",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -3154,7 +3154,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 22_summary_sum",
+            "type": "workload.googleapis.com/testsummary 22_sum",
             "labels": {
               "foo": "bar"
             }
@@ -3184,7 +3184,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 22_summary_count",
+            "type": "workload.googleapis.com/testsummary 22_count",
             "labels": {
               "foo": "bar"
             }
@@ -3214,10 +3214,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 22_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 22",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -3244,10 +3244,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 22_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 22",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -3274,10 +3274,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 22_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 22",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -3304,7 +3304,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 23_summary_sum",
+            "type": "workload.googleapis.com/testsummary 23_sum",
             "labels": {
               "foo": "bar"
             }
@@ -3334,7 +3334,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 23_summary_count",
+            "type": "workload.googleapis.com/testsummary 23_count",
             "labels": {
               "foo": "bar"
             }
@@ -3364,10 +3364,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 23_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 23",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -3394,10 +3394,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 23_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 23",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -3424,10 +3424,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 23_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 23",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -3454,7 +3454,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 24_summary_sum",
+            "type": "workload.googleapis.com/testsummary 24_sum",
             "labels": {
               "foo": "bar"
             }
@@ -3484,7 +3484,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 24_summary_count",
+            "type": "workload.googleapis.com/testsummary 24_count",
             "labels": {
               "foo": "bar"
             }
@@ -3514,10 +3514,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 24_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 24",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -3544,10 +3544,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 24_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 24",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -3574,10 +3574,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 24_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 24",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -3604,7 +3604,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 25_summary_sum",
+            "type": "workload.googleapis.com/testsummary 25_sum",
             "labels": {
               "foo": "bar"
             }
@@ -3634,7 +3634,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 25_summary_count",
+            "type": "workload.googleapis.com/testsummary 25_count",
             "labels": {
               "foo": "bar"
             }
@@ -3664,10 +3664,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 25_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 25",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -3694,10 +3694,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 25_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 25",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -3724,10 +3724,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 25_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 25",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -3754,7 +3754,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 26_summary_sum",
+            "type": "workload.googleapis.com/testsummary 26_sum",
             "labels": {
               "foo": "bar"
             }
@@ -3784,7 +3784,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 26_summary_count",
+            "type": "workload.googleapis.com/testsummary 26_count",
             "labels": {
               "foo": "bar"
             }
@@ -3814,10 +3814,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 26_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 26",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -3844,10 +3844,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 26_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 26",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -3874,10 +3874,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 26_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 26",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -3904,7 +3904,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 27_summary_sum",
+            "type": "workload.googleapis.com/testsummary 27_sum",
             "labels": {
               "foo": "bar"
             }
@@ -3934,7 +3934,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 27_summary_count",
+            "type": "workload.googleapis.com/testsummary 27_count",
             "labels": {
               "foo": "bar"
             }
@@ -3964,10 +3964,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 27_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 27",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -3994,10 +3994,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 27_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 27",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -4024,10 +4024,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 27_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 27",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -4054,7 +4054,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 28_summary_sum",
+            "type": "workload.googleapis.com/testsummary 28_sum",
             "labels": {
               "foo": "bar"
             }
@@ -4084,7 +4084,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 28_summary_count",
+            "type": "workload.googleapis.com/testsummary 28_count",
             "labels": {
               "foo": "bar"
             }
@@ -4114,10 +4114,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 28_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 28",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -4144,10 +4144,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 28_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 28",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -4174,10 +4174,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 28_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 28",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -4204,7 +4204,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 29_summary_sum",
+            "type": "workload.googleapis.com/testsummary 29_sum",
             "labels": {
               "foo": "bar"
             }
@@ -4234,7 +4234,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 29_summary_count",
+            "type": "workload.googleapis.com/testsummary 29_count",
             "labels": {
               "foo": "bar"
             }
@@ -4264,10 +4264,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 29_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 29",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -4294,10 +4294,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 29_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 29",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -4324,10 +4324,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 29_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 29",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -4354,7 +4354,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 30_summary_sum",
+            "type": "workload.googleapis.com/testsummary 30_sum",
             "labels": {
               "foo": "bar"
             }
@@ -4384,7 +4384,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 30_summary_count",
+            "type": "workload.googleapis.com/testsummary 30_count",
             "labels": {
               "foo": "bar"
             }
@@ -4414,10 +4414,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 30_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 30",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -4444,10 +4444,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 30_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 30",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -4474,10 +4474,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 30_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 30",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -4504,7 +4504,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 31_summary_sum",
+            "type": "workload.googleapis.com/testsummary 31_sum",
             "labels": {
               "foo": "bar"
             }
@@ -4534,7 +4534,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 31_summary_count",
+            "type": "workload.googleapis.com/testsummary 31_count",
             "labels": {
               "foo": "bar"
             }
@@ -4564,10 +4564,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 31_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 31",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -4594,10 +4594,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 31_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 31",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -4624,10 +4624,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 31_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 31",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -4654,7 +4654,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 32_summary_sum",
+            "type": "workload.googleapis.com/testsummary 32_sum",
             "labels": {
               "foo": "bar"
             }
@@ -4684,7 +4684,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 32_summary_count",
+            "type": "workload.googleapis.com/testsummary 32_count",
             "labels": {
               "foo": "bar"
             }
@@ -4714,10 +4714,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 32_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 32",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -4744,10 +4744,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 32_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 32",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -4774,10 +4774,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 32_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 32",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -4804,7 +4804,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 33_summary_sum",
+            "type": "workload.googleapis.com/testsummary 33_sum",
             "labels": {
               "foo": "bar"
             }
@@ -4834,7 +4834,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 33_summary_count",
+            "type": "workload.googleapis.com/testsummary 33_count",
             "labels": {
               "foo": "bar"
             }
@@ -4864,10 +4864,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 33_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 33",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -4894,10 +4894,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 33_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 33",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -4924,10 +4924,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 33_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 33",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -4954,7 +4954,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 34_summary_sum",
+            "type": "workload.googleapis.com/testsummary 34_sum",
             "labels": {
               "foo": "bar"
             }
@@ -4984,7 +4984,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 34_summary_count",
+            "type": "workload.googleapis.com/testsummary 34_count",
             "labels": {
               "foo": "bar"
             }
@@ -5014,10 +5014,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 34_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 34",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -5044,10 +5044,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 34_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 34",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -5074,10 +5074,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 34_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 34",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -5104,7 +5104,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 35_summary_sum",
+            "type": "workload.googleapis.com/testsummary 35_sum",
             "labels": {
               "foo": "bar"
             }
@@ -5134,7 +5134,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 35_summary_count",
+            "type": "workload.googleapis.com/testsummary 35_count",
             "labels": {
               "foo": "bar"
             }
@@ -5164,10 +5164,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 35_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 35",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -5194,10 +5194,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 35_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 35",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -5224,10 +5224,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 35_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 35",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -5254,7 +5254,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 36_summary_sum",
+            "type": "workload.googleapis.com/testsummary 36_sum",
             "labels": {
               "foo": "bar"
             }
@@ -5284,7 +5284,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 36_summary_count",
+            "type": "workload.googleapis.com/testsummary 36_count",
             "labels": {
               "foo": "bar"
             }
@@ -5314,10 +5314,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 36_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 36",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -5344,10 +5344,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 36_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 36",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -5374,10 +5374,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 36_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 36",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -5404,7 +5404,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 37_summary_sum",
+            "type": "workload.googleapis.com/testsummary 37_sum",
             "labels": {
               "foo": "bar"
             }
@@ -5434,7 +5434,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 37_summary_count",
+            "type": "workload.googleapis.com/testsummary 37_count",
             "labels": {
               "foo": "bar"
             }
@@ -5464,10 +5464,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 37_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 37",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -5494,10 +5494,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 37_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 37",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -5524,10 +5524,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 37_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 37",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -5554,7 +5554,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 38_summary_sum",
+            "type": "workload.googleapis.com/testsummary 38_sum",
             "labels": {
               "foo": "bar"
             }
@@ -5584,7 +5584,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 38_summary_count",
+            "type": "workload.googleapis.com/testsummary 38_count",
             "labels": {
               "foo": "bar"
             }
@@ -5614,10 +5614,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 38_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 38",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -5644,10 +5644,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 38_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 38",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -5674,10 +5674,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 38_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 38",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -5704,7 +5704,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 39_summary_sum",
+            "type": "workload.googleapis.com/testsummary 39_sum",
             "labels": {
               "foo": "bar"
             }
@@ -5734,7 +5734,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 39_summary_count",
+            "type": "workload.googleapis.com/testsummary 39_count",
             "labels": {
               "foo": "bar"
             }
@@ -5764,10 +5764,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 39_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 39",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -5794,10 +5794,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 39_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 39",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -5824,10 +5824,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 39_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 39",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -5854,7 +5854,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 40_summary_sum",
+            "type": "workload.googleapis.com/testsummary 40_sum",
             "labels": {
               "foo": "bar"
             }
@@ -5884,7 +5884,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 40_summary_count",
+            "type": "workload.googleapis.com/testsummary 40_count",
             "labels": {
               "foo": "bar"
             }
@@ -5914,10 +5914,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 40_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 40",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -5944,10 +5944,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 40_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 40",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -5974,10 +5974,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 40_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 40",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -6008,7 +6008,7 @@
       "timeSeries": [
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 41_summary_sum",
+            "type": "workload.googleapis.com/testsummary 41_sum",
             "labels": {
               "foo": "bar"
             }
@@ -6038,7 +6038,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 41_summary_count",
+            "type": "workload.googleapis.com/testsummary 41_count",
             "labels": {
               "foo": "bar"
             }
@@ -6068,10 +6068,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 41_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 41",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -6098,10 +6098,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 41_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 41",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -6128,10 +6128,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary 41_summary_percentile",
+            "type": "workload.googleapis.com/testsummary 41",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -6162,7 +6162,7 @@
   "createMetricDescriptorRequests": [
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 1_summary_sum",
+        "type": "workload.googleapis.com/testsummary 1_sum",
         "labels": [
           {
             "key": "foo"
@@ -6172,12 +6172,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 1_summary_sum"
+        "displayName": "testsummary 1_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 1_summary_count",
+        "type": "workload.googleapis.com/testsummary 1_count",
         "labels": [
           {
             "key": "foo"
@@ -6187,31 +6187,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 1_summary_count"
+        "displayName": "testsummary 1_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 1_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 1",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 1_summary_percentile"
+        "displayName": "testsummary 1"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 2_summary_sum",
+        "type": "workload.googleapis.com/testsummary 2_sum",
         "labels": [
           {
             "key": "foo"
@@ -6221,12 +6221,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 2_summary_sum"
+        "displayName": "testsummary 2_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 2_summary_count",
+        "type": "workload.googleapis.com/testsummary 2_count",
         "labels": [
           {
             "key": "foo"
@@ -6236,31 +6236,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 2_summary_count"
+        "displayName": "testsummary 2_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 2_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 2",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 2_summary_percentile"
+        "displayName": "testsummary 2"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 3_summary_sum",
+        "type": "workload.googleapis.com/testsummary 3_sum",
         "labels": [
           {
             "key": "foo"
@@ -6270,12 +6270,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 3_summary_sum"
+        "displayName": "testsummary 3_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 3_summary_count",
+        "type": "workload.googleapis.com/testsummary 3_count",
         "labels": [
           {
             "key": "foo"
@@ -6285,31 +6285,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 3_summary_count"
+        "displayName": "testsummary 3_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 3_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 3",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 3_summary_percentile"
+        "displayName": "testsummary 3"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 4_summary_sum",
+        "type": "workload.googleapis.com/testsummary 4_sum",
         "labels": [
           {
             "key": "foo"
@@ -6319,12 +6319,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 4_summary_sum"
+        "displayName": "testsummary 4_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 4_summary_count",
+        "type": "workload.googleapis.com/testsummary 4_count",
         "labels": [
           {
             "key": "foo"
@@ -6334,31 +6334,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 4_summary_count"
+        "displayName": "testsummary 4_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 4_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 4",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 4_summary_percentile"
+        "displayName": "testsummary 4"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 5_summary_sum",
+        "type": "workload.googleapis.com/testsummary 5_sum",
         "labels": [
           {
             "key": "foo"
@@ -6368,12 +6368,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 5_summary_sum"
+        "displayName": "testsummary 5_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 5_summary_count",
+        "type": "workload.googleapis.com/testsummary 5_count",
         "labels": [
           {
             "key": "foo"
@@ -6383,31 +6383,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 5_summary_count"
+        "displayName": "testsummary 5_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 5_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 5",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 5_summary_percentile"
+        "displayName": "testsummary 5"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 6_summary_sum",
+        "type": "workload.googleapis.com/testsummary 6_sum",
         "labels": [
           {
             "key": "foo"
@@ -6417,12 +6417,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 6_summary_sum"
+        "displayName": "testsummary 6_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 6_summary_count",
+        "type": "workload.googleapis.com/testsummary 6_count",
         "labels": [
           {
             "key": "foo"
@@ -6432,31 +6432,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 6_summary_count"
+        "displayName": "testsummary 6_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 6_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 6",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 6_summary_percentile"
+        "displayName": "testsummary 6"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 7_summary_sum",
+        "type": "workload.googleapis.com/testsummary 7_sum",
         "labels": [
           {
             "key": "foo"
@@ -6466,12 +6466,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 7_summary_sum"
+        "displayName": "testsummary 7_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 7_summary_count",
+        "type": "workload.googleapis.com/testsummary 7_count",
         "labels": [
           {
             "key": "foo"
@@ -6481,31 +6481,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 7_summary_count"
+        "displayName": "testsummary 7_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 7_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 7",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 7_summary_percentile"
+        "displayName": "testsummary 7"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 8_summary_sum",
+        "type": "workload.googleapis.com/testsummary 8_sum",
         "labels": [
           {
             "key": "foo"
@@ -6515,12 +6515,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 8_summary_sum"
+        "displayName": "testsummary 8_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 8_summary_count",
+        "type": "workload.googleapis.com/testsummary 8_count",
         "labels": [
           {
             "key": "foo"
@@ -6530,31 +6530,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 8_summary_count"
+        "displayName": "testsummary 8_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 8_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 8",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 8_summary_percentile"
+        "displayName": "testsummary 8"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 9_summary_sum",
+        "type": "workload.googleapis.com/testsummary 9_sum",
         "labels": [
           {
             "key": "foo"
@@ -6564,12 +6564,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 9_summary_sum"
+        "displayName": "testsummary 9_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 9_summary_count",
+        "type": "workload.googleapis.com/testsummary 9_count",
         "labels": [
           {
             "key": "foo"
@@ -6579,31 +6579,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 9_summary_count"
+        "displayName": "testsummary 9_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 9_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 9",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 9_summary_percentile"
+        "displayName": "testsummary 9"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 10_summary_sum",
+        "type": "workload.googleapis.com/testsummary 10_sum",
         "labels": [
           {
             "key": "foo"
@@ -6613,12 +6613,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 10_summary_sum"
+        "displayName": "testsummary 10_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 10_summary_count",
+        "type": "workload.googleapis.com/testsummary 10_count",
         "labels": [
           {
             "key": "foo"
@@ -6628,31 +6628,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 10_summary_count"
+        "displayName": "testsummary 10_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 10_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 10",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 10_summary_percentile"
+        "displayName": "testsummary 10"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 11_summary_sum",
+        "type": "workload.googleapis.com/testsummary 11_sum",
         "labels": [
           {
             "key": "foo"
@@ -6662,12 +6662,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 11_summary_sum"
+        "displayName": "testsummary 11_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 11_summary_count",
+        "type": "workload.googleapis.com/testsummary 11_count",
         "labels": [
           {
             "key": "foo"
@@ -6677,31 +6677,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 11_summary_count"
+        "displayName": "testsummary 11_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 11_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 11",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 11_summary_percentile"
+        "displayName": "testsummary 11"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 12_summary_sum",
+        "type": "workload.googleapis.com/testsummary 12_sum",
         "labels": [
           {
             "key": "foo"
@@ -6711,12 +6711,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 12_summary_sum"
+        "displayName": "testsummary 12_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 12_summary_count",
+        "type": "workload.googleapis.com/testsummary 12_count",
         "labels": [
           {
             "key": "foo"
@@ -6726,31 +6726,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 12_summary_count"
+        "displayName": "testsummary 12_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 12_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 12",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 12_summary_percentile"
+        "displayName": "testsummary 12"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 13_summary_sum",
+        "type": "workload.googleapis.com/testsummary 13_sum",
         "labels": [
           {
             "key": "foo"
@@ -6760,12 +6760,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 13_summary_sum"
+        "displayName": "testsummary 13_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 13_summary_count",
+        "type": "workload.googleapis.com/testsummary 13_count",
         "labels": [
           {
             "key": "foo"
@@ -6775,31 +6775,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 13_summary_count"
+        "displayName": "testsummary 13_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 13_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 13",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 13_summary_percentile"
+        "displayName": "testsummary 13"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 14_summary_sum",
+        "type": "workload.googleapis.com/testsummary 14_sum",
         "labels": [
           {
             "key": "foo"
@@ -6809,12 +6809,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 14_summary_sum"
+        "displayName": "testsummary 14_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 14_summary_count",
+        "type": "workload.googleapis.com/testsummary 14_count",
         "labels": [
           {
             "key": "foo"
@@ -6824,31 +6824,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 14_summary_count"
+        "displayName": "testsummary 14_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 14_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 14",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 14_summary_percentile"
+        "displayName": "testsummary 14"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 15_summary_sum",
+        "type": "workload.googleapis.com/testsummary 15_sum",
         "labels": [
           {
             "key": "foo"
@@ -6858,12 +6858,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 15_summary_sum"
+        "displayName": "testsummary 15_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 15_summary_count",
+        "type": "workload.googleapis.com/testsummary 15_count",
         "labels": [
           {
             "key": "foo"
@@ -6873,31 +6873,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 15_summary_count"
+        "displayName": "testsummary 15_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 15_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 15",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 15_summary_percentile"
+        "displayName": "testsummary 15"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 16_summary_sum",
+        "type": "workload.googleapis.com/testsummary 16_sum",
         "labels": [
           {
             "key": "foo"
@@ -6907,12 +6907,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 16_summary_sum"
+        "displayName": "testsummary 16_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 16_summary_count",
+        "type": "workload.googleapis.com/testsummary 16_count",
         "labels": [
           {
             "key": "foo"
@@ -6922,31 +6922,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 16_summary_count"
+        "displayName": "testsummary 16_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 16_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 16",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 16_summary_percentile"
+        "displayName": "testsummary 16"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 17_summary_sum",
+        "type": "workload.googleapis.com/testsummary 17_sum",
         "labels": [
           {
             "key": "foo"
@@ -6956,12 +6956,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 17_summary_sum"
+        "displayName": "testsummary 17_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 17_summary_count",
+        "type": "workload.googleapis.com/testsummary 17_count",
         "labels": [
           {
             "key": "foo"
@@ -6971,31 +6971,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 17_summary_count"
+        "displayName": "testsummary 17_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 17_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 17",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 17_summary_percentile"
+        "displayName": "testsummary 17"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 18_summary_sum",
+        "type": "workload.googleapis.com/testsummary 18_sum",
         "labels": [
           {
             "key": "foo"
@@ -7005,12 +7005,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 18_summary_sum"
+        "displayName": "testsummary 18_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 18_summary_count",
+        "type": "workload.googleapis.com/testsummary 18_count",
         "labels": [
           {
             "key": "foo"
@@ -7020,31 +7020,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 18_summary_count"
+        "displayName": "testsummary 18_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 18_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 18",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 18_summary_percentile"
+        "displayName": "testsummary 18"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 19_summary_sum",
+        "type": "workload.googleapis.com/testsummary 19_sum",
         "labels": [
           {
             "key": "foo"
@@ -7054,12 +7054,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 19_summary_sum"
+        "displayName": "testsummary 19_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 19_summary_count",
+        "type": "workload.googleapis.com/testsummary 19_count",
         "labels": [
           {
             "key": "foo"
@@ -7069,31 +7069,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 19_summary_count"
+        "displayName": "testsummary 19_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 19_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 19",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 19_summary_percentile"
+        "displayName": "testsummary 19"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 20_summary_sum",
+        "type": "workload.googleapis.com/testsummary 20_sum",
         "labels": [
           {
             "key": "foo"
@@ -7103,12 +7103,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 20_summary_sum"
+        "displayName": "testsummary 20_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 20_summary_count",
+        "type": "workload.googleapis.com/testsummary 20_count",
         "labels": [
           {
             "key": "foo"
@@ -7118,31 +7118,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 20_summary_count"
+        "displayName": "testsummary 20_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 20_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 20",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 20_summary_percentile"
+        "displayName": "testsummary 20"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 21_summary_sum",
+        "type": "workload.googleapis.com/testsummary 21_sum",
         "labels": [
           {
             "key": "foo"
@@ -7152,12 +7152,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 21_summary_sum"
+        "displayName": "testsummary 21_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 21_summary_count",
+        "type": "workload.googleapis.com/testsummary 21_count",
         "labels": [
           {
             "key": "foo"
@@ -7167,31 +7167,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 21_summary_count"
+        "displayName": "testsummary 21_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 21_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 21",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 21_summary_percentile"
+        "displayName": "testsummary 21"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 22_summary_sum",
+        "type": "workload.googleapis.com/testsummary 22_sum",
         "labels": [
           {
             "key": "foo"
@@ -7201,12 +7201,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 22_summary_sum"
+        "displayName": "testsummary 22_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 22_summary_count",
+        "type": "workload.googleapis.com/testsummary 22_count",
         "labels": [
           {
             "key": "foo"
@@ -7216,31 +7216,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 22_summary_count"
+        "displayName": "testsummary 22_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 22_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 22",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 22_summary_percentile"
+        "displayName": "testsummary 22"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 23_summary_sum",
+        "type": "workload.googleapis.com/testsummary 23_sum",
         "labels": [
           {
             "key": "foo"
@@ -7250,12 +7250,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 23_summary_sum"
+        "displayName": "testsummary 23_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 23_summary_count",
+        "type": "workload.googleapis.com/testsummary 23_count",
         "labels": [
           {
             "key": "foo"
@@ -7265,31 +7265,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 23_summary_count"
+        "displayName": "testsummary 23_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 23_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 23",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 23_summary_percentile"
+        "displayName": "testsummary 23"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 24_summary_sum",
+        "type": "workload.googleapis.com/testsummary 24_sum",
         "labels": [
           {
             "key": "foo"
@@ -7299,12 +7299,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 24_summary_sum"
+        "displayName": "testsummary 24_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 24_summary_count",
+        "type": "workload.googleapis.com/testsummary 24_count",
         "labels": [
           {
             "key": "foo"
@@ -7314,31 +7314,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 24_summary_count"
+        "displayName": "testsummary 24_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 24_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 24",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 24_summary_percentile"
+        "displayName": "testsummary 24"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 25_summary_sum",
+        "type": "workload.googleapis.com/testsummary 25_sum",
         "labels": [
           {
             "key": "foo"
@@ -7348,12 +7348,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 25_summary_sum"
+        "displayName": "testsummary 25_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 25_summary_count",
+        "type": "workload.googleapis.com/testsummary 25_count",
         "labels": [
           {
             "key": "foo"
@@ -7363,31 +7363,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 25_summary_count"
+        "displayName": "testsummary 25_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 25_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 25",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 25_summary_percentile"
+        "displayName": "testsummary 25"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 26_summary_sum",
+        "type": "workload.googleapis.com/testsummary 26_sum",
         "labels": [
           {
             "key": "foo"
@@ -7397,12 +7397,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 26_summary_sum"
+        "displayName": "testsummary 26_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 26_summary_count",
+        "type": "workload.googleapis.com/testsummary 26_count",
         "labels": [
           {
             "key": "foo"
@@ -7412,31 +7412,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 26_summary_count"
+        "displayName": "testsummary 26_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 26_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 26",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 26_summary_percentile"
+        "displayName": "testsummary 26"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 27_summary_sum",
+        "type": "workload.googleapis.com/testsummary 27_sum",
         "labels": [
           {
             "key": "foo"
@@ -7446,12 +7446,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 27_summary_sum"
+        "displayName": "testsummary 27_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 27_summary_count",
+        "type": "workload.googleapis.com/testsummary 27_count",
         "labels": [
           {
             "key": "foo"
@@ -7461,31 +7461,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 27_summary_count"
+        "displayName": "testsummary 27_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 27_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 27",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 27_summary_percentile"
+        "displayName": "testsummary 27"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 28_summary_sum",
+        "type": "workload.googleapis.com/testsummary 28_sum",
         "labels": [
           {
             "key": "foo"
@@ -7495,12 +7495,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 28_summary_sum"
+        "displayName": "testsummary 28_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 28_summary_count",
+        "type": "workload.googleapis.com/testsummary 28_count",
         "labels": [
           {
             "key": "foo"
@@ -7510,31 +7510,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 28_summary_count"
+        "displayName": "testsummary 28_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 28_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 28",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 28_summary_percentile"
+        "displayName": "testsummary 28"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 29_summary_sum",
+        "type": "workload.googleapis.com/testsummary 29_sum",
         "labels": [
           {
             "key": "foo"
@@ -7544,12 +7544,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 29_summary_sum"
+        "displayName": "testsummary 29_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 29_summary_count",
+        "type": "workload.googleapis.com/testsummary 29_count",
         "labels": [
           {
             "key": "foo"
@@ -7559,31 +7559,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 29_summary_count"
+        "displayName": "testsummary 29_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 29_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 29",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 29_summary_percentile"
+        "displayName": "testsummary 29"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 30_summary_sum",
+        "type": "workload.googleapis.com/testsummary 30_sum",
         "labels": [
           {
             "key": "foo"
@@ -7593,12 +7593,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 30_summary_sum"
+        "displayName": "testsummary 30_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 30_summary_count",
+        "type": "workload.googleapis.com/testsummary 30_count",
         "labels": [
           {
             "key": "foo"
@@ -7608,31 +7608,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 30_summary_count"
+        "displayName": "testsummary 30_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 30_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 30",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 30_summary_percentile"
+        "displayName": "testsummary 30"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 31_summary_sum",
+        "type": "workload.googleapis.com/testsummary 31_sum",
         "labels": [
           {
             "key": "foo"
@@ -7642,12 +7642,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 31_summary_sum"
+        "displayName": "testsummary 31_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 31_summary_count",
+        "type": "workload.googleapis.com/testsummary 31_count",
         "labels": [
           {
             "key": "foo"
@@ -7657,31 +7657,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 31_summary_count"
+        "displayName": "testsummary 31_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 31_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 31",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 31_summary_percentile"
+        "displayName": "testsummary 31"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 32_summary_sum",
+        "type": "workload.googleapis.com/testsummary 32_sum",
         "labels": [
           {
             "key": "foo"
@@ -7691,12 +7691,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 32_summary_sum"
+        "displayName": "testsummary 32_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 32_summary_count",
+        "type": "workload.googleapis.com/testsummary 32_count",
         "labels": [
           {
             "key": "foo"
@@ -7706,31 +7706,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 32_summary_count"
+        "displayName": "testsummary 32_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 32_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 32",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 32_summary_percentile"
+        "displayName": "testsummary 32"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 33_summary_sum",
+        "type": "workload.googleapis.com/testsummary 33_sum",
         "labels": [
           {
             "key": "foo"
@@ -7740,12 +7740,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 33_summary_sum"
+        "displayName": "testsummary 33_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 33_summary_count",
+        "type": "workload.googleapis.com/testsummary 33_count",
         "labels": [
           {
             "key": "foo"
@@ -7755,31 +7755,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 33_summary_count"
+        "displayName": "testsummary 33_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 33_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 33",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 33_summary_percentile"
+        "displayName": "testsummary 33"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 34_summary_sum",
+        "type": "workload.googleapis.com/testsummary 34_sum",
         "labels": [
           {
             "key": "foo"
@@ -7789,12 +7789,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 34_summary_sum"
+        "displayName": "testsummary 34_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 34_summary_count",
+        "type": "workload.googleapis.com/testsummary 34_count",
         "labels": [
           {
             "key": "foo"
@@ -7804,31 +7804,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 34_summary_count"
+        "displayName": "testsummary 34_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 34_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 34",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 34_summary_percentile"
+        "displayName": "testsummary 34"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 35_summary_sum",
+        "type": "workload.googleapis.com/testsummary 35_sum",
         "labels": [
           {
             "key": "foo"
@@ -7838,12 +7838,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 35_summary_sum"
+        "displayName": "testsummary 35_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 35_summary_count",
+        "type": "workload.googleapis.com/testsummary 35_count",
         "labels": [
           {
             "key": "foo"
@@ -7853,31 +7853,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 35_summary_count"
+        "displayName": "testsummary 35_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 35_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 35",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 35_summary_percentile"
+        "displayName": "testsummary 35"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 36_summary_sum",
+        "type": "workload.googleapis.com/testsummary 36_sum",
         "labels": [
           {
             "key": "foo"
@@ -7887,12 +7887,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 36_summary_sum"
+        "displayName": "testsummary 36_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 36_summary_count",
+        "type": "workload.googleapis.com/testsummary 36_count",
         "labels": [
           {
             "key": "foo"
@@ -7902,31 +7902,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 36_summary_count"
+        "displayName": "testsummary 36_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 36_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 36",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 36_summary_percentile"
+        "displayName": "testsummary 36"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 37_summary_sum",
+        "type": "workload.googleapis.com/testsummary 37_sum",
         "labels": [
           {
             "key": "foo"
@@ -7936,12 +7936,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 37_summary_sum"
+        "displayName": "testsummary 37_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 37_summary_count",
+        "type": "workload.googleapis.com/testsummary 37_count",
         "labels": [
           {
             "key": "foo"
@@ -7951,31 +7951,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 37_summary_count"
+        "displayName": "testsummary 37_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 37_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 37",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 37_summary_percentile"
+        "displayName": "testsummary 37"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 38_summary_sum",
+        "type": "workload.googleapis.com/testsummary 38_sum",
         "labels": [
           {
             "key": "foo"
@@ -7985,12 +7985,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 38_summary_sum"
+        "displayName": "testsummary 38_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 38_summary_count",
+        "type": "workload.googleapis.com/testsummary 38_count",
         "labels": [
           {
             "key": "foo"
@@ -8000,31 +8000,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 38_summary_count"
+        "displayName": "testsummary 38_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 38_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 38",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 38_summary_percentile"
+        "displayName": "testsummary 38"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 39_summary_sum",
+        "type": "workload.googleapis.com/testsummary 39_sum",
         "labels": [
           {
             "key": "foo"
@@ -8034,12 +8034,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 39_summary_sum"
+        "displayName": "testsummary 39_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 39_summary_count",
+        "type": "workload.googleapis.com/testsummary 39_count",
         "labels": [
           {
             "key": "foo"
@@ -8049,31 +8049,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 39_summary_count"
+        "displayName": "testsummary 39_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 39_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 39",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 39_summary_percentile"
+        "displayName": "testsummary 39"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 40_summary_sum",
+        "type": "workload.googleapis.com/testsummary 40_sum",
         "labels": [
           {
             "key": "foo"
@@ -8083,12 +8083,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 40_summary_sum"
+        "displayName": "testsummary 40_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 40_summary_count",
+        "type": "workload.googleapis.com/testsummary 40_count",
         "labels": [
           {
             "key": "foo"
@@ -8098,31 +8098,31 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 40_summary_count"
+        "displayName": "testsummary 40_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 40_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 40",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 40_summary_percentile"
+        "displayName": "testsummary 40"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 41_summary_sum",
+        "type": "workload.googleapis.com/testsummary 41_sum",
         "labels": [
           {
             "key": "foo"
@@ -8132,12 +8132,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 41_summary_sum"
+        "displayName": "testsummary 41_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 41_summary_count",
+        "type": "workload.googleapis.com/testsummary 41_count",
         "labels": [
           {
             "key": "foo"
@@ -8147,26 +8147,26 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 41_summary_count"
+        "displayName": "testsummary 41_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary 41_summary_percentile",
+        "type": "workload.googleapis.com/testsummary 41",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary 41_summary_percentile"
+        "displayName": "testsummary 41"
       }
     }
   ],
diff --git a/exporter/collector/integrationtest/testdata/fixtures/summary_metrics_expect.json b/exporter/collector/integrationtest/testdata/fixtures/summary_metrics_expect.json
index 44e75d6..531755f 100644
--- a/exporter/collector/integrationtest/testdata/fixtures/summary_metrics_expect.json
+++ b/exporter/collector/integrationtest/testdata/fixtures/summary_metrics_expect.json
@@ -4,7 +4,7 @@
       "timeSeries": [
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary_summary_sum",
+            "type": "workload.googleapis.com/testsummary_sum",
             "labels": {
               "foo": "bar"
             }
@@ -34,7 +34,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary_summary_count",
+            "type": "workload.googleapis.com/testsummary_count",
             "labels": {
               "foo": "bar"
             }
@@ -64,10 +64,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary_summary_percentile",
+            "type": "workload.googleapis.com/testsummary",
             "labels": {
               "foo": "bar",
-              "percentile": "50.000000"
+              "quantile": "0.500000"
             }
           },
           "resource": {
@@ -94,10 +94,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary_summary_percentile",
+            "type": "workload.googleapis.com/testsummary",
             "labels": {
               "foo": "bar",
-              "percentile": "75.000000"
+              "quantile": "0.750000"
             }
           },
           "resource": {
@@ -124,10 +124,10 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/testsummary_summary_percentile",
+            "type": "workload.googleapis.com/testsummary",
             "labels": {
               "foo": "bar",
-              "percentile": "90.000000"
+              "quantile": "0.900000"
             }
           },
           "resource": {
@@ -158,7 +158,7 @@
   "createMetricDescriptorRequests": [
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary_summary_sum",
+        "type": "workload.googleapis.com/testsummary_sum",
         "labels": [
           {
             "key": "foo"
@@ -168,12 +168,12 @@
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary_summary_sum"
+        "displayName": "testsummary_sum"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary_summary_count",
+        "type": "workload.googleapis.com/testsummary_count",
         "labels": [
           {
             "key": "foo"
@@ -183,26 +183,26 @@
         "valueType": "INT64",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary_summary_count"
+        "displayName": "testsummary_count"
       }
     },
     {
       "metricDescriptor": {
-        "type": "workload.googleapis.com/testsummary_summary_percentile",
+        "type": "workload.googleapis.com/testsummary",
         "labels": [
           {
             "key": "foo"
           },
           {
-            "key": "percentile",
-            "description": "the value at a given percentile of a distribution"
+            "key": "quantile",
+            "description": "the value at a given quantile of a distribution"
           }
         ],
         "metricKind": "GAUGE",
         "valueType": "DOUBLE",
         "unit": "1",
         "description": "This is a test summary",
-        "displayName": "testsummary_summary_percentile"
+        "displayName": "testsummary"
       }
     }
   ],
diff --git a/exporter/collector/integrationtest/testdata/fixtures/workload_metrics_expect.json b/exporter/collector/integrationtest/testdata/fixtures/workload_metrics_expect.json
index be2e752..9d5532e 100644
--- a/exporter/collector/integrationtest/testdata/fixtures/workload_metrics_expect.json
+++ b/exporter/collector/integrationtest/testdata/fixtures/workload_metrics_expect.json
@@ -3445,7 +3445,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/telemetry_scrape_encoded_size_bytes_summary_sum",
+            "type": "workload.googleapis.com/telemetry_scrape_encoded_size_bytes_sum",
             "labels": {
               "content_type": "text/plain; version=0.0.4",
               "encoding": "gzip",
@@ -3480,7 +3480,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/telemetry_scrape_encoded_size_bytes_summary_count",
+            "type": "workload.googleapis.com/telemetry_scrape_encoded_size_bytes_count",
             "labels": {
               "content_type": "text/plain; version=0.0.4",
               "encoding": "gzip",
@@ -3515,7 +3515,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/telemetry_scrape_size_bytes_summary_sum",
+            "type": "workload.googleapis.com/telemetry_scrape_size_bytes_sum",
             "labels": {
               "content_type": "text/plain; version=0.0.4",
               "job": "default/rabbitmq/0",
@@ -3549,7 +3549,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/telemetry_scrape_size_bytes_summary_count",
+            "type": "workload.googleapis.com/telemetry_scrape_size_bytes_count",
             "labels": {
               "content_type": "text/plain; version=0.0.4",
               "job": "default/rabbitmq/0",
@@ -3583,7 +3583,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/telemetry_scrape_duration_seconds_summary_sum",
+            "type": "workload.googleapis.com/telemetry_scrape_duration_seconds_sum",
             "labels": {
               "content_type": "text/plain; version=0.0.4",
               "job": "default/rabbitmq/0",
@@ -3617,7 +3617,7 @@
         },
         {
           "metric": {
-            "type": "workload.googleapis.com/telemetry_scrape_duration_seconds_summary_count",
+            "type": "workload.googleapis.com/telemetry_scrape_duration_seconds_count",
             "labels": {
               "content_type": "text/plain; version=0.0.4",
               "job": "default/rabbitmq/0",
diff --git a/exporter/collector/metricsexporter_test.go b/exporter/collector/metricsexporter_test.go
index 0d6c806..5aaeeb9 100644
--- a/exporter/collector/metricsexporter_test.go
+++ b/exporter/collector/metricsexporter_test.go
@@ -478,7 +478,7 @@ func TestSummaryPointToTimeSeries(t *testing.T) {
 	assert.Equal(t, sumResult.ValueType, metricpb.MetricDescriptor_DOUBLE)
 	assert.Equal(t, sumResult.Unit, unit)
 	assert.Same(t, sumResult.Resource, mr)
-	assert.Equal(t, sumResult.Metric.Type, "workload.googleapis.com/mysummary_summary_sum")
+	assert.Equal(t, sumResult.Metric.Type, "workload.googleapis.com/mysummary_sum")
 	assert.Equal(t, sumResult.Metric.Labels, map[string]string{})
 	assert.Nil(t, sumResult.Metadata)
 	assert.Len(t, sumResult.Points, 1)
@@ -492,7 +492,7 @@ func TestSummaryPointToTimeSeries(t *testing.T) {
 	assert.Equal(t, countResult.ValueType, metricpb.MetricDescriptor_INT64)
 	assert.Equal(t, countResult.Unit, unit)
 	assert.Same(t, countResult.Resource, mr)
-	assert.Equal(t, countResult.Metric.Type, "workload.googleapis.com/mysummary_summary_count")
+	assert.Equal(t, countResult.Metric.Type, "workload.googleapis.com/mysummary_count")
 	assert.Equal(t, countResult.Metric.Labels, map[string]string{})
 	assert.Nil(t, countResult.Metadata)
 	assert.Len(t, countResult.Points, 1)
@@ -506,9 +506,9 @@ func TestSummaryPointToTimeSeries(t *testing.T) {
 	assert.Equal(t, quantileResult.ValueType, metricpb.MetricDescriptor_DOUBLE)
 	assert.Equal(t, quantileResult.Unit, unit)
 	assert.Same(t, quantileResult.Resource, mr)
-	assert.Equal(t, quantileResult.Metric.Type, "workload.googleapis.com/mysummary_summary_percentile")
+	assert.Equal(t, quantileResult.Metric.Type, "workload.googleapis.com/mysummary")
 	assert.Equal(t, quantileResult.Metric.Labels, map[string]string{
-		"percentile": "100.000000",
+		"quantile": "1.000000",
 	})
 	assert.Nil(t, quantileResult.Metadata)
 	assert.Len(t, quantileResult.Points, 1)
@@ -813,8 +813,8 @@ func TestMetricDescriptorMapping(t *testing.T) {
 			},
 			expected: []*metricpb.MetricDescriptor{
 				{
-					DisplayName: "test.metric_summary_sum",
-					Type:        "workload.googleapis.com/test.metric_summary_sum",
+					DisplayName: "test.metric_sum",
+					Type:        "workload.googleapis.com/test.metric_sum",
 					MetricKind:  metricpb.MetricDescriptor_CUMULATIVE,
 					ValueType:   metricpb.MetricDescriptor_DOUBLE,
 					Unit:        "1",
@@ -826,8 +826,8 @@ func TestMetricDescriptorMapping(t *testing.T) {
 					},
 				},
 				{
-					DisplayName: "test.metric_summary_count",
-					Type:        "workload.googleapis.com/test.metric_summary_count",
+					DisplayName: "test.metric_count",
+					Type:        "workload.googleapis.com/test.metric_count",
 					MetricKind:  metricpb.MetricDescriptor_CUMULATIVE,
 					ValueType:   metricpb.MetricDescriptor_INT64,
 					Unit:        "1",
@@ -839,8 +839,8 @@ func TestMetricDescriptorMapping(t *testing.T) {
 					},
 				},
 				{
-					Type:        "workload.googleapis.com/test.metric_summary_percentile",
-					DisplayName: "test.metric_summary_percentile",
+					Type:        "workload.googleapis.com/test.metric",
+					DisplayName: "test.metric",
 					MetricKind:  metricpb.MetricDescriptor_GAUGE,
 					ValueType:   metricpb.MetricDescriptor_DOUBLE,
 					Unit:        "1",
@@ -850,8 +850,8 @@ func TestMetricDescriptorMapping(t *testing.T) {
 							Key: "test_label",
 						},
 						{
-							Key:         "percentile",
-							Description: "the value at a given percentile of a distribution",
+							Key:         "quantile",
+							Description: "the value at a given quantile of a distribution",
 						},
 					},
 				},