RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2025-01-03 13:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Follow up #15178

Browse Source 
Renaming

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
This commit is contained in:
György Krajcsovits 2024-10-21 11:03:47 +02:00
parent 482bb453c6
commit 70742a64aa
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
scrape/scrape_test.go
View File

@ -3844,24 +3844,24 @@ metric: <
for metricsTextName, metricsText := range metricsTexts {
for name, tc := range map[string]struct {
scrapeClassicHistograms bool
convertClassicHistograms bool
alwaysScrapeClassicHistograms bool
convertClassicHistograms bool
}{
"convert with scrape": {
scrapeClassicHistograms: true,
convertClassicHistograms: true,
alwaysScrapeClassicHistograms: true,
convertClassicHistograms: true,
},
"convert without scrape": {
scrapeClassicHistograms: false,
convertClassicHistograms: true,
alwaysScrapeClassicHistograms: false,
convertClassicHistograms: true,
},
"scrape without convert": {
scrapeClassicHistograms: true,
convertClassicHistograms: false,
alwaysScrapeClassicHistograms: true,
convertClassicHistograms: false,
},
"neither scrape nor convert": {
scrapeClassicHistograms: false,
convertClassicHistograms: false,
alwaysScrapeClassicHistograms: false,
convertClassicHistograms: false,
},
} {
var expectedClassicHistCount, expectedNativeHistCount int
@ -3870,16 +3870,16 @@ metric: <
expectedNativeHistCount = 1
expectCustomBuckets = false
expectedClassicHistCount = 0
if metricsText.hasClassic && tc.scrapeClassicHistograms {
if metricsText.hasClassic && tc.alwaysScrapeClassicHistograms {
expectedClassicHistCount = 1
}
} else if metricsText.hasClassic {
switch {
case tc.scrapeClassicHistograms && tc.convertClassicHistograms:
case tc.alwaysScrapeClassicHistograms && tc.convertClassicHistograms:
expectedClassicHistCount = 1
expectedNativeHistCount = 1
expectCustomBuckets = true
case !tc.scrapeClassicHistograms && tc.convertClassicHistograms:
case !tc.alwaysScrapeClassicHistograms && tc.convertClassicHistograms:
expectedClassicHistCount = 0
expectedNativeHistCount = 1
expectCustomBuckets = true
@ -3894,13 +3894,13 @@ metric: <
defer simpleStorage.Close()
config := &config.ScrapeConfig{
JobName: "test",
SampleLimit: 100,
Scheme: "http",
ScrapeInterval: model.Duration(100 * time.Millisecond),
ScrapeTimeout: model.Duration(100 * time.Millisecond),
ScrapeClassicHistograms: tc.scrapeClassicHistograms,
ConvertClassicHistograms: tc.convertClassicHistograms,
JobName: "test",
SampleLimit: 100,
Scheme: "http",
ScrapeInterval: model.Duration(100 * time.Millisecond),
ScrapeTimeout: model.Duration(100 * time.Millisecond),
AlwaysScrapeClassicHistograms: tc.alwaysScrapeClassicHistograms,
ConvertClassicHistograms: tc.convertClassicHistograms,
}
scrapeCount := 0