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

TLS configuration for Zipkin #3676

Merged
merged 1 commit into from
May 15, 2022
Merged

TLS configuration for Zipkin #3676

merged 1 commit into from
May 15, 2022

Conversation

mmorel-35
Copy link
Contributor

Which problem is this PR solving?

Short description of the changes

  • Add tls configuration for Zipkin server

Signed-off-by: Matthieu MOREL [email protected]

@mmorel-35 mmorel-35 requested a review from a team as a code owner May 13, 2022 10:21
@codecov
Copy link

codecov bot commented May 13, 2022

Codecov Report

Merging #3676 (439b600) into main (a49094c) will increase coverage by 0.06%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main    #3676      +/-   ##
==========================================
+ Coverage   96.50%   96.56%   +0.06%     
==========================================
  Files         268      268              
  Lines       15668    15689      +21     
==========================================
+ Hits        15120    15150      +30     
+ Misses        457      449       -8     
+ Partials       91       90       -1     
Impacted Files Coverage Δ
ports/ports.go 100.00% <ø> (ø)
cmd/collector/app/builder_flags.go 100.00% <100.00%> (ø)
cmd/collector/app/collector.go 76.36% <100.00%> (+0.66%) ⬆️
cmd/collector/app/server/zipkin.go 92.45% <100.00%> (+21.72%) ⬆️
pkg/config/tlscfg/cert_watcher.go 92.63% <0.00%> (-2.11%) ⬇️
cmd/query/app/static_handler.go 95.80% <0.00%> (+1.79%) ⬆️

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 a49094c...439b600. Read the comment docs.

@albertteoh
Copy link
Contributor

How to update the documentation for example.

You shouldn't need to explicitly modify docs as the CLI docs are autogenerated on release: https://github.com/jaegertracing/documentation/blob/main/RELEASE.md#auto-generated-documentation-for-cli-flags

@mmorel-35
Copy link
Contributor Author

mmorel-35 commented May 13, 2022

You shouldn't need to explicitly modify docs as the CLI docs are autogenerated on release:

Oh, great 👍🏻 !!

cmd/collector/app/server/zipkin_test.go Outdated Show resolved Hide resolved
cmd/collector/app/server/zipkin_test.go Outdated Show resolved Hide resolved
Copy link
Contributor

@albertteoh albertteoh left a comment

Choose a reason for hiding this comment

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

Looks good, just a couple of nits.

cmd/collector/app/server/zipkin_test.go Outdated Show resolved Hide resolved
cmd/collector/app/server/zipkin_test.go Outdated Show resolved Hide resolved
Signed-off-by: Matthieu MOREL <[email protected]>
Copy link
Contributor

@albertteoh albertteoh left a comment

Choose a reason for hiding this comment

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

Thanks!

@albertteoh albertteoh enabled auto-merge (squash) May 15, 2022 01:22
@albertteoh albertteoh merged commit 04a5fdb into jaegertracing:main May 15, 2022
@mmorel-35 mmorel-35 deleted the issue-3668 branch May 15, 2022 06:35
@mmorel-35
Copy link
Contributor Author

Hi @albertteoh , @yurishkuro !
When can we expect for the next release including the TLS features on Admin and Zipkin collector to be published ?

@albertteoh
Copy link
Contributor

Hi @albertteoh , @yurishkuro ! When can we expect for the next release including the TLS features on Admin and Zipkin collector to be published ?

The tentative date for the next release v1.35.0 is around 3rd June: https://github.com/jaegertracing/jaeger/blob/main/RELEASE.md#release-managers

@mmorel-35
Copy link
Contributor Author

Great! Thank you!

albertteoh pushed a commit to albertteoh/jaeger that referenced this pull request Jul 13, 2022
Signed-off-by: Matthieu MOREL <[email protected]>

Co-authored-by: Matthieu MOREL <[email protected]>
Signed-off-by: Albert Teoh <[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.

Support TLS config for Zipkin Collector
2 participants