Skip to content

Add event processing histogram metric #1134

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 5 commits into from
Oct 12, 2023
Merged

Add event processing histogram metric #1134

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
59d3322
Add event processing histogram metric
Oct 11, 2023
71cc350
Add more context to metric description
Oct 12, 2023
9bf4fc4
ctrl -> ctlr
Oct 12, 2023
0674758
Some more name changes
Oct 12, 2023
6288b83
Add batch ID and inject loggers
Oct 12, 2023
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
Prev Previous commit
Next Next commit
Some more name changes
  • Loading branch information
Kate Osborn committed Oct 12, 2023
commit 067475834f5d6d247aefbd7430c71cbc16fa4b30
4 changes: 2 additions & 2 deletions internal/mode/static/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/resolver"
)

type controllerMetricsCollector interface {
type handlerMetricsCollector interface {
ObserveLastEventBatchProcessTime(time.Duration)
}

Expand All @@ -51,7 +51,7 @@ type eventHandlerConfig struct {
// controlConfigNSName is the NamespacedName of the NginxGateway config for this controller.
controlConfigNSName types.NamespacedName
// metricsCollector collects metrics for this controller.
metricsCollector controllerMetricsCollector
metricsCollector handlerMetricsCollector
// logger is the logger to be used by the EventHandler.
logger logr.Logger
// version is the current version number of the nginx config.
Expand Down
16 changes: 8 additions & 8 deletions internal/mode/static/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,9 @@ func StartManager(cfg config.Config) error {
}

var (
mgrCollector ngxruntime.MetricsCollector = collectors.NewManagerNoopCollector()
ngxruntimeCollector ngxruntime.MetricsCollector = collectors.NewManagerNoopCollector()
// nolint:ineffassign // not an ineffectual assignment. Will be used if metrics are disabled.
ctlrCollector controllerMetricsCollector = collectors.NewControllerNoopCollector()
handlerCollector handlerMetricsCollector = collectors.NewControllerNoopCollector()
)

if cfg.MetricsConfig.Enabled {
Expand All @@ -144,12 +144,12 @@ func StartManager(cfg config.Config) error {
return fmt.Errorf("cannot create nginx metrics collector: %w", err)
}

mgrCollector = collectors.NewManagerMetricsCollector(constLabels)
ctlrCollector = collectors.NewControllerCollector(constLabels)
ngxruntimeCollector = collectors.NewManagerMetricsCollector(constLabels)
handlerCollector = collectors.NewControllerCollector(constLabels)
metrics.Registry.MustRegister(
ngxCollector,
mgrCollector.(prometheus.Collector),
ctlrCollector.(prometheus.Collector),
ngxruntimeCollector.(prometheus.Collector),
handlerCollector.(prometheus.Collector),
)
}

Expand All @@ -174,12 +174,12 @@ func StartManager(cfg config.Config) error {
cfg.Logger.WithName("nginxFileManager"),
file.NewStdLibOSFileManager(),
),
nginxRuntimeMgr: ngxruntime.NewManagerImpl(mgrCollector),
nginxRuntimeMgr: ngxruntime.NewManagerImpl(ngxruntimeCollector),
statusUpdater: statusUpdater,
eventRecorder: recorder,
healthChecker: hc,
controlConfigNSName: controlConfigNSName,
metricsCollector: ctlrCollector,
metricsCollector: handlerCollector,
})

objects, objectLists := prepareFirstEventBatchPreparerArgs(cfg.GatewayClassName, cfg.GatewayNsName)
Expand Down