Skip to content

Revert "Drop obsolete go collector in favor of controller-runtime" #499

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

Merged
merged 1 commit into from
Mar 10, 2025
Merged

Revert "Drop obsolete go collector in favor of controller-runtime" #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions cmd/sharder/app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"fmt"

"github.com/go-logr/logr"
"github.com/prometheus/client_golang/prometheus/collectors"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"go.uber.org/automaxprocs/maxprocs"
Expand All @@ -31,6 +32,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/metrics"

"github.com/timebertt/kubernetes-controller-sharding/pkg/controller"
healthzutils "github.com/timebertt/kubernetes-controller-sharding/pkg/utils/healthz"
Expand Down Expand Up @@ -90,6 +92,10 @@ func run(ctx context.Context, log logr.Logger, opts *options) error {
log.Error(err, "Failed to set GOMAXPROCS")
}

// replace deprecated legacy go collector
metrics.Registry.Unregister(collectors.NewGoCollector())
metrics.Registry.MustRegister(collectors.NewGoCollector(collectors.WithGoCollectorRuntimeMetrics(collectors.MetricsAll)))

log.Info("Setting up manager")
mgr, err := manager.New(opts.restConfig, opts.managerOptions)
if err != nil {
Expand Down
6 changes: 6 additions & 0 deletions webhosting-operator/cmd/webhosting-operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
goruntime "runtime"
"strconv"

"github.com/prometheus/client_golang/prometheus/collectors"
"go.uber.org/automaxprocs/maxprocs"
"go.uber.org/zap/zapcore"
appsv1 "k8s.io/api/apps/v1"
Expand All @@ -42,6 +43,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
"sigs.k8s.io/controller-runtime/pkg/metrics"
"sigs.k8s.io/controller-runtime/pkg/metrics/filters"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

Expand Down Expand Up @@ -101,6 +103,10 @@ func main() {
setupLog.Error(err, "Failed to set GOMAXPROCS")
}

// replace deprecated legacy go collector
metrics.Registry.Unregister(collectors.NewGoCollector())
metrics.Registry.MustRegister(collectors.NewGoCollector(collectors.WithGoCollectorRuntimeMetrics(collectors.MetricsAll)))

mgr, err := ctrl.NewManager(opts.restConfig, opts.managerOptions)
if err != nil {
setupLog.Error(err, "unable to start manager")
Expand Down
Loading