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

Jump to bottom

Collector kafka producer protocol version config #1658

Merged
merged 6 commits into from
Jul 12, 2019
Merged

Collector kafka producer protocol version config #1658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1542008
Configurable kafka protocol version for msg consuming by jaeger ingester
Jun 27, 2019
8cd8860
Merge branch 'master' into ingester_kafka_consumer_protocol_version_c…
marqc Jul 1, 2019
aebc038
rename kafka.consumer.version to kafka.consumer.protcol-version
Jul 8, 2019
66ccdac
Merge branch 'master' of github.com:jaegertracing/jaeger into collect…
Jul 9, 2019
caf0760
Configurable kafka protocol/server version in producer
Jul 9, 2019
f97c7bd
remove "(experimental)" annotation from kafka.producer settings
Jul 11, 2019
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
10 changes: 9 additions & 1 deletion pkg/kafka/producer/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ type Builder interface {

// Configuration describes the configuration properties needed to create a Kafka producer
type Configuration struct {
Brokers []string
Brokers []string
ProtocolVersion string
auth.AuthenticationConfig
}

Expand All @@ -36,5 +37,12 @@ func (c *Configuration) NewProducer() (sarama.AsyncProducer, error) {
saramaConfig := sarama.NewConfig()
saramaConfig.Producer.Return.Successes = true
c.AuthenticationConfig.SetConfiguration(saramaConfig)
if len(c.ProtocolVersion) > 0 {
ver, err := sarama.ParseKafkaVersion(c.ProtocolVersion)
if err != nil {
return nil, err
}
saramaConfig.Version = ver
}
return sarama.NewAsyncProducer(c.Brokers, saramaConfig)
}
26 changes: 16 additions & 10 deletions plugin/storage/kafka/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,14 @@ const (
// EncodingZipkinThrift is used for spans encoded as Zipkin Thrift.
EncodingZipkinThrift = "zipkin-thrift"

configPrefix = "kafka.producer"
suffixBrokers = ".brokers"
suffixTopic = ".topic"
suffixEncoding = ".encoding"
defaultBroker = "127.0.0.1:9092"
defaultTopic = "jaeger-spans"
defaultEncoding = EncodingProto
configPrefix = "kafka.producer"
suffixBrokers = ".brokers"
suffixTopic = ".topic"
suffixProtocolVersion = ".protocol-version"
suffixEncoding = ".encoding"
defaultBroker = "127.0.0.1:9092"
defaultTopic = "jaeger-spans"
defaultEncoding = EncodingProto
)

var (
Expand All @@ -59,15 +60,19 @@ func (opt *Options) AddFlags(flagSet *flag.FlagSet) {
flagSet.String(
configPrefix+suffixBrokers,
defaultBroker,
"(experimental) The comma-separated list of kafka brokers. i.e. '127.0.0.1:9092,0.0.0:1234'")
"The comma-separated list of kafka brokers. i.e. '127.0.0.1:9092,0.0.0:1234'")
flagSet.String(
configPrefix+suffixTopic,
defaultTopic,
"(experimental) The name of the kafka topic")
"The name of the kafka topic")
flagSet.String(
configPrefix+suffixProtocolVersion,
"",
"Kafka protocol version - must be supported by kafka server")
flagSet.String(
configPrefix+suffixEncoding,
defaultEncoding,
fmt.Sprintf(`(experimental) Encoding of spans ("%s" or "%s") sent to kafka.`, EncodingJSON, EncodingProto),
fmt.Sprintf(`Encoding of spans ("%s" or "%s") sent to kafka.`, EncodingJSON, EncodingProto),
)
auth.AddFlags(configPrefix, flagSet)
}
Expand All @@ -78,6 +83,7 @@ func (opt *Options) InitFromViper(v *viper.Viper) {
authenticationOptions.InitFromViper(configPrefix, v)
opt.config = producer.Configuration{
Brokers: strings.Split(stripWhiteSpace(v.GetString(configPrefix+suffixBrokers)), ","),
ProtocolVersion: v.GetString(configPrefix + suffixProtocolVersion),
AuthenticationConfig: authenticationOptions,
}
opt.topic = v.GetString(configPrefix + suffixTopic)
Expand Down