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.

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

Configurable kafka protocol version for msg consuming by jaeger ingester #1640

Conversation

marqc
Copy link
Contributor

@marqc marqc commented Jun 27, 2019

Which problem is this PR solving?

Jaeger ingester silently doesn't consume messages, when kafka server doesn't support kafka protocol in version 0.0.9.

Short description of the changes

I added new kafka.consumer.protocol-version configuration option, that allows specify kafka protocol version to use. Default is "0.9.0.0" which was used by bsm/sarama-cluster as default version (for backwards compatibility).

@codecov
Copy link

codecov bot commented Jun 27, 2019

Codecov Report

Merging #1640 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1640      +/-   ##
==========================================
+ Coverage   98.71%   98.71%   +<.01%     
==========================================
  Files         193      193              
  Lines        9228     9233       +5     
==========================================
+ Hits         9109     9114       +5     
  Misses         91       91              
  Partials       28       28
Impacted Files Coverage Δ
cmd/ingester/app/flags.go 100% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 65c8e56...12c3221. Read the comment docs.

pkg/kafka/consumer/config.go Outdated Show resolved Hide resolved
cmd/ingester/app/flags.go Outdated Show resolved Hide resolved
cmd/ingester/app/flags.go Outdated Show resolved Hide resolved
Signed-off-by: Chodor Marek <marek.chodor@grupawp.pl>
@marqc marqc force-pushed the ingester_kafka_consumer_protocol_version_config branch from a9def7d to 1542008 Compare July 1, 2019 08:10
…onfig

Signed-off-by: Chodor Marek <marek.chodor@grupawp.pl>
@marqc marqc force-pushed the ingester_kafka_consumer_protocol_version_config branch from 8b2ff4b to 8cd8860 Compare July 1, 2019 09:39
@yurishkuro
Copy link
Member

tests are failing

--- FAIL: TestOptionsWithFlags (0.00s)
    flags_test.go:46: 
        	Error Trace:	flags_test.go:46
        	Error:      	Not equal: 
        	            	expected: "1.0.0"
        	            	actual  : ""
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -1 +1 @@
        	            	-1.0.0
        	            	+
        	Test:       	TestOptionsWithFlags
    flags_test.go:47: 
        	Error Trace:	flags_test.go:47
        	Error:      	Not equal: 
        	            	expected: 5
        	            	actual  : 1000
        	Test:       	TestOptionsWithFlags
    flags_test.go:48: 
        	Error Trace:	flags_test.go:48
        	Error:      	Not equal: 
        	            	expected: 120000000000
        	            	actual  : 60000000000
        	Test:       	TestOptionsWithFlags

Signed-off-by: Chodor Marek <marek.chodor@grupawp.pl>
@marqc marqc force-pushed the ingester_kafka_consumer_protocol_version_config branch from 123f92e to aebc038 Compare July 8, 2019 14:47
@marqc
Copy link
Contributor Author

marqc commented Jul 8, 2019

@yurishkuro I made a typo in test data config. Fixed now.

@yurishkuro yurishkuro merged commit c14b096 into jaegertracing:master Jul 8, 2019
@yurishkuro
Copy link
Member

yurishkuro commented Jul 8, 2019

Q: wouldn't a symmetric change in producer code make sense as well?

@marqc
Copy link
Contributor Author

marqc commented Jul 8, 2019

Q: wouldn't a symmetric change in producer code make sense as well?

Yes. Good point. I can prepare some PR for cmd/collector pkg/kafka/producer tomorrow

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants