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

fix collector panic due to sarama sdk #2654

Merged
merged 1 commit into from
Nov 26, 2020

Conversation

Betula-L
Copy link
Contributor

@Betula-L Betula-L requested a review from a team as a code owner November 26, 2020 11:08
@Betula-L Betula-L requested a review from pavolloffay November 26, 2020 11:08
@Betula-L Betula-L force-pushed the fix-collector-panic branch from 309f195 to 594f7f6 Compare November 26, 2020 11:09
@codecov
Copy link

codecov bot commented Nov 26, 2020

Codecov Report

Merging #2654 (0642a85) into master (57b4ea2) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2654      +/-   ##
==========================================
- Coverage   95.10%   95.09%   -0.02%     
==========================================
  Files         213      213              
  Lines        9490     9491       +1     
==========================================
  Hits         9025     9025              
  Misses        388      388              
- Partials       77       78       +1     
Impacted Files Coverage Δ
plugin/storage/kafka/writer.go 100.00% <100.00%> (ø)
cmd/query/app/server.go 88.52% <0.00%> (-1.64%) ⬇️
plugin/storage/integration/integration.go 77.90% <0.00%> (+0.55%) ⬆️

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 b8ccf73...0642a85. Read the comment docs.

@Betula-L Betula-L force-pushed the fix-collector-panic branch from 594f7f6 to 0642a85 Compare November 26, 2020 11:55
Copy link
Contributor

@objectiser objectiser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@yurishkuro yurishkuro merged commit 9bd0a8b into jaegertracing:master Nov 26, 2020
yurishkuro added a commit that referenced this pull request Jan 13, 2021
…ectors (#2657)

* add metrics that show agent connection collector status

Signed-off-by: WalkerWang731 <[email protected]>

* update comment

Signed-off-by: WalkerWang731 <[email protected]>

* exec make fmt

Signed-off-by: WalkerWang731 <[email protected]>

* simplify function and add testing relevant code in the builder_test.go

Signed-off-by: WalkerWang731 <[email protected]>

* add comment in connect_metrics.go

Signed-off-by: WalkerWang731 <[email protected]>

* simplify code and changed use expvar to show target

Signed-off-by: WalkerWang731 <[email protected]>

* simplify code and changed use expvar to show target

Signed-off-by: WalkerWang731 <[email protected]>

* exec make fmt

Signed-off-by: WalkerWang731 <[email protected]>

* Fix collector panic due to sarama sdk returning nil error (#2654)

Signed-off-by: luhualin <[email protected]>

Co-authored-by: luhualin <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Fix flaky tbuffered server test (#2635)

* Fix flaky tbuffered server test

Signed-off-by: Pavel Kositsyn <[email protected]>

* Apply suggestions from code review - more readable comments

Co-authored-by: Yuri Shkuro <[email protected]>
Signed-off-by: Pavel Kositsyn <[email protected]>

Co-authored-by: Yuri Shkuro <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Add github actions for integration tests (#2649)

* Add github action for jaeger integration tests

Signed-off-by: Ashmita Bohara <[email protected]>

* Create separate workflow for each integration test

Signed-off-by: Ashmita Bohara <[email protected]>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Clean-up GH action names (#2661)

Signed-off-by: WalkerWang731 <[email protected]>

* Fix for failures in badger integration tests (#2660)

Signed-off-by: Ashmita Bohara <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Add protogen validation test (#2662)

Signed-off-by: Ashmita Bohara <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Add github action for jaeger all-in-one image (#2663)

* Add github action for jaeger all-in-one image

Signed-off-by: Ashmita Bohara <[email protected]>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <[email protected]>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <[email protected]>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <[email protected]>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <[email protected]>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <[email protected]>

* Make steps self-explantory

Signed-off-by: Ashmita Bohara <[email protected]>

* Fix git tags issue

Signed-off-by: Ashmita Bohara <[email protected]>

* Fix ES integration test

Signed-off-by: Ashmita Bohara <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Update comment that looks confusing during builds

Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Use GitHub actions based build badges

Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Fix and minor improvements to all-in-one github action (#2667)

Signed-off-by: Ashmita Bohara <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Fix docker login issue with all-in-one build (#2668)

* Fix docker login issue with all-in-one build

Signed-off-by: Ashmita Bohara <[email protected]>

* Fix docker login issue with all-in-one build

Signed-off-by: Ashmita Bohara <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Fix issue with all-in-one build (#2669)

Signed-off-by: Ashmita Bohara <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Update cmd/agent/app/reporter/connect_metrics.go

accept suggestions

Co-authored-by: Yuri Shkuro <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Update cmd/agent/app/reporter/connect_metrics.go

accept suggestions

Co-authored-by: Yuri Shkuro <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* simplify the code that remove ConnectMetricsParams{} and integrate ConnectMetrics{}

Signed-off-by: WalkerWang731 <[email protected]>

* simplify the code that remove ConnectMetricsParams{} and integrate ConnectMetrics{}

Signed-off-by: WalkerWang731 <[email protected]>

* merage from the lastest master branch and exec make fmt

Signed-off-by: walker.wangxy <[email protected]>

* add comment on ConnectMetrics

Signed-off-by: WalkerWang731 <[email protected]>

* clear up redundant codes

Signed-off-by: WalkerWang731 <[email protected]>

Co-authored-by: WalkerWang731 <[email protected]>
Co-authored-by: Betula-L <[email protected]>
Co-authored-by: luhualin <[email protected]>
Co-authored-by: Pavel Kositsyn <[email protected]>
Co-authored-by: Yuri Shkuro <[email protected]>
Co-authored-by: Ashmita <[email protected]>
Co-authored-by: Yuri Shkuro <[email protected]>
Co-authored-by: walker.wangxy <[email protected]>
bhiravabhatla pushed a commit to bhiravabhatla/jaeger that referenced this pull request Jan 25, 2021
…ectors (jaegertracing#2657)

* add metrics that show agent connection collector status

Signed-off-by: WalkerWang731 <[email protected]>

* update comment

Signed-off-by: WalkerWang731 <[email protected]>

* exec make fmt

Signed-off-by: WalkerWang731 <[email protected]>

* simplify function and add testing relevant code in the builder_test.go

Signed-off-by: WalkerWang731 <[email protected]>

* add comment in connect_metrics.go

Signed-off-by: WalkerWang731 <[email protected]>

* simplify code and changed use expvar to show target

Signed-off-by: WalkerWang731 <[email protected]>

* simplify code and changed use expvar to show target

Signed-off-by: WalkerWang731 <[email protected]>

* exec make fmt

Signed-off-by: WalkerWang731 <[email protected]>

* Fix collector panic due to sarama sdk returning nil error (jaegertracing#2654)

Signed-off-by: luhualin <[email protected]>

Co-authored-by: luhualin <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Fix flaky tbuffered server test (jaegertracing#2635)

* Fix flaky tbuffered server test

Signed-off-by: Pavel Kositsyn <[email protected]>

* Apply suggestions from code review - more readable comments

Co-authored-by: Yuri Shkuro <[email protected]>
Signed-off-by: Pavel Kositsyn <[email protected]>

Co-authored-by: Yuri Shkuro <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Add github actions for integration tests (jaegertracing#2649)

* Add github action for jaeger integration tests

Signed-off-by: Ashmita Bohara <[email protected]>

* Create separate workflow for each integration test

Signed-off-by: Ashmita Bohara <[email protected]>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Clean-up GH action names (jaegertracing#2661)

Signed-off-by: WalkerWang731 <[email protected]>

* Fix for failures in badger integration tests (jaegertracing#2660)

Signed-off-by: Ashmita Bohara <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Add protogen validation test (jaegertracing#2662)

Signed-off-by: Ashmita Bohara <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Add github action for jaeger all-in-one image (jaegertracing#2663)

* Add github action for jaeger all-in-one image

Signed-off-by: Ashmita Bohara <[email protected]>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <[email protected]>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <[email protected]>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <[email protected]>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <[email protected]>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <[email protected]>

* Make steps self-explantory

Signed-off-by: Ashmita Bohara <[email protected]>

* Fix git tags issue

Signed-off-by: Ashmita Bohara <[email protected]>

* Fix ES integration test

Signed-off-by: Ashmita Bohara <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Update comment that looks confusing during builds

Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Use GitHub actions based build badges

Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Fix and minor improvements to all-in-one github action (jaegertracing#2667)

Signed-off-by: Ashmita Bohara <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Fix docker login issue with all-in-one build (jaegertracing#2668)

* Fix docker login issue with all-in-one build

Signed-off-by: Ashmita Bohara <[email protected]>

* Fix docker login issue with all-in-one build

Signed-off-by: Ashmita Bohara <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Fix issue with all-in-one build (jaegertracing#2669)

Signed-off-by: Ashmita Bohara <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Update cmd/agent/app/reporter/connect_metrics.go

accept suggestions

Co-authored-by: Yuri Shkuro <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* Update cmd/agent/app/reporter/connect_metrics.go

accept suggestions

Co-authored-by: Yuri Shkuro <[email protected]>
Signed-off-by: WalkerWang731 <[email protected]>

* simplify the code that remove ConnectMetricsParams{} and integrate ConnectMetrics{}

Signed-off-by: WalkerWang731 <[email protected]>

* simplify the code that remove ConnectMetricsParams{} and integrate ConnectMetrics{}

Signed-off-by: WalkerWang731 <[email protected]>

* merage from the lastest master branch and exec make fmt

Signed-off-by: walker.wangxy <[email protected]>

* add comment on ConnectMetrics

Signed-off-by: WalkerWang731 <[email protected]>

* clear up redundant codes

Signed-off-by: WalkerWang731 <[email protected]>

Co-authored-by: WalkerWang731 <[email protected]>
Co-authored-by: Betula-L <[email protected]>
Co-authored-by: luhualin <[email protected]>
Co-authored-by: Pavel Kositsyn <[email protected]>
Co-authored-by: Yuri Shkuro <[email protected]>
Co-authored-by: Ashmita <[email protected]>
Co-authored-by: Yuri Shkuro <[email protected]>
Co-authored-by: walker.wangxy <[email protected]>
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.

Jaeger collector crashed accidentally due to samara return nil error
3 participants