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

Improved graceful shutdown - Collector #2076

Merged
merged 1 commit into from
Feb 26, 2020
Merged

Improved graceful shutdown - Collector #2076

merged 1 commit into from
Feb 26, 2020

Conversation

jpkrohling
Copy link
Contributor

@jpkrohling jpkrohling commented Feb 18, 2020

Which problem is this PR solving?

Resolves #295

@jpkrohling jpkrohling requested a review from a team as a code owner February 18, 2020 12:42
@jpkrohling jpkrohling requested review from objectiser and yurishkuro and removed request for objectiser February 18, 2020 12:42
@codecov
Copy link

codecov bot commented Feb 18, 2020

Codecov Report

Merging #2076 into master will increase coverage by <.01%.
The diff coverage is 57.69%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2076      +/-   ##
==========================================
+ Coverage   96.31%   96.31%   +<.01%     
==========================================
  Files         214      214              
  Lines       10532    10540       +8     
==========================================
+ Hits        10144    10152       +8     
  Misses        329      329              
  Partials       59       59
Impacted Files Coverage Δ
cmd/collector/app/server/test.go 33.33% <0%> (-16.67%) ⬇️
cmd/collector/app/span_handler_builder.go 100% <100%> (ø) ⬆️
cmd/collector/app/span_processor.go 100% <100%> (ø) ⬆️
cmd/collector/app/collector.go 72.41% <43.75%> (-1.4%) ⬇️
...lugin/sampling/strategystore/adaptive/processor.go 100% <0%> (+0.79%) ⬆️
cmd/query/app/server.go 94.52% <0%> (+2.73%) ⬆️

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 d5036f4...f686434. Read the comment docs.

@yurishkuro
Copy link
Member

did you mean to do git checkout master cmd/agent?

@jpkrohling
Copy link
Contributor Author

This is on top of #2031. Once that one is merged, this will get rebased and should show only the collector changes.

zipkinSpansHandler, jaegerBatchesHandler, grpcHandler := handlerBuilder.BuildHandlers()

c.spanProcessor = handlerBuilder.BuildSpanProcessor()
c.spanHandlers = handlerBuilder.BuildHandlers(c.spanProcessor)
Copy link
Member

Choose a reason for hiding this comment

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

Should this be a factory? zipkinSpansHandler, jaegerBatchesHandler, grpcHandler can implement Factory.CreateHandler()

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good question, probably as part of another PR.

cmd/collector/app/collector.go Outdated Show resolved Hide resolved
cmd/collector/app/collector.go Outdated Show resolved Hide resolved
cmd/collector/app/span_processor_test.go Outdated Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Feb 19, 2020

Codecov Report

❗ No coverage uploaded for pull request base (master@043b1ae). Click here to learn what that means.
The diff coverage is 57.69%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #2076   +/-   ##
=========================================
  Coverage          ?   96.33%           
=========================================
  Files             ?      214           
  Lines             ?    10537           
  Branches          ?        0           
=========================================
  Hits              ?    10151           
  Misses            ?      328           
  Partials          ?       58
Impacted Files Coverage Δ
cmd/collector/app/server/test.go 33.33% <0%> (ø)
cmd/collector/app/span_handler_builder.go 100% <100%> (ø)
cmd/collector/app/span_processor.go 100% <100%> (ø)
cmd/collector/app/collector.go 72.41% <43.75%> (ø)

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 043b1ae...c7b0a5b. Read the comment docs.

@jpkrohling
Copy link
Contributor Author

@annanay25, @yurishkuro is this ready to be merged once 1.17 is out?

@yurishkuro
Copy link
Member

I haven't reviewed this one. Let's merge the agent change and rebase this PR.

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
@yurishkuro yurishkuro merged commit 5fb7d72 into jaegertracing:master Feb 26, 2020
@jpkrohling jpkrohling deleted the 295-GracefulShutdown-Collector branch July 28, 2021 19:22
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.

Graceful shutdown by properly handling SIGTERM
3 participants