diff --git a/model/textparse/openmetricsparse.go b/model/textparse/openmetricsparse.go index a1ea28bfae..078df4e402 100644 --- a/model/textparse/openmetricsparse.go +++ b/model/textparse/openmetricsparse.go @@ -98,18 +98,18 @@ type OpenMetricsParser struct { // lines ending with _created are skipped by default as they are // parsed by the CreatedTimestamp method. The skipCT flag is set to // false when the CreatedTimestamp method is called. - skipCT bool + skipCTSeries bool } type openMetricsParserOptions struct { // SkipCT skips the parsing of _created lines. - SkipCT bool + SkipCTSeries bool } type OpenMetricsOption func(*openMetricsParserOptions) -func WithOMParserCTSeriesSkipped(skipCT bool) OpenMetricsOption { +func WithOMParserCTSeriesSkipped(skipCTSeries bool) OpenMetricsOption { return func(o *openMetricsParserOptions) { - o.SkipCT = skipCT + o.SkipCTSeries = skipCTSeries } } @@ -118,7 +118,7 @@ func NewOpenMetricsParser(b []byte, st *labels.SymbolTable) Parser { return &OpenMetricsParser{ l: &openMetricsLexer{b: b}, builder: labels.NewScratchBuilderWithSymbolTable(st, 16), - skipCT: false, + skipCTSeries: false, } } @@ -129,12 +129,12 @@ func NewOpenMetricsParserWithOpts(b []byte, st *labels.SymbolTable, opts ...Open builder: labels.NewScratchBuilderWithSymbolTable(st, 16), } DefaultOpenMetricsParserOptions := openMetricsParserOptions{ - SkipCT: true, + SkipCTSeries: true, } for _, opt := range opts { opt(&DefaultOpenMetricsParserOptions) } - parser.skipCT = DefaultOpenMetricsParserOptions.SkipCT + parser.skipCTSeries = DefaultOpenMetricsParserOptions.SkipCTSeries return parser } @@ -336,7 +336,7 @@ func deepCopy(p *OpenMetricsParser) OpenMetricsParser { builder: p.builder, mtype: p.mtype, val: p.val, - skipCT: false, + skipCTSeries: false, } return newParser } @@ -628,7 +628,7 @@ func (p *OpenMetricsParser) parseMetricSuffix(t token) (Entry, error) { } } - if p.skipCT { + if p.skipCTSeries { var newLbs labels.Labels p.Metric(&newLbs) name := newLbs.Get(model.MetricNameLabel) diff --git a/model/textparse/openmetricsparse_test.go b/model/textparse/openmetricsparse_test.go index 23cb5590bf..f0a0acaa8a 100644 --- a/model/textparse/openmetricsparse_test.go +++ b/model/textparse/openmetricsparse_test.go @@ -961,15 +961,15 @@ go_gc_duration_seconds_created`) _, err := parser.Next() require.NoError(t, err) require.Equal(t, "go_goroutines", string(parser.l.b[parser.offsets[0]:parser.offsets[1]])) - require.True(t, parser.skipCT) + require.True(t, parser.skipCTSeries) // Create a deep copy of the parser copyParser := deepCopy(parser) etype, err := copyParser.Next() require.NoError(t, err) require.Equal(t, EntryType, etype) - require.True(t, parser.skipCT) - require.False(t, copyParser.skipCT) + require.True(t, parser.skipCTSeries) + require.False(t, copyParser.skipCTSeries) // Modify the original parser further parser.Next() @@ -977,12 +977,12 @@ go_gc_duration_seconds_created`) parser.Next() require.Equal(t, "go_gc_duration_seconds", string(parser.l.b[parser.offsets[0]:parser.offsets[1]])) require.Equal(t, "summary", string(parser.mtype)) - require.False(t, copyParser.skipCT) - require.True(t, parser.skipCT) + require.False(t, copyParser.skipCTSeries) + require.True(t, parser.skipCTSeries) // Ensure the copy remains unchanged copyParser.Next() copyParser.Next() require.Equal(t, "go_gc_duration_seconds", string(copyParser.l.b[copyParser.offsets[0]:copyParser.offsets[1]])) - require.False(t, copyParser.skipCT) + require.False(t, copyParser.skipCTSeries) }