refac: rename skipCT to skipCTSeries

Signed-off-by: Manik Rana <manikrana54@gmail.com>
This commit is contained in:
Manik Rana 2024-08-05 15:24:10 +05:30
parent 6d0144c16d
commit d80bab7705
2 changed files with 15 additions and 15 deletions

View file

@ -98,18 +98,18 @@ type OpenMetricsParser struct {
// lines ending with _created are skipped by default as they are // lines ending with _created are skipped by default as they are
// parsed by the CreatedTimestamp method. The skipCT flag is set to // parsed by the CreatedTimestamp method. The skipCT flag is set to
// false when the CreatedTimestamp method is called. // false when the CreatedTimestamp method is called.
skipCT bool skipCTSeries bool
} }
type openMetricsParserOptions struct { type openMetricsParserOptions struct {
// SkipCT skips the parsing of _created lines. // SkipCT skips the parsing of _created lines.
SkipCT bool SkipCTSeries bool
} }
type OpenMetricsOption func(*openMetricsParserOptions) type OpenMetricsOption func(*openMetricsParserOptions)
func WithOMParserCTSeriesSkipped(skipCT bool) OpenMetricsOption { func WithOMParserCTSeriesSkipped(skipCTSeries bool) OpenMetricsOption {
return func(o *openMetricsParserOptions) { return func(o *openMetricsParserOptions) {
o.SkipCT = skipCT o.SkipCTSeries = skipCTSeries
} }
} }
@ -118,7 +118,7 @@ func NewOpenMetricsParser(b []byte, st *labels.SymbolTable) Parser {
return &OpenMetricsParser{ return &OpenMetricsParser{
l: &openMetricsLexer{b: b}, l: &openMetricsLexer{b: b},
builder: labels.NewScratchBuilderWithSymbolTable(st, 16), 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), builder: labels.NewScratchBuilderWithSymbolTable(st, 16),
} }
DefaultOpenMetricsParserOptions := openMetricsParserOptions{ DefaultOpenMetricsParserOptions := openMetricsParserOptions{
SkipCT: true, SkipCTSeries: true,
} }
for _, opt := range opts { for _, opt := range opts {
opt(&DefaultOpenMetricsParserOptions) opt(&DefaultOpenMetricsParserOptions)
} }
parser.skipCT = DefaultOpenMetricsParserOptions.SkipCT parser.skipCTSeries = DefaultOpenMetricsParserOptions.SkipCTSeries
return parser return parser
} }
@ -336,7 +336,7 @@ func deepCopy(p *OpenMetricsParser) OpenMetricsParser {
builder: p.builder, builder: p.builder,
mtype: p.mtype, mtype: p.mtype,
val: p.val, val: p.val,
skipCT: false, skipCTSeries: false,
} }
return newParser return newParser
} }
@ -628,7 +628,7 @@ func (p *OpenMetricsParser) parseMetricSuffix(t token) (Entry, error) {
} }
} }
if p.skipCT { if p.skipCTSeries {
var newLbs labels.Labels var newLbs labels.Labels
p.Metric(&newLbs) p.Metric(&newLbs)
name := newLbs.Get(model.MetricNameLabel) name := newLbs.Get(model.MetricNameLabel)

View file

@ -961,15 +961,15 @@ go_gc_duration_seconds_created`)
_, err := parser.Next() _, err := parser.Next()
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, "go_goroutines", string(parser.l.b[parser.offsets[0]:parser.offsets[1]])) 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 // Create a deep copy of the parser
copyParser := deepCopy(parser) copyParser := deepCopy(parser)
etype, err := copyParser.Next() etype, err := copyParser.Next()
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, EntryType, etype) require.Equal(t, EntryType, etype)
require.True(t, parser.skipCT) require.True(t, parser.skipCTSeries)
require.False(t, copyParser.skipCT) require.False(t, copyParser.skipCTSeries)
// Modify the original parser further // Modify the original parser further
parser.Next() parser.Next()
@ -977,12 +977,12 @@ go_gc_duration_seconds_created`)
parser.Next() parser.Next()
require.Equal(t, "go_gc_duration_seconds", string(parser.l.b[parser.offsets[0]:parser.offsets[1]])) 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.Equal(t, "summary", string(parser.mtype))
require.False(t, copyParser.skipCT) require.False(t, copyParser.skipCTSeries)
require.True(t, parser.skipCT) require.True(t, parser.skipCTSeries)
// Ensure the copy remains unchanged // Ensure the copy remains unchanged
copyParser.Next() copyParser.Next()
copyParser.Next() copyParser.Next()
require.Equal(t, "go_gc_duration_seconds", string(copyParser.l.b[copyParser.offsets[0]:copyParser.offsets[1]])) 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)
} }