Skip to content

Commit

Permalink
Merge branch 'main' into balance-metrics-by-resources
Browse files Browse the repository at this point in the history
  • Loading branch information
SHaaD94 authored Apr 29, 2024
2 parents f14f588 + 556c237 commit 22dd715
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func (p *PipelineSelector) retryHighPriorityPipelines(ctx context.Context, retry
}
}

// checkStopRetry checks if retry should be suspended if all higher priority levels have exceeded their max retries
// checkContinueRetry checks if retry should be suspended if all higher priority levels have exceeded their max retries
func (p *PipelineSelector) checkContinueRetry(index int) bool {
for i := 0; i < index; i++ {
if p.loadRetryCount(i) < p.constants.MaxRetries {
Expand Down
2 changes: 1 addition & 1 deletion exporter/splunkhecexporter/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2095,7 +2095,7 @@ func TestPushLogsRetryableFailureMultipleResources(t *testing.T) {
assert.Equal(t, logs, expectedErr.Data())
}

// validateCompressedEqual validates that GZipped `got` contains `expected` strings
// validateCompressedContains validates that GZipped `got` contains `expected` strings
func validateCompressedContains(t *testing.T, expected []string, got []byte) {
z, err := gzip.NewReader(bytes.NewReader(got))
require.NoError(t, err)
Expand Down
2 changes: 1 addition & 1 deletion exporter/sumologicexporter/prometheus_formatter.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func (f *prometheusFormatter) sanitizeKeyBytes(s []byte) []byte {
return f.sanitNameRegex.ReplaceAll(s, []byte{'_'})
}

// sanitizeKey returns sanitized value string performing the following substitutions:
// sanitizeValue returns sanitized value string performing the following substitutions:
// `/` -> `//`
// `"` -> `\"`
// "\n" -> `\n`
Expand Down

0 comments on commit 22dd715

Please sign in to comment.