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 jaeger receiver to honor TLS config #2866

Merged
merged 6 commits into from
Apr 20, 2021

Conversation

dstdfx
Copy link
Contributor

@dstdfx dstdfx commented Mar 31, 2021

Description:
Add missing TLSConfig into the jaeger receiver's configuration.
Create TLS listener if TLS config is passed.

Link to tracking Issue: #2850

@dstdfx dstdfx requested a review from a team March 31, 2021 09:19
@dstdfx dstdfx changed the title Fix jaeger receiver HTTP to honor TLS config Fix jaeger receiver to honor TLS config Mar 31, 2021
@codecov
Copy link

codecov bot commented Mar 31, 2021

Codecov Report

Merging #2866 (8d21bb0) into main (d93c9d2) will decrease coverage by 0.00%.
The diff coverage is 50.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #2866      +/-   ##
==========================================
- Coverage   91.61%   91.60%   -0.01%     
==========================================
  Files         312      312              
  Lines       15437    15434       -3     
==========================================
- Hits        14143    14139       -4     
- Misses        884      885       +1     
  Partials      410      410              
Impacted Files Coverage Δ
receiver/jaegerreceiver/trace_receiver.go 73.50% <33.33%> (-1.01%) ⬇️
receiver/jaegerreceiver/factory.go 95.69% <100.00%> (+0.04%) ⬆️

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 d93c9d2...8d21bb0. Read the comment docs.

@keitwb
Copy link
Contributor

keitwb commented Mar 31, 2021

The httpconfig.HTTPServerConfig used has a ToServer and ToListener method that ensures all the config is used: https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/confighttp/confighttp.go#L158.

Is it possible to fit that into this receiver?

@dstdfx
Copy link
Contributor Author

dstdfx commented Mar 31, 2021

The httpconfig.HTTPServerConfig used has a ToServer and ToListener method that ensures all the config is used: https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/confighttp/confighttp.go#L158.

Is it possible to fit that into this receiver?

Looks doable, just need to make sure httpconfig.HTTPServerConfig.Endpoint has a valid port as we do in the helper:
https://github.com/open-telemetry/opentelemetry-collector/blob/main/receiver/jaegerreceiver/factory.go#L242

@dstdfx
Copy link
Contributor Author

dstdfx commented Apr 1, 2021

@keitwb I think it also makes sense to use configgrpc.GRPCServerSettings for GRPC collector and use available methods for building net.Listener and server options but it's a matter of another PR, what do you think?

@keitwb
Copy link
Contributor

keitwb commented Apr 1, 2021

@keitwb I think it also makes sense to use configgrpc.GRPCServerSettings for GRPC collector and use available methods for building net.Listener and server options but it's a matter of another PR, what do you think?

Yeah I agree, a different PR.

@keitwb
Copy link
Contributor

keitwb commented Apr 1, 2021

@tigrannajaryan can you take a look?

Copy link
Member

@jpkrohling jpkrohling left a comment

Choose a reason for hiding this comment

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

The code itself looks good to me, but haven't there been any changes to the docs?

@dstdfx
Copy link
Contributor Author

dstdfx commented Apr 7, 2021

The code itself looks good to me, but haven't there been any changes to the docs?

@jpkrohling As I see TLS configuration is already described here:
https://github.com/open-telemetry/opentelemetry-collector/blob/main/receiver/jaegerreceiver/README.md#advanced-configuration

CHANGELOG.md Outdated Show resolved Hide resolved
Add missing TLSConfig into jaeger reciever's configuration.

Create TLS listener if TLS config is passed.

Signed-off-by: Daniil Rutskiy <dstdfx@gmail.com>
Signed-off-by: Daniil Rutskiy <dstdfx@gmail.com>
Signed-off-by: Daniil Rutskiy <dstdfx@gmail.com>
Signed-off-by: Daniil Rutskiy <dstdfx@gmail.com>
Signed-off-by: Daniil Rutskiy <dstdfx@gmail.com>
@bogdandrutu bogdandrutu merged commit 65420f4 into open-telemetry:main Apr 20, 2021
@dstdfx dstdfx deleted the honor-tls-jaeger-rcv branch April 21, 2021 08:55
hughesjj pushed a commit to hughesjj/opentelemetry-collector that referenced this pull request Apr 27, 2023
…-agent/pkg/apm (open-telemetry#2866)

* Bump github.com/stretchr/testify in /pkg/signalfx-agent/pkg/apm

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.1 to 1.8.2.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.8.1...v1.8.2)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* make tidy

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: jeffreyc-splunk <jeffreyc@splunk.com>
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.

4 participants