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.

Sign up for GitHub

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

Jump to bottom

[Prometheus Remote Write Exporter for Cortex] Add TLS Support and Default HTTP Client #255

Merged
merged 27 commits into from
Aug 26, 2020
Merged

[Prometheus Remote Write Exporter for Cortex] Add TLS Support and Default HTTP Client #255

merged 27 commits into from
Aug 26, 2020

Conversation

ercl
Copy link
Contributor

@ercl ercl commented Aug 21, 2020

This PR implements TLS support for the Go SDK Prometheus Remote Write Exporter for Cortex. It includes functionality for creating a default HTTP client for the exporter, unit tests, and an integration test for mutual TLS.

Eric Lee added 15 commits August 21, 2020 13:26
Start buildClient for creating a default HTTP client
024d0c7
Add TestBuildClient and first subtest
65ac7da
Update TestBuildClient with TLS server, TLS Config, and Proxy URL
3b8c061
Add methods for loading user-supplied certificates
d42defe
Add buildTLSConfig for creating a new TLS Config struct
39b0b43
Add TLS Config and Proxy URL to buildClient, and update TestBuildClient
635bffc
Add additional tests for TestBuildClient
53325bc
Add helper function for generating certificate files
b2e8a4e
Add helper function for generating CA certificate files
dd4a485
Add helper function for generating serving certificate files
74a1b06
Add helper function for generating client certificate files
70194fe
Add part of integration test with certificate creation and TLS server
ce97a6b
Add helper function for creating the test server's TLS Config struct
7cabc6f
Update TestMutualTLS by adding TLS Config to server and client
65f62cb
Run make precommit and fix lint errors
b219481
jmacd
jmacd approved these changes Aug 24, 2020
View reviewed changes
Copy link
Contributor

@jmacd jmacd left a comment

Choose a reason for hiding this comment

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

👍

MrAlias
MrAlias reviewed Aug 25, 2020
View reviewed changes
exporters/metric/cortex/auth.go Show resolved Hide resolved
exporters/metric/cortex/auth.go Outdated Show resolved Hide resolved
exporters/metric/cortex/auth.go Outdated Show resolved Hide resolved
exporters/metric/cortex/auth.go Outdated Show resolved Hide resolved
MrAlias
MrAlias reviewed Aug 25, 2020
View reviewed changes
Copy link
Contributor

@MrAlias MrAlias 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 in the overall approach. The previous review (sorry about the partial submit of that) contained some things that need to be addressed and this one has more nice-to-haves.

Great job.

exporters/metric/cortex/auth_test.go Outdated Show resolved Hide resolved
exporters/metric/cortex/auth_test.go Outdated Show resolved Hide resolved
exporters/metric/cortex/auth_test.go Outdated Show resolved Hide resolved
exporters/metric/cortex/auth_test.go Outdated Show resolved Hide resolved
@ercl
Copy link
Contributor Author

ercl commented Aug 26, 2020

Thanks for all the feedback! The recent commits should address everything in the reviews.

MrAlias
MrAlias approved these changes Aug 26, 2020
View reviewed changes
Copy link
Contributor

@MrAlias MrAlias left a comment

Choose a reason for hiding this comment

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

🚀

@MrAlias
Copy link
Contributor

MrAlias commented Aug 26, 2020

@ercl this looks ready to merge. If you can update with the master branch it should be good to go.

@ercl
Copy link
Contributor Author

ercl commented Aug 26, 2020 •
edited
Loading

Merged! I also updated the HTTP Transport's DialContext timeout since the mutual tls test was occasionally taking too much time on GOARCH 386.

@MrAlias
Copy link
Contributor

MrAlias commented Aug 26, 2020

Merged! I also updated the HTTP Transport's DialContext timeout since the mutual tls test was occasionally taking too much time on GOARCH 386.

Hmm, looks like this is still out of sync. I'll be sure to not merge anything before this if you can update again.

@ercl
Copy link
Contributor Author

ercl commented Aug 26, 2020

Merged again! I think the reason why CircleCI tests fail is because the testing script sets the timeout at 30s, which the Mutual TLS test occasionally goes over.

@MrAlias MrAlias merged commit 1f7546c into open-telemetry:master Aug 26, 2020
plantfansam referenced this pull request in plantfansam/opentelemetry-go-contrib Mar 18, 2022
@jmacd
Remove NewZeroNumber in favor of Number(0) (#255)
88dafbb
@pellared pellared added this to the untracked milestone Nov 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MrAlias MrAlias MrAlias approved these changes

@jmacd jmacd jmacd approved these changes

@Aneurysm9 Aneurysm9 Awaiting requested review from Aneurysm9

@evantorrie evantorrie Awaiting requested review from evantorrie

@lizthegrey lizthegrey Awaiting requested review from lizthegrey

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
untracked
Development

Successfully merging this pull request may close these issues.
4 participants
@ercl @MrAlias @jmacd @pellared