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

[rhythm] Fix registering of kafka read client metrics #4502

Merged
merged 1 commit into from
Jan 2, 2025
Merged

[rhythm] Fix registering of kafka read client metrics #4502

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
2 changes: 1 addition & 1 deletion modules/blockbuilder/blockbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func (b *BlockBuilder) starting(ctx context.Context) (err error) {

b.kafkaClient, err = ingest.NewReaderClient(
b.cfg.IngestStorageConfig.Kafka,
ingest.NewReaderClientMetrics(blockBuilderServiceName, nil),
ingest.NewReaderClientMetrics(blockBuilderServiceName, prometheus.DefaultRegisterer),
b.logger,
)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion modules/generator/generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ func (g *Generator) starting(ctx context.Context) (err error) {
if g.cfg.Ingest.Enabled {
g.kafkaClient, err = ingest.NewReaderClient(
g.cfg.Ingest.Kafka,
ingest.NewReaderClientMetrics("generator", nil),
ingest.NewReaderClientMetrics("generator", prometheus.DefaultRegisterer),
g.logger,
)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion pkg/ingest/reader_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func NewReaderClient(kafkaCfg KafkaConfig, metrics *kprom.Metrics, logger log.Lo
}

func NewReaderClientMetrics(component string, reg prometheus.Registerer) *kprom.Metrics {
return kprom.NewMetrics("loki_ingest_storage_reader",
return kprom.NewMetrics("tempo_ingest_storage_reader",
kprom.Registerer(prometheus.WrapRegistererWith(prometheus.Labels{"component": component}, reg)),
// Do not export the client ID, because we use it to specify options to the backend.
kprom.FetchAndProduceDetail(kprom.Batches, kprom.Records, kprom.CompressedBytes, kprom.UncompressedBytes))
Expand Down
4 changes: 4 additions & 0 deletions pkg/ingest/writer_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ func NewProducer(client *kgo.Client, maxBufferedBytes int64, reg prometheus.Regi
bufferedProduceBytes: promauto.With(reg).NewSummary(
prometheus.SummaryOpts{
Namespace: "tempo",
Subsystem: "distributor",
Name: "buffered_produce_bytes",
Help: "The buffered produce records in bytes. Quantile buckets keep track of buffered records size over the last 60s.",
Objectives: map[float64]float64{0.5: 0.05, 0.99: 0.001, 1: 0.001},
Expand All @@ -210,16 +211,19 @@ func NewProducer(client *kgo.Client, maxBufferedBytes int64, reg prometheus.Regi
bufferedProduceBytesLimit: promauto.With(reg).NewGauge(
prometheus.GaugeOpts{
Namespace: "tempo",
Subsystem: "distributor",
Name: "buffered_produce_bytes_limit",
Help: "The bytes limit on buffered produce records. Produce requests fail once this limit is reached.",
}),
produceRequestsTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{
Namespace: "tempo",
Subsystem: "distributor",
Name: "produce_requests_total",
Help: "Total number of produce requests issued to Kafka.",
}),
produceFailuresTotal: promauto.With(reg).NewCounterVec(prometheus.CounterOpts{
Namespace: "tempo",
Subsystem: "distributor",
Name: "produce_failures_total",
Help: "Total number of failed produce requests issued to Kafka.",
}, []string{"reason"}),
Expand Down