expfmt/encode_test.go

@@ -383,9 +383,9 @@ func TestEscapedEncode(t *testing.T) {
 		t.Errorf("expected the output bytes buffer to be non-empty")
 	}
 
-	expected := `# TYPE U__foo_2e_metric untyped
-U__foo_2e_metric 1.234
-U__foo_2e_metric{U__dotted_2e_label_2e_name="my.label.value"} 8
+	expected := `# TYPE foo_metric untyped
+foo_metric 1.234
+foo_metric{dotted_label_name="my.label.value"} 8
 `
 
 	if string(out) != expected {

expfmt/expfmt.go

@@ -112,6 +112,29 @@ func NewOpenMetricsFormat(version string) (Format, error) {
 	return FmtUnknown, fmt.Errorf("unknown open metrics version string")
 }
 
+// WithEscapingScheme returns a copy of Format with the specified escaping
+// scheme appended to the end. If an escaping scheme already exists it is
+// removed.
+func (f Format) WithEscapingScheme(s model.EscapingScheme) Format {
+	var terms []string
+	for _, p := range strings.Split(string(f), ";") {
+		toks := strings.Split(p, "=")
+		if len(toks) != 2 {
+			trimmed := strings.TrimSpace(p)
+			if len(trimmed) > 0 {
+				terms = append(terms, trimmed)
+			}
+			continue
+		}
+		key := strings.TrimSpace(toks[0])
+		if key != model.EscapingKey {
+			terms = append(terms, strings.TrimSpace(p))
+		}
+	}
+	terms = append(terms, model.EscapingKey+"="+s.String())
+	return Format(strings.Join(terms, "; "))
+}
+
 // FormatType deduces an overall FormatType for the given format.
 func (f Format) FormatType() FormatType {
 	toks := strings.Split(string(f), ";")

expfmt/expfmt_test.go

@@ -17,6 +17,8 @@ import (
 	"testing"
 
 	"github.com/prometheus/common/model"
+
+	"github.com/stretchr/testify/require"
 )
 
 // Test Format to Escapting Scheme conversion
@@ -92,9 +94,7 @@ func TestToFormatType(t *testing.T) {
 		},
 	}
 	for _, test := range tests {
-		if test.format.FormatType() != test.expected {
-			t.Errorf("expected %v got %v", test.expected, test.format.FormatType())
-		}
+		require.Equal(t, test.expected, test.format.FormatType())
 	}
 }
 
@@ -105,11 +105,11 @@ func TestToEscapingScheme(t *testing.T) {
 	}{
 		{
 			format:   FmtProtoCompact,
-			expected: model.ValueEncodingEscaping,
+			expected: model.UnderscoreEscaping,
 		},
 		{
-			format:   "application/openmetrics-text; version=1.0.0; charset=utf-8; escaping=underscores",
-			expected: model.UnderscoreEscaping,
+			format:   "application/openmetrics-text; version=1.0.0; charset=utf-8; escaping=dots",
+			expected: model.DotsEscaping,
 		},
 		{
 			format:   "application/openmetrics-text; version=1.0.0; charset=utf-8; escaping=allow-utf-8",
@@ -122,8 +122,43 @@ func TestToEscapingScheme(t *testing.T) {
 		},
 	}
 	for _, test := range tests {
-		if test.format.ToEscapingScheme() != test.expected {
-			t.Errorf("expected %v got %v", test.expected, test.format.ToEscapingScheme())
-		}
+		require.Equal(t, test.expected, test.format.ToEscapingScheme())
+	}
+}
+
+func TestWithEscapingScheme(t *testing.T) {
+	tests := []struct {
+		name     string
+		format   Format
+		scheme   model.EscapingScheme
+		expected string
+	}{
+		{
+			name:     "no existing term, append one",
+			format:   FmtProtoCompact,
+			scheme:   model.DotsEscaping,
+			expected: "application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=compact-text; escaping=dots",
+		},
+		{
+			name:     "existing term at end, replace",
+			format:   "application/openmetrics-text; version=1.0.0; charset=utf-8; escaping=underscores",
+			scheme:   model.ValueEncodingEscaping,
+			expected: "application/openmetrics-text; version=1.0.0; charset=utf-8; escaping=values",
+		},
+		{
+			name:     "existing term in middle, replace",
+			format:   "application/openmetrics-text; escaping=dots; version=1.0.0; charset=utf-8; ",
+			scheme:   model.NoEscaping,
+			expected: "application/openmetrics-text; version=1.0.0; charset=utf-8; escaping=allow-utf-8",
+		},
+		{
+			name:     "multiple existing terms removed",
+			format:   "application/openmetrics-text; escaping=dots; version=1.0.0; charset=utf-8; escaping=allow-utf-8",
+			scheme:   model.ValueEncodingEscaping,
+			expected: "application/openmetrics-text; version=1.0.0; charset=utf-8; escaping=values",
+		},
+	}
+	for _, test := range tests {
+		require.Equal(t, test.expected, string(test.format.WithEscapingScheme(test.scheme)))
 	}
 }

model/metric.go

@@ -34,10 +34,13 @@ var (
 	// goroutines are started.
 	NameValidationScheme = LegacyValidation
 
-	// NameEscapingScheme defines the default way that names will be
-	// escaped when presented to systems that do not support UTF-8 names. If the
-	// Content-Type "escaping" term is specified, that will override this value.
-	NameEscapingScheme = ValueEncodingEscaping
+	// NameEscapingScheme defines the default way that names will be escaped when
+	// presented to systems that do not support UTF-8 names. If the Content-Type
+	// "escaping" term is specified, that will override this value.
+	// NameEscapingScheme should not be set to the NoEscaping value. That string
+	// is used in content negotiation to indicate that a system supports UTF-8 and
+	// has that feature enabled.
+	NameEscapingScheme = UnderscoreEscaping
 )
 
 // ValidationScheme is a Go enum for determining how metric and label names will