-
Notifications
You must be signed in to change notification settings - Fork 417
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
[CONTINT-3554] Fix build on linux and do not send cgroup node inode if in host cgroup namespace #2453
Merged
Merged
[CONTINT-3554] Fix build on linux and do not send cgroup node inode if in host cgroup namespace #2453
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
54c2269
Add build flags and stub + make sure the inode is reported only if we…
AliDatadog 901f30d
remove test build flag
AliDatadog d27c2f9
make tests non environment specific
AliDatadog 96ae25e
Merge branch 'main' into ali/fix-cid-retrieval-on-host
nsrip-dd c27d945
Merge branch 'main' into ali/fix-cid-retrieval-on-host
nsrip-dd File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
// Unless explicitly stated otherwise all files in this repository are licensed | ||
// under the Apache License Version 2.0. | ||
// This product includes software developed at Datadog (https://www.datadoghq.com/). | ||
// Copyright 2016 Datadog, Inc. | ||
|
||
//go:build !linux | ||
|
||
package internal | ||
|
||
// ContainerID attempts to return the container ID from /proc/self/cgroup or empty on failure. | ||
func ContainerID() string { | ||
return "" | ||
} | ||
|
||
// EntityID attempts to return the container ID or the cgroup v2 node inode if the container ID is not available. | ||
// The cid is prefixed with `cid-` and the inode with `in-`. | ||
func EntityID() string { | ||
return "" | ||
} |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
test
build tag isn't defined, so these tests won't run. I think you just want thelinux
tag.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks. I just removed it !
I also asked a review to my team members. They should have the knowledge necessary. Normally I am just aligning on what is done in dogstatsd DataDog/datadog-go#291