Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dynamic series adjustment #64

Merged
merged 15 commits into from
Jul 24, 2024
Merged

Dynamic series adjustment #64

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7be3a79
Add series doubling and halving functionality
yomek33 Jul 15, 2024
79901fa
Add series gradual increase and decrease functionlity
yomek33 Jul 15, 2024
e52cbdd
change seriesOperationMode name, fix test code, change gradual change…
yomek33 Jul 17, 2024
4cf527b
Standardize and fix seriesCount variable usage in RunMetrics function
yomek33 Jul 17, 2024
2ad7cf9
add details in help
yomek33 Jul 17, 2024
2d5ae8c
Add license text
yomek33 Jul 17, 2024
cb21a84
fix go version to 1.21, fix flag help text
yomek33 Jul 18, 2024
2822c9a
go mod tidy
yomek33 Jul 18, 2024
5569a40
separate logics into its own function
yomek33 Jul 18, 2024
fddb408
Update metrics handling logic
yomek33 Jul 19, 2024
c85b907
go mod tidy
yomek33 Jul 19, 2024
8173c0c
gofumpt
yomek33 Jul 22, 2024
7a2f8dd
copyright 2022->2024, change flug default
yomek33 Jul 23, 2024
bddbb3b
change currentSeriesCount to be a pointer
yomek33 Jul 23, 2024
a41aecf
fix
yomek33 Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions metrics/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ func handleMetricTicks(metricCount, metricLength, metricCycle *int, labelKeys *[
}

func changeSeriesGradual(seriesChangeRate, maxSeriesCount, minSeriesCount, currentSeriesCount *int, seriesIncrease *bool) {
fmt.Printf("Current series count: %d\n", *currentSeriesCount)
if *seriesIncrease {
*currentSeriesCount += *seriesChangeRate
if *currentSeriesCount >= *maxSeriesCount {
Expand All @@ -136,7 +137,7 @@ func changeSeriesGradual(seriesChangeRate, maxSeriesCount, minSeriesCount, curre
}
} else {
*currentSeriesCount -= *seriesChangeRate
if *currentSeriesCount <= *minSeriesCount {
if *currentSeriesCount < *minSeriesCount {
*currentSeriesCount = *minSeriesCount
*seriesIncrease = true
}
Expand All @@ -155,19 +156,18 @@ func changeSeriesDoubleHalve(currentSeriesCount *int, seriesIncrease *bool) {
*seriesIncrease = !*seriesIncrease
}

func handleDoubleHalveMode(metricCount, metricLength, metricCycle, seriesCycle int, labelKeys, labelValues []string, seriesCount int, changeSeriesTick *time.Ticker, updateNotify chan struct{}) {
currentSeriesCount := seriesCount
func handleDoubleHalveMode(metricCount, metricLength, metricCycle, seriesCycle int, labelKeys, labelValues []string, currentSeriesCount *int, changeSeriesTick *time.Ticker, updateNotify chan struct{}) {
seriesIncrease := true
for tick := range changeSeriesTick.C {
metricsMux.Lock()
unregisterMetrics()
registerMetrics(metricCount, metricLength, metricCycle, labelKeys)
cycleValues(labelKeys, labelValues, currentSeriesCount, seriesCycle)
cycleValues(labelKeys, labelValues, *currentSeriesCount, seriesCycle)
metricsMux.Unlock()

changeSeriesDoubleHalve(&currentSeriesCount, &seriesIncrease)
changeSeriesDoubleHalve(currentSeriesCount, &seriesIncrease)

fmt.Printf("%v: Adjusting series count. New count: %d\n", tick, currentSeriesCount)
fmt.Printf("%v: Adjusting series count. New count: %d\n", tick, *currentSeriesCount)

select {
case updateNotify <- struct{}{}:
Expand All @@ -177,19 +177,19 @@ func handleDoubleHalveMode(metricCount, metricLength, metricCycle, seriesCycle i
}

func handleGradualChangeMode(metricCount, metricLength, metricCycle, seriesCycle int, labelKeys, labelValues []string, seriesChangeRate, maxSeriesCount, minSeriesCount int, changeSeriesTick *time.Ticker, updateNotify chan struct{}) {
cstyan marked this conversation as resolved.
Show resolved Hide resolved
currentSeriesCount := minSeriesCount
currentSeriesCount := &minSeriesCount
seriesIncrease := true

for tick := range changeSeriesTick.C {
metricsMux.Lock()
unregisterMetrics()
registerMetrics(metricCount, metricLength, metricCycle, labelKeys)
cycleValues(labelKeys, labelValues, currentSeriesCount, seriesCycle)
cycleValues(labelKeys, labelValues, *currentSeriesCount, seriesCycle)
metricsMux.Unlock()

changeSeriesGradual(&seriesChangeRate, &maxSeriesCount, &minSeriesCount, &currentSeriesCount, &seriesIncrease)
changeSeriesGradual(&seriesChangeRate, &maxSeriesCount, &minSeriesCount, currentSeriesCount, &seriesIncrease)

fmt.Printf("%v: Adjusting series count. New count: %d\n", tick, currentSeriesCount)
fmt.Printf("%v: Adjusting series count. New count: %d\n", tick, *currentSeriesCount)

select {
case updateNotify <- struct{}{}:
Expand Down Expand Up @@ -225,13 +225,13 @@ func RunMetrics(metricCount, labelCount, seriesCount, seriesChangeRate, maxSerie
changeSeriesTick := time.NewTicker(time.Duration(seriesChangeInterval) * time.Second)
updateNotify := make(chan struct{}, 1)

var currentSeriesCount int
currentSeriesCount := seriesCount

switch seriesOperationMode {
case "double-halve":
registerMetrics(metricCount, metricLength, metricCycle, labelKeys)
cycleValues(labelKeys, labelValues, currentSeriesCount, seriesCycle)
go handleDoubleHalveMode(metricCount, metricLength, metricCycle, seriesCycle, labelKeys, labelValues, seriesCount, changeSeriesTick, updateNotify)
go handleDoubleHalveMode(metricCount, metricLength, metricCycle, seriesCycle, labelKeys, labelValues, &currentSeriesCount, changeSeriesTick, updateNotify)
go handleValueTicks(&labelKeys, &labelValues, &currentSeriesCount, &seriesCycle, updateNotify, valueTick)
go handleSeriesTicks(&labelKeys, &labelValues, &currentSeriesCount, &seriesCycle, updateNotify, seriesTick)

Expand All @@ -246,9 +246,8 @@ func RunMetrics(metricCount, labelCount, seriesCount, seriesChangeRate, maxSerie
go handleSeriesTicks(&labelKeys, &labelValues, &currentSeriesCount, &seriesCycle, updateNotify, seriesTick)

default:
currentSeriesCount = seriesCount
registerMetrics(metricCount, metricLength, metricCycle, labelKeys)
cycleValues(labelKeys, labelValues, seriesCount, seriesCycle)
cycleValues(labelKeys, labelValues, currentSeriesCount, seriesCycle)
go handleValueTicks(&labelKeys, &labelValues, &currentSeriesCount, &seriesCycle, updateNotify, valueTick)
go handleSeriesTicks(&labelKeys, &labelValues, &currentSeriesCount, &seriesCycle, updateNotify, seriesTick)
go handleMetricTicks(&metricCount, &metricLength, &metricCycle, &labelKeys, updateNotify, metricTick)
Expand Down