[jaeger-v2] Migrate ElasticSearch/OpenSearch to use OTEL's TLS configuration#6079
Merged
yurishkuro merged 1 commit intojaegertracing:mainfrom Oct 14, 2024
Merged
[jaeger-v2] Migrate ElasticSearch/OpenSearch to use OTEL's TLS configuration#6079yurishkuro merged 1 commit intojaegertracing:mainfrom
yurishkuro merged 1 commit intojaegertracing:mainfrom
Conversation
Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #6079 +/- ##
==========================================
- Coverage 96.92% 96.92% -0.01%
==========================================
Files 351 351
Lines 16675 16672 -3
==========================================
- Hits 16162 16159 -3
Misses 329 329
Partials 184 184
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
yurishkuro
reviewed
Oct 14, 2024
| TLS: configtls.ClientConfig{ | ||
| Insecure: true, | ||
| Config: configtls.Config{ | ||
| CAFile: certFilePath.Name(), |
Member
There was a problem hiding this comment.
what's the meaning of this combination Insecure: true but with a CAFile?
Collaborator
Author
There was a problem hiding this comment.
@yurishkuro from the implementation of LoadTLSConfig, it looks like the configuration still gets loaded if the CAFile is present.
func (c ClientConfig) LoadTLSConfig(_ context.Context) (*tls.Config, error) {
if c.Insecure && !c.hasCA() {
return nil, nil
}
tlsCfg, err := c.loadTLSConfig()
if err != nil {
return nil, fmt.Errorf("failed to load TLS config: %w", err)
}
tlsCfg.ServerName = c.ServerName
tlsCfg.InsecureSkipVerify = c.InsecureSkipVerify
return tlsCfg, nil
}
yurishkuro
approved these changes
Oct 14, 2024
yurishkuro
added
the
changelog:experimental
chahatsagarmain
pushed a commit
to chahatsagarmain/jaeger
that referenced
this pull request
Oct 23, 2024
…uration (jaegertracing#6079) ## Which problem is this PR solving? - Towards jaegertracing#6059 ## Description of the changes - Migrated the ElasticSearch/OpenSearch configurations to use OTEL's TLS configurations - In a follow up PR, I'll re-evaluate the groupings of the configurations and add the missing mapstructure tags ## How was this change tested? - CI ## 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`: `yarn lint` and `yarn test` Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Which problem is this PR solving?
Description of the changes
How was this change tested?
Checklist
jaeger:make lint testjaeger-ui:yarn lintandyarn test