Refactor container-id weblog test #4925
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…y call 'cat /proc/self/cgroup' on the weblog container instead of asking the weblog application (over an HTTP call) to read a file. This allows us to instead call the '/' endpoint which all weblog applications should be handling.
…essary. They were only used for the container-id testing.
zacharycmontoya
requested review from
P403n1x87,
quinna-h,
jade-guiton-dd,
ygree,
smola and
sezen-datadog
and removed request for
a team
cbeauchesne
reviewed
Jul 18, 2025
| reason="Missing endpoint", | ||
| ) | ||
| @missing_feature(context.library == "ruby" and context.weblog_variant != "rails70", reason="Missing endpoint") | ||
| self.r = weblog.get("/") |
There was a problem hiding this comment.
Is there a reason for keeping this request ?
There was a problem hiding this comment.
I kept it because I thought it would be necessary in order to test that trace payloads sent to the agent have the required header. What happens if I remove it?
There was a problem hiding this comment.
Your test code is checking all traces trigerred by the scenario, not only this one (it's the default scenario , and there are thousand of them).
Well, it does not hurt, but as your test is no linked to only this requests, it's not that necessary. Up to you, both are fine to me.
cbeauchesne
approved these changes
Jul 18, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
We're in the process of enhancing the container-id extraction support in the C++ tracer and I wanted to update the testing to support it. The current logic depends on the weblog applications implementing a
/read_fileendpoint and the test runner trusts this endpoint, only making assertions if that value is present. This means we're showing false positives against the C++ tracer code. I'm proposing changes to make the test runner get the expected value itself, instead of getting both the expected value and the actual value from the weblog application.Changes
Refactors the container-id weblog test logic to get the expected value by directly running
cat /proc/self/cgroupon the weblog container, instead of depending on the weblog HTTP server to self-report the cgroup via the/read_fileendpoint.This PR also removes all
/read_fileendpoints since this was the only use of the endpoint.Workflow
🚀 Once your PR is reviewed and the CI green, you can merge it!
🛟 #apm-shared-testing 🛟
Reviewer checklist
[<language>], double-check that only<language>is impacted by the changebuild-XXX-imagelabel is present