From 0d572d5ad8ae0a1292460f7914129c857b55151c Mon Sep 17 00:00:00 2001 From: Owen Williams Date: Thu, 28 Dec 2023 14:42:13 -0500 Subject: [PATCH] remove bad backports --- expfmt/openmetrics_create_test.go | 9 +-------- expfmt/text_create_test.go | 7 ------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/expfmt/openmetrics_create_test.go b/expfmt/openmetrics_create_test.go index 37b17672..9449e792 100644 --- a/expfmt/openmetrics_create_test.go +++ b/expfmt/openmetrics_create_test.go @@ -24,7 +24,6 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" dto "github.com/prometheus/client_model/go" - "github.com/prometheus/common/model" ) func TestCreateOpenMetrics(t *testing.T) { @@ -33,12 +32,6 @@ func TestCreateOpenMetrics(t *testing.T) { t.Error(err) } - oldDefaultScheme := model.DefaultNameEscapingScheme - model.DefaultNameEscapingScheme = model.NoEscaping - defer func() { - model.DefaultNameEscapingScheme = oldDefaultScheme - }() - var scenarios = []struct { in *dto.MetricFamily out string @@ -50,7 +43,7 @@ func TestCreateOpenMetrics(t *testing.T) { Help: proto.String("two-line\n doc str\\ing"), Type: dto.MetricType_COUNTER.Enum(), Metric: []*dto.Metric{ - { + { Label: []*dto.LabelPair{ { Name: proto.String("labelname"), diff --git a/expfmt/text_create_test.go b/expfmt/text_create_test.go index cc992224..fb20a863 100644 --- a/expfmt/text_create_test.go +++ b/expfmt/text_create_test.go @@ -22,16 +22,9 @@ import ( "google.golang.org/protobuf/proto" dto "github.com/prometheus/client_model/go" - "github.com/prometheus/common/model" ) func TestCreate(t *testing.T) { - oldDefaultScheme := model.DefaultNameEscapingScheme - model.DefaultNameEscapingScheme = model.NoEscaping - defer func() { - model.DefaultNameEscapingScheme = oldDefaultScheme - }() - var scenarios = []struct { in *dto.MetricFamily out string