Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* [CHANGE] Added a single binary 3.0 mode `--target=all-3.0` to begin testing single binary 3.0 and updating integration tests. [#6021](https://github.com/grafana/tempo/pull/6021) (@joe-elliott)
This will be removed in 3.0 and become the standard single binary mode.
* [CHANGE] Upgrade Tempo to go 1.25.4 [#5939](https://github.com/grafana/tempo/pull/5939) [#6001](https://github.com/grafana/tempo/pull/6001) (@ruslan-mikhailov)
* [CHANGE] Kafka KIP-714 telemetry is enabled by default. Added `disable_kafka_telemetry` config flag to opt-out [#6046](https://github.com/grafana/tempo/pull/6046) (@oleg-kozlyuk-grafana)
* [FEATURE] Add `tempo_metrics_generator_registry_active_series_demand_estimate` that estimates metrics-generator active series demand even when the active series limit is reached [#5710](https://github.com/grafana/tempo/pull/5710) (@carles-grafana)
* [FEATURE] Added validation mode and tests for tempo-vulture [#5605](https://github.com/grafana/tempo/pull/5605) (@davidham)
* [FEATURE] New block encoding vParquet5-preview3 replacing well-known attributes with dedicated column defaults. This format is in development and breaking changes are expected before final release. [#5696](https://github.com/grafana/tempo/pull/5696) (@stoewer)
Expand Down
2 changes: 2 additions & 0 deletions docs/sources/tempo/configuration/manifest.md
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ distributor:
producer_max_buffered_bytes: 0
target_consumer_lag_at_startup: 0s
max_consumer_lag_at_startup: 0s
disable_kafka_telemetry: false
consumer_group_lag_metric_update_interval: 0s
extend_writes: true
retry_after_on_resource_exhausted: 0s
Expand Down Expand Up @@ -825,6 +826,7 @@ ingest:
producer_max_buffered_bytes: 1073741824
target_consumer_lag_at_startup: 2s
max_consumer_lag_at_startup: 15s
disable_kafka_telemetry: false
consumer_group_lag_metric_update_interval: 1m0s
block_builder:
instance_id: hostname
Expand Down
4 changes: 4 additions & 0 deletions pkg/ingest/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ type KafkaConfig struct {
TargetConsumerLagAtStartup time.Duration `yaml:"target_consumer_lag_at_startup"`
MaxConsumerLagAtStartup time.Duration `yaml:"max_consumer_lag_at_startup"`

DisableKafkaTelemetry bool `yaml:"disable_kafka_telemetry"`

ConsumerGroupLagMetricUpdateInterval time.Duration `yaml:"consumer_group_lag_metric_update_interval"`

// The fetch backoff config to use in the concurrent fetchers (when enabled). This setting
Expand Down Expand Up @@ -122,6 +124,8 @@ func (cfg *KafkaConfig) RegisterFlagsWithPrefix(prefix string, f *flag.FlagSet)
f.DurationVar(&cfg.TargetConsumerLagAtStartup, prefix+".target-consumer-lag-at-startup", 2*time.Second, "The best-effort maximum lag a consumer tries to achieve at startup. "+consumerLagUsage)
f.DurationVar(&cfg.MaxConsumerLagAtStartup, prefix+".max-consumer-lag-at-startup", 15*time.Second, "The guaranteed maximum lag before a consumer is considered to have caught up reading from a partition at startup, becomes ACTIVE in the hash ring and passes the readiness check. "+consumerLagUsage)

f.BoolVar(&cfg.DisableKafkaTelemetry, prefix+".disable-kafka-telemetry", false, "Disable KIP-714 Kafka client metrics")

f.DurationVar(&cfg.ConsumerGroupLagMetricUpdateInterval, prefix+".consumer_group_lag_metric_update_interval", 1*time.Minute, "How often the lag metric is updated. Set to 0 to disable metric calculation and export ")
}

Expand Down
1 change: 1 addition & 0 deletions pkg/ingest/testkafka/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
kgo.DefaultProduceTopic(topic),
// We will choose the Partition of each record.
kgo.RecordPartitioner(kgo.ManualPartitioner()),
kgo.DisableClientMetrics(),

Check notice on line 23 in pkg/ingest/testkafka/client.go

View workflow job for this annotation

GitHub Actions / Coverage Annotations

Uncovered line

Line 23 is not covered by tests
)
require.NoError(t, err)
t.Cleanup(writeClient.Close)
Expand Down
5 changes: 5 additions & 0 deletions pkg/ingest/writer_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,11 @@
}),
}

// Disable client metrics if explicitly disabled to reduce noise.
if cfg.DisableKafkaTelemetry {
opts = append(opts, kgo.DisableClientMetrics())
}

Check notice on line 144 in pkg/ingest/writer_client.go

View workflow job for this annotation

GitHub Actions / Coverage Annotations

Uncovered lines

Lines 143-144 are not covered by tests

if cfg.AutoCreateTopicEnabled {
opts = append(opts, kgo.AllowAutoTopicCreation())
}
Expand Down
Loading