Skip to content
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

chore(dataobj): fix dataobj_config metrics #15824

Merged
merged 1 commit into from
Jan 17, 2025
Merged

chore(dataobj): fix dataobj_config metrics #15824

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
3 changes: 2 additions & 1 deletion pkg/dataobj/dataobj.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,12 @@ func NewBuilder(cfg BuilderConfig, bucket objstore.Bucket, tenantID string) (*Bu
}

var (
metrics = newMetrics(cfg)
metrics = newMetrics()

flushBuffer = bytes.NewBuffer(make([]byte, 0, int(cfg.TargetObjectSize)))
encoder = encoding.NewEncoder(flushBuffer)
)
metrics.ObserveConfig(cfg)

return &Builder{
cfg: cfg,
Expand Down
74 changes: 38 additions & 36 deletions pkg/dataobj/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ type metrics struct {
streams *streams.Metrics
encoding *encoding.Metrics

shaPrefixSize prometheus.Metric
targetPageSize prometheus.Metric
targetObjectSize prometheus.Metric
shaPrefixSize prometheus.Gauge
targetPageSize prometheus.Gauge
targetObjectSize prometheus.Gauge

appendTime prometheus.Histogram
buildTime prometheus.Histogram
Expand All @@ -28,44 +28,35 @@ type metrics struct {
}

// newMetrics creates a new set of [metrics] for instrumenting data objects.
func newMetrics(cfg BuilderConfig) *metrics {
func newMetrics() *metrics {
return &metrics{
logs: logs.NewMetrics(),
streams: streams.NewMetrics(),
encoding: encoding.NewMetrics(),

shaPrefixSize: prometheus.MustNewConstMetric(
prometheus.NewDesc(
"loki_dataobj_config_sha_prefix_size",
"Configured SHA prefix size.",
nil,
nil,
),
prometheus.UntypedValue,
float64(cfg.SHAPrefixSize),
),

targetPageSize: prometheus.MustNewConstMetric(
prometheus.NewDesc(
"loki_dataobj_config_target_page_size_bytes",
"Configured target page size in bytes.",
nil,
nil,
),
prometheus.UntypedValue,
float64(cfg.TargetPageSize),
),

targetObjectSize: prometheus.MustNewConstMetric(
prometheus.NewDesc(
"loki_dataobj_config_target_object_size_bytes",
"Configured target object size in bytes.",
nil,
nil,
),
prometheus.UntypedValue,
float64(cfg.TargetObjectSize),
),
shaPrefixSize: prometheus.NewGauge(prometheus.GaugeOpts{
Namespace: "loki",
Subsystem: "dataobj",
Name: "config_sha_prefix_size",

Help: "Configured SHA prefix size.",
}),

targetPageSize: prometheus.NewGauge(prometheus.GaugeOpts{
Namespace: "loki",
Subsystem: "dataobj",
Name: "config_target_page_size_bytes",

Help: "Configured target page size in bytes.",
}),

targetObjectSize: prometheus.NewGauge(prometheus.GaugeOpts{
Namespace: "loki",
Subsystem: "dataobj",
Name: "config_target_object_size_bytes",

Help: "Configured target object size in bytes.",
}),

appendTime: prometheus.NewHistogram(prometheus.HistogramOpts{
Namespace: "loki",
Expand Down Expand Up @@ -116,6 +107,13 @@ func newMetrics(cfg BuilderConfig) *metrics {
}
}

// ObserveConfig updates config metrics based on the provided [BuilderConfig].
func (m *metrics) ObserveConfig(cfg BuilderConfig) {
m.shaPrefixSize.Set(float64(cfg.SHAPrefixSize))
m.targetPageSize.Set(float64(cfg.TargetPageSize))
m.targetObjectSize.Set(float64(cfg.TargetObjectSize))
}

// Register registers metrics to report to reg.
func (m *metrics) Register(reg prometheus.Registerer) error {
var errs []error
Expand All @@ -124,6 +122,10 @@ func (m *metrics) Register(reg prometheus.Registerer) error {
errs = append(errs, m.streams.Register(reg))
errs = append(errs, m.encoding.Register(reg))

errs = append(errs, reg.Register(m.shaPrefixSize))
errs = append(errs, reg.Register(m.targetPageSize))
errs = append(errs, reg.Register(m.targetObjectSize))

errs = append(errs, reg.Register(m.appendTime))
errs = append(errs, reg.Register(m.buildTime))
errs = append(errs, reg.Register(m.flushTime))
Expand Down
Loading