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

Support export via TLS (fix #12) #65

Merged
merged 1 commit into from
Nov 21, 2024
Merged

Support export via TLS (fix #12) #65

merged 1 commit into from
Nov 21, 2024

Conversation

krjakbrjak
Copy link

@krjakbrjak krjakbrjak commented Sep 13, 2024 •
edited
Loading

Proposed changes

Added optional TLS credentials to the gRPC client.

Checklist

Before creating a PR, run through this checklist and mark each as complete.

  • I have read the CONTRIBUTING document
  • If applicable, I have added tests that prove my fix is effective or that my feature works
  • If applicable, I have checked that any relevant tests pass after adding my changes

@krjakbrjak krjakbrjak changed the title Added optional TLS certificates to the gRPC client Add optional TLS certificates to the gRPC client Sep 13, 2024
jdehaan
jdehaan reviewed Sep 13, 2024
View reviewed changes
src/http_module.cpp Outdated Show resolved Hide resolved
@AlekseySVTN
Copy link

AlekseySVTN commented Oct 1, 2024 •
edited
Loading

When we can use this? I need this PR to be merged. How we can merge this more quickly?

@krjakbrjak
Copy link
Author

When we can use this? I need this PR to be merged. How we can merge this more quickly?

It is ready to be reviewed.

@AlekseySVTN
Copy link

AlekseySVTN commented Oct 1, 2024 •
edited
Loading

When we can use this? I need this PR to be merged. How we can merge this more quickly?

It is ready to be reviewed.

This PR can be linked to #12

@AlekseySVTN
Copy link

AlekseySVTN commented Oct 1, 2024 •
edited
Loading

@jdehaan, Could you review PR again please.

jdehaan
jdehaan approved these changes Oct 2, 2024
View reviewed changes
Copy link

@jdehaan jdehaan left a comment

Choose a reason for hiding this comment

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

LGTM, great to have the tests as well!!

@AlekseySVTN
Copy link

AlekseySVTN commented Oct 2, 2024 •
edited
Loading

@p-pautov Could you please add your review too? Or can @krjakbrjak merge it?

p-pautov
p-pautov reviewed Nov 14, 2024
View reviewed changes
Copy link
Contributor

@p-pautov p-pautov left a comment

Choose a reason for hiding this comment

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

Thanks for the PR.

The commit message is rather confusing, though. It should probably be "Support export via TLS (fix #12)."

src/http_module.cpp Outdated Show resolved Hide resolved
src/http_module.cpp Outdated Show resolved Hide resolved
src/http_module.cpp Outdated Show resolved Hide resolved
src/http_module.cpp Outdated Show resolved Hide resolved
tests/otel_collector_tls.t Outdated Show resolved Hide resolved
src/batch_exporter.hpp Outdated Show resolved Hide resolved
src/http_module.cpp Outdated Show resolved Hide resolved
src/http_module.cpp Outdated Show resolved Hide resolved
@krjakbrjak krjakbrjak changed the title Add optional TLS certificates to the gRPC client Support export via TLS Nov 15, 2024
@krjakbrjak
Copy link
Author

Thanks for the PR.

The commit message is rather confusing, though. It should probably be "Support export via TLS (fix #12)."

Thanks for the review. I pushed the changes. Please let me know what you think.

p-pautov
p-pautov reviewed Nov 16, 2024
View reviewed changes
Copy link
Contributor

@p-pautov p-pautov left a comment

Choose a reason for hiding this comment

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

The commit message is not quite there, yet.

src/batch_exporter.hpp Outdated Show resolved Hide resolved
src/http_module.cpp Outdated Show resolved Hide resolved
src/http_module.cpp Outdated Show resolved Hide resolved
src/http_module.cpp Outdated Show resolved Hide resolved
src/http_module.cpp Outdated Show resolved Hide resolved
src/http_module.cpp Outdated Show resolved Hide resolved
src/trace_service_client.hpp Outdated Show resolved Hide resolved
src/trace_service_client.hpp Outdated Show resolved Hide resolved
src/trace_service_client.hpp Outdated Show resolved Hide resolved
src/http_module.cpp Outdated Show resolved Hide resolved
@krjakbrjak krjakbrjak changed the title Support export via TLS Support export via TLS (fix #12) Nov 16, 2024
@p-pautov
Copy link
Contributor

Could you please resolve conversations you've addressed.

p-pautov
p-pautov reviewed Nov 18, 2024
View reviewed changes
src/http_module.cpp Outdated Show resolved Hide resolved
src/http_module.cpp Outdated Show resolved Hide resolved
src/http_module.cpp Outdated Show resolved Hide resolved
src/http_module.cpp Outdated Show resolved Hide resolved
src/http_module.cpp Outdated Show resolved Hide resolved
src/http_module.cpp Outdated Show resolved Hide resolved
p-pautov
p-pautov reviewed Nov 20, 2024
View reviewed changes
Copy link
Contributor

@p-pautov p-pautov left a comment

Choose a reason for hiding this comment

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

The commits need to be squashed and rebased (as main was updated) before the merge.

Also, the commit message should be:

Support export via TLS (fix #12).

src/batch_exporter.hpp Outdated Show resolved Hide resolved
src/http_module.cpp Outdated Show resolved Hide resolved
src/http_module.cpp Outdated Show resolved Hide resolved
src/http_module.cpp Outdated Show resolved Hide resolved
src/trace_service_client.hpp Outdated Show resolved Hide resolved
src/http_module.cpp Outdated Show resolved Hide resolved
src/http_module.cpp Outdated Show resolved Hide resolved
src/http_module.cpp Outdated Show resolved Hide resolved
p-pautov
p-pautov requested changes Nov 21, 2024
View reviewed changes
Copy link
Contributor

@p-pautov p-pautov left a comment

Choose a reason for hiding this comment

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

Almost there...

src/http_module.cpp Outdated Show resolved Hide resolved
src/batch_exporter.hpp Outdated Show resolved Hide resolved
p-pautov
p-pautov reviewed Nov 21, 2024
View reviewed changes
src/http_module.cpp Outdated Show resolved Hide resolved
p-pautov
p-pautov approved these changes Nov 21, 2024
View reviewed changes
Copy link
Contributor

@p-pautov p-pautov left a comment

Choose a reason for hiding this comment

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

Thanks for your work!

@p-pautov p-pautov merged commit 6c1659a into nginxinc:main Nov 21, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@p-pautov p-pautov p-pautov approved these changes

@jdehaan jdehaan jdehaan approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@krjakbrjak @AlekseySVTN @p-pautov @jdehaan