Merge remote-tracking branch 'origin/main' into owilliams/escaping

Author: ywwg

expfmt/encode_test.go

@@ -18,6 +18,7 @@ import (
 	"net/http"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/proto"
 
@@ -311,50 +312,28 @@ foo_metric 1.234
 
 func TestEscapedEncode(t *testing.T) {
 	tests := []struct {
-		name           string
-		format         Format
-		expectedOutput string // empty means no specific output check
+		name   string
+		format Format
 	}{
 		{
-			name:           "ProtoDelim with escaping",
-			format:         FmtProtoDelim + "; escaping=underscores",
-			expectedOutput: "M\n\nfoo_metric\x18\x03\"\v*\t\tX9\xb4\xc8v\xbe\xf3?\"0\n#\n\x11dotted_label_name\x12\x0emy.label.value*\t\t\x00\x00\x00\x00\x00\x00 @",
+			name:   "ProtoDelim",
+			format: FmtProtoDelim,
+		},
+		{
+			name:   "ProtoDelim with escaping underscores",
+			format: FmtProtoDelim + "; escaping=underscores",
 		},
 		{
 			name:   "ProtoCompact",
 			format: FmtProtoCompact,
-			expectedOutput: `name:"foo_metric" type:UNTYPED metric:{untyped:{value:1.234}} metric:{label:{name:"dotted_label_name" value:"my.label.value"} untyped:{value:8}}
-`,
 		},
 		{
 			name:   "ProtoText",
 			format: FmtProtoText,
-			expectedOutput: `name: "foo_metric"
-type: UNTYPED
-metric: {
-  untyped: {
-    value: 1.234
-  }
-}
-metric: {
-  label: {
-    name: "dotted_label_name"
-    value: "my.label.value"
-  }
-  untyped: {
-    value: 8
-  }
-}
-
-`,
 		},
 		{
 			name:   "Text",
 			format: FmtText,
-			expectedOutput: `# TYPE foo_metric untyped
-foo_metric 1.234
-foo_metric{dotted_label_name="my.label.value"} 8
-`,
 		},
 	}
 
@@ -388,10 +367,12 @@ foo_metric{dotted_label_name="my.label.value"} 8
 			err := encoder.Encode(metric)
 			require.NoError(t, err)
 
-			out := buff.Bytes()
-			require.NotEmptyf(t, out, "expected the output bytes buffer to be non-empty")
-
-			require.Equal(t, tt.expectedOutput, string(out))
+			s := buff.String()
+			assert.NotContains(t, s, "foo.metric")
+			assert.Contains(t, s, "foo_metric")
+			assert.NotContains(t, s, "dotted.label.name")
+			assert.Contains(t, s, "dotted_label_name")
+			assert.Contains(t, s, "my.label.value")
 		})
 	}
 }