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

[receiver/fluentforward] Release port on shutdown #9111

Merged
merged 6 commits into from
Apr 18, 2022
Merged

[receiver/fluentforward] Release port on shutdown #9111

merged 6 commits into from
Apr 18, 2022

Conversation

gagansingh355
Copy link
Contributor

This is fix for #9110.

@gagansingh355 gagansingh355 requested a review from a team April 7, 2022 10:42
@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Apr 7, 2022 •
edited
Loading

CLA Signed

The committers listed above are authorized under a signed CLA.

@gagansingh355 gagansingh355 changed the title Fix for #9110 Fluentforward receiver not releasing port for reloading of OTEL collector #9110 Apr 7, 2022
@gagansingh355 gagansingh355 changed the title Fluentforward receiver not releasing port for reloading of OTEL collector #9110 Fix for #9110 - Fluentforward receiver not releasing port for reloading of OTEL collector Apr 7, 2022
@jpkrohling
Copy link
Member

LGTM, but there's a merge conflict with the changelog. Unfortunately, I can't fix it for you.

@gagansingh355
Copy link
Contributor Author

@jpkrohling , I have resolved the merge conflict. Please merge this.

@gagansingh355
Copy link
Contributor Author

gagansingh355 commented Apr 14, 2022 •
edited
Loading

@jpkrohling Seems like some changes were pushed in CHANGELOG.md after i resolved previous conflicts. Please merge this again.

@jpkrohling jpkrohling changed the title Fix for #9110 - Fluentforward receiver not releasing port for reloading of OTEL collector [receiver/fluentforward] Release port on shutdown Apr 14, 2022
jpkrohling
jpkrohling reviewed Apr 14, 2022
View reviewed changes
CHANGELOG.md Outdated
@@ -68,6 +68,7 @@
- `signalfxexporter`: Fix bug to enable timeouts for correlating traces and metrics (#9101)
- `windowsperfcountersreceiver`: fix exported values being integers instead of doubles (#9138)
- `prometheusreceiver`: Fix issues with relabelling the `job` and `instance` labels. (#8780)
- `fluentforwardreceiver`: Fluentforward receiver not releasing port for reloading of OTEL collector (#9111)
Copy link
Member

Choose a reason for hiding this comment

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

Sorry for one more change about this, but we just had a release and this has to be moved to the unreleased section. I tried updating this PR, but I couldn't push my changes.

Copy link
Contributor Author

@gagansingh355 gagansingh355 Apr 14, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

@jpkrohling I have update this push to unreleased section.

@gagansingh355
Copy link
Contributor Author

@jpkrohling , @dmitryax New code was pushed in main hence test were failing, I have down merged main branch into this. Please merge this.

@codeboten codeboten merged commit df42db3 into open-telemetry:main Apr 18, 2022
@codeboten
Copy link
Contributor

Thanks @gagansingh355

@ahayworth ahayworth mentioned this pull request May 16, 2022
Closed
@dmitryax dmitryax mentioned this pull request May 31, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jpkrohling jpkrohling jpkrohling approved these changes

@codeboten codeboten codeboten approved these changes

@dmitryax dmitryax dmitryax approved these changes

Assignees

@dmitryax dmitryax

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@gagansingh355 @jpkrohling @codeboten @dmitryax