Browse Source

Merge pull request #15417 from huochexizhan/main

chore: fix some function names in comment
pull/13642/merge
Björn Rabenstein 1 day ago committed by GitHub
parent
commit
e8003cb347
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      model/textparse/openmetricsparse.go
  2. 2
      promql/engine.go
  3. 2
      web/web.go

2
model/textparse/openmetricsparse.go

@ -388,7 +388,7 @@ func (p *OpenMetricsParser) setCTParseValues(ct int64, ctHashSet uint64, mfName
p.skipCTSeries = skipCTSeries // Do we need to set it?
}
// resetCtParseValues resets the parser to the state before CreatedTimestamp method was called.
// resetCTParseValues resets the parser to the state before CreatedTimestamp method was called.
func (p *OpenMetricsParser) resetCTParseValues() {
p.ctHashSet = 0
p.skipCTSeries = true

2
promql/engine.go

@ -3451,7 +3451,7 @@ func handleVectorBinopError(err error, e *parser.BinaryExpr) annotations.Annotat
return nil
}
// groupingKey builds and returns the grouping key for the given metric and
// generateGroupingKey builds and returns the grouping key for the given metric and
// grouping labels.
func generateGroupingKey(metric labels.Labels, grouping []string, without bool, buf []byte) (uint64, []byte) {
if without {

2
web/web.go

@ -110,7 +110,7 @@ const (
Stopping
)
// withStackTrace logs the stack trace in case the request panics. The function
// withStackTracer logs the stack trace in case the request panics. The function
// will re-raise the error which will then be handled by the net/http package.
// It is needed because the go-kit log package doesn't manage properly the
// panics from net/http (see https://github.com/go-kit/kit/issues/233).

Loading…
Cancel
Save