Skip to content

[refractor] Remove dependency on tlscfg.Options #6478

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

Merged

Conversation

Saumya40-codes
Copy link
Contributor

@Saumya40-codes Saumya40-codes commented Jan 4, 2025

Which problem is this PR solving?

Description of the changes

  • Removes the dependency of various jaeger packages on tlscfg.Options
  • Options is now private struct in tlscfg
  • In place of tlscfg.Options corresponding configtls by OTEL is used

How was this change tested?

  • Running go test -v in all the packages which were changed/dependent on tlscfg.Options

Checklist

@Saumya40-codes Saumya40-codes requested a review from a team as a code owner January 4, 2025 09:51
@Saumya40-codes Saumya40-codes requested a review from jkowall January 4, 2025 09:51
@Saumya40-codes Saumya40-codes marked this pull request as draft January 4, 2025 09:58
Copy link

codecov bot commented Jan 4, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.27%. Comparing base (e7ed1e1) to head (f6f6d2b).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6478      +/-   ##
==========================================
- Coverage   96.31%   96.27%   -0.04%     
==========================================
  Files         370      370              
  Lines       21170    21169       -1     
==========================================
- Hits        20389    20380       -9     
- Misses        598      604       +6     
- Partials      183      185       +2     
Flag Coverage Δ
badger_v1 10.75% <0.00%> (ø)
badger_v2 2.80% <0.00%> (ø)
cassandra-4.x-v1-manual 16.64% <20.68%> (ø)
cassandra-4.x-v2-auto 2.73% <0.00%> (ø)
cassandra-4.x-v2-manual 2.73% <0.00%> (ø)
cassandra-5.x-v1-manual 16.64% <20.68%> (ø)
cassandra-5.x-v2-auto 2.73% <0.00%> (ø)
cassandra-5.x-v2-manual 2.73% <0.00%> (ø)
elasticsearch-6.x-v1 20.34% <20.68%> (ø)
elasticsearch-7.x-v1 20.41% <20.68%> (ø)
elasticsearch-8.x-v1 20.56% <20.68%> (-0.01%) ⬇️
elasticsearch-8.x-v2 2.80% <0.00%> (+<0.01%) ⬆️
grpc_v1 12.41% <24.13%> (ø)
grpc_v2 9.15% <0.00%> (-0.01%) ⬇️
kafka-3.x-v1 10.43% <0.00%> (-0.16%) ⬇️
kafka-3.x-v2 2.80% <0.00%> (ø)
memory_v2 2.80% <0.00%> (ø)
opensearch-1.x-v1 20.45% <20.68%> (-0.01%) ⬇️
opensearch-2.x-v1 20.45% <20.68%> (-0.01%) ⬇️
opensearch-2.x-v2 2.79% <0.00%> (-0.01%) ⬇️
tailsampling-processor 0.52% <0.00%> (ø)
unittests 95.14% <100.00%> (-0.04%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Saumya40-codes Saumya40-codes marked this pull request as ready for review January 4, 2025 10:51
@dosubot dosubot bot added the area/storage label Jan 4, 2025
Copy link
Member

@yurishkuro yurishkuro left a comment

Choose a reason for hiding this comment

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

lgtm

yurishkuro
yurishkuro previously approved these changes Jan 4, 2025
@yurishkuro
Copy link
Member

CI is failing

@yurishkuro
Copy link
Member

please get the CI tests & lint checks green

Signed-off-by: Yuri Shkuro <[email protected]>
@yurishkuro yurishkuro changed the title [refractor] remove dependancy on tlscfg.Options [refractor] Remove dependency on tlscfg.Options Jan 5, 2025
@yurishkuro yurishkuro dismissed their stale review January 5, 2025 17:13

waiting for green build

@yurishkuro yurishkuro enabled auto-merge (squash) January 5, 2025 17:50
@yurishkuro yurishkuro merged commit a44d8b1 into jaegertracing:main Jan 5, 2025
54 checks passed
@yurishkuro
Copy link
Member

Thanks!

adityachopra29 pushed a commit to adityachopra29/jaeger that referenced this pull request Jan 9, 2025
## Which problem is this PR solving?
- Resolves jaegertracing#6468

## Description of the changes
- Removes the dependency of various `jaeger` packages on tlscfg.Options
- Options is now `private` struct in tlscfg
- In place of `tlscfg.Options` corresponding `configtls` by OTEL is used

## How was this change tested?
- Running `go test -v` in all the packages which were changed/dependent
on tlscfg.Options

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `npm run lint` and `npm run test`

---------

Signed-off-by: Saumya Shah <[email protected]>
Signed-off-by: Yuri Shkuro <[email protected]>
Co-authored-by: Yuri Shkuro <[email protected]>
Co-authored-by: Yuri Shkuro <[email protected]>
Signed-off-by: adityachopra29 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove dependency on tlscfg.Options
2 participants