Skip to content

Add telemetry job - option 2 #1392

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.

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

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
102 changes: 0 additions & 102 deletions internal/mode/static/leader.go

This file was deleted.

84 changes: 56 additions & 28 deletions internal/mode/static/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"k8s.io/client-go/tools/record"
ctlr "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
ctrlcfg "sigs.k8s.io/controller-runtime/pkg/config"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/metrics"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
Expand All @@ -34,6 +35,7 @@ import (
"github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller/predicate"
"github.com/nginxinc/nginx-gateway-fabric/internal/framework/events"
"github.com/nginxinc/nginx-gateway-fabric/internal/framework/gatewayclass"
"github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers"
"github.com/nginxinc/nginx-gateway-fabric/internal/framework/status"
"github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/config"
"github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/metrics/collectors"
Expand All @@ -45,6 +47,7 @@ import (
"github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/relationship"
"github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/resolver"
"github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation"
"github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/telemetry"
)

const (
Expand All @@ -65,9 +68,17 @@ func init() {

func StartManager(cfg config.Config) error {
options := manager.Options{
Scheme: scheme,
Logger: cfg.Logger,
Metrics: getMetricsOptions(cfg.MetricsConfig),
Scheme: scheme,
Logger: cfg.Logger,
Metrics: getMetricsOptions(cfg.MetricsConfig),
LeaderElection: true,
LeaderElectionNamespace: cfg.GatewayPodConfig.Namespace,
LeaderElectionID: cfg.LeaderElection.LockName,
LeaderElectionReleaseOnCancel: true,
Controller: ctrlcfg.Controller{
// All of our controllers still need to work in case of non-leader pods
NeedLeaderElection: helpers.GetPointer(false),
},
}

if cfg.HealthConfig.Enabled {
Expand Down Expand Up @@ -199,41 +210,58 @@ func StartManager(cfg config.Config) error {
firstBatchPreparer,
)

if err = mgr.Add(eventLoop); err != nil {
if err = mgr.Add(&leaderOrNonLeaderRunnable{eventLoop}); err != nil {
return fmt.Errorf("cannot register event loop: %w", err)
}

leaderElectorLogger := cfg.Logger.WithName("leaderElector")

if cfg.LeaderElection.Enabled {
leaderElector, err := newLeaderElectorRunnable(leaderElectorRunnableConfig{
kubeConfig: clusterCfg,
recorder: recorder,
onStartedLeading: func(ctx context.Context) {
leaderElectorLogger.Info("Started leading")
statusUpdater.Enable(ctx)
},
onStoppedLeading: func() {
leaderElectorLogger.Info("Stopped leading")
statusUpdater.Disable()
},
lockNs: cfg.GatewayPodConfig.Namespace,
lockName: cfg.LeaderElection.LockName,
identity: cfg.LeaderElection.Identity,
})
if err != nil {
return err
}
if err = mgr.Add(&enableOnLeaderElectedJob{enable: statusUpdater.Enable}); err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Smart way to do this without a big refactor 👍

return err
}

if err = mgr.Add(leaderElector); err != nil {
return fmt.Errorf("cannot register leader elector: %w", err)
}
telemetryJob := telemetry.NewJob(
&telemetry.StdoutExporter{},
cfg.Logger.WithName("telemetryExporter"),
)
if err = mgr.Add(&leaderRunnable{telemetryJob}); err != nil {
return fmt.Errorf("cannot register telemetry job: %w", err)
}

cfg.Logger.Info("Starting manager")
return mgr.Start(ctx)
}

type leaderRunnable struct {
manager.Runnable
}

func (r *leaderRunnable) NeedLeaderElection() bool {
return true
}

type leaderOrNonLeaderRunnable struct {
manager.Runnable
}

func (r *leaderOrNonLeaderRunnable) NeedLeaderElection() bool {
return false
}

// implements manager.LeaderElectorRunnable
type enableOnLeaderElectedJob struct {
enable func(context.Context)
}

func (j *enableOnLeaderElectedJob) Start(ctx context.Context) error {
j.enable(ctx)
return nil
}

func (j *enableOnLeaderElectedJob) NeedLeaderElection() bool {
return true
}

var _ manager.LeaderElectionRunnable = &enableOnLeaderElectedJob{}

func registerControllers(
ctx context.Context,
cfg config.Config,
Expand Down
60 changes: 60 additions & 0 deletions internal/mode/static/telemetry/job.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
package telemetry

import (
"context"
"fmt"
"time"

"github.com/go-logr/logr"
"k8s.io/apimachinery/pkg/util/wait"
"sigs.k8s.io/controller-runtime/pkg/manager"
)

// Data type (any or not) is yet to be determined
type Exporter interface {
Export(ctx context.Context, data any) error
}

type StdoutExporter struct{}

func (s *StdoutExporter) Export(_ context.Context, data any) error {
fmt.Printf("exporting data: %+v\n", data)
return nil
}

type Data struct{}

type Job struct {
exporter Exporter
logger logr.Logger
}

func NewJob(exporter Exporter, logger logr.Logger) *Job {
return &Job{
exporter: exporter,
logger: logger,
}
}

func (j *Job) NeedLeaderElection() bool {
return true
}

func (j *Job) Start(ctx context.Context) error {
j.logger.Info("starting telemetry job")
wait.UntilWithContext(ctx, j.report, 10*time.Second)
j.logger.Info("stopping telemetry job")
return nil
}

func (j *Job) report(ctx context.Context) {
j.logger.Info("reporting telemetry")

err := j.exporter.Export(ctx, Data{})
if err != nil {
j.logger.Error(err, "failed to export telemetry")
}
}

var _ manager.LeaderElectionRunnable = &Job{}
var _ manager.Runnable = &Job{}