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

Document usage of multiple collector config files #5989

Merged
merged 2 commits into from
Feb 12, 2025

Conversation

meswapnilk
Copy link
Contributor

Closes #5296

@meswapnilk meswapnilk requested a review from a team as a code owner January 20, 2025 10:01
@opentelemetrybot opentelemetrybot requested review from a team and TylerHelmuth and removed request for a team January 20, 2025 10:01
follows:

```shell
otelcol --cofig=file:/path/to/first/file --config=file:/path/to/second/file
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
otelcol --cofig=file:/path/to/first/file --config=file:/path/to/second/file
otelcol --config=file:/path/to/first/file --config=file:/path/to/second/file

@tiffany76
Copy link
Contributor

@mowies, does this PR address the issue you raised in #5296?

@mowies
Copy link
Member

mowies commented Feb 3, 2025

Yes, LGTM!

@opentelemetrybot opentelemetrybot requested a review from a team February 10, 2025 04:27
@tiffany76
Copy link
Contributor

@meswapnilk, could you fix the typo in my earlier comment? Thanks!

Copy link
Contributor

@chalin chalin left a comment

Choose a reason for hiding this comment

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

LGTM with @tiffany76's suggestion addressed, and approval from @open-telemetry/collector-approvers.

@tiffany76
Copy link
Contributor

Hi @meswapnilk, it looks like some submodule changes were included in your last commit that shouldn't be there. Could you run npm run fix:submodule locally? If that doesn't work, try rebasing. Once those submodules are gone, the conflicts should disappear as well. Thanks.

@meswapnilk
Copy link
Contributor Author

Hi @meswapnilk, it looks like some submodule changes were included in your last commit that shouldn't be there. Could you run npm run fix:submodule locally? If that doesn't work, try rebasing. Once those submodules are gone, the conflicts should disappear as well. Thanks.

Done

@tiffany76 tiffany76 added this pull request to the merge queue Feb 12, 2025
Merged via the queue into open-telemetry:main with commit 7097e50 Feb 12, 2025
18 checks passed
@opentelemetrybot
Copy link
Collaborator

Thank you for your contribution! 🎉 We would like to hear from you about your experience contributing to OpenTelemetry by taking a few minutes to fill out this survey

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Usage of multiple collector config files is not clearly documented
7 participants