extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-05-31 15:16:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

metrics lint; cache infrastructure (#74, #76)

Browse Source
This commit is contained in:
Michael Quigley 2022-10-19 11:25:08 -04:00
parent 095024c179
commit 83c12e30cb
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
2 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
controller/metrics.go
View File

@ -36,15 +36,22 @@ type metricsAgent struct {
cfg *MetricsConfig cfg *MetricsConfig
influx influxdb2.Client influx influxdb2.Client
writeApi api.WriteAPIBlocking writeApi api.WriteAPIBlocking
envCache map[string]*envCacheEntry
zCtx ziti.Context zCtx ziti.Context
zListener edge.Listener zListener edge.Listener
shutdown chan struct{} shutdown chan struct{}
joined chan struct{} joined chan struct{}
} }
type envCacheEntry struct {
env string
lastAccess time.Time
}
func newMetricsAgent(cfg *MetricsConfig) *metricsAgent { func newMetricsAgent(cfg *MetricsConfig) *metricsAgent {
ma := &metricsAgent{ ma := &metricsAgent{
cfg: cfg, cfg: cfg,
envCache: make(map[string]*envCacheEntry),
shutdown: make(chan struct{}), shutdown: make(chan struct{}),
joined: make(chan struct{}), joined: make(chan struct{}),
} }

46
endpoints/frontend/metrics.go
View File

@ -80,28 +80,30 @@ func (ma *metricsAgent) pushUpdate(mu metricsUpdate) {
} }
func (ma *metricsAgent) sendMetrics() error { func (ma *metricsAgent) sendMetrics() error {
m := &model.Metrics{ if len(ma.accum) > 0 {
Namespace: ma.cfg.Identity, m := &model.Metrics{
Sessions: ma.accum, Namespace: ma.cfg.Identity,
Sessions: ma.accum,
}
metricsJson, err := bson.Marshal(m)
if err != nil {
return errors.Wrap(err, "error marshaling metrics")
}
conn, err := ma.zCtx.Dial(ma.cfg.Metrics.Service)
if err != nil {
return errors.Wrap(err, "error connecting to metrics service")
}
n, err := conn.Write(metricsJson)
if err != nil {
return errors.Wrap(err, "error sending metrics")
}
defer func() { _ = conn.Close() }()
if n != len(metricsJson) {
return errors.Wrap(err, "short metrics write")
}
logrus.Infof("sent %d bytes of metrics data", n)
ma.accum = make(map[string]model.SessionMetrics)
ma.lastSend = time.Now()
} }
metricsJson, err := bson.Marshal(m)
if err != nil {
return errors.Wrap(err, "error marshaling metrics")
}
conn, err := ma.zCtx.Dial(ma.cfg.Metrics.Service)
if err != nil {
return errors.Wrap(err, "error connecting to metrics service")
}
n, err := conn.Write(metricsJson)
if err != nil {
return errors.Wrap(err, "error sending metrics")
}
defer func() { _ = conn.Close() }()
if n != len(metricsJson) {
return errors.Wrap(err, "short metrics write")
}
logrus.Infof("sent %d bytes of metrics data", n)
ma.accum = make(map[string]model.SessionMetrics)
ma.lastSend = time.Now()
return nil return nil
} }