Skip to content

Commit

Permalink
[ws-daemon] Remove gitpod_ws_daemon_workspace_cpu_limit_sec metric
Browse files Browse the repository at this point in the history
  • Loading branch information
aledbf committed Aug 30, 2021
1 parent 4044baf commit 67455a4
Showing 1 changed file with 0 additions and 23 deletions.
23 changes: 0 additions & 23 deletions components/ws-daemon/pkg/resources/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"container/ring"
"context"
"errors"
"fmt"
"os"
"path/filepath"
"strconv"
Expand Down Expand Up @@ -44,9 +43,6 @@ type Controller struct {
processPriorities map[ProcessType]int

Prometheus prometheus.Registerer
metrics struct {
CPULimit *prometheus.CounterVec
}

mu sync.RWMutex
stopOnce sync.Once
Expand Down Expand Up @@ -141,31 +137,13 @@ func NewController(containerID, instanceID string, cgroupPath string, opts ...Co
}
gov.cpuExpenditures = ring.New(sampleCount)

err = gov.registerPrometheusGauges()
if err != nil {
return nil, xerrors.Errorf("cannot register Prometheus metrics: %w", err)
}

if gov.ControlPeriod%gov.SamplingPeriod != 0 {
return nil, xerrors.Errorf("control period must be a multiple of sampling period")
}

return gov, nil
}

func (gov *Controller) registerPrometheusGauges() (err error) {
gov.metrics.CPULimit = prometheus.NewCounterVec(prometheus.CounterOpts{
Name: "workspace_cpu_limit_sec",
Help: "Time spent in each CPU limit",
}, []string{"limit"})
err = gov.Prometheus.Register(gov.metrics.CPULimit)
if err != nil {
log.WithError(err).Warn("cannot register Prometheus metric")
}

return nil
}

// Start actually starts governing. This function is meant to be called as a Go-routine.
func (gov *Controller) Start(ctx context.Context) {
t := time.NewTicker(gov.SamplingPeriod)
Expand Down Expand Up @@ -359,7 +337,6 @@ func (gov *Controller) enforceCPULimit(limit int64) (didChange bool, err error)

periodToMilliseconds := (time.Duration(period) * time.Microsecond).Milliseconds()
newQuota := limit * (10 /* milli-jiffie per jiffie */) * periodToMilliseconds
gov.metrics.CPULimit.WithLabelValues(fmt.Sprintf("%d", limit)).Add(gov.SamplingPeriod.Seconds())

if newQuota == currentQuota {
return false, nil
Expand Down

0 comments on commit 67455a4

Please sign in to comment.