Files
ziti/controller/model/command.go
T
Paul Lorenz 187aa11f24 Own the metrics wire format in ziti. Fixes #4036
- adds a common/servermetrics package that owns the metrics MetricsMessage wire
  format and the reporting/usage subsystem (message builder, usage registry,
  interval and usage counters), wrapping the openziti/metrics Registry for
  metric collection
- moves the controllers metrics reporter into the router package and removes it
  from the shared metrics package, breaking a common -> router/env import cycle
- repoints controller and router consumers to common/servermetrics; base metric
  collection stays on openziti/metrics
- keeps the proto field numbers and the metrics content-type identical so the
  encoding is byte-compatible across the move, and uses a distinct proto package
  name so ziti's and the library's messages coexist without a global proto
  registry clash
- adds a round-trip test asserting wire compatibility with the library's
  MetricsMessage
- leaves openziti/metrics unchanged, so sdk-golang and the shared xgress data
  plane are unaffected
2026-06-29 22:37:25 -04:00

216 lines
6.3 KiB
Go

/*
Copyright NetFoundry Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package model
import (
"errors"
"runtime/debug"
"time"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/foundation/v2/goroutines"
"github.com/openziti/metrics"
"github.com/openziti/ziti/v2/common/pb/cmd_pb"
"github.com/openziti/ziti/v2/common/servermetrics"
"github.com/openziti/ziti/v2/controller/change"
"github.com/openziti/ziti/v2/controller/command"
"github.com/openziti/ziti/v2/controller/fields"
"github.com/openziti/ziti/v2/controller/idgen"
"github.com/openziti/ziti/v2/controller/ioc"
"github.com/openziti/ziti/v2/controller/models"
"github.com/sirupsen/logrus"
"google.golang.org/protobuf/proto"
)
const (
backgroundQueueMetricsBase = "command.background"
backgroundQueueDroppedEntries = backgroundQueueMetricsBase + ".dropped_entries"
)
func newCommandManager(env Env, registry ioc.Registry) *CommandManager {
command.GetDefaultDecoders().Clear()
result := &CommandManager{
env: env,
registry: registry,
Decoders: command.GetDefaultDecoders(),
backgroundDelayThreshold: env.GetConfig().Command.Background.DelayThreshold,
backgroundWorkTimer: env.GetMetricsRegistry().Timer(backgroundQueueMetricsBase + ".work_timer"),
}
if env.GetConfig().Command.Background.Enabled {
poolConfig := goroutines.PoolConfig{
QueueSize: env.GetConfig().Command.Background.QueueSize,
MinWorkers: 0,
MaxWorkers: 1,
IdleTime: 5 * time.Second,
CloseNotify: env.GetCloseNotifyChannel(),
PanicHandler: func(err interface{}) {
pfxlog.Logger().
WithField(logrus.ErrorKey, err).
WithField("backtrace", string(debug.Stack())).Error("panic during background command processing")
},
WorkerFunction: backgroundCommandPoolWorker,
}
servermetrics.ConfigureGoroutinesPoolMetrics(&poolConfig, env.GetMetricsRegistry(), backgroundQueueMetricsBase)
pool, err := goroutines.NewPool(poolConfig)
if err != nil {
pfxlog.Logger().WithError(err).Fatal("could not create background command worker pool")
}
result.backgroundPool = pool
if env.GetConfig().Command.Background.DropWhenFull {
result.droppedEntries = env.GetMetricsRegistry().Meter(backgroundQueueDroppedEntries)
}
}
return result
}
type CommandManager struct {
env Env
registry ioc.Registry
Decoders command.Decoders
backgroundPool goroutines.Pool
backgroundDelayThreshold time.Duration
droppedEntries metrics.Meter
backgroundWorkTimer metrics.Timer
}
func (self *CommandManager) registerGenericCommands() {
self.Decoders.RegisterF(int32(cmd_pb.CommandType_CreateEntityType), self.decodeCreateEntityCommand)
self.Decoders.RegisterF(int32(cmd_pb.CommandType_UpdateEntityType), self.decodeUpdateEntityCommand)
self.Decoders.RegisterF(int32(cmd_pb.CommandType_DeleteEntityType), self.decodeDeleteEntityCommand)
}
func (self *CommandManager) decodeCreateEntityCommand(_ int32, data []byte) (command.Command, error) {
msg := &cmd_pb.CreateEntityCommand{}
if err := proto.Unmarshal(data, msg); err != nil {
return nil, err
}
decoder, err := ioc.Get[createDecoderF](self.registry, msg.EntityType+CreateDecoder)
if err != nil {
return nil, err
}
return decoder(msg)
}
func (self *CommandManager) decodeUpdateEntityCommand(_ int32, data []byte) (command.Command, error) {
msg := &cmd_pb.UpdateEntityCommand{}
if err := proto.Unmarshal(data, msg); err != nil {
return nil, err
}
decoder, err := ioc.Get[updateDecoderF](self.registry, msg.EntityType+UpdateDecoder)
if err != nil {
return nil, err
}
return decoder(msg)
}
func (self *CommandManager) decodeDeleteEntityCommand(_ int32, data []byte) (command.Command, error) {
msg := &cmd_pb.DeleteEntityCommand{}
if err := proto.Unmarshal(data, msg); err != nil {
return nil, err
}
decoder, err := ioc.Get[deleteDecoderF](self.registry, msg.EntityType+DeleteDecoder)
if err != nil {
return nil, err
}
return decoder(msg)
}
func backgroundCommandPoolWorker(_ uint32, f func()) {
f()
}
func (self *CommandManager) backGroundableTask(f func()) bool {
if self.env.GetConfig().Command.Background.Enabled && !self.isBackgroundWorkTimerBelowThreshold() {
if self.env.GetConfig().Command.Background.DropWhenFull {
if err := self.backgroundPool.QueueOrError(f); err != nil {
if errors.Is(err, goroutines.QueueFullError) {
self.droppedEntries.Mark(1)
}
return false
}
} else {
if err := self.backgroundPool.Queue(f); err != nil {
return false
}
}
return true
}
self.backgroundWorkTimer.Time(f)
return true
}
func (self *CommandManager) isBackgroundWorkTimerBelowThreshold() bool {
return self.backgroundWorkTimer.Percentile(0.9) < float64(self.backgroundDelayThreshold.Nanoseconds())
}
// CommandMsg is a TypedMessage which is also a pointer type.
//
// T is message type. We want to enforce that the TypeMessage implementation is a pointer type
// so we can use new(T) to create instances of it
type CommandMsg[T any] interface {
cmd_pb.TypedMessage
*T
}
type creator[T models.Entity] interface {
command.EntityCreator[T]
Dispatch(cmd command.Command) error
}
type updater[T models.Entity] interface {
command.EntityUpdater[T]
Dispatch(cmd command.Command) error
}
func DispatchCreate[T models.Entity](c creator[T], entity T, ctx *change.Context) error {
if entity.GetId() == "" {
id := idgen.MustNewUUIDString()
entity.SetId(id)
}
cmd := &command.CreateEntityCommand[T]{
Context: ctx,
Creator: c,
Entity: entity,
}
return c.Dispatch(cmd)
}
func DispatchUpdate[T models.Entity](u updater[T], entity T, updatedFields fields.UpdatedFields, ctx *change.Context) error {
cmd := &command.UpdateEntityCommand[T]{
Context: ctx,
Updater: u,
Entity: entity,
UpdatedFields: updatedFields,
}
return u.Dispatch(cmd)
}