fix: expand k8s pod discovery regex#1288
Merged
kruskall merged 6 commits intoelastic:mainfrom Aug 9, 2022
Merged
Conversation
update k8s pod ID discovery regex to the current status of the spec. See https://github.com/elastic/apm/blob/main/specs/agents/metadata.md#containerkubernetes-metadata Add a testcase to make sure the pod mentioned in the related issue is discovered correctly.
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
🤖 GitHub commentsTo re-run your PR in the CI, just comment with:
|
axw
reviewed
Aug 8, 2022
Member
axw
left a comment
axw
left a comment
There was a problem hiding this comment.
Should we also add the test case from the description of elastic/apm#508?
This should also add support for containerd-cri containers.
include ^ and $ on each regex for clarity and also to be better in line with the current spec.
🌐 Coverage report
|
Member
Author
|
It turns out that the test case in the description was not recognized as the discovery algorithm was outdated. I've updated the code, added comments and a test case 🏓 |
axw
approved these changes
Aug 9, 2022
v1v
added a commit
to v1v/apm-agent-go
that referenced
this pull request
Sep 1, 2022
…hmark-reporting * upstream/main: (25 commits) docs: update correct env flag for loglevel (elastic#1299) fix: readd deprecated span_frames_min_duration option as fallback for older configuration (elastic#1297) feat: rename span_frames_min_duration to span_stack_trace_min_duration (elastic#1285) test: verify Ubuntu cgroup line parsing for container ID (elastic#1293) tracer: Parse global labels per tracer (elastic#1290) feat: update sns span.name to reflect the current spec (elastic#1286) fix: expand k8s pod discovery regex (elastic#1288) test: add testcase for sqs delete_batch operation (elastic#1283) docs: document ELASTIC_APM_SERVER_CA_CERT_FILE (elastic#1289) fix: reformat code with go 1.19 to fix ci failure (elastic#1284) feat: add service target fields support to elasticsearch module (elastic#1281) fix: use the correct destination resource and name for azure queue (elastic#1282) feat: add service target fields support to azure module (elastic#1280) feat: add service target fields support to aws module (elastic#1278) feat: add service target fields support to sql module (elastic#1279) synchronize json schema specs (elastic#1260) fix: make sure at least one of the service target fields is sent (elastic#1277) docs: add link to release-notes-2.x (elastic#1271) feat: add service target fields (elastic#1274) perf: skip tracestate regex validation for es vendor key (elastic#1275) ...
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
update k8s pod ID discovery regex to the current status of the spec.
See https://github.com/elastic/apm/blob/main/specs/agents/metadata.md#containerkubernetes-metadata
Add a testcase to make sure the pod mentioned in the related issue is
discovered correctly.
Closes #822