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

HTTPD instrumentation: Safe modification of httpd.conf #3395

Merged
merged 5 commits into from
Oct 28, 2024

Conversation

CostisC
Copy link
Contributor

@CostisC CostisC commented Oct 26, 2024

Description:
The Include /usr/local/apache2/conf/opentemetry_agent.conf may be appended on the same line with the last httpd.conf statement, if there is not a blank last line in httpd.conf. This results in a corrupted httpd configuration, and the service will not start.

It is safer that an empty line comes before the addition of Include ...opentemetry_agent.conf, as a protection measure against such cases.

Link to tracking Issue(s): N/A

Testing: Change httpd.conf to not have an blank last line, and then restart the instrumented httpd pod. It fails to start up.

Documentation: N/A

@CostisC CostisC requested a review from a team as a code owner October 26, 2024 16:11
Copy link

linux-foundation-easycla bot commented Oct 26, 2024

CLA Signed

The committers listed above are authorized under a signed CLA.

@swiatekm
Copy link
Contributor

Thank you for the contribution! Could you add a changelog entry to this PR? Running make chlog-new in the operator root directory will create a template file in .chloggen that you can fill in.

@swiatekm swiatekm merged commit 143c33c into open-telemetry:main Oct 28, 2024
36 checks passed
@CostisC CostisC deleted the httpd_safe_conf branch October 28, 2024 17:04
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.

2 participants